diff --git a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/common/grpc/GrpcResponseBatchStreamer.java b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/common/grpc/GrpcResponseBatchStreamer.java
index bf1914ecf735c677a78ec2af4e3516f5aa5c4427..675fec5463e8ec08cc48430318a069a961960c10 100644
--- a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/common/grpc/GrpcResponseBatchStreamer.java
+++ b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/common/grpc/GrpcResponseBatchStreamer.java
@@ -28,30 +28,30 @@ import java.util.function.Supplier;
 import io.grpc.stub.StreamObserver;
 import lombok.Setter;
 
-public class GrpcResponseBatchStreamer<ElemType, ResType> {
+public class GrpcResponseBatchStreamer<E, T> {
 
 	public static final int DEFAULT_BATCH_SIZE = 100;
 
 	@Setter
 	private int batchSize = DEFAULT_BATCH_SIZE;
 
-	private final Supplier<GrpcResponseBuilder<ElemType, ResType>> responseBuilderSupplier;
-	private final StreamObserver<ResType> responseObserver;
-	private GrpcResponseBuilder<ElemType, ResType> responseBuilder;
+	private final Supplier<GrpcResponseBuilder<E, T>> responseBuilderSupplier;
+	private final StreamObserver<T> responseObserver;
+	private GrpcResponseBuilder<E, T> responseBuilder;
 
-	public static <ElemType, ResType> GrpcResponseBatchStreamer<ElemType, ResType> create(Supplier<GrpcResponseBuilder<ElemType, ResType>> responseBuilderSupplier,
-			StreamObserver<ResType> responseObserver) {
+	public static <E, T> GrpcResponseBatchStreamer<E, T> create(Supplier<GrpcResponseBuilder<E, T>> responseBuilderSupplier,
+			StreamObserver<T> responseObserver) {
 		return new GrpcResponseBatchStreamer<>(responseBuilderSupplier, responseObserver);
 	}
 
-	private GrpcResponseBatchStreamer(Supplier<GrpcResponseBuilder<ElemType, ResType>> responseBuilderSupplier,
-			StreamObserver<ResType> responseObserver) {
+	private GrpcResponseBatchStreamer(Supplier<GrpcResponseBuilder<E, T>> responseBuilderSupplier,
+			StreamObserver<T> responseObserver) {
 		this.responseBuilderSupplier = responseBuilderSupplier;
 		this.responseObserver = responseObserver;
 		responseBuilder = responseBuilderSupplier.get();
 	}
 
-	public void send(ElemType element) {
+	public void send(E element) {
 		responseBuilder.addElement(element);
 		if (batchIsFull()) {
 			sendResponse();
diff --git a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/common/grpc/GrpcResponseBuilder.java b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/common/grpc/GrpcResponseBuilder.java
index 0cfe4aeb41286868ab8c896095d167504360bd2c..1651ab8808b0a0a6a5d2182310c3fd383566596f 100644
--- a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/common/grpc/GrpcResponseBuilder.java
+++ b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/common/grpc/GrpcResponseBuilder.java
@@ -23,11 +23,11 @@
  */
 package de.ozgcloud.vorgang.common.grpc;
 
-public interface GrpcResponseBuilder<ElemType, ResType> {
+public interface GrpcResponseBuilder<E, T> {
 
 	int getElementCount();
 
-	void addElement(ElemType elem);
+	void addElement(E elem);
 
-	ResType build();
+	T build();
 }