diff --git a/ui/index.jsp b/ui/index.jsp
index 510493ccf98..6dee5a060ce 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -377,8 +377,7 @@
                                     <fmt:message key="label.menu.ipaddresses"/>
                                 </div>
                             </div>
-                        </div>                  
-						<!--
+                        </div>  
                         <div class="leftmenu_expandedlist">
                             <div class="leftmenu_content" id="leftmenu_security_group">
                                 <div class="leftmenu_secondindent">
@@ -387,8 +386,7 @@
                                     <fmt:message key="label.menu.security.groups"/>
                                 </div>
                             </div>
-                        </div>
-						-->
+                        </div>						
                     </div>                    
                 </div>  
                 <div class="leftmenu_list">
diff --git a/ui/scripts/cloud.core.init.js b/ui/scripts/cloud.core.init.js
index a6f9f066c68..9589ad6d93e 100644
--- a/ui/scripts/cloud.core.init.js
+++ b/ui/scripts/cloud.core.init.js
@@ -125,7 +125,7 @@ $(document).ready(function() {
 		bindAndListMidMenuItems($("#leftmenu_volume"), "listVolumes", volumeGetSearchParams, "listvolumesresponse", "volume", "jsp/volume.jsp", afterLoadVolumeJSP, volumeToMidmenu, volumeToRightPanel, getMidmenuId, false);
 		bindAndListMidMenuItems($("#leftmenu_snapshot"), "listSnapshots", snapshotGetSearchParams, "listsnapshotsresponse", "snapshot", "jsp/snapshot.jsp", afterLoadSnapshotJSP, snapshotToMidmenu, snapshotToRightPanel, getMidmenuId, false);
 		bindAndListMidMenuItems($("#leftmenu_ip"), "listPublicIpAddresses&forvirtualnetwork=true", ipGetSearchParams, "listpublicipaddressesresponse", "publicipaddress", "jsp/ipaddress.jsp", afterLoadIpJSP, ipToMidmenu, ipToRightPanel, ipGetMidmenuId, false);
-		bindAndListMidMenuItems($("#leftmenu_security_group"), "listNetworkGroups", securityGroupGetSearchParams, "listnetworkgroupsresponse", "securitygroup", "jsp/securitygroup.jsp", afterLoadSecurityGroupJSP, securityGroupToMidmenu, securityGroupToRightPanel, getMidmenuId, false);
+		bindAndListMidMenuItems($("#leftmenu_security_group"), "listSecurityGroups", securityGroupGetSearchParams, "listsecuritygroupsresponse", "securitygroup", "jsp/securitygroup.jsp", afterLoadSecurityGroupJSP, securityGroupToMidmenu, securityGroupToRightPanel, getMidmenuId, false);
 					 		  
 		bindAndListMidMenuItems($("#leftmenu_submenu_my_template"), "listTemplates&templatefilter=self", templateGetSearchParams, "listtemplatesresponse", "template", "jsp/template.jsp", afterLoadTemplateJSP, templateToMidmenu, templateToRightPanel, templateGetMidmenuId, false);
 		bindAndListMidMenuItems($("#leftmenu_submenu_featured_template"), "listTemplates&templatefilter=featured", templateGetSearchParams, "listtemplatesresponse", "template", "jsp/template.jsp", afterLoadTemplateJSP, templateToMidmenu, templateToRightPanel, templateGetMidmenuId, false);
diff --git a/ui/scripts/cloud.core.securitygroup.js b/ui/scripts/cloud.core.securitygroup.js
index bea3cae72b1..b1c8aa3d74b 100644
--- a/ui/scripts/cloud.core.securitygroup.js
+++ b/ui/scripts/cloud.core.securitygroup.js
@@ -74,7 +74,7 @@ function initAddSecurityGroupDialog() {
 				$thisDialog.dialog("close");
 							
 				$.ajax({						
-				    data: createURL("command=createNetworkGroup&name="+todb(name)+"&description="+todb(desc)),
+				    data: createURL("command=createSecurityGroup&name="+todb(name)+"&description="+todb(desc)),
 					dataType: "json",
 					success: function(json) {						    			   
 						var item = json.createsecuritygroupresponse.securitygroup;																		   
@@ -171,7 +171,7 @@ function doDeleteSecurityGroup($actionLink, $thisTab, $midmenuItem1) {
             array1.push("&name="+jsonObj.name);    
 		    
 			var id = jsonObj.id;
-			var apiCommand = "command=deleteNetworkGroup" + array1.join(""); 	                 
+			var apiCommand = "command=deleteSecurityGroup" + array1.join(""); 	                 
             doActionToTab(id, $actionLink, apiCommand, $midmenuItem1, $thisTab); 
 	    }, 
 	    "Cancel": function() { 
@@ -217,11 +217,11 @@ function securityGroupJsonToDetailsTab() {
     var id = jsonObj.id;    
     var jsonObj;   
     $.ajax({
-        data: createURL("command=listNetworkGroups&id="+id),
+        data: createURL("command=listSecurityGroups&id="+id),
         dataType: "json",
         async: false,
         success: function(json) {  
-            var items = json.listnetworkgroupsresponse.securitygroup;            
+            var items = json.listsecurityGroupsresponse.securitygroup;            
             if(items != null && items.length > 0) {
                 jsonObj = items[0];
                 $midmenuItem1.data("jsonObj", jsonObj);  
@@ -261,10 +261,10 @@ function securityGroupJsonToIngressRuleTab() {
         
     $.ajax({
 		cache: false,		
-		data: createURL("command=listNetworkGroups"+"&domainid="+securityGroupObj.domainid+"&account="+securityGroupObj.account+"&networkgroupname="+securityGroupObj.name),
+		data: createURL("command=listSecurityGroups"+"&domainid="+securityGroupObj.domainid+"&account="+securityGroupObj.account+"&securitygroupname="+securityGroupObj.name),
 		dataType: "json",
 		success: function(json) {	
-		    var securityGroupObj = json.listnetworkgroupsresponse.securitygroup[0];		    				    
+		    var securityGroupObj = json.listsecurityGroupsresponse.securitygroup[0];		    				    
 			var items = securityGroupObj.ingressrule;    
 			var $container = $thisTab.find("#tab_container").empty();     																			
 			if (items != null && items.length > 0) {			    
@@ -299,8 +299,8 @@ function securityGroupIngressRuleJSONToTemplate(jsonObj, $template) {
     var cidrOrGroup;
     if(jsonObj.cidr != null && jsonObj.cidr.length > 0)
         cidrOrGroup = jsonObj.cidr;
-    else if (jsonObj.account != null && jsonObj.account.length > 0 &&  jsonObj.networkgroupname != null && jsonObj.networkgroupname.length > 0)
-        cidrOrGroup = jsonObj.account + "/" + jsonObj.networkgroupname;		    
+    else if (jsonObj.account != null && jsonObj.account.length > 0 &&  jsonObj.securitygroupname != null && jsonObj.securitygroupname.length > 0)
+        cidrOrGroup = jsonObj.account + "/" + jsonObj.securitygroupname;		    
     $template.find("#cidr").text(cidrOrGroup);	
     
     // actions	
@@ -325,7 +325,7 @@ function securityGroupIngressRuleJSONToTemplate(jsonObj, $template) {
 var securityGroupIngressRuleActionMap = {      
     "Delete Ingress Rule": {      
         isAsyncJob: true,
-        asyncJobResponse: "revokenetworkgroupingress",
+        asyncJobResponse: "revokeSecurityGroupIngress",
 		dialogBeforeActionFn : doDeleteIngressRule,
         inProcessText: "Deleting Ingress Rule....",
         afterActionSeccessFn: function(json, id, $subgridItem) {                 
@@ -351,7 +351,7 @@ function doDeleteIngressRule($actionLink, $subgridItem) {
             var moreCriteria = [];		 
 	        moreCriteria.push("&domainid="+securityGroupObj.domainid);    	    	        
 	        moreCriteria.push("&account="+securityGroupObj.account);    	    		    	        
-	        moreCriteria.push("&networkgroupname="+securityGroupObj.name);    
+	        moreCriteria.push("&securitygroupname="+securityGroupObj.name);    
     	    	
     	    var protocol = ingressRuleObj.protocol;      
 	        moreCriteria.push("&protocol="+protocol);		    	
@@ -380,11 +380,11 @@ function doDeleteIngressRule($actionLink, $subgridItem) {
 	            moreCriteria.push("&cidrlist="+encodeURIComponent(cidr));
     						
 	        var account = ingressRuleObj.account;
-	        var networkGroupName = ingressRuleObj.networkgroupname; 
-	        if((account != null && account.length > 0) && (networkGroupName != null && networkGroupName.length > 0))                        
-                moreCriteria.push("&usernetworkgrouplist[0].account="+account + "&usernetworkgrouplist[0].group="+networkGroupName);    			
+	        var securitygroupname = ingressRuleObj.securitygroupname; 
+	        if((account != null && account.length > 0) && (securitygroupname != null && securitygroupname.length > 0))                        
+                moreCriteria.push("&usersecuritygrouplist[0].account="+account + "&usersecuritygrouplist[0].group="+securitygroupname);    			
 						
-			var apiCommand = "command=revokeNetworkGroupIngress"+moreCriteria.join("");                  
+			var apiCommand = "command=revokeSecurityGroupIngress"+moreCriteria.join("");                  
             doActionToSubgridItem(id, $actionLink, apiCommand, $subgridItem); 
 	    }, 
 	    "Cancel": function() {