diff --git a/src/main/java/net/geant/nmaas/externalservices/kubernetes/RemoteClusterManager.java b/src/main/java/net/geant/nmaas/externalservices/kubernetes/RemoteClusterManager.java
index 7ab5cf48dd4a9f2d50d2f5cffecf48911b8649e8..e8a450a03b6bd955e35b09b0a880c75db06db3d1 100644
--- a/src/main/java/net/geant/nmaas/externalservices/kubernetes/RemoteClusterManager.java
+++ b/src/main/java/net/geant/nmaas/externalservices/kubernetes/RemoteClusterManager.java
@@ -349,7 +349,7 @@ public class RemoteClusterManager implements ClusterMonitoringService {
 
     }
 
-    public boolean clusterExist(Long id) {
+    public boolean clusterExists(Long id) {
         return clusterRepository.existsById(id);
     }
 
diff --git a/src/main/java/net/geant/nmaas/externalservices/kubernetes/entities/KClusterDeployment.java b/src/main/java/net/geant/nmaas/externalservices/kubernetes/entities/KClusterDeployment.java
index 7db61dcff250a2f4621faccd33d1ef9e1e9633ff..a3599570413da6bca307c3f1f6773cccc220c04e 100644
--- a/src/main/java/net/geant/nmaas/externalservices/kubernetes/entities/KClusterDeployment.java
+++ b/src/main/java/net/geant/nmaas/externalservices/kubernetes/entities/KClusterDeployment.java
@@ -12,10 +12,6 @@ import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
-import net.geant.nmaas.orchestration.entities.DomainTechDetails;
-import org.apache.commons.lang3.StringUtils;
-
-import java.util.Optional;
 
 @Entity
 @Table(name = "k_cluster_deployment")
diff --git a/src/main/java/net/geant/nmaas/nmservice/deployment/containerorchestrators/kubernetes/KubernetesManager.java b/src/main/java/net/geant/nmaas/nmservice/deployment/containerorchestrators/kubernetes/KubernetesManager.java
index 752b3fa953a33644b32bc0756e8dbd0ba1929288..ab50670ce702020ee8318f6a3f813de6ec4c2eea 100644
--- a/src/main/java/net/geant/nmaas/nmservice/deployment/containerorchestrators/kubernetes/KubernetesManager.java
+++ b/src/main/java/net/geant/nmaas/nmservice/deployment/containerorchestrators/kubernetes/KubernetesManager.java
@@ -107,7 +107,7 @@ public class KubernetesManager implements ContainerOrchestrator {
                 appDeployment.getDescriptiveDeploymentId()
         );
         //verify cluster
-        if(remoteClusterManager.clusterExist(appDeployment.getRemoteClusterId())) {
+        if(remoteClusterManager.clusterExists(appDeployment.getRemoteClusterId())) {
            serviceInfo.setRemoteCluster(remoteClusterManager.getCluster(appDeployment.getRemoteClusterId()));
         }
 
diff --git a/src/main/java/net/geant/nmaas/orchestration/tasks/app/AppRequestVerificationTask.java b/src/main/java/net/geant/nmaas/orchestration/tasks/app/AppRequestVerificationTask.java
index cd623ce85a832418db8482a70a6f354763aa30b9..1da23840cb3c47d9147ad889a0c93a4cab44f3ee 100644
--- a/src/main/java/net/geant/nmaas/orchestration/tasks/app/AppRequestVerificationTask.java
+++ b/src/main/java/net/geant/nmaas/orchestration/tasks/app/AppRequestVerificationTask.java
@@ -43,7 +43,7 @@ public class AppRequestVerificationTask {
             final AppDeployment appDeployment = repository.findByDeploymentId(deploymentId).orElseThrow(() -> new InvalidDeploymentIdException(deploymentId));
             final Application application = appRepository.findById(Long.valueOf(appDeployment.getApplicationId().getValue())).orElseThrow(() ->
                     new InvalidApplicationIdException("Application for deployment " + deploymentId + " does not exist in repository"));
-            if(!remoteClusterManager.clusterExist(appDeployment.getRemoteClusterId())) {
+            if(!remoteClusterManager.clusterExists(appDeployment.getRemoteClusterId())) {
                 throw new InvalidAttributesException("Wrong remote cluster Id");
             }
             serviceDeployment.verifyRequest(
diff --git a/src/test/java/net/geant/nmaas/orchestration/tasks/app/AppRequestVerificationTaskTest.java b/src/test/java/net/geant/nmaas/orchestration/tasks/app/AppRequestVerificationTaskTest.java
index 53b50f799169a22954f8b31f1c9a0b9657a7afb3..622f4cd25704c5a4af63235d9bd1389790545c55 100644
--- a/src/test/java/net/geant/nmaas/orchestration/tasks/app/AppRequestVerificationTaskTest.java
+++ b/src/test/java/net/geant/nmaas/orchestration/tasks/app/AppRequestVerificationTaskTest.java
@@ -42,7 +42,7 @@ public class AppRequestVerificationTaskTest {
     public void shouldTriggerRequestVerify() throws InterruptedException {
         when(deployments.findByDeploymentId(deploymentId)).thenReturn(Optional.of(AppDeployment.builder().applicationId(Identifier.newInstance(10L)).build()));
         when(applications.findById(any(Long.class))).thenReturn(Optional.of(new Application()));
-        when(remoteClusterManager.clusterExist(any())).thenReturn(true);
+        when(remoteClusterManager.clusterExists(any())).thenReturn(true);
         task.trigger(new AppVerifyRequestActionEvent(this, deploymentId));
         verify(deploy, times(1)).verifyRequest(any(Identifier.class), any(AppDeployment.class), isNull());
     }