diff --git a/plugins/database/quota/resources/META-INF/cloudstack/quota/spring-quota-context.xml b/plugins/database/quota/resources/META-INF/cloudstack/quota/spring-quota-context.xml
index 521529d2fa6..ed0e3877efe 100644
--- a/plugins/database/quota/resources/META-INF/cloudstack/quota/spring-quota-context.xml
+++ b/plugins/database/quota/resources/META-INF/cloudstack/quota/spring-quota-context.xml
@@ -27,7 +27,7 @@
 
     <bean id="QuotaManager" class="org.apache.cloudstack.quota.QuotaManagerImpl" />
     <bean id="QuotaService" class="org.apache.cloudstack.quota.QuotaServiceImpl" />
-    <bean id="QuotaDBUtils" class="org.apache.cloudstack.quota.QuotaDBUtilsImpl" />
+    <bean id="QuotaResponseBuilder" class="org.apache.cloudstack.quota.QuotaResponseBuilderImpl" />
     <bean id="QuotaTariffDao" class="org.apache.cloudstack.quota.dao.QuotaTariffDaoImpl" />
     <bean id="QuotaBalanceDao" class="org.apache.cloudstack.quota.dao.QuotaBalanceDaoImpl"/>
     <bean id="QuotaCreditsDao" class="org.apache.cloudstack.quota.dao.QuotaCreditsDaoImpl"/>
diff --git a/plugins/database/quota/src/org/apache/cloudstack/api/command/QuotaBalanceCmd.java b/plugins/database/quota/src/org/apache/cloudstack/api/command/QuotaBalanceCmd.java
index bafe0a7b71e..e8163f60767 100644
--- a/plugins/database/quota/src/org/apache/cloudstack/api/command/QuotaBalanceCmd.java
+++ b/plugins/database/quota/src/org/apache/cloudstack/api/command/QuotaBalanceCmd.java
@@ -31,7 +31,7 @@ import org.apache.cloudstack.api.response.DomainResponse;
 import org.apache.cloudstack.api.response.QuotaBalanceResponse;
 import org.apache.cloudstack.context.CallContext;
 import org.apache.cloudstack.quota.QuotaBalanceVO;
-import org.apache.cloudstack.quota.QuotaDBUtils;
+import org.apache.cloudstack.quota.QuotaResponseBuilder;
 import org.apache.cloudstack.quota.QuotaService;
 import org.apache.cloudstack.api.response.QuotaStatementItemResponse;
 
