diff --git a/server/src/com/cloud/api/commands/CreateNetworkGroupCmd.java b/server/src/com/cloud/api/commands/CreateSecurityGroupCmd.java
similarity index 94%
rename from server/src/com/cloud/api/commands/CreateNetworkGroupCmd.java
rename to server/src/com/cloud/api/commands/CreateSecurityGroupCmd.java
index 58698b3fea1..f837b21fcee 100644
--- a/server/src/com/cloud/api/commands/CreateNetworkGroupCmd.java
+++ b/server/src/com/cloud/api/commands/CreateSecurityGroupCmd.java
@@ -28,8 +28,8 @@ import com.cloud.api.response.NetworkGroupResponse;
 import com.cloud.network.security.NetworkGroupVO;
 
 @Implementation(method="createNetworkGroup", manager=Manager.NetworkGroupManager)
-public class CreateNetworkGroupCmd extends BaseCmd {
-    public static final Logger s_logger = Logger.getLogger(CreateNetworkGroupCmd.class.getName());
+public class CreateSecurityGroupCmd extends BaseCmd {
+    public static final Logger s_logger = Logger.getLogger(CreateSecurityGroupCmd.class.getName());
 
     private static final String s_name = "createnetworkgroupresponse";
 
diff --git a/server/src/com/cloud/network/security/NetworkGroupListener.java b/server/src/com/cloud/network/security/NetworkGroupListener.java
index e93f4e9792c..c8f20e39cc0 100644
--- a/server/src/com/cloud/network/security/NetworkGroupListener.java
+++ b/server/src/com/cloud/network/security/NetworkGroupListener.java
@@ -44,12 +44,12 @@ import com.cloud.network.security.dao.NetworkGroupWorkDao;
 public class NetworkGroupListener implements Listener {
     public static final Logger s_logger = Logger.getLogger(NetworkGroupListener.class.getName());
 
-	NetworkGroupManagerImpl _networkGroupManager;
+	SecurityGroupManagerImpl _networkGroupManager;
     AgentManager _agentMgr;
     NetworkGroupWorkDao _workDao;
     
 
-	public NetworkGroupListener(NetworkGroupManagerImpl networkGroupManager,
+	public NetworkGroupListener(SecurityGroupManagerImpl networkGroupManager,
 			AgentManager agentMgr, NetworkGroupWorkDao workDao) {
 		super();
 		_networkGroupManager = networkGroupManager;
diff --git a/server/src/com/cloud/network/security/NetworkGroupManager.java b/server/src/com/cloud/network/security/NetworkGroupManager.java
index 33b4b0c9ea9..c5b0ae79f9a 100644
--- a/server/src/com/cloud/network/security/NetworkGroupManager.java
+++ b/server/src/com/cloud/network/security/NetworkGroupManager.java
@@ -21,7 +21,7 @@ import java.util.HashMap;
 import java.util.List;
 
 import com.cloud.api.commands.AuthorizeNetworkGroupIngressCmd;
-import com.cloud.api.commands.CreateNetworkGroupCmd;
+import com.cloud.api.commands.CreateSecurityGroupCmd;
 import com.cloud.api.commands.DeleteNetworkGroupCmd;
 import com.cloud.api.commands.ListNetworkGroupsCmd;
 import com.cloud.api.commands.RevokeNetworkGroupIngressCmd;
@@ -53,7 +53,7 @@ public interface NetworkGroupManager extends Manager {
 	 * @param command the command specifying the name and description
 	 * @return the created network group if successful, null otherwise
 	 */
-	public NetworkGroupVO createNetworkGroup(CreateNetworkGroupCmd command) throws PermissionDeniedException, InvalidParameterValueException;
+	public NetworkGroupVO createNetworkGroup(CreateSecurityGroupCmd command) throws PermissionDeniedException, InvalidParameterValueException;
 	
 	public NetworkGroupVO createDefaultNetworkGroup( Long accountId);
 	
diff --git a/server/src/com/cloud/network/security/NetworkGroupManagerImpl.java b/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java
similarity index 99%
rename from server/src/com/cloud/network/security/NetworkGroupManagerImpl.java
rename to server/src/com/cloud/network/security/SecurityGroupManagerImpl.java
index c478fb23d74..8056090d675 100644
--- a/server/src/com/cloud/network/security/NetworkGroupManagerImpl.java
+++ b/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java
@@ -46,7 +46,7 @@ import com.cloud.agent.manager.Commands;
 import com.cloud.api.BaseCmd;
 import com.cloud.api.ServerApiException;
 import com.cloud.api.commands.AuthorizeNetworkGroupIngressCmd;
-import com.cloud.api.commands.CreateNetworkGroupCmd;
+import com.cloud.api.commands.CreateSecurityGroupCmd;
 import com.cloud.api.commands.DeleteNetworkGroupCmd;
 import com.cloud.api.commands.ListNetworkGroupsCmd;
 import com.cloud.api.commands.RevokeNetworkGroupIngressCmd;
@@ -87,8 +87,8 @@ import com.cloud.vm.UserVmVO;
 import com.cloud.vm.dao.UserVmDao;
 
 @Local(value={NetworkGroupManager.class})
-public class NetworkGroupManagerImpl implements NetworkGroupManager {
-    public static final Logger s_logger = Logger.getLogger(NetworkGroupManagerImpl.class.getName());
+public class SecurityGroupManagerImpl implements NetworkGroupManager {
+    public static final Logger s_logger = Logger.getLogger(SecurityGroupManagerImpl.class.getName());
 
 	@Inject NetworkGroupDao _networkGroupDao;
 	@Inject IngressRuleDao  _ingressRuleDao;
@@ -846,7 +846,7 @@ public class NetworkGroupManagerImpl implements NetworkGroupManager {
 	}
 
 	@Override
-    public NetworkGroupVO createNetworkGroup(CreateNetworkGroupCmd cmd) throws PermissionDeniedException, InvalidParameterValueException {
+    public NetworkGroupVO createNetworkGroup(CreateSecurityGroupCmd cmd) throws PermissionDeniedException, InvalidParameterValueException {
         if (!_enabled) {
             return null;
         }