diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/nachrichten/postfach/PostfachMailITCase.java b/vorgang-manager-server/src/test/java/de/ozgcloud/nachrichten/postfach/PostfachMailITCase.java
index e894dd415bcd3e7a67811a31fccea7cc6fce0e86..fab9c19f0df743c5a4671a4f8717e94602eea885 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/nachrichten/postfach/PostfachMailITCase.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/nachrichten/postfach/PostfachMailITCase.java
@@ -351,8 +351,8 @@ class PostfachMailITCase {
 
 				var mails = callGrpcListEndpoint();
 				assertThat(mails).hasSize(1);
-				var binaryFiles = loadAttachments(mails.getFirst());
-				assertThat(binaryFiles).hasSize(1).first().extracting(OzgCloudFile::getContentType)
+				var ozgCloudFiles = loadAttachments(mails.getFirst());
+				assertThat(ozgCloudFiles).hasSize(1).first().extracting(OzgCloudFile::getContentType)
 						.isEqualTo("application/vnd.openxmlformats-officedocument.wordprocessingml.document");
 			}
 
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/TestConfiguration.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/TestConfiguration.java
index 36a1974e232a2a03d0018ef8a31bcc9a637d60ca..653543097e717f7a140f582eb71e87ccc96102bd 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/TestConfiguration.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/TestConfiguration.java
@@ -42,7 +42,7 @@ public class TestConfiguration {
 	}
 
 	@Bean
-	OzgCloudFileTestUtil binaryFileTestUtil(MongoOperations mongoOperations, GridFsTemplate gridFsTemplate) {
+	OzgCloudFileTestUtil ozgCloudFileTestUtil(MongoOperations mongoOperations, GridFsTemplate gridFsTemplate) {
 		return new OzgCloudFileTestUtil(mongoOperations, gridFsTemplate);
 	}
 }