@@ -62,7 +62,7 @@ public class QuotaBalanceCmd extends BaseCmd {
     @Inject
     QuotaService _quotaService;
     @Inject
-    QuotaDBUtils _quotaDBUtils;
+    QuotaResponseBuilder _quotaDBUtils;
 
     public Long getAccountId() {
         return accountId;
diff --git a/plugins/database/quota/src/org/apache/cloudstack/api/command/QuotaStatementCmd.java b/plugins/database/quota/src/org/apache/cloudstack/api/command/QuotaStatementCmd.java
index 9c5e910082d..80aac0d1713 100644
--- a/plugins/database/quota/src/org/apache/cloudstack/api/command/QuotaStatementCmd.java
+++ b/plugins/database/quota/src/org/apache/cloudstack/api/command/QuotaStatementCmd.java
@@ -30,7 +30,7 @@ import org.apache.cloudstack.api.response.AccountResponse;
 import org.apache.cloudstack.api.response.DomainResponse;
 import org.apache.cloudstack.api.response.QuotaStatementResponse;
 import org.apache.cloudstack.context.CallContext;
-import org.apache.cloudstack.quota.QuotaDBUtils;
+import org.apache.cloudstack.quota.QuotaResponseBuilder;
 import org.apache.cloudstack.quota.QuotaService;
 import org.apache.cloudstack.quota.QuotaUsageVO;
 import org.apache.cloudstack.api.response.QuotaStatementItemResponse;
@@ -65,7 +65,7 @@ public class QuotaStatementCmd extends BaseCmd {
     @Inject
     QuotaService _quotaService;
     @Inject
-    QuotaDBUtils _quotaDBUtils;
+    QuotaResponseBuilder _quotaDBUtils;
 
     public Long getAccountId() {
         return accountId;
diff --git a/plugins/database/quota/src/org/apache/cloudstack/api/command/QuotaTariffListCmd.java b/plugins/database/quota/src/org/apache/cloudstack/api/command/QuotaTariffListCmd.java
index 7200cc25ea3..704cd5e3b6f 100644
--- a/plugins/database/quota/src/org/apache/cloudstack/api/command/QuotaTariffListCmd.java
+++ b/plugins/database/quota/src/org/apache/cloudstack/api/command/QuotaTariffListCmd.java
@@ -23,7 +23,7 @@ import org.apache.cloudstack.api.BaseListCmd;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.response.ListResponse;
 import org.apache.cloudstack.api.response.QuotaTariffResponse;
-import org.apache.cloudstack.quota.QuotaDBUtilsImpl;
+import org.apache.cloudstack.quota.QuotaResponseBuilderImpl;
 import org.apache.cloudstack.quota.QuotaTariffVO;
 import org.apache.log4j.Logger;
 
@@ -37,7 +37,7 @@ public class QuotaTariffListCmd extends BaseListCmd {
     private static final String s_name = "quotatarifflistresponse";
 
     @Inject
-    QuotaDBUtilsImpl _quotaDBUtils;
+    QuotaResponseBuilderImpl _quotaDBUtils;
 
     @Parameter(name = ApiConstants.USAGE_TYPE, type = CommandType.INTEGER, required = false, description = "Usage type of the resource")
     private Integer usageType;
@@ -46,7 +46,7 @@ public class QuotaTariffListCmd extends BaseListCmd {
         super();
     }
 
-    public QuotaTariffListCmd(final QuotaDBUtilsImpl quotaDBUtils) {
+    public QuotaTariffListCmd(final QuotaResponseBuilderImpl quotaDBUtils) {
         super();
         _quotaDBUtils = quotaDBUtils;
     }
diff --git a/plugins/database/quota/src/org/apache/cloudstack/api/command/QuotaTariffUpdateCmd.java b/plugins/database/quota/src/org/apache/cloudstack/api/command/QuotaTariffUpdateCmd.java
index acf23411a16..fb38e840b35 100644
--- a/plugins/database/quota/src/org/apache/cloudstack/api/command/QuotaTariffUpdateCmd.java
+++ b/plugins/database/quota/src/org/apache/cloudstack/api/command/QuotaTariffUpdateCmd.java
@@ -24,7 +24,7 @@ import org.apache.cloudstack.api.BaseCmd;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.api.response.QuotaTariffResponse;
-import org.apache.cloudstack.quota.QuotaDBUtilsImpl;
+import org.apache.cloudstack.quota.QuotaResponseBuilderImpl;
 import org.apache.cloudstack.quota.QuotaTariffVO;
 import org.apache.log4j.Logger;
 
@@ -37,7 +37,7 @@ public class QuotaTariffUpdateCmd extends BaseCmd {
     private static final String s_name = "quotatariffupdateresponse";
 
     @Inject
-    QuotaDBUtilsImpl _quotaDBUtils;
+    QuotaResponseBuilderImpl _quotaDBUtils;
 
     @Parameter(name = ApiConstants.USAGE_TYPE, type = CommandType.INTEGER, required = true, description = "Integer value for the usage type of the resource")
     private Integer usageType;
@@ -76,7 +76,7 @@ public class QuotaTariffUpdateCmd extends BaseCmd {
         super();
     }
 
-    public QuotaTariffUpdateCmd(final QuotaDBUtilsImpl quotaDBUtils) {
+    public QuotaTariffUpdateCmd(final QuotaResponseBuilderImpl quotaDBUtils) {
         super();
         _quotaDBUtils = quotaDBUtils;
     }
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 482978d4798..35a9a8fdc40 100644
--- a/plugins/database/quota/src/org/apache/cloudstack/quota/QuotaManagerImpl.java
+++ b/plugins/database/quota/src/org/apache/cloudstack/quota/QuotaManagerImpl.java
@@ -62,7 +62,7 @@ public class QuotaManagerImpl extends ManagerBase implements QuotaManager {
     @Inject
     private QuotaUsageDao _quotaUsageDao;
     @Inject
-    private QuotaDBUtils _quotaDBUtils;
+    private QuotaResponseBuilder _quotaDBUtils;
     @Inject
     private QuotaBalanceDao _quotaBalanceDao;
     @Inject
diff --git a/plugins/database/quota/src/org/apache/cloudstack/quota/QuotaDBUtils.java b/plugins/database/quota/src/org/apache/cloudstack/quota/QuotaResponseBuilder.java
similarity index 98%
rename from plugins/database/quota/src/org/apache/cloudstack/quota/QuotaDBUtils.java
rename to plugins/database/quota/src/org/apache/cloudstack/quota/QuotaResponseBuilder.java
index 02e95fb74a8..d1317f5459f 100644
--- a/plugins/database/quota/src/org/apache/cloudstack/quota/QuotaDBUtils.java
+++ b/plugins/database/quota/src/org/apache/cloudstack/quota/QuotaResponseBuilder.java
@@ -30,7 +30,7 @@ import org.apache.cloudstack.api.response.QuotaTariffResponse;
 import java.util.Date;
 import java.util.List;
 
-public interface QuotaDBUtils {
+public interface QuotaResponseBuilder {
 
     QuotaTariffVO updateQuotaTariffPlan(QuotaTariffUpdateCmd cmd);
 
diff --git a/plugins/database/quota/src/org/apache/cloudstack/quota/QuotaDBUtilsImpl.java b/plugins/database/quota/src/org/apache/cloudstack/quota/QuotaResponseBuilderImpl.java
similarity index 98%
rename from plugins/database/quota/src/org/apache/cloudstack/quota/QuotaDBUtilsImpl.java
rename to plugins/database/quota/src/org/apache/cloudstack/quota/QuotaResponseBuilderImpl.java
index e15398af72f..96e87064907 100644
--- a/plugins/database/quota/src/org/apache/cloudstack/quota/QuotaDBUtilsImpl.java
+++ b/plugins/database/quota/src/org/apache/cloudstack/quota/QuotaResponseBuilderImpl.java
@@ -52,9 +52,9 @@ import java.util.Iterator;
 import java.util.List;
 
 @Component
-@Local(value = QuotaDBUtilsImpl.class)
-public class QuotaDBUtilsImpl implements QuotaDBUtils {
-    private static final Logger s_logger = Logger.getLogger(QuotaDBUtilsImpl.class.getName());
+@Local(value = QuotaResponseBuilderImpl.class)
+public class QuotaResponseBuilderImpl implements QuotaResponseBuilder {
+    private static final Logger s_logger = Logger.getLogger(QuotaResponseBuilderImpl.class.getName());
 
     @Inject
     private QuotaTariffDao _quotaTariffDao;
diff --git a/plugins/database/quota/src/org/apache/cloudstack/quota/QuotaServiceImpl.java b/plugins/database/quota/src/org/apache/cloudstack/quota/QuotaServiceImpl.java
index c0b8c537fba..f6abe3281cb 100644
--- a/plugins/database/quota/src/org/apache/cloudstack/quota/QuotaServiceImpl.java
+++ b/plugins/database/quota/src/org/apache/cloudstack/quota/QuotaServiceImpl.java
@@ -72,7 +72,7 @@ public class QuotaServiceImpl extends ManagerBase implements QuotaService, Confi
     @Inject
     private QuotaBalanceDao _quotaBalanceDao;
     @Inject
-    private QuotaDBUtils _quotaDBUtils;
+    private QuotaResponseBuilder _quotaDBUtils;
     @Inject
     private QuotaManager _quotaManager;