diff --git a/agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java b/agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java
index f8f4bda4fc4..f13096ebb9e 100644
--- a/agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java
+++ b/agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java
@@ -135,7 +135,7 @@ import com.cloud.agent.api.check.CheckSshCommand;
 import com.cloud.agent.api.proxy.CheckConsoleProxyLoadCommand;
 import com.cloud.agent.api.proxy.ConsoleProxyLoadAnswer;
 import com.cloud.agent.api.proxy.WatchConsoleProxyLoadCommand;
-import com.cloud.agent.api.routing.IPAssocCommand;
+import com.cloud.agent.api.routing.IpAssocCommand;
 import com.cloud.agent.api.routing.IpAssocAnswer;
 import com.cloud.agent.api.routing.NetworkElementCommand;
 import com.cloud.agent.api.storage.CreateAnswer;
@@ -882,8 +882,8 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
             	return execute((FenceCommand) cmd);
             } else if (cmd instanceof StartCommand ) {
             	return execute((StartCommand) cmd);
-            }  else if (cmd instanceof IPAssocCommand) {
-                return execute((IPAssocCommand)cmd);
+            }  else if (cmd instanceof IpAssocCommand) {
+                return execute((IpAssocCommand)cmd);
             }else if (cmd instanceof NetworkElementCommand) {
             	return _virtRouterResource.executeRequest(cmd);
             } else if (cmd instanceof CheckSshCommand) {
@@ -1031,7 +1031,7 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
         vm.attachDevice(nic.toString());
     }
     