\ No newline at end of file
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/collaboration/CollaborationITCase.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/collaboration/CollaborationITCase.java
index b2674661c9acf200fc3ad59956c3cf4599d2257d..b524f1135e0ce1bca3ef4bb433184d3f36f0a88c 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/collaboration/CollaborationITCase.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/collaboration/CollaborationITCase.java
@@ -165,7 +165,7 @@ class CollaborationITCase {
 		void shouldReturnStoredSmallFile() {
 			var fileId = ozgCloudFileTestUtil.saveOzgCloudFile().getId();
 
-			var file = downloadBinaryFile(fileId);
+			var file = downloadOzgCloudFile(fileId);
 
 			assertThat(file).hasSameSizeAs(OzgCloudFileTestFactory.CONTENT).isEqualTo(OzgCloudFileTestFactory.CONTENT);
 		}
@@ -175,7 +175,7 @@ class CollaborationITCase {
 			var content = OzgCloudFileTestFactory.createContentInByte(FileService.CHUNK_SIZE);
 			var fileId = ozgCloudFileTestUtil.saveOzgCloudFile(content).getId();
 
-			var file = downloadBinaryFile(fileId);
+			var file = downloadOzgCloudFile(fileId);
 
 			assertThat(file).hasSameSizeAs(content).isEqualTo(content);
 		}
@@ -185,12 +185,12 @@ class CollaborationITCase {
 			var input = OzgCloudFileTestFactory.createContentInMiB(5);
 			var fileId = ozgCloudFileTestUtil.saveOzgCloudFile(input).getId();
 
-			var downloadedFile = downloadBinaryFile(fileId);
+			var downloadedFile = downloadOzgCloudFile(fileId);
 
 			assertThat(downloadedFile).hasSameSizeAs(input).isEqualTo(input);
 		}
 
-		private byte[] downloadBinaryFile(String fileId) {
+		private byte[] downloadOzgCloudFile(String fileId) {
 			var request = GrpcGetFileContentRequest.newBuilder().setId(fileId).build();
 			var it = getServiceStub().getFileContent(request);
 			var content = new ByteArrayOutputStream();
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/common/migration/M013_CreateOzgCloudFileCollectionTest.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/common/migration/M013_CreateOzgCloudFileCollectionTest.java
index dbc47c32f9003292d0b9aa33bcaeae6654dde633..36b17c3d6891bb628c0f6141a38b444bd27af62c 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/common/migration/M013_CreateOzgCloudFileCollectionTest.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/common/migration/M013_CreateOzgCloudFileCollectionTest.java
@@ -78,15 +78,15 @@ class M013_CreateOzgCloudFileCollectionTest { // NOSONAR
 	void shouldMigrateMetadata() {
 		migration.doMigration(template);
 
-		assertThat(loadBinaryFile()).containsAllEntriesOf(createBinaryFileFromMetadata(fileId));
+		assertThat(loadOzgCloudFile()).containsAllEntriesOf(createOzgCloudFileFromMetadata(fileId));
 	}
 
 	@Test
 	void shouldLoadContentByContentId() {
 		migration.doMigration(template);
 
-		var binaryFileDocument = loadBinaryFile();
-		assertThat(getFileContentByContentId(binaryFileDocument)).hasBinaryContent(CONTENT);
+		var ozgCloudFileDocument = loadOzgCloudFile();
+		assertThat(getFileContentByContentId(ozgCloudFileDocument)).hasBinaryContent(CONTENT);
 	}
 
 	@Test
@@ -96,8 +96,8 @@ class M013_CreateOzgCloudFileCollectionTest { // NOSONAR
 
 		migration.doMigration(template);
 
-		var binaryFiles = template.findAll(Document.class, M013_CreateOzgCloudFileCollection.NEW_COLLECTION_NAME);
-		assertThat(binaryFiles).hasSize(1).first().usingRecursiveComparison().isEqualTo(ozgCloudFile);
+		var ozgCloudFiles = template.findAll(Document.class, M013_CreateOzgCloudFileCollection.NEW_COLLECTION_NAME);
+		assertThat(ozgCloudFiles).hasSize(1).first().usingRecursiveComparison().isEqualTo(ozgCloudFile);
 	}
 
 	private String uploadFile() {
@@ -119,7 +119,7 @@ class M013_CreateOzgCloudFileCollectionTest { // NOSONAR
 		return ozgCloudFile;
 	}
 
-	private Document createBinaryFileFromMetadata(String fileId) {
+	private Document createOzgCloudFileFromMetadata(String fileId) {
 		var ozgCloudFile = createMetadata();
 		ozgCloudFile.append(M013_CreateOzgCloudFileCollection.FIELD_ID, new ObjectId(fileId));
 		ozgCloudFile.append(M013_CreateOzgCloudFileCollection.FIELD_CONTENT_ID, fileId);
@@ -138,7 +138,7 @@ class M013_CreateOzgCloudFileCollectionTest { // NOSONAR
 		return metadata;
 	}
 
-	private Document loadBinaryFile() {
+	private Document loadOzgCloudFile() {
 		return template.findById(fileId, Document.class, M013_CreateOzgCloudFileCollection.NEW_COLLECTION_NAME);
 	}
 
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/files/OzgCloudFileRepositoryITCase.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/files/OzgCloudFileRepositoryITCase.java
index d97ad15e72c8189e2fbbdd45c232b8bafcd0d15a..6efa60a53808485f8b1ed5c8252887c1a10f6905 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/files/OzgCloudFileRepositoryITCase.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/files/OzgCloudFileRepositoryITCase.java
@@ -220,7 +220,7 @@ class OzgCloudFileRepositoryITCase {
 		}
 
 		@Test
-		void shouldPatchBinaryFile() {
+		void shouldPatchOzgCloudFile() {
 			repository.patch(FileId.from(ozgCloudFile.getId()), ozgCloudFile.getVersion(), PATCH_MAP);
 
 			var loaded = mongoOperations.findById(ozgCloudFile.getId(), OzgCloudFile.class);