diff --git a/document-manager-server/src/main/java/de/ozgcloud/document/BescheidManagerConfiguration.java b/document-manager-server/src/main/java/de/ozgcloud/document/DocumentManagerConfiguration.java
similarity index 98%
rename from document-manager-server/src/main/java/de/ozgcloud/document/BescheidManagerConfiguration.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/DocumentManagerConfiguration.java
index 53fb8207045409331e66085e4674f2d71ba91bf6..551f4778c8f17c8e31e626cf9b297a704a2db282 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/document/BescheidManagerConfiguration.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/DocumentManagerConfiguration.java
@@ -39,7 +39,7 @@ import de.ozgcloud.vorgang.grpc.command.CommandServiceGrpc;
 import net.devh.boot.grpc.client.inject.GrpcClient;
 
 @Configuration
-public class BescheidManagerConfiguration {
+public class DocumentManagerConfiguration {
 
 	public static final String COMMAND_SERVICE_NAME = "bescheid_OzgCloudCommandService";
 	public static final String USER_PROFILE_SERVICE_NAME = "bescheid_OzgCloudUserProfileService";
diff --git a/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidService.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidService.java
index dab645b8e5410fa2c35cf3e50fe84b9ddc4586b3..a942c708721ff27ae8ccc2b6d9d317203520db02 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidService.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidService.java
@@ -26,6 +26,11 @@ import de.ozgcloud.apilib.common.command.OzgCloudCommand;
 import de.ozgcloud.apilib.common.command.OzgCloudCommandService;
 import de.ozgcloud.apilib.common.command.OzgCloudCreateSubCommandsRequest;
 import de.ozgcloud.apilib.common.command.grpc.CommandMapper;
+import de.ozgcloud.command.Command;
+import de.ozgcloud.common.binaryfile.FileId;
+import de.ozgcloud.common.errorhandling.TechnicalException;
+import de.ozgcloud.document.Document;
+import de.ozgcloud.document.DocumentManagerConfiguration;
 import de.ozgcloud.document.bescheid.administration.AdministrationService;
 import de.ozgcloud.document.bescheid.attributes.ClientAttributeService;
 import de.ozgcloud.document.bescheid.common.freemarker.TemplateHandler;
@@ -33,12 +38,8 @@ import de.ozgcloud.document.bescheid.common.user.UserProfileService;
 import de.ozgcloud.document.bescheid.vorgang.Vorgang;
 import de.ozgcloud.document.bescheid.vorgang.VorgangId;
 import de.ozgcloud.document.bescheid.vorgang.VorgangService;
-import de.ozgcloud.command.Command;
 import de.ozgcloud.document.common.attached_item.AttachedItem;
 import de.ozgcloud.document.common.attached_item.AttachedItemService;
-import de.ozgcloud.common.binaryfile.FileId;
-import de.ozgcloud.common.errorhandling.TechnicalException;
-import de.ozgcloud.document.Document;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 
@@ -68,7 +69,7 @@ public class BescheidService {
 	private final VorgangService vorgangService;
 	private final AttachedItemService attachedItemService;
 	private final UserProfileService userProfileService;
-	@Qualifier(BescheidManagerConfiguration.COMMAND_SERVICE_NAME)
+	@Qualifier(DocumentManagerConfiguration.COMMAND_SERVICE_NAME)
 	private final OzgCloudCommandService commandService;
 	private final AdministrationService administrationService;
 
diff --git a/document-manager-server/src/main/java/de/ozgcloud/document/common/attached_item/AttachedItemService.java b/document-manager-server/src/main/java/de/ozgcloud/document/common/attached_item/AttachedItemService.java
index 8881932dd1cb1f1b8ce9c0b7355eb2d1a6f10aed..db06b2a30ebd55fc14f183891ec8f2a7c895a8f7 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/document/common/attached_item/AttachedItemService.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/common/attached_item/AttachedItemService.java
@@ -37,15 +37,15 @@ import org.springframework.stereotype.Service;
 import de.ozgcloud.apilib.common.command.OzgCloudCommand;
 import de.ozgcloud.apilib.common.command.OzgCloudCommandService;
 import de.ozgcloud.apilib.common.command.grpc.CommandMapper;
+import de.ozgcloud.command.Command;
+import de.ozgcloud.common.errorhandling.TechnicalException;
+import de.ozgcloud.document.Document;
+import de.ozgcloud.document.DocumentManagerConfiguration;
 import de.ozgcloud.document.bescheid.Bescheid;
 import de.ozgcloud.document.bescheid.Bescheid.Status;
 import de.ozgcloud.document.bescheid.BescheidCallContextAttachingInterceptor;
-import de.ozgcloud.document.bescheid.BescheidManagerConfiguration;
 import de.ozgcloud.document.bescheid.BescheidMapper;
 import de.ozgcloud.document.bescheid.vorgang.VorgangId;
-import de.ozgcloud.command.Command;
-import de.ozgcloud.common.errorhandling.TechnicalException;
-import de.ozgcloud.document.Document;
 import lombok.RequiredArgsConstructor;
 
 @Service
@@ -58,7 +58,7 @@ public class AttachedItemService {
 	static final String UPDATE_ATTACHED_ITEM_ORDER = "UPDATE_ATTACHED_ITEM";
 	static final String DELETE_ATTACHED_ITEM = "DELETE_ATTACHED_ITEM";
 
-	@Qualifier(BescheidManagerConfiguration.COMMAND_SERVICE_NAME)
+	@Qualifier(DocumentManagerConfiguration.COMMAND_SERVICE_NAME)
 	private final OzgCloudCommandService commandService;
 	private final VorgangAttachedItemRemoteService remoteService;