diff --git a/cloudslang-compiler/src/main/java/io/cloudslang/lang/compiler/scorecompiler/DefaultExternalExecutionStepFactory.java b/cloudslang-compiler/src/main/java/io/cloudslang/lang/compiler/scorecompiler/DefaultExternalExecutionStepFactory.java
index 85330f35ba..ca4491e49f 100644
--- a/cloudslang-compiler/src/main/java/io/cloudslang/lang/compiler/scorecompiler/DefaultExternalExecutionStepFactory.java
+++ b/cloudslang-compiler/src/main/java/io/cloudslang/lang/compiler/scorecompiler/DefaultExternalExecutionStepFactory.java
@@ -42,7 +42,7 @@ public ExecutionStep createFinishExternalFlowStep(Long index,
     }
 
     @Override
-    public ExecutionStep createSetWorkerGroupExternalFlowStep(Long index,
+    public ExecutionStep createWorkerGroupExternalFlowStep(Long index,
                                                               Map<String, Serializable> preStepData,
                                                               String stepName,
                                                               String workerGroup) {
diff --git a/cloudslang-compiler/src/main/java/io/cloudslang/lang/compiler/scorecompiler/ExecutionPlanBuilder.java b/cloudslang-compiler/src/main/java/io/cloudslang/lang/compiler/scorecompiler/ExecutionPlanBuilder.java
index 9996b19886..feb0c656e2 100644
--- a/cloudslang-compiler/src/main/java/io/cloudslang/lang/compiler/scorecompiler/ExecutionPlanBuilder.java
+++ b/cloudslang-compiler/src/main/java/io/cloudslang/lang/compiler/scorecompiler/ExecutionPlanBuilder.java
@@ -153,7 +153,7 @@ private List<ExecutionStep> buildStepExecutionSteps(
             );
         }
 
-        ExecutionStep workerStep = createSetWorkerGroupStep(currentId++, step, inheritWorkerGroupFromFlow(
+        ExecutionStep workerStep = createWorkerGroupStep(currentId++, step, inheritWorkerGroupFromFlow(
                 step, compiledFlow));
         stepExecutionSteps.add(workerStep);
         ExecutionStep executionStep = createBeginStep(currentId++, step, inheritWorkerGroupFromFlow(
@@ -251,12 +251,12 @@ private ExecutionStep createBeginStep(Long id, Step step, String workerGroup) {
                 step.getPreStepActionData(), step.getRefId(), step.getName(), workerGroup);
     }
 
-    private ExecutionStep createSetWorkerGroupStep(Long id, Step step, String workerGroup) {
+    private ExecutionStep createWorkerGroupStep(Long id, Step step, String workerGroup) {
         if (step instanceof ExternalStep) {
-            return externalStepFactory.createSetWorkerGroupExternalFlowStep(id, step.getPreStepActionData(),
+            return externalStepFactory.createWorkerGroupExternalFlowStep(id, step.getPreStepActionData(),
                     step.getName(), workerGroup);
         }
-        return stepFactory.createSetWorkerGroupStep(id, step.getPreStepActionData(), step.getName(), workerGroup);
+        return stepFactory.createWorkerGroupStep(id, step.getPreStepActionData(), step.getName(), workerGroup);
     }
 
     public void setStepFactory(ExecutionStepFactory stepFactory) {
diff --git a/cloudslang-compiler/src/main/java/io/cloudslang/lang/compiler/scorecompiler/ExecutionStepFactory.java b/cloudslang-compiler/src/main/java/io/cloudslang/lang/compiler/scorecompiler/ExecutionStepFactory.java
index c7639cb085..e88eae8fc2 100644
--- a/cloudslang-compiler/src/main/java/io/cloudslang/lang/compiler/scorecompiler/ExecutionStepFactory.java
+++ b/cloudslang-compiler/src/main/java/io/cloudslang/lang/compiler/scorecompiler/ExecutionStepFactory.java
@@ -58,7 +58,7 @@ public ExecutionStep createBeginStepStep(Long index, List<Argument> stepInputs,
         return createGeneralStep(index, STEP_EXECUTION_DATA_CLASS, "beginStep", actionData);
     }
 
-    public ExecutionStep createSetWorkerGroupStep(Long index, Map<String, Serializable> preStepData, String stepName,
+    public ExecutionStep createWorkerGroupStep(Long index, Map<String, Serializable> preStepData, String stepName,
                                                   String workerGroup) {
         Validate.notNull(preStepData, "preStepData is null");
         Map<String, Serializable> actionData = new HashMap<>();
diff --git a/cloudslang-compiler/src/main/java/io/cloudslang/lang/compiler/scorecompiler/ExternalExecutionStepFactory.java b/cloudslang-compiler/src/main/java/io/cloudslang/lang/compiler/scorecompiler/ExternalExecutionStepFactory.java
index 118deb50bd..aabe9febc3 100644
--- a/cloudslang-compiler/src/main/java/io/cloudslang/lang/compiler/scorecompiler/ExternalExecutionStepFactory.java
+++ b/cloudslang-compiler/src/main/java/io/cloudslang/lang/compiler/scorecompiler/ExternalExecutionStepFactory.java
@@ -26,6 +26,6 @@ ExecutionStep createFinishExternalFlowStep(Long index, Map<String, Serializable>
                                                Map<String, ResultNavigation> navigationValues,
                                                String stepName, String workerGroup, boolean parallelLoop);
 
-    ExecutionStep createSetWorkerGroupExternalFlowStep(Long index, Map<String, Serializable> preStepData,
+    ExecutionStep createWorkerGroupExternalFlowStep(Long index, Map<String, Serializable> preStepData,
                                                        String stepName, String workerGroup);
 }
diff --git a/cloudslang-compiler/src/test/java/io/cloudslang/lang/compiler/scorecompiler/ExecutionPlanBuilderTest.java b/cloudslang-compiler/src/test/java/io/cloudslang/lang/compiler/scorecompiler/ExecutionPlanBuilderTest.java
index 16e6e3b922..e0b750c285 100644
--- a/cloudslang-compiler/src/test/java/io/cloudslang/lang/compiler/scorecompiler/ExecutionPlanBuilderTest.java
+++ b/cloudslang-compiler/src/test/java/io/cloudslang/lang/compiler/scorecompiler/ExecutionPlanBuilderTest.java
@@ -181,7 +181,7 @@ private void mockWorkerStep(Long stepId, Step step) {
         String name = step.getName();
         String group = step.getWorkerGroup();
         when(stepFactory
-                .createSetWorkerGroupStep(eq(stepId),
+                .createWorkerGroupStep(eq(stepId),
                         eq(preStepActionData), eq(name), eq(group))).thenReturn(new ExecutionStep(stepId));
     }