diff --git a/api/src/org/apache/cloudstack/acl/IAMEntityType.java b/api/src/org/apache/cloudstack/acl/IAMEntityType.java
index 0a442530dac..9299ae9ae0c 100644
--- a/api/src/org/apache/cloudstack/acl/IAMEntityType.java
+++ b/api/src/org/apache/cloudstack/acl/IAMEntityType.java
@@ -38,8 +38,8 @@ public enum IAMEntityType {
     PortForwardingRule,
     Event,
     AsyncJob,
-    AclPolicy,
-    AclGroup,
+    IAMPolicy,
+    IAMGroup,
     MonitorService,
     SSLCert
 }
diff --git a/services/iam/plugin/src/org/apache/cloudstack/iam/IAMApiServiceImpl.java b/services/iam/plugin/src/org/apache/cloudstack/iam/IAMApiServiceImpl.java
index 945f48ec0f7..42c1adc52d1 100644
--- a/services/iam/plugin/src/org/apache/cloudstack/iam/IAMApiServiceImpl.java
+++ b/services/iam/plugin/src/org/apache/cloudstack/iam/IAMApiServiceImpl.java
@@ -182,8 +182,8 @@ public class IAMApiServiceImpl extends ManagerBase implements IAMApiService, Man
         s_typeMap.put(IAMEntityType.PortForwardingRule, PortForwardingRuleVO.class);
         s_typeMap.put(IAMEntityType.Event, EventVO.class);
         s_typeMap.put(IAMEntityType.AsyncJob, AsyncJobVO.class);
-        s_typeMap.put(IAMEntityType.AclGroup, IAMGroupVO.class);
-        s_typeMap.put(IAMEntityType.AclPolicy, IAMPolicyVO.class);
+        s_typeMap.put(IAMEntityType.IAMGroup, IAMGroupVO.class);
+        s_typeMap.put(IAMEntityType.IAMPolicy, IAMPolicyVO.class);
         s_typeMap.put(IAMEntityType.MonitorService, MonitoringServiceVO.class);
         s_typeMap.put(IAMEntityType.SSLCert, SslCertVO.class);
     }