diff --git a/webdriver/commands/Accept_Alert.json b/webdriver/commands/AcceptAlert.json
similarity index 100%
rename from webdriver/commands/Accept_Alert.json
rename to webdriver/commands/AcceptAlert.json
diff --git a/webdriver/commands/Add_Cookie.json b/webdriver/commands/AddCookie.json
similarity index 100%
rename from webdriver/commands/Add_Cookie.json
rename to webdriver/commands/AddCookie.json
diff --git a/webdriver/commands/Close_Window.json b/webdriver/commands/CloseWindow.json
similarity index 100%
rename from webdriver/commands/Close_Window.json
rename to webdriver/commands/CloseWindow.json
diff --git a/webdriver/commands/Delete_All_Cookies.json b/webdriver/commands/DeleteAllCookies.json
similarity index 100%
rename from webdriver/commands/Delete_All_Cookies.json
rename to webdriver/commands/DeleteAllCookies.json
diff --git a/webdriver/commands/Delete_Cookie.json b/webdriver/commands/DeleteCookie.json
similarity index 100%
rename from webdriver/commands/Delete_Cookie.json
rename to webdriver/commands/DeleteCookie.json
diff --git a/webdriver/commands/Delete_Session.json b/webdriver/commands/DeleteSession.json
similarity index 100%
rename from webdriver/commands/Delete_Session.json
rename to webdriver/commands/DeleteSession.json
diff --git a/webdriver/commands/Dismiss_Alert.json b/webdriver/commands/DismissAlert.json
similarity index 100%
rename from webdriver/commands/Dismiss_Alert.json
rename to webdriver/commands/DismissAlert.json
diff --git a/webdriver/commands/Element_Clear.json b/webdriver/commands/ElementClear.json
similarity index 100%
rename from webdriver/commands/Element_Clear.json
rename to webdriver/commands/ElementClear.json
diff --git a/webdriver/commands/Element_Click.json b/webdriver/commands/ElementClick.json
similarity index 100%
rename from webdriver/commands/Element_Click.json
rename to webdriver/commands/ElementClick.json
diff --git a/webdriver/commands/Element_Send_Keys.json b/webdriver/commands/ElementSendKeys.json
similarity index 100%
rename from webdriver/commands/Element_Send_Keys.json
rename to webdriver/commands/ElementSendKeys.json
diff --git a/webdriver/commands/Execute_Async_Script.json b/webdriver/commands/ExecuteAsyncScript.json
similarity index 100%
rename from webdriver/commands/Execute_Async_Script.json
rename to webdriver/commands/ExecuteAsyncScript.json
diff --git a/webdriver/commands/Execute_Script.json b/webdriver/commands/ExecuteScript.json
similarity index 100%
rename from webdriver/commands/Execute_Script.json
rename to webdriver/commands/ExecuteScript.json
diff --git a/webdriver/commands/Find_Element.json b/webdriver/commands/FindElement.json
similarity index 100%
rename from webdriver/commands/Find_Element.json
rename to webdriver/commands/FindElement.json
diff --git a/webdriver/commands/Find_Element_From_Element.json b/webdriver/commands/FindElementFromElement.json
similarity index 100%
rename from webdriver/commands/Find_Element_From_Element.json
rename to webdriver/commands/FindElementFromElement.json
diff --git a/webdriver/commands/Find_Elements.json b/webdriver/commands/FindElements.json
similarity index 100%
rename from webdriver/commands/Find_Elements.json
rename to webdriver/commands/FindElements.json
diff --git a/webdriver/commands/Find_Elements_From_Element.json b/webdriver/commands/FindElementsFromElement.json
similarity index 100%
rename from webdriver/commands/Find_Elements_From_Element.json
rename to webdriver/commands/FindElementsFromElement.json
diff --git a/webdriver/commands/Fullscreen_Window.json b/webdriver/commands/FullscreenWindow.json
similarity index 100%
rename from webdriver/commands/Fullscreen_Window.json
rename to webdriver/commands/FullscreenWindow.json
diff --git a/webdriver/commands/Get_Active_Element.json b/webdriver/commands/GetActiveElement.json
similarity index 100%
rename from webdriver/commands/Get_Active_Element.json
rename to webdriver/commands/GetActiveElement.json
diff --git a/webdriver/commands/Get_Alert_Text.json b/webdriver/commands/GetAlertText.json
similarity index 100%
rename from webdriver/commands/Get_Alert_Text.json
rename to webdriver/commands/GetAlertText.json
diff --git a/webdriver/commands/Get_All_Cookies.json b/webdriver/commands/GetAllCookies.json
similarity index 100%
rename from webdriver/commands/Get_All_Cookies.json
rename to webdriver/commands/GetAllCookies.json
diff --git a/webdriver/commands/Get_Current_URL.json b/webdriver/commands/GetCurrentURL.json
similarity index 100%
rename from webdriver/commands/Get_Current_URL.json
rename to webdriver/commands/GetCurrentURL.json
diff --git a/webdriver/commands/Get_Element_Attribute.json b/webdriver/commands/GetElementAttribute.json
similarity index 100%
rename from webdriver/commands/Get_Element_Attribute.json
rename to webdriver/commands/GetElementAttribute.json
diff --git a/webdriver/commands/Get_Element_CSS_Value.json b/webdriver/commands/GetElementCSSValue.json
similarity index 100%
rename from webdriver/commands/Get_Element_CSS_Value.json
rename to webdriver/commands/GetElementCSSValue.json
diff --git a/webdriver/commands/Get_Element_Property.json b/webdriver/commands/GetElementProperty.json
similarity index 100%
rename from webdriver/commands/Get_Element_Property.json
rename to webdriver/commands/GetElementProperty.json
diff --git a/webdriver/commands/Get_Element_Rect.json b/webdriver/commands/GetElementRect.json
similarity index 100%
rename from webdriver/commands/Get_Element_Rect.json
rename to webdriver/commands/GetElementRect.json
diff --git a/webdriver/commands/Get_Element_Tag_Name.json b/webdriver/commands/GetElementTagName.json
similarity index 100%
rename from webdriver/commands/Get_Element_Tag_Name.json
rename to webdriver/commands/GetElementTagName.json
diff --git a/webdriver/commands/Get_Element_Text.json b/webdriver/commands/GetElementText.json
similarity index 100%
rename from webdriver/commands/Get_Element_Text.json
rename to webdriver/commands/GetElementText.json
diff --git a/webdriver/commands/Get_Named_Cookie.json b/webdriver/commands/GetNamedCookie.json
similarity index 100%
rename from webdriver/commands/Get_Named_Cookie.json
rename to webdriver/commands/GetNamedCookie.json
diff --git a/webdriver/commands/Get_Page_Source.json b/webdriver/commands/GetPageSource.json
similarity index 100%
rename from webdriver/commands/Get_Page_Source.json
rename to webdriver/commands/GetPageSource.json
diff --git a/webdriver/commands/Get_Timeouts.json b/webdriver/commands/GetTimeouts.json
similarity index 100%
rename from webdriver/commands/Get_Timeouts.json
rename to webdriver/commands/GetTimeouts.json
diff --git a/webdriver/commands/Get_Title.json b/webdriver/commands/GetTitle.json
similarity index 100%
rename from webdriver/commands/Get_Title.json
rename to webdriver/commands/GetTitle.json
diff --git a/webdriver/commands/Get_Window_Handle.json b/webdriver/commands/GetWindowHandle.json
similarity index 100%
rename from webdriver/commands/Get_Window_Handle.json
rename to webdriver/commands/GetWindowHandle.json
diff --git a/webdriver/commands/Get_Window_Handles.json b/webdriver/commands/GetWindowHandles.json
similarity index 100%
rename from webdriver/commands/Get_Window_Handles.json
rename to webdriver/commands/GetWindowHandles.json
diff --git a/webdriver/commands/Get_Window_Rect.json b/webdriver/commands/GetWindowRect.json
similarity index 100%
rename from webdriver/commands/Get_Window_Rect.json
rename to webdriver/commands/GetWindowRect.json
diff --git a/webdriver/commands/Is_Element_Enabled.json b/webdriver/commands/IsElementEnabled.json
similarity index 100%
rename from webdriver/commands/Is_Element_Enabled.json
rename to webdriver/commands/IsElementEnabled.json
diff --git a/webdriver/commands/Is_Element_Selected.json b/webdriver/commands/IsElementSelected.json
similarity index 100%
rename from webdriver/commands/Is_Element_Selected.json
rename to webdriver/commands/IsElementSelected.json
diff --git a/webdriver/commands/Maximize_Window.json b/webdriver/commands/MaximizeWindow.json
similarity index 100%
rename from webdriver/commands/Maximize_Window.json
rename to webdriver/commands/MaximizeWindow.json
diff --git a/webdriver/commands/Minimize_Window.json b/webdriver/commands/MinimizeWindow.json
similarity index 100%
rename from webdriver/commands/Minimize_Window.json
rename to webdriver/commands/MinimizeWindow.json
diff --git a/webdriver/commands/Navigate_To.json b/webdriver/commands/NavigateTo.json
similarity index 100%
rename from webdriver/commands/Navigate_To.json
rename to webdriver/commands/NavigateTo.json
diff --git a/webdriver/commands/New_Session.json b/webdriver/commands/NewSession.json
similarity index 100%
rename from webdriver/commands/New_Session.json
rename to webdriver/commands/NewSession.json
diff --git a/webdriver/commands/Perform_Actions.json b/webdriver/commands/PerformActions.json
similarity index 100%
rename from webdriver/commands/Perform_Actions.json
rename to webdriver/commands/PerformActions.json
diff --git a/webdriver/commands/Release_Actions.json b/webdriver/commands/ReleaseActions.json
similarity index 100%
rename from webdriver/commands/Release_Actions.json
rename to webdriver/commands/ReleaseActions.json
diff --git a/webdriver/commands/Send_Alert_Text.json b/webdriver/commands/SendAlertText.json
similarity index 100%
rename from webdriver/commands/Send_Alert_Text.json
rename to webdriver/commands/SendAlertText.json
diff --git a/webdriver/commands/Set_Timeouts.json b/webdriver/commands/SetTimeouts.json
similarity index 100%
rename from webdriver/commands/Set_Timeouts.json
rename to webdriver/commands/SetTimeouts.json
diff --git a/webdriver/commands/Set_Window_Rect.json b/webdriver/commands/SetWindowRect.json
similarity index 100%
rename from webdriver/commands/Set_Window_Rect.json
rename to webdriver/commands/SetWindowRect.json
diff --git a/webdriver/commands/Switch_To_Frame.json b/webdriver/commands/SwitchToFrame.json
similarity index 100%
rename from webdriver/commands/Switch_To_Frame.json
rename to webdriver/commands/SwitchToFrame.json
diff --git a/webdriver/commands/Switch_To_Parent_Frame.json b/webdriver/commands/SwitchToParentFrame.json
similarity index 100%
rename from webdriver/commands/Switch_To_Parent_Frame.json
rename to webdriver/commands/SwitchToParentFrame.json
diff --git a/webdriver/commands/Switch_To_Window.json b/webdriver/commands/SwitchToWindow.json
similarity index 100%
rename from webdriver/commands/Switch_To_Window.json
rename to webdriver/commands/SwitchToWindow.json
diff --git a/webdriver/commands/Take_Element_Screenshot.json b/webdriver/commands/TakeElementScreenshot.json
similarity index 100%
rename from webdriver/commands/Take_Element_Screenshot.json
rename to webdriver/commands/TakeElementScreenshot.json
diff --git a/webdriver/commands/Take_Screenshot.json b/webdriver/commands/TakeScreenshot.json
similarity index 100%
rename from webdriver/commands/Take_Screenshot.json
rename to webdriver/commands/TakeScreenshot.json