diff --git a/api/src/main/java/org/apache/cloudstack/api/ResponseGenerator.java b/api/src/main/java/org/apache/cloudstack/api/ResponseGenerator.java
index e21270fab4d..acc8dca1618 100644
--- a/api/src/main/java/org/apache/cloudstack/api/ResponseGenerator.java
+++ b/api/src/main/java/org/apache/cloudstack/api/ResponseGenerator.java
@@ -112,6 +112,7 @@ import org.apache.cloudstack.api.response.SSHKeyPairResponse;
 import org.apache.cloudstack.api.response.SecondaryStorageHeuristicsResponse;
 import org.apache.cloudstack.api.response.SecurityGroupResponse;
 import org.apache.cloudstack.api.response.ServiceOfferingResponse;
+import org.apache.cloudstack.api.response.ServiceOfferingCategoryResponse;
 import org.apache.cloudstack.api.response.ServiceResponse;
 import org.apache.cloudstack.api.response.SharedFSResponse;
 import org.apache.cloudstack.api.response.Site2SiteCustomerGatewayResponse;
@@ -220,6 +221,7 @@ import com.cloud.network.vpc.VpcOffering;
 import com.cloud.offering.DiskOffering;
 import com.cloud.offering.NetworkOffering;
 import com.cloud.offering.ServiceOffering;
+import com.cloud.offering.ServiceOfferingCategory;
 import com.cloud.org.Cluster;
 import com.cloud.projects.Project;
 import com.cloud.projects.ProjectAccount;
