diff --git a/api-lib-core/src/main/java/de/ozgcloud/apilib/client_attribute/grpc/OzgCloudClientAttributeGrpcService.java b/api-lib-core/src/main/java/de/ozgcloud/apilib/client_attribute/grpc/OzgCloudClientAttributeGrpcService.java
index b99807d114f40082d39a1d109cac6d73033a2a58..cebaf6360285e9b87d9a95452fc0ef85ea010fb0 100644
--- a/api-lib-core/src/main/java/de/ozgcloud/apilib/client_attribute/grpc/OzgCloudClientAttributeGrpcService.java
+++ b/api-lib-core/src/main/java/de/ozgcloud/apilib/client_attribute/grpc/OzgCloudClientAttributeGrpcService.java
@@ -45,25 +45,25 @@ public class OzgCloudClientAttributeGrpcService implements OzgCloudClientAttribu
 
 	@Override
 	public void setClientAttribute(OzgCloudBooleanClientAttribute clientAttribute, OzgCloudVorgangId vorgangId) {
-		setClientAttribute(clientAttributeMapper.toGrpc(clientAttribute), vorgangId);
+		doSetClientAttribute(clientAttributeMapper.toGrpc(clientAttribute), vorgangId);
 	}
 
 	@Override
 	public void setClientAttribute(OzgCloudStringClientAttribute clientAttribute, OzgCloudVorgangId vorgangId) {
-		setClientAttribute(clientAttributeMapper.toGrpc(clientAttribute), vorgangId);
+		doSetClientAttribute(clientAttributeMapper.toGrpc(clientAttribute), vorgangId);
 	}
 
 	@Override
 	public void setClientAttribute(OzgCloudLongClientAttribute clientAttribute, OzgCloudVorgangId vorgangId) {
-		setClientAttribute(clientAttributeMapper.toGrpc(clientAttribute), vorgangId);
+		doSetClientAttribute(clientAttributeMapper.toGrpc(clientAttribute), vorgangId);
 	}
 
 	@Override
 	public void setClientAttribute(OzgCloudDoubleClientAttribute clientAttribute, OzgCloudVorgangId vorgangId) {
-		setClientAttribute(clientAttributeMapper.toGrpc(clientAttribute), vorgangId);
+		doSetClientAttribute(clientAttributeMapper.toGrpc(clientAttribute), vorgangId);
 	}
 
-	void setClientAttribute(GrpcClientAttribute clientAttribute, OzgCloudVorgangId vorgangId) {
+	void doSetClientAttribute(GrpcClientAttribute clientAttribute, OzgCloudVorgangId vorgangId) {
 		getAttributesServiceStub().set(buildRequest(clientAttribute, vorgangId.toString()));
 	}
 
diff --git a/api-lib-core/src/test/java/de/ozgcloud/apilib/client_attribute/grpc/OzgCloudClientAttributeGrpcServiceTest.java b/api-lib-core/src/test/java/de/ozgcloud/apilib/client_attribute/grpc/OzgCloudClientAttributeGrpcServiceTest.java
index 039a6ec8fe9821f352e6c6de348dd89b52e6dd0b..e9341c3d72ca55c6f9edec2dd088c8197ae84234 100644
--- a/api-lib-core/src/test/java/de/ozgcloud/apilib/client_attribute/grpc/OzgCloudClientAttributeGrpcServiceTest.java
+++ b/api-lib-core/src/test/java/de/ozgcloud/apilib/client_attribute/grpc/OzgCloudClientAttributeGrpcServiceTest.java
@@ -69,7 +69,7 @@ class OzgCloudClientAttributeGrpcServiceTest {
 
 		@BeforeEach
 		void init() {
-			doNothing().when(service).setClientAttribute(any(GrpcClientAttribute.class), any());
+			doNothing().when(service).doSetClientAttribute(any(GrpcClientAttribute.class), any());
 		}
 
 		@Nested
@@ -93,7 +93,7 @@ class OzgCloudClientAttributeGrpcServiceTest {
 			void shouldCallSetClientAttribute() {
 				service.setClientAttribute(CLIENT_ATTRIBUTE, OzgCloudVorgangTestFactory.ID);
 
-				verify(service).setClientAttribute(grpcClientAttribute, OzgCloudVorgangTestFactory.ID);
+				verify(service).doSetClientAttribute(grpcClientAttribute, OzgCloudVorgangTestFactory.ID);
 			}
 		}
 
@@ -118,7 +118,7 @@ class OzgCloudClientAttributeGrpcServiceTest {
 			void shouldCallSetClientAttribute() {
 				service.setClientAttribute(CLIENT_ATTRIBUTE, OzgCloudVorgangTestFactory.ID);
 
-				verify(service).setClientAttribute(grpcClientAttribute, OzgCloudVorgangTestFactory.ID);
+				verify(service).doSetClientAttribute(grpcClientAttribute, OzgCloudVorgangTestFactory.ID);
 			}
 		}
 
@@ -143,7 +143,7 @@ class OzgCloudClientAttributeGrpcServiceTest {
 			void shouldCallSetClientAttribute() {
 				service.setClientAttribute(CLIENT_ATTRIBUTE, OzgCloudVorgangTestFactory.ID);
 
-				verify(service).setClientAttribute(grpcClientAttribute, OzgCloudVorgangTestFactory.ID);
+				verify(service).doSetClientAttribute(grpcClientAttribute, OzgCloudVorgangTestFactory.ID);
 			}
 		}
 
@@ -168,13 +168,13 @@ class OzgCloudClientAttributeGrpcServiceTest {
 			void shouldCallSetClientAttribute() {
 				service.setClientAttribute(CLIENT_ATTRIBUTE, OzgCloudVorgangTestFactory.ID);
 
-				verify(service).setClientAttribute(grpcClientAttribute, OzgCloudVorgangTestFactory.ID);
+				verify(service).doSetClientAttribute(grpcClientAttribute, OzgCloudVorgangTestFactory.ID);
 			}
 		}
 	}
 
 	@Nested
-	class TestSetClientAttributeGrpc {
+	class TestDoSetClientAttribute {
 
 		@Mock
 		private ClientAttributeServiceBlockingStub stubWithInterceptor;
@@ -189,21 +189,21 @@ class OzgCloudClientAttributeGrpcServiceTest {
 
 		@Test
 		void shouldCallBuildRequest() {
-			service.setClientAttribute(grpcClientAttribute, OzgCloudVorgangTestFactory.ID);
+			service.doSetClientAttribute(grpcClientAttribute, OzgCloudVorgangTestFactory.ID);
 
 			verify(service).buildRequest(grpcClientAttribute, OzgCloudVorgangTestFactory.ID.toString());
 		}
 
 		@Test
 		void shouldCallGetServiceBlockingStub() {
-			service.setClientAttribute(grpcClientAttribute, OzgCloudVorgangTestFactory.ID);
+			service.doSetClientAttribute(grpcClientAttribute, OzgCloudVorgangTestFactory.ID);
 
 			verify(service).getAttributesServiceStub();
 		}
 
 		@Test
 		void shouldCallSet() {
-			service.setClientAttribute(grpcClientAttribute, OzgCloudVorgangTestFactory.ID);
+			service.doSetClientAttribute(grpcClientAttribute, OzgCloudVorgangTestFactory.ID);
 
 			verify(stubWithInterceptor).set(grpcRequest);
 		}