-    public Answer execute(IPAssocCommand cmd) {
+    public Answer execute(IpAssocCommand cmd) {
         String routerName = cmd.getAccessDetail(NetworkElementCommand.ROUTER_NAME);
         String routerIp = cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP);
         String[] results = new String[cmd.getIpAddresses().length];
diff --git a/api/src/com/cloud/agent/api/routing/IpAssocAnswer.java b/api/src/com/cloud/agent/api/routing/IpAssocAnswer.java
index 7415ce523ea..0a0b76504d2 100644
--- a/api/src/com/cloud/agent/api/routing/IpAssocAnswer.java
+++ b/api/src/com/cloud/agent/api/routing/IpAssocAnswer.java
@@ -33,7 +33,7 @@ public class IpAssocAnswer extends Answer{
         super();
     }
     
-    public IpAssocAnswer(IPAssocCommand cmd, String[] results) {
+    public IpAssocAnswer(IpAssocCommand cmd, String[] results) {
 
         boolean finalResult = true;
         for (String result : results) {
diff --git a/api/src/com/cloud/agent/api/routing/IPAssocCommand.java b/api/src/com/cloud/agent/api/routing/IpAssocCommand.java
similarity index 89%
rename from api/src/com/cloud/agent/api/routing/IPAssocCommand.java
rename to api/src/com/cloud/agent/api/routing/IpAssocCommand.java
index 6def0b42661..598b87b7245 100644
--- a/api/src/com/cloud/agent/api/routing/IPAssocCommand.java
+++ b/api/src/com/cloud/agent/api/routing/IpAssocCommand.java
@@ -24,14 +24,14 @@ import com.cloud.agent.api.to.IpAddressTO;
  * @author alena
  *
  */
-public class IPAssocCommand extends NetworkElementCommand {
+public class IpAssocCommand extends NetworkElementCommand {
     
 	IpAddressTO[] ipAddresses;
 
-	protected IPAssocCommand() {
+	protected IpAssocCommand() {
 	}
 	
-	public IPAssocCommand(IpAddressTO[] ips) {
+	public IpAssocCommand(IpAddressTO[] ips) {
 		this.ipAddresses = ips;
 	}
 
diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
index cdfb93ef231..ee803e0ebe8 100755
--- a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
+++ b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
@@ -45,7 +45,7 @@ import com.cloud.agent.api.proxy.CheckConsoleProxyLoadCommand;
 import com.cloud.agent.api.proxy.ConsoleProxyLoadAnswer;
 import com.cloud.agent.api.proxy.WatchConsoleProxyLoadCommand;
 import com.cloud.agent.api.routing.DhcpEntryCommand;
-import com.cloud.agent.api.routing.IPAssocCommand;
+import com.cloud.agent.api.routing.IpAssocCommand;
 import com.cloud.agent.api.routing.IpAssocAnswer;
 import com.cloud.agent.api.routing.LoadBalancerConfigCommand;
 import com.cloud.agent.api.routing.NetworkElementCommand;
@@ -104,8 +104,8 @@ public class VirtualRoutingResource implements Manager {
                 return execute((SetStaticNatRulesCommand)cmd);
             }else if (cmd instanceof LoadBalancerConfigCommand) {
                 return execute((LoadBalancerConfigCommand)cmd);
-            } else if (cmd instanceof IPAssocCommand) {
-                return execute((IPAssocCommand)cmd);
+            } else if (cmd instanceof IpAssocCommand) {
+                return execute((IpAssocCommand)cmd);
             } else if (cmd instanceof CheckConsoleProxyLoadCommand) {
                 return execute((CheckConsoleProxyLoadCommand)cmd);
             } else if(cmd instanceof WatchConsoleProxyLoadCommand) {
@@ -266,7 +266,7 @@ public class VirtualRoutingResource implements Manager {
         return new Answer(cmd);
     }
 
-    protected Answer execute(final IPAssocCommand cmd) {
+    protected Answer execute(final IpAssocCommand cmd) {
         IpAddressTO[] ips = cmd.getIpAddresses();
         String[] results = new String[cmd.getIpAddresses().length];
         int i = 0;
diff --git a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
index 55c52a1198f..603c3a88cf1 100644
--- a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
+++ b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
@@ -131,7 +131,7 @@ import com.cloud.agent.api.proxy.CheckConsoleProxyLoadCommand;
 import com.cloud.agent.api.proxy.ConsoleProxyLoadAnswer;
 import com.cloud.agent.api.proxy.WatchConsoleProxyLoadCommand;
 import com.cloud.agent.api.routing.DhcpEntryCommand;
-import com.cloud.agent.api.routing.IPAssocCommand;
+import com.cloud.agent.api.routing.IpAssocCommand;
 import com.cloud.agent.api.routing.IpAssocAnswer;
 import com.cloud.agent.api.routing.LoadBalancerConfigCommand;
 import com.cloud.agent.api.routing.NetworkElementCommand;
@@ -384,8 +384,8 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
             return execute((SetStaticNatRulesCommand) cmd);
         }  else if (clazz == LoadBalancerConfigCommand.class) {
             return execute((LoadBalancerConfigCommand) cmd);
-        } else if (clazz == IPAssocCommand.class) {
-            return execute((IPAssocCommand) cmd);
+        } else if (clazz == IpAssocCommand.class) {
+            return execute((IpAssocCommand) cmd);
         } else if (clazz == CheckConsoleProxyLoadCommand.class) {
             return execute((CheckConsoleProxyLoadCommand) cmd);
         } else if (clazz == WatchConsoleProxyLoadCommand.class) {
@@ -1547,7 +1547,7 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
         return null;
     }
 
-    protected Answer execute(final IPAssocCommand cmd) {
+    protected Answer execute(final IpAssocCommand cmd) {
         Connection conn = getConnection();
         String[] results = new String[cmd.getIpAddresses().length];
         int i = 0;
diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
index 6a348440dc3..63090deaf12 100755
--- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -43,7 +43,7 @@ import com.cloud.agent.api.StopAnswer;
 import com.cloud.agent.api.check.CheckSshAnswer;
 import com.cloud.agent.api.check.CheckSshCommand;
 import com.cloud.agent.api.routing.DhcpEntryCommand;
-import com.cloud.agent.api.routing.IPAssocCommand;
+import com.cloud.agent.api.routing.IpAssocCommand;
 import com.cloud.agent.api.routing.LoadBalancerConfigCommand;
 import com.cloud.agent.api.routing.NetworkElementCommand;
 import com.cloud.agent.api.routing.RemoteAccessVpnCfgCommand;
@@ -1505,7 +1505,7 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian
                 ipsToSend[i++] = ip;
                 firstIP = false;
             }
-            IPAssocCommand cmd = new IPAssocCommand(ipsToSend);
+            IpAssocCommand cmd = new IpAssocCommand(ipsToSend);
             cmd.setAccessDetail(NetworkElementCommand.ROUTER_IP, router.getPrivateIpAddress());
             cmd.setAccessDetail(NetworkElementCommand.ROUTER_GUEST_IP, router.getGuestIpAddress());
             cmd.setAccessDetail(NetworkElementCommand.ROUTER_NAME, router.getInstanceName());