@@ -267,7 +269,7 @@ public interface ResponseGenerator {
 
     ServiceOfferingResponse createServiceOfferingResponse(ServiceOffering offering);
 
-    org.apache.cloudstack.api.response.ServiceOfferingCategoryResponse createServiceOfferingCategoryResponse(com.cloud.offering.ServiceOfferingCategory category);
+    ServiceOfferingCategoryResponse createServiceOfferingCategoryResponse(ServiceOfferingCategory category);
 
     ConfigurationResponse createConfigurationResponse(Configuration cfg);
 
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java
index 43dc04a5d03..543f56d0d9b 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java
@@ -32,6 +32,7 @@ import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.api.response.DiskOfferingResponse;
 import org.apache.cloudstack.api.response.DomainResponse;
 import org.apache.cloudstack.api.response.ServiceOfferingResponse;
+import org.apache.cloudstack.api.response.ServiceOfferingCategoryResponse;
 import org.apache.cloudstack.api.response.VgpuProfileResponse;
 import org.apache.cloudstack.api.response.VsphereStoragePoliciesResponse;
 import org.apache.cloudstack.api.response.ZoneResponse;
@@ -291,7 +292,7 @@ public class CreateServiceOfferingCmd extends BaseCmd {
 
     @Parameter(name = ApiConstants.SERVICE_OFFERING_CATEGORY_ID,
             type = CommandType.UUID,
-            entityType = org.apache.cloudstack.api.response.ServiceOfferingCategoryResponse.class,
+            entityType = ServiceOfferingCategoryResponse.class,
             required = false,
             description = "the ID of the service offering category to associate with this offering",
             since = "4.23")
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/UpdateServiceOfferingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/UpdateServiceOfferingCmd.java
index f721b75259f..92a1b456c26 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/UpdateServiceOfferingCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/UpdateServiceOfferingCmd.java
@@ -29,6 +29,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.ServiceOfferingResponse;
+import org.apache.cloudstack.api.response.ServiceOfferingCategoryResponse;
 import org.apache.commons.lang3.EnumUtils;
 import org.apache.commons.lang3.StringUtils;
 
@@ -111,7 +112,7 @@ public class UpdateServiceOfferingCmd extends BaseCmd {
 
     @Parameter(name = ApiConstants.SERVICE_OFFERING_CATEGORY_ID,
             type = CommandType.UUID,
-            entityType = org.apache.cloudstack.api.response.ServiceOfferingCategoryResponse.class,
+            entityType = ServiceOfferingCategoryResponse.class,
             required = false,
             description = "the ID of the service offering category to associate",
             since = "4.23")
diff --git a/api/src/main/java/org/apache/cloudstack/query/QueryService.java b/api/src/main/java/org/apache/cloudstack/query/QueryService.java
index 8474416a810..8b460264e9c 100644
--- a/api/src/main/java/org/apache/cloudstack/query/QueryService.java
+++ b/api/src/main/java/org/apache/cloudstack/query/QueryService.java
@@ -88,6 +88,7 @@ import org.apache.cloudstack.api.response.RouterHealthCheckResultResponse;
 import org.apache.cloudstack.api.response.SecondaryStorageHeuristicsResponse;
 import org.apache.cloudstack.api.response.SecurityGroupResponse;
 import org.apache.cloudstack.api.response.ServiceOfferingResponse;
+import org.apache.cloudstack.api.response.ServiceOfferingCategoryResponse;
 import org.apache.cloudstack.api.response.SnapshotResponse;
 import org.apache.cloudstack.api.response.StorageAccessGroupResponse;
 import org.apache.cloudstack.api.response.StoragePoolResponse;
@@ -186,7 +187,7 @@ public interface QueryService {
 
     ListResponse<ServiceOfferingResponse>  searchForServiceOfferings(ListServiceOfferingsCmd cmd);
 
-    ListResponse<org.apache.cloudstack.api.response.ServiceOfferingCategoryResponse> listServiceOfferingCategories(ListServiceOfferingCategoriesCmd cmd);
+    ListResponse<ServiceOfferingCategoryResponse> listServiceOfferingCategories(ListServiceOfferingCategoriesCmd cmd);
 
     ListResponse<ZoneResponse>  listDataCenters(ListZonesCmd cmd);
 
diff --git a/server/src/main/java/com/cloud/api/ApiResponseHelper.java b/server/src/main/java/com/cloud/api/ApiResponseHelper.java
index 217004e1673..3b048bfc429 100644
--- a/server/src/main/java/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/main/java/com/cloud/api/ApiResponseHelper.java
@@ -166,6 +166,7 @@ import org.apache.cloudstack.api.response.SecondaryStorageHeuristicsResponse;
 import org.apache.cloudstack.api.response.SecurityGroupResponse;
 import org.apache.cloudstack.api.response.SecurityGroupRuleResponse;
 import org.apache.cloudstack.api.response.ServiceOfferingResponse;
+import org.apache.cloudstack.api.response.ServiceOfferingCategoryResponse;
 import org.apache.cloudstack.api.response.ServiceResponse;
 import org.apache.cloudstack.api.response.SharedFSResponse;
 import org.apache.cloudstack.api.response.Site2SiteCustomerGatewayResponse;
@@ -373,6 +374,7 @@ import com.cloud.offering.DiskOffering;
 import com.cloud.offering.NetworkOffering;
 import com.cloud.offering.NetworkOffering.Detail;
 import com.cloud.offering.ServiceOffering;
+import com.cloud.offering.ServiceOfferingCategory;
 import com.cloud.offerings.NetworkOfferingVO;
 import com.cloud.offerings.dao.NetworkOfferingDao;
 import com.cloud.org.Cluster;
@@ -646,8 +648,8 @@ public class ApiResponseHelper implements ResponseGenerator {
     }
 
     @Override
-    public org.apache.cloudstack.api.response.ServiceOfferingCategoryResponse createServiceOfferingCategoryResponse(com.cloud.offering.ServiceOfferingCategory category) {
-        org.apache.cloudstack.api.response.ServiceOfferingCategoryResponse response = new org.apache.cloudstack.api.response.ServiceOfferingCategoryResponse();
+    public ServiceOfferingCategoryResponse createServiceOfferingCategoryResponse(ServiceOfferingCategory category) {
+        ServiceOfferingCategoryResponse response = new ServiceOfferingCategoryResponse();
         response.setId(category.getUuid());
         response.setName(category.getName());
         response.setSortKey(category.getSortKey());
diff --git a/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java b/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java
index 91b3471a576..11c2106eb99 100644
--- a/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java
+++ b/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java
@@ -481,7 +481,7 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
     ServiceOfferingDetailsDao _srvOfferingDetailsDao;
 
     @Inject
-    com.cloud.service.dao.ServiceOfferingCategoryDao _serviceOfferingCategoryDao;
+    ServiceOfferingCategoryDao _serviceOfferingCategoryDao;
 
     @Inject
     DiskOfferingDao _diskOfferingDao;
diff --git a/server/src/main/java/com/cloud/api/query/dao/ServiceOfferingJoinDaoImpl.java b/server/src/main/java/com/cloud/api/query/dao/ServiceOfferingJoinDaoImpl.java
index b15225e6165..b351d8de15f 100644
--- a/server/src/main/java/com/cloud/api/query/dao/ServiceOfferingJoinDaoImpl.java
+++ b/server/src/main/java/com/cloud/api/query/dao/ServiceOfferingJoinDaoImpl.java
@@ -44,6 +44,8 @@ import com.cloud.dc.dao.VsphereStoragePolicyDao;
 import com.cloud.offering.ServiceOffering;
 import com.cloud.server.ResourceTag.ResourceObjectType;
 import com.cloud.storage.DiskOfferingVO;
+import com.cloud.service.dao.ServiceOfferingCategoryDao;
+import com.cloud.service.ServiceOfferingCategoryVO;
 import com.cloud.user.AccountManager;
 import com.cloud.utils.db.GenericDaoBase;
 import com.cloud.utils.db.Filter;
@@ -65,7 +67,7 @@ public class ServiceOfferingJoinDaoImpl extends GenericDaoBase<ServiceOfferingJo
     @Inject
     private AccountManager accountManager;
     @Inject
-    private com.cloud.service.dao.ServiceOfferingCategoryDao _serviceOfferingCategoryDao;
+    private ServiceOfferingCategoryDao _serviceOfferingCategoryDao;
 
     private SearchBuilder<ServiceOfferingJoinVO> sofIdSearch;
 
@@ -152,7 +154,7 @@ public class ServiceOfferingJoinDaoImpl extends GenericDaoBase<ServiceOfferingJo
 
         // Set category information if available
         if (offering.getCategoryId() != null) {
-            com.cloud.service.ServiceOfferingCategoryVO category = _serviceOfferingCategoryDao.findById(offering.getCategoryId());
+            ServiceOfferingCategoryVO category = _serviceOfferingCategoryDao.findById(offering.getCategoryId());
             if (category != null) {
                 offeringResponse.setCategoryId(category.getUuid());
                 offeringResponse.setCategoryName(category.getName());
diff --git a/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
index 92bd9adf3b9..dc86fd7c49f 100644
--- a/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -8636,7 +8636,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
             throw new InvalidParameterValueException("Service offering category with name " + name + " already exists");
         }
 
-        com.cloud.service.ServiceOfferingCategoryVO category = new ServiceOfferingCategoryVO(name);
+        ServiceOfferingCategoryVO category = new ServiceOfferingCategoryVO(name);
         if (sortKey != null) {
             category.setSortKey(sortKey);
         }
@@ -8651,7 +8651,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
     public boolean deleteServiceOfferingCategory(DeleteServiceOfferingCategoryCmd cmd) {
         Long categoryId = cmd.getId();
 
-        com.cloud.service.ServiceOfferingCategoryVO category = _serviceOfferingCategoryDao.findById(categoryId);
+        ServiceOfferingCategoryVO category = _serviceOfferingCategoryDao.findById(categoryId);
         if (category == null) {
             throw new InvalidParameterValueException("Unable to find service offering category with id " + categoryId);
         }