diff --git a/impl/core/src/main/java/io/serverlessworkflow/impl/executors/CallFunctionExecutor.java b/impl/core/src/main/java/io/serverlessworkflow/impl/executors/CallFunctionExecutorBuilder.java
similarity index 98%
rename from impl/core/src/main/java/io/serverlessworkflow/impl/executors/CallFunctionExecutor.java
rename to impl/core/src/main/java/io/serverlessworkflow/impl/executors/CallFunctionExecutorBuilder.java
index 0b60486b..2bb382b4 100644
--- a/impl/core/src/main/java/io/serverlessworkflow/impl/executors/CallFunctionExecutor.java
+++ b/impl/core/src/main/java/io/serverlessworkflow/impl/executors/CallFunctionExecutorBuilder.java
@@ -33,7 +33,7 @@
 import java.util.Map;
 import java.util.Optional;
 
-public class CallFunctionExecutor implements CallableTaskBuilder<CallFunction> {
+public class CallFunctionExecutorBuilder implements CallableTaskBuilder<CallFunction> {
 
   private TaskExecutorBuilder<? extends TaskBase> executorBuilder;
   private WorkflowValueResolver<Map<String, Object>> args;
diff --git a/impl/core/src/main/resources/META-INF/services/io.serverlessworkflow.impl.executors.CallableTaskBuilder b/impl/core/src/main/resources/META-INF/services/io.serverlessworkflow.impl.executors.CallableTaskBuilder
index 6c31b128..b4cdcebc 100644
--- a/impl/core/src/main/resources/META-INF/services/io.serverlessworkflow.impl.executors.CallableTaskBuilder
+++ b/impl/core/src/main/resources/META-INF/services/io.serverlessworkflow.impl.executors.CallableTaskBuilder
@@ -1 +1 @@
-io.serverlessworkflow.impl.executors.CallFunctionExecutor
\ No newline at end of file
+io.serverlessworkflow.impl.executors.CallFunctionExecutorBuilder
\ No newline at end of file