diff --git a/client/tomcatconf/commands.properties.in b/client/tomcatconf/commands.properties.in
index 75c215043de..3ab31b22ca6 100755
--- a/client/tomcatconf/commands.properties.in
+++ b/client/tomcatconf/commands.properties.in
@@ -202,12 +202,12 @@ listClusters=com.cloud.api.commands.ListClustersCmd;1
 enableStorageMaintenance=com.cloud.api.commands.PreparePrimaryStorageForMaintenanceCmd;1
 cancelStorageMaintenance=com.cloud.api.commands.CancelPrimaryStorageMaintenanceCmd;1
 
-#### network group commands
-createNetworkGroup=com.cloud.api.commands.CreateNetworkGroupCmd;11
-deleteNetworkGroup=com.cloud.api.commands.DeleteNetworkGroupCmd;11
-authorizeNetworkGroupIngress=com.cloud.api.commands.AuthorizeNetworkGroupIngressCmd;11
-revokeNetworkGroupIngress=com.cloud.api.commands.RevokeNetworkGroupIngressCmd;11
-listNetworkGroups=com.cloud.api.commands.ListNetworkGroupsCmd;11
+#### security group commands
+createNetworkGroup=com.cloud.api.commands.CreateSecurityGroupCmd;11
+deleteNetworkGroup=com.cloud.api.commands.DeleteSecurityGroupCmd;11
+authorizeNetworkGroupIngress=com.cloud.api.commands.AuthorizeSecurityGroupIngressCmd;11
+revokeNetworkGroupIngress=com.cloud.api.commands.RevokeSecurityGroupIngressCmd;11
+listNetworkGroups=com.cloud.api.commands.ListSecurityGroupsCmd;11
 
 registerPreallocatedLun=com.cloud.api.commands.RegisterPreallocatedLunCmd;1
 deletePreallocatedLun=com.cloud.api.commands.DeletePreallocatedLunCmd;1
diff --git a/setup/db/schema-21to22.sql b/setup/db/schema-21to22.sql
index 8a261bac324..92296839550 100644
--- a/setup/db/schema-21to22.sql
+++ b/setup/db/schema-21to22.sql
@@ -11,5 +11,9 @@ ALTER TABLE `vm_instance` DROP COLUMN `group`
 -- NOTE for tables below
 -- these 2 tables were used in 2.1, but are not in 2.2
 -- we will need a migration script for these tables when the migration is written
+-- furthermore we have renamed the following in 2.2
+-- network_group table --> security_group table
+-- network_group_vm_map table --> security_group_vm_map table
 DROP TABLE `cloud`.`security_group`;
 DROP TABLE `cloud`.`security_group_vm_map`;
+--END NOTE