diff --git a/aggregation-manager-interface/src/main/protobuf/vorgangstub.model.proto b/aggregation-manager-interface/src/main/protobuf/aggregationdata.model.proto
similarity index 70%
rename from aggregation-manager-interface/src/main/protobuf/vorgangstub.model.proto
rename to aggregation-manager-interface/src/main/protobuf/aggregationdata.model.proto
index 7591e603d53be7304d713052bfd1e99e589d79f0..3a7655d6165ab81ad5bcca1de825e2e5f1352a5d 100644
--- a/aggregation-manager-interface/src/main/protobuf/vorgangstub.model.proto
+++ b/aggregation-manager-interface/src/main/protobuf/aggregationdata.model.proto
@@ -23,42 +23,42 @@
  */
 
 syntax = "proto3";
-package de.ozgcloud.aggregation.vorgangstub;
+package de.ozgcloud.aggregation.data;
 
 
 option java_multiple_files = true;
-option java_package = "de.ozgcloud.aggregation.vorgangstub";
-option java_outer_classname = "VorgangStubModelProto";
+option java_package = "de.ozgcloud.aggregation.data";
+option java_outer_classname = "AggregationDataModelProto";
 
-message SubmitVorgangStubRequest {
+message GrpcSendAggregationDataRequest {
   string name = 1;
   string mandant = 2;
-  repeated VorgangStub vorgangStubs = 3;
+  repeated GrpcAggregationData aggregationData = 3;
 }
 
-message VorgangStub {
+message GrpcAggregationData {
   string id = 1;
   string status = 2;
   string eingangDatum = 3;
   string vorgangName = 4;
-  Payload payload = 5;
+  GrpcPayload payload = 5;
 }
 
-message Payload {
-  repeated Property properties = 1;
+message GrpcPayload {
+  repeated GrpcProperty properties = 1;
 }
 
-message Property {
+message GrpcProperty {
   string key = 1;
   oneof value {
     string stringValue = 2;
-    Payload nestedPayload = 3;
-    ValueList valueList = 4;
+    GrpcPayload nestedPayload = 3;
+    GrpcValueList valueList = 4;
   }
 }
 
-message ValueList {
+message GrpcValueList {
   repeated string values = 1;
 }
 
-message SubmitVorgangStubResponse {}
\ No newline at end of file
+message GrpcSendAggregationDataResponse {}
\ No newline at end of file
diff --git a/aggregation-manager-interface/src/main/protobuf/vorgangstub.proto b/aggregation-manager-interface/src/main/protobuf/aggregationdata.proto
similarity index 75%
rename from aggregation-manager-interface/src/main/protobuf/vorgangstub.proto
rename to aggregation-manager-interface/src/main/protobuf/aggregationdata.proto
index ee8ab3fee849a9c2633b4a345596494fcc2c9641..4cc7204d018bef7a3825caf672659c5a386b905b 100644
--- a/aggregation-manager-interface/src/main/protobuf/vorgangstub.proto
+++ b/aggregation-manager-interface/src/main/protobuf/aggregationdata.proto
@@ -23,14 +23,14 @@
  */
 
 syntax = "proto3";
-package de.ozgcloud.aggregation.vorgangstub;
+package de.ozgcloud.aggregation.data;
 
-import "vorgangstub.model.proto";
+import "aggregationdata.model.proto";
 
 option java_multiple_files = true;
-option java_package = "de.ozgcloud.aggregation.vorgangstub";
-option java_outer_classname = "VorgangStubProto";
+option java_package = "de.ozgcloud.aggregation.data";
+option java_outer_classname = "AggregationDataProto";
 
-service VorgangStubService {
-  rpc SubmitVorgangStubs(stream SubmitVorgangStubRequest) returns (SubmitVorgangStubResponse);
+service AggregationDataService {
+  rpc SendAggregationData(stream GrpcSendAggregationDataRequest) returns (GrpcSendAggregationDataResponse);
 }
\ No newline at end of file
diff --git a/aggregation-manager-interface/src/main/protobuf/configuration.model.proto b/aggregation-manager-interface/src/main/protobuf/mapping.model.proto
similarity index 72%
rename from aggregation-manager-interface/src/main/protobuf/configuration.model.proto
rename to aggregation-manager-interface/src/main/protobuf/mapping.model.proto
index 6597e90cbf88feabfb18af2d08ee1b640b0d20a0..b7a6e67d187785cf2973efd956e240b5692f4803 100644
--- a/aggregation-manager-interface/src/main/protobuf/configuration.model.proto
+++ b/aggregation-manager-interface/src/main/protobuf/mapping.model.proto
@@ -23,27 +23,27 @@
  */
 
 syntax = "proto3";
-package de.ozgcloud.aggregation.configuration;
+package de.ozgcloud.aggregation.mapping;
 
 
 option java_multiple_files = true;
-option java_package = "de.ozgcloud.aggregation.configuration";
-option java_outer_classname = "ConfigurationModelProto";
+option java_package = "de.ozgcloud.aggregation.mapping";
+option java_outer_classname = "MappingModelProto";
 
-message GetAggregationConfigurationsRequest {}
+message GrpcGetAggregationMappingsRequest {}
 
-message GetAggregationConfigurationsResponse {
-  repeated AggregationConfiguration configurations = 1;
+message GrpcGetAggregationMappingsResponse {
+  repeated GrpcAggregationMapping mappings = 1;
 }
 
-message AggregationConfiguration {
+message GrpcAggregationMapping {
   string name = 1;
   string formEngineName = 2;
   string formId = 3;
-  repeated AggregationMapping mappings = 4;
+  repeated GrpcFieldMapping fieldMappings = 4;
 }
 
-message AggregationMapping {
+message GrpcFieldMapping {
   string source = 1;
   string target = 2;
 
diff --git a/aggregation-manager-interface/src/main/protobuf/configuration.proto b/aggregation-manager-interface/src/main/protobuf/mapping.proto
similarity index 73%
rename from aggregation-manager-interface/src/main/protobuf/configuration.proto
rename to aggregation-manager-interface/src/main/protobuf/mapping.proto
index c8636a66a1240b82f5ea2d1bd2f726c7413adcc9..ad4fd60f9bace6b4dee0fca6ce855aef7cecebc4 100644
--- a/aggregation-manager-interface/src/main/protobuf/configuration.proto
+++ b/aggregation-manager-interface/src/main/protobuf/mapping.proto
@@ -23,14 +23,14 @@
  */
 
 syntax = "proto3";
-package de.ozgcloud.aggregation.configuration;
+package de.ozgcloud.aggregation.mapping;
 
-import "configuration.model.proto";
+import "mapping.model.proto";
 
 option java_multiple_files = true;
-option java_package = "de.ozgcloud.aggregation.configuration";
-option java_outer_classname = "AggregationConfigurationProto";
+option java_package = "de.ozgcloud.aggregation.mapping";
+option java_outer_classname = "AggregationMappingProto";
 
-service AggregationConfigurationService {
-  rpc GetAggregationConfigurations(GetAggregationConfigurationsRequest) returns (GetAggregationConfigurationsResponse);
+service AggregationMappingService {
+  rpc GetAggregationMappings(GrpcGetAggregationMappingsRequest) returns (GrpcGetAggregationMappingsResponse);
 }
\ No newline at end of file
diff --git a/aggregation-manager-server/src/main/java/de/ozgcloud/aggregation/configuration/AggregationConfigurationGrpcService.java b/aggregation-manager-server/src/main/java/de/ozgcloud/aggregation/configuration/AggregationConfigurationGrpcService.java
deleted file mode 100644
index 6c8781973ef199012ad8cb5cbad1ce76d6e5b80f..0000000000000000000000000000000000000000
--- a/aggregation-manager-server/src/main/java/de/ozgcloud/aggregation/configuration/AggregationConfigurationGrpcService.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package de.ozgcloud.aggregation.configuration;
-
-import de.ozgcloud.aggregation.configuration.AggregationConfigurationServiceGrpc.AggregationConfigurationServiceImplBase;
-import io.grpc.stub.StreamObserver;
-
-class AggregationConfigurationGrpcService extends AggregationConfigurationServiceImplBase {
-
-	@Override
-	public void getAggregationConfigurations(GetAggregationConfigurationsRequest request,
-			StreamObserver<GetAggregationConfigurationsResponse> responseObserver) {
-		// Implement in OZG-????
-	}
-}
diff --git a/aggregation-manager-server/src/main/java/de/ozgcloud/aggregation/data/AggregationDataGrpcService.java b/aggregation-manager-server/src/main/java/de/ozgcloud/aggregation/data/AggregationDataGrpcService.java
new file mode 100644
index 0000000000000000000000000000000000000000..b9cb0bf22f48e68e0c59fb304beb7e085323b3ad
--- /dev/null
+++ b/aggregation-manager-server/src/main/java/de/ozgcloud/aggregation/data/AggregationDataGrpcService.java
@@ -0,0 +1,14 @@
+package de.ozgcloud.aggregation.data;
+
+import de.ozgcloud.aggregation.data.AggregationDataServiceGrpc.AggregationDataServiceImplBase;
+import io.grpc.stub.StreamObserver;
+
+class AggregationDataGrpcService extends AggregationDataServiceImplBase {
+
+	@Override
+	public StreamObserver<GrpcSendAggregationDataRequest> sendAggregationData(StreamObserver<GrpcSendAggregationDataResponse> responseObserver) {
+		// Implement in OZG-7909
+		return null;
+	}
+
+}
diff --git a/aggregation-manager-server/src/main/java/de/ozgcloud/aggregation/mapping/AggregationMappingGrpcService.java b/aggregation-manager-server/src/main/java/de/ozgcloud/aggregation/mapping/AggregationMappingGrpcService.java
new file mode 100644
index 0000000000000000000000000000000000000000..62813e122483fc66b2648bf3186c73be4769d753
--- /dev/null
+++ b/aggregation-manager-server/src/main/java/de/ozgcloud/aggregation/mapping/AggregationMappingGrpcService.java
@@ -0,0 +1,13 @@
+package de.ozgcloud.aggregation.mapping;
+
+import de.ozgcloud.aggregation.mapping.AggregationMappingServiceGrpc.AggregationMappingServiceImplBase;
+import io.grpc.stub.StreamObserver;
+
+class AggregationMappingGrpcService extends AggregationMappingServiceImplBase {
+
+	@Override
+	public void getAggregationMappings(GrpcGetAggregationMappingsRequest request,
+			StreamObserver<GrpcGetAggregationMappingsResponse> responseObserver) {
+		// Implement in OZG-????
+	}
+}
diff --git a/aggregation-manager-server/src/main/java/de/ozgcloud/aggregation/vorgangstub/VorgangGrpcService.java b/aggregation-manager-server/src/main/java/de/ozgcloud/aggregation/vorgangstub/VorgangGrpcService.java
deleted file mode 100644
index 6718849cab309f02b0d4f212342dd09c2569c49a..0000000000000000000000000000000000000000
--- a/aggregation-manager-server/src/main/java/de/ozgcloud/aggregation/vorgangstub/VorgangGrpcService.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package de.ozgcloud.aggregation.vorgangstub;
-
-import de.ozgcloud.aggregation.vorgangstub.VorgangStubServiceGrpc.VorgangStubServiceImplBase;
-import io.grpc.stub.StreamObserver;
-
-class VorgangGrpcService extends VorgangStubServiceImplBase {
-
-	@Override
-	public StreamObserver<SubmitVorgangStubRequest> submitVorgangStubs(StreamObserver<SubmitVorgangStubResponse> responseObserver) {
-		// Implement in OZG-7909
-		return null;
-	}
-
-}