diff --git a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/StorageOrchestrator.java b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/StorageOrchestrator.java
index 933b4e0c5ce6..414ba7c4fe44 100644
--- a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/StorageOrchestrator.java
+++ b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/StorageOrchestrator.java
@@ -131,7 +131,7 @@ public class StorageOrchestrator extends ManagerBase implements StorageOrchestra
 
     @Override
     public String getConfigComponentName() {
-        return StorageOrchestrationService.class.getName();
+        return StorageOrchestrationService.class.getSimpleName();
     }
 
     @Override
diff --git a/plugins/event-bus/webhook/src/main/java/org/apache/cloudstack/mom/webhook/WebhookServiceImpl.java b/plugins/event-bus/webhook/src/main/java/org/apache/cloudstack/mom/webhook/WebhookServiceImpl.java
index 002916fef9dd..ab4818bda90f 100644
--- a/plugins/event-bus/webhook/src/main/java/org/apache/cloudstack/mom/webhook/WebhookServiceImpl.java
+++ b/plugins/event-bus/webhook/src/main/java/org/apache/cloudstack/mom/webhook/WebhookServiceImpl.java
@@ -270,7 +270,7 @@ public boolean stop() {
 
     @Override
     public String getConfigComponentName() {
-        return WebhookService.class.getName();
+        return WebhookService.class.getSimpleName();
     }
 
     @Override
diff --git a/server/src/main/java/com/cloud/resourcelimit/ResourceLimitManagerImpl.java b/server/src/main/java/com/cloud/resourcelimit/ResourceLimitManagerImpl.java
index a79b074685db..a746bb1c76a7 100644
--- a/server/src/main/java/com/cloud/resourcelimit/ResourceLimitManagerImpl.java
+++ b/server/src/main/java/com/cloud/resourcelimit/ResourceLimitManagerImpl.java
@@ -2236,7 +2236,7 @@ public void decrementVmGpuResourceCount(long accountId, Boolean display, Service
 
     @Override
     public String getConfigComponentName() {
-        return ResourceLimitManagerImpl.class.getName();
+        return ResourceLimitManagerImpl.class.getSimpleName();
     }
 
     @Override
diff --git a/server/src/main/java/org/apache/cloudstack/command/ReconcileCommandServiceImpl.java b/server/src/main/java/org/apache/cloudstack/command/ReconcileCommandServiceImpl.java
index 5edf05d1a5c0..2ae7861f5e47 100644
--- a/server/src/main/java/org/apache/cloudstack/command/ReconcileCommandServiceImpl.java
+++ b/server/src/main/java/org/apache/cloudstack/command/ReconcileCommandServiceImpl.java
@@ -162,7 +162,7 @@ public boolean stop() {
 
     @Override
     public String getConfigComponentName() {
-        return ReconcileCommandService.class.getName();
+        return ReconcileCommandService.class.getSimpleName();
     }
 
     @Override
diff --git a/server/src/main/java/org/apache/cloudstack/consoleproxy/ConsoleAccessManagerImpl.java b/server/src/main/java/org/apache/cloudstack/consoleproxy/ConsoleAccessManagerImpl.java
index 237135b5176b..929869b03c14 100644
--- a/server/src/main/java/org/apache/cloudstack/consoleproxy/ConsoleAccessManagerImpl.java
+++ b/server/src/main/java/org/apache/cloudstack/consoleproxy/ConsoleAccessManagerImpl.java
@@ -153,7 +153,7 @@ public boolean start() {
 
     @Override
     public String getConfigComponentName() {
-        return ConsoleAccessManager.class.getName();
+        return ConsoleAccessManager.class.getSimpleName();
     }
 
     @Override
diff --git a/server/src/main/java/org/apache/cloudstack/resource/ResourceCleanupServiceImpl.java b/server/src/main/java/org/apache/cloudstack/resource/ResourceCleanupServiceImpl.java
index b752a4c384f3..78ae4017f0e9 100644
--- a/server/src/main/java/org/apache/cloudstack/resource/ResourceCleanupServiceImpl.java
+++ b/server/src/main/java/org/apache/cloudstack/resource/ResourceCleanupServiceImpl.java
@@ -611,7 +611,7 @@ public List<Class<?>> getCommands() {
 
     @Override
     public String getConfigComponentName() {
-        return ResourceCleanupService.class.getName();
+        return ResourceCleanupService.class.getSimpleName();
     }
 
     @Override