diff --git a/plugins/database/quota/src/org/apache/cloudstack/api/command/QuotaEditMappingCmd.java b/plugins/database/quota/src/org/apache/cloudstack/api/command/QuotaEditMappingCmd.java
index f2580bf5d5d..e5dccd018df 100644
--- a/plugins/database/quota/src/org/apache/cloudstack/api/command/QuotaEditMappingCmd.java
+++ b/plugins/database/quota/src/org/apache/cloudstack/api/command/QuotaEditMappingCmd.java
@@ -87,7 +87,7 @@ public class QuotaEditMappingCmd extends BaseCmd {
         final List<QuotaConfigurationResponse> responses = new ArrayList<QuotaConfigurationResponse>();
         for (final QuotaMappingVO resource : result.first()) {
             final QuotaConfigurationResponse configurationResponse = _quotaDBUtils.createQuotaConfigurationResponse(resource);
-            configurationResponse.setObjectName("QuotaMapping");
+            configurationResponse.setObjectName("quotamapping");
             responses.add(configurationResponse);
         }
 
diff --git a/plugins/database/quota/src/org/apache/cloudstack/api/command/QuotaMapping.java b/plugins/database/quota/src/org/apache/cloudstack/api/command/QuotaMappingCmd.java
similarity index 94%
rename from plugins/database/quota/src/org/apache/cloudstack/api/command/QuotaMapping.java
rename to plugins/database/quota/src/org/apache/cloudstack/api/command/QuotaMappingCmd.java
index a0f4b510c88..d1c4e58698d 100644
--- a/plugins/database/quota/src/org/apache/cloudstack/api/command/QuotaMapping.java
+++ b/plugins/database/quota/src/org/apache/cloudstack/api/command/QuotaMappingCmd.java
@@ -34,9 +34,9 @@ import com.cloud.user.Account;
 import com.cloud.utils.Pair;
 
 @APICommand(name = "quotaMapping", responseObject = QuotaConfigurationResponse.class, description = "Lists all Quota and Usage configurations", since = "4.2.0", requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
-public class QuotaMapping extends BaseListCmd {
+public class QuotaMappingCmd extends BaseListCmd {
 
-    public static final Logger s_logger = Logger.getLogger(QuotaMapping.class.getName());
+    public static final Logger s_logger = Logger.getLogger(QuotaMappingCmd.class.getName());
 
     private static final String s_name = "quotaconfigurationresponse";
 
@@ -46,11 +46,11 @@ public class QuotaMapping extends BaseListCmd {
     @Parameter(name = "type", type = CommandType.STRING, required = false, description = "Usage type of the resource")
     private String usageType;
 
-    public QuotaMapping() {
+    public QuotaMappingCmd() {
         super();
     }
 
-    public QuotaMapping(final QuotaDBUtilsImpl quotaDBUtils) {
+    public QuotaMappingCmd(final QuotaDBUtilsImpl quotaDBUtils) {
         super();
         _quotaDBUtils = quotaDBUtils;
     }
diff --git a/plugins/database/quota/src/org/apache/cloudstack/quota/QuotaDBUtils.java b/plugins/database/quota/src/org/apache/cloudstack/quota/QuotaDBUtils.java
index e68d431c118..ef4c9e352e2 100644
--- a/plugins/database/quota/src/org/apache/cloudstack/quota/QuotaDBUtils.java
+++ b/plugins/database/quota/src/org/apache/cloudstack/quota/QuotaDBUtils.java
@@ -19,7 +19,7 @@ package org.apache.cloudstack.quota;
 import java.util.List;
 
 import org.apache.cloudstack.api.command.QuotaEditMappingCmd;
-import org.apache.cloudstack.api.command.QuotaMapping;
+import org.apache.cloudstack.api.command.QuotaMappingCmd;
 import org.apache.cloudstack.api.response.QuotaConfigurationResponse;
 import org.apache.cloudstack.api.response.QuotaCreditsResponse;
 import org.apache.cloudstack.api.response.QuotaStatementResponse;
@@ -30,7 +30,7 @@ public interface QuotaDBUtils {
 
     Pair<List<QuotaMappingVO>, Integer> editQuotaMapping(QuotaEditMappingCmd cmd);
 
-    Pair<List<QuotaMappingVO>, Integer> listConfigurations(QuotaMapping cmd);
+    Pair<List<QuotaMappingVO>, Integer> listConfigurations(QuotaMappingCmd cmd);
 
     QuotaConfigurationResponse createQuotaConfigurationResponse(QuotaMappingVO configuration);
 
diff --git a/plugins/database/quota/src/org/apache/cloudstack/quota/QuotaDBUtilsImpl.java b/plugins/database/quota/src/org/apache/cloudstack/quota/QuotaDBUtilsImpl.java
index 2e63621f9ac..b0d046d1f0e 100644
--- a/plugins/database/quota/src/org/apache/cloudstack/quota/QuotaDBUtilsImpl.java
+++ b/plugins/database/quota/src/org/apache/cloudstack/quota/QuotaDBUtilsImpl.java
@@ -28,7 +28,7 @@ import javax.ejb.Local;
 import javax.inject.Inject;
 
 import org.apache.cloudstack.api.command.QuotaEditMappingCmd;
-import org.apache.cloudstack.api.command.QuotaMapping;
+import org.apache.cloudstack.api.command.QuotaMappingCmd;
 import org.apache.cloudstack.api.response.QuotaConfigurationResponse;
 import org.apache.cloudstack.api.response.QuotaCreditsResponse;
 import org.apache.cloudstack.api.response.QuotaStatementResponse;
@@ -106,7 +106,7 @@ public class QuotaDBUtilsImpl implements QuotaDBUtils {
     }
 
     @Override
-    public Pair<List<QuotaMappingVO>, Integer> listConfigurations(final QuotaMapping cmd) {
+    public Pair<List<QuotaMappingVO>, Integer> listConfigurations(final QuotaMappingCmd cmd) {
         final Pair<List<QuotaMappingVO>, Integer> result = _quotaMappingDao.listAllMapping();
         TransactionLegacy.open(TransactionLegacy.CLOUD_DB);
         return result;
diff --git a/plugins/database/quota/src/org/apache/cloudstack/quota/QuotaManagerImpl.java b/plugins/database/quota/src/org/apache/cloudstack/quota/QuotaManagerImpl.java
index 493279af1b6..ae1b351ea2b 100644
--- a/plugins/database/quota/src/org/apache/cloudstack/quota/QuotaManagerImpl.java
+++ b/plugins/database/quota/src/org/apache/cloudstack/quota/QuotaManagerImpl.java
@@ -37,7 +37,7 @@ import com.cloud.utils.db.TransactionLegacy;
 import org.apache.cloudstack.api.command.QuotaCreditsCmd;
 import org.apache.cloudstack.api.command.QuotaEditMappingCmd;
 import org.apache.cloudstack.api.command.QuotaEmailTemplateAddCmd;
-import org.apache.cloudstack.api.command.QuotaMapping;
+import org.apache.cloudstack.api.command.QuotaMappingCmd;
 import org.apache.cloudstack.api.command.QuotaRefreshCmd;
 import org.apache.cloudstack.api.command.QuotaStatementCmd;
 import org.apache.cloudstack.context.CallContext;
@@ -118,7 +118,7 @@ public class QuotaManagerImpl extends ManagerBase implements QuotaManager, Confi
     @Override
     public List<Class<?>> getCommands() {
         final List<Class<?>> cmdList = new ArrayList<Class<?>>();
-        cmdList.add(QuotaMapping.class);
+        cmdList.add(QuotaMappingCmd.class);
         cmdList.add(QuotaCreditsCmd.class);
         cmdList.add(QuotaEmailTemplateAddCmd.class);
         cmdList.add(QuotaRefreshCmd.class);