--- a/doodle/tk/events.d	Sun Aug 08 22:01:54 2010 +0930
+++ b/doodle/tk/events.d	Mon Aug 09 21:43:24 2010 +0930
@@ -69,14 +69,14 @@
 */
 
 final class ButtonEvent : PointerEvent {
-    this(in ButtonAction button_action,
-         in ButtonName button_name,
+    this(in ButtonAction buttonAction,
+         in ButtonName buttonName,
          in Point pixelPoint,
          in Point modelPoint,
          in Mask mask) {   
         super(pixelPoint, modelPoint, mask);
-        _buttonAction = button_action;
-        _buttonName = button_name;
+        _buttonAction = buttonAction;
+        _buttonName = buttonName;
     }
 
     override string toString() const {
@@ -85,8 +85,8 @@
                                  _pixelPoint, _modelPoint, _mask);
     }
 
-    ButtonAction button_action() const { return _buttonAction; }
-    ButtonName button_name() const { return _buttonName; }
+    ButtonAction buttonAction() const { return _buttonAction; }
+    ButtonName buttonName() const { return _buttonName; }
 
     private {
         ButtonAction _buttonAction;