diff --git a/client/tomcatconf/commands.properties.in b/client/tomcatconf/commands.properties.in
index bb98211053a..c0a522dc086 100755
--- a/client/tomcatconf/commands.properties.in
+++ b/client/tomcatconf/commands.properties.in
@@ -33,11 +33,11 @@ updateResourceLimit=com.cloud.api.commands.UpdateResourceLimitCmd;3
 listResourceLimits=com.cloud.api.commands.ListResourceLimitsCmd;15
 
 #### VM commands
-deployVirtualMachine=com.cloud.api.commands.DeployVm2Cmd;11
-destroyVirtualMachine=com.cloud.api.commands.DestroyVm2Cmd;15
+deployVirtualMachine=com.cloud.api.commands.DeployVMCmd;11
+destroyVirtualMachine=com.cloud.api.commands.DestroyVMCmd;15
 rebootVirtualMachine=com.cloud.api.commands.RebootVMCmd;15
-startVirtualMachine=com.cloud.api.commands.StartVm2Cmd;15
-stopVirtualMachine=com.cloud.api.commands.StopVm2Cmd;15
+startVirtualMachine=com.cloud.api.commands.StartVMCmd;15
+stopVirtualMachine=com.cloud.api.commands.StopVMCmd;15
 resetPasswordForVirtualMachine=com.cloud.api.commands.ResetVMPasswordCmd;15
 changeServiceForVirtualMachine=com.cloud.api.commands.UpgradeVMCmd;15
 updateVirtualMachine=com.cloud.api.commands.UpdateVMCmd;15
@@ -117,16 +117,16 @@ listLoadBalancerRules=com.cloud.api.commands.ListLoadBalancerRulesCmd;15
 listLoadBalancerRuleInstances=com.cloud.api.commands.ListLoadBalancerRuleInstancesCmd;15
 
 #### router commands
-startRouter=com.cloud.api.commands.StartRouter2Cmd;3
+startRouter=com.cloud.api.commands.StartRouterCmd;3
 rebootRouter=com.cloud.api.commands.RebootRouterCmd;3
-stopRouter=com.cloud.api.commands.StopRouter2Cmd;3
+stopRouter=com.cloud.api.commands.StopRouterCmd;3
 changeServiceForRouter=com.cloud.api.commands.UpgradeRouterCmd;3
 listRouters=com.cloud.api.commands.ListRoutersCmd;7
 
 #### system vm commands
-startSystemVm=com.cloud.api.commands.StartSystemVm2Cmd;1
+startSystemVm=com.cloud.api.commands.StartSystemVmCmd;1
 rebootSystemVm=com.cloud.api.commands.RebootSystemVmCmd;1
-stopSystemVm=com.cloud.api.commands.StopSystemVm2Cmd;1
+stopSystemVm=com.cloud.api.commands.StopSystemVmCmd;1
 listSystemVms=com.cloud.api.commands.ListSystemVMsCmd;1
 
 #### configuration commands
diff --git a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
index e6ef7b5e576..369de47ef6b 100644
--- a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
+++ b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
@@ -531,7 +531,7 @@ public class ConsoleProxyManagerImpl implements ConsoleProxyManager, VirtualMach
     @Override
     public ConsoleProxyVO startProxy(long proxyVmId, long startEventId) {
         try {
-            return start2(proxyVmId, startEventId);
+            return start(proxyVmId, startEventId);
         } catch (StorageUnavailableException e) {
             s_logger.warn("Exception while trying to start console proxy", e);
             return null;
@@ -887,7 +887,7 @@ public class ConsoleProxyManagerImpl implements ConsoleProxyManager, VirtualMach
         if (s_logger.isDebugEnabled())
             s_logger.debug("Assign console proxy from a newly started instance for request from data center : " + dataCenterId);
 
-        Map<String, Object> context = createProxyInstance2(dataCenterId);
+        Map<String, Object> context = createProxyInstance(dataCenterId);
 
         long proxyVmId = (Long) context.get("proxyVmId");
         if (proxyVmId == 0) {
@@ -927,7 +927,7 @@ public class ConsoleProxyManagerImpl implements ConsoleProxyManager, VirtualMach
         if (s_logger.isDebugEnabled())
             s_logger.debug("Assign console proxy from a newly started instance for request from data center : " + dataCenterId);
 
-        Map<String, Object> context = createProxyInstance2(dataCenterId);
+        Map<String, Object> context = createProxyInstance(dataCenterId);
 
         long proxyVmId = (Long) context.get("proxyVmId");
         if (proxyVmId == 0) {
@@ -1468,7 +1468,7 @@ public class ConsoleProxyManagerImpl implements ConsoleProxyManager, VirtualMach
                                 try {
                                     if (proxyLock.lock(ACQUIRE_GLOBAL_LOCK_TIMEOUT_FOR_SYNC)) {
                                         try {
-                                            readyProxy = start2(readyProxy.getId(), 0);
+                                            readyProxy = start(readyProxy.getId(), 0);
                                         } finally {
                                             proxyLock.unlock();
                                         }