diff --git a/cli/CommandLine.cpp b/cli/CommandLine.cpp
index f539c75..d314cec 100644
--- a/cli/CommandLine.cpp
+++ b/cli/CommandLine.cpp
@@ -217,10 +217,10 @@ void TouchPressCommand::RunAction()
     param.y = atof(args["y"].asString().data());
     param.type = type;
     param.name = "TouchPress";
-    param.button = MouseInputImpl::GetInstance().DEFAULT_BUTTON;
-    param.action = MouseInputImpl::GetInstance().DEFAULT_ACTION;
-    param.sourceType = MouseInputImpl::GetInstance().DEFAULT_SOURCETYPE;
-    param.sourceTool = MouseInputImpl::GetInstance().DEFAULT_SOURCETOOL;
+    param.button = MouseInputImpl::GetInstance().defaultButton;
+    param.action = MouseInputImpl::GetInstance().defaultAction;
+    param.sourceType = MouseInputImpl::GetInstance().defaultSourceType;
+    param.sourceTool = MouseInputImpl::GetInstance().defaultSourceTool;
     SetEventParams(param);
     SetCommandResult("result", true);
 }
@@ -261,10 +261,10 @@ void TouchReleaseCommand::RunAction()
     param.y = atof(args["y"].asString().data());
     param.type = type;
     param.name = "TouchRelease";
-    param.button = MouseInputImpl::GetInstance().DEFAULT_BUTTON;
-    param.action = MouseInputImpl::GetInstance().DEFAULT_ACTION;
-    param.sourceType = MouseInputImpl::GetInstance().DEFAULT_SOURCETYPE;
-    param.sourceTool = MouseInputImpl::GetInstance().DEFAULT_SOURCETOOL;
+    param.button = MouseInputImpl::GetInstance().defaultButton;
+    param.action = MouseInputImpl::GetInstance().defaultAction;
+    param.sourceType = MouseInputImpl::GetInstance().defaultSourceType;
+    param.sourceTool = MouseInputImpl::GetInstance().defaultSourceTool;
     SetEventParams(param);
     SetCommandResult("result", true);
 }
@@ -301,10 +301,10 @@ void TouchMoveCommand::RunAction()
     param.y = atof(args["y"].asString().data());
     param.type = type;
     param.name = "TouchMove";
-    param.button = MouseInputImpl::GetInstance().DEFAULT_BUTTON;
-    param.action = MouseInputImpl::GetInstance().DEFAULT_ACTION;
-    param.sourceType = MouseInputImpl::GetInstance().DEFAULT_SOURCETYPE;
-    param.sourceTool = MouseInputImpl::GetInstance().DEFAULT_SOURCETOOL;
+    param.button = MouseInputImpl::GetInstance().defaultButton;
+    param.action = MouseInputImpl::GetInstance().defaultAction;
+    param.sourceType = MouseInputImpl::GetInstance().defaultSourceType;
+    param.sourceTool = MouseInputImpl::GetInstance().defaultSourceTool;
     SetEventParams(param);
     SetCommandResult("result", true);
 }
diff --git a/mock/MouseInput.h b/mock/MouseInput.h
index 613d714..05d1309 100644
--- a/mock/MouseInput.h
+++ b/mock/MouseInput.h
@@ -33,10 +33,10 @@ public:
     virtual void SetSourceTool(int sourceToolVal);
     virtual void SetPressedBtns(std::set<int>& pressedBtns);
     virtual void SetAxisValues(std::vector<double>& axisValues); // 13 is array size
-    const int DEFAULT_BUTTON = -1; // default unknown
-    const int DEFAULT_ACTION = 0;  // default unknown
-    const int DEFAULT_SOURCETYPE = 2; // default touch
-    const int DEFAULT_SOURCETOOL = 1; // default finger
+    const int defaultButton = -1; // default unknown
+    const int defaultAction = 0;  // default unknown
+    const int defaultSourceType = 2; // default touch
+    const int defaultSourceTool = 1; // default finger
 
 protected:
     MouseInput();