diff --git a/experimental/lambda/pom.xml b/experimental/lambda/pom.xml
index 5c20338c..242917d1 100644
--- a/experimental/lambda/pom.xml
+++ b/experimental/lambda/pom.xml
@@ -19,7 +19,7 @@
         </dependency>
         <dependency>
             <groupId>io.serverlessworkflow</groupId>
-            <artifactId>serverlessworkflow-fluent-java</artifactId>
+            <artifactId>serverlessworkflow-fluent-func</artifactId>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
diff --git a/experimental/lambda/src/test/java/io/serverless/workflow/impl/FluentDSLCallTest.java b/experimental/lambda/src/test/java/io/serverless/workflow/impl/FluentDSLCallTest.java
index dd4f9a29..9706be4f 100644
--- a/experimental/lambda/src/test/java/io/serverless/workflow/impl/FluentDSLCallTest.java
+++ b/experimental/lambda/src/test/java/io/serverless/workflow/impl/FluentDSLCallTest.java
@@ -19,7 +19,7 @@
 
 import io.serverlessworkflow.api.types.FlowDirectiveEnum;
 import io.serverlessworkflow.api.types.Workflow;
-import io.serverlessworkflow.fluent.java.JavaWorkflowBuilder;
+import io.serverlessworkflow.fluent.func.FuncWorkflowBuilder;
 import io.serverlessworkflow.impl.WorkflowApplication;
 import io.serverlessworkflow.impl.WorkflowDefinition;
 import java.util.Collection;
@@ -33,7 +33,7 @@ public class FluentDSLCallTest {
   void testJavaFunction() throws InterruptedException, ExecutionException {
     try (WorkflowApplication app = WorkflowApplication.builder().build()) {
       final Workflow workflow =
-          JavaWorkflowBuilder.workflow("testJavaCall")
+          FuncWorkflowBuilder.workflow("testJavaCall")
               .tasks(tasks -> tasks.callFn(f -> f.fn(JavaFunctions::getName)))
               .build();
       assertThat(
@@ -51,7 +51,7 @@ void testJavaFunction() throws InterruptedException, ExecutionException {
   void testForLoop() throws InterruptedException, ExecutionException {
     try (WorkflowApplication app = WorkflowApplication.builder().build()) {
       Workflow workflow =
-          JavaWorkflowBuilder.workflow()
+          FuncWorkflowBuilder.workflow()
               .tasks(
                   t ->
                       t.forFn(
@@ -76,7 +76,7 @@ void testForLoop() throws InterruptedException, ExecutionException {
   void testSwitch() throws InterruptedException, ExecutionException {
     try (WorkflowApplication app = WorkflowApplication.builder().build()) {
       Workflow workflow =
-          JavaWorkflowBuilder.workflow()
+          FuncWorkflowBuilder.workflow()
               .tasks(
                   tasks ->
                       tasks
diff --git a/experimental/pom.xml b/experimental/pom.xml
index e269b7b0..3312207e 100644
--- a/experimental/pom.xml
+++ b/experimental/pom.xml
@@ -32,7 +32,7 @@
         </dependency>
         <dependency>
             <groupId>io.serverlessworkflow</groupId>
-            <artifactId>serverlessworkflow-fluent-java</artifactId>
+            <artifactId>serverlessworkflow-fluent-func</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>
diff --git a/fluent/java/pom.xml b/fluent/func/pom.xml
similarity index 87%
rename from fluent/java/pom.xml
rename to fluent/func/pom.xml
index aa12ec97..d1230b34 100644
--- a/fluent/java/pom.xml
+++ b/fluent/func/pom.xml
@@ -9,8 +9,8 @@
         <version>8.0.0-SNAPSHOT</version>
     </parent>
 
-    <name>Serverless Workflow :: Fluent :: Java</name>
-    <artifactId>serverlessworkflow-fluent-java</artifactId>
+    <name>Serverless Workflow :: Fluent :: Functional</name>
+    <artifactId>serverlessworkflow-fluent-func</artifactId>
 
     <properties>
         <maven.compiler.source>17</maven.compiler.source>
@@ -29,7 +29,7 @@
         </dependency>
         <dependency>
             <groupId>io.serverlessworkflow</groupId>
-            <artifactId>serverlessworkflow-fluent-standard</artifactId>
+            <artifactId>serverlessworkflow-fluent-spec</artifactId>
         </dependency>
 
         <dependency>
diff --git a/fluent/java/src/main/java/io/serverlessworkflow/fluent/java/CallTaskJavaBuilder.java b/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncCallTaskBuilder.java
similarity index 75%
rename from fluent/java/src/main/java/io/serverlessworkflow/fluent/java/CallTaskJavaBuilder.java
rename to fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncCallTaskBuilder.java
index 8149ebba..d045e5c0 100644
--- a/fluent/java/src/main/java/io/serverlessworkflow/fluent/java/CallTaskJavaBuilder.java
+++ b/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncCallTaskBuilder.java
@@ -13,29 +13,29 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.serverlessworkflow.fluent.java;
+package io.serverlessworkflow.fluent.func;
 
 import io.serverlessworkflow.api.types.CallJava;
 import io.serverlessworkflow.api.types.CallTaskJava;
-import io.serverlessworkflow.fluent.standard.TaskBaseBuilder;
+import io.serverlessworkflow.fluent.spec.TaskBaseBuilder;
 import java.util.function.Function;
 
-public class CallTaskJavaBuilder extends TaskBaseBuilder<CallTaskJavaBuilder>
-    implements JavaTransformationHandlers<CallTaskJavaBuilder> {
+public class FuncCallTaskBuilder extends TaskBaseBuilder<FuncCallTaskBuilder>
+    implements FuncTransformations<FuncCallTaskBuilder> {
 
   private CallTaskJava callTaskJava;
 
-  CallTaskJavaBuilder() {
+  FuncCallTaskBuilder() {
     callTaskJava = new CallTaskJava(new CallJava() {});
     super.setTask(callTaskJava.getCallJava());
   }
 
   @Override
-  protected CallTaskJavaBuilder self() {
+  protected FuncCallTaskBuilder self() {
     return this;
   }
 
-  public <T, V> CallTaskJavaBuilder fn(Function<T, V> function) {
+  public <T, V> FuncCallTaskBuilder fn(Function<T, V> function) {
     this.callTaskJava = new CallTaskJava(CallJava.function(function));
     super.setTask(this.callTaskJava.getCallJava());
     return this;
diff --git a/fluent/java/src/main/java/io/serverlessworkflow/fluent/java/DoTaskJavaBuilder.java b/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncDoTaskBuilder.java
similarity index 58%
rename from fluent/java/src/main/java/io/serverlessworkflow/fluent/java/DoTaskJavaBuilder.java
rename to fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncDoTaskBuilder.java
index b17cf643..ec721c1e 100644
--- a/fluent/java/src/main/java/io/serverlessworkflow/fluent/java/DoTaskJavaBuilder.java
+++ b/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncDoTaskBuilder.java
@@ -13,49 +13,49 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.serverlessworkflow.fluent.java;
+package io.serverlessworkflow.fluent.func;
 
-import io.serverlessworkflow.fluent.standard.BaseDoTaskBuilder;
+import io.serverlessworkflow.fluent.spec.BaseDoTaskBuilder;
 import java.util.function.Consumer;
 
-public class DoTaskJavaBuilder extends BaseDoTaskBuilder<DoTaskJavaBuilder, TaskItemListJavaBuilder>
-    implements JavaTransformationHandlers<DoTaskJavaBuilder> {
+public class FuncDoTaskBuilder extends BaseDoTaskBuilder<FuncDoTaskBuilder, FuncTaskItemListBuilder>
+    implements FuncTransformations<FuncDoTaskBuilder> {
 
-  DoTaskJavaBuilder() {
-    super(new TaskItemListJavaBuilder());
+  FuncDoTaskBuilder() {
+    super(new FuncTaskItemListBuilder());
   }
 
   @Override
-  protected DoTaskJavaBuilder self() {
+  protected FuncDoTaskBuilder self() {
     return this;
   }
 
-  public DoTaskJavaBuilder callFn(String name, Consumer<CallTaskJavaBuilder> consumer) {
+  public FuncDoTaskBuilder callFn(String name, Consumer<FuncCallTaskBuilder> consumer) {
     this.innerListBuilder().callJava(name, consumer);
     return this;
   }
 
-  public DoTaskJavaBuilder callFn(Consumer<CallTaskJavaBuilder> consumer) {
+  public FuncDoTaskBuilder callFn(Consumer<FuncCallTaskBuilder> consumer) {
     this.innerListBuilder().callJava(consumer);
     return this;
   }
 
-  public DoTaskJavaBuilder forFn(String name, Consumer<ForTaskJavaBuilder> consumer) {
+  public FuncDoTaskBuilder forFn(String name, Consumer<FuncForTaskBuilder> consumer) {
     this.innerListBuilder().forFn(name, consumer);
     return this;
   }
 
-  public DoTaskJavaBuilder forFn(Consumer<ForTaskJavaBuilder> consumer) {
+  public FuncDoTaskBuilder forFn(Consumer<FuncForTaskBuilder> consumer) {
     this.innerListBuilder().forFn(consumer);
     return this;
   }
 
-  public DoTaskJavaBuilder switchFn(String name, Consumer<SwitchTaskJavaBuilder> consumer) {
+  public FuncDoTaskBuilder switchFn(String name, Consumer<FuncSwitchTaskBuilder> consumer) {
     this.innerListBuilder().switchFn(name, consumer);
     return this;
   }
 
-  public DoTaskJavaBuilder switchFn(Consumer<SwitchTaskJavaBuilder> consumer) {
+  public FuncDoTaskBuilder switchFn(Consumer<FuncSwitchTaskBuilder> consumer) {
     this.innerListBuilder().switchFn(consumer);
     return this;
   }
diff --git a/fluent/java/src/main/java/io/serverlessworkflow/fluent/java/ForTaskJavaBuilder.java b/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncForTaskBuilder.java
similarity index 76%
rename from fluent/java/src/main/java/io/serverlessworkflow/fluent/java/ForTaskJavaBuilder.java
rename to fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncForTaskBuilder.java
index 241272f0..c24a5af5 100644
--- a/fluent/java/src/main/java/io/serverlessworkflow/fluent/java/ForTaskJavaBuilder.java
+++ b/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncForTaskBuilder.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.serverlessworkflow.fluent.java;
+package io.serverlessworkflow.fluent.func;
 
 import io.serverlessworkflow.api.types.CallJava;
 import io.serverlessworkflow.api.types.CallTaskJava;
@@ -21,7 +21,7 @@
 import io.serverlessworkflow.api.types.ForTaskFunction;
 import io.serverlessworkflow.api.types.Task;
 import io.serverlessworkflow.api.types.TaskItem;
-import io.serverlessworkflow.fluent.standard.TaskBaseBuilder;
+import io.serverlessworkflow.fluent.spec.TaskBaseBuilder;
 import io.serverlessworkflow.impl.expressions.LoopFunction;
 import io.serverlessworkflow.impl.expressions.LoopPredicate;
 import io.serverlessworkflow.impl.expressions.LoopPredicateIndex;
@@ -32,13 +32,13 @@
 import java.util.function.Consumer;
 import java.util.function.Function;
 
-public class ForTaskJavaBuilder extends TaskBaseBuilder<ForTaskJavaBuilder>
-    implements JavaTransformationHandlers<ForTaskJavaBuilder> {
+public class FuncForTaskBuilder extends TaskBaseBuilder<FuncForTaskBuilder>
+    implements FuncTransformations<FuncForTaskBuilder> {
 
   private final ForTaskFunction forTaskFunction;
   private final List<TaskItem> items;
 
-  ForTaskJavaBuilder() {
+  FuncForTaskBuilder() {
     this.forTaskFunction = new ForTaskFunction();
     this.forTaskFunction.withFor(new ForTaskConfiguration());
     this.items = new ArrayList<>();
@@ -46,26 +46,26 @@ public class ForTaskJavaBuilder extends TaskBaseBuilder<ForTaskJavaBuilder>
   }
 
   @Override
-  protected ForTaskJavaBuilder self() {
+  protected FuncForTaskBuilder self() {
     return this;
   }
 
-  public <T, V> ForTaskJavaBuilder whileC(LoopPredicate<T, V> predicate) {
+  public <T, V> FuncForTaskBuilder whileC(LoopPredicate<T, V> predicate) {
     this.forTaskFunction.withWhile(predicate);
     return this;
   }
 
-  public <T, V> ForTaskJavaBuilder whileC(LoopPredicateIndex<T, V> predicate) {
+  public <T, V> FuncForTaskBuilder whileC(LoopPredicateIndex<T, V> predicate) {
     this.forTaskFunction.withWhile(predicate);
     return this;
   }
 
-  public <T> ForTaskJavaBuilder collection(Function<T, Collection<?>> collectionF) {
+  public <T> FuncForTaskBuilder collection(Function<T, Collection<?>> collectionF) {
     this.forTaskFunction.withCollection(collectionF);
     return this;
   }
 
-  public <T, V, R> ForTaskJavaBuilder tasks(String name, LoopFunction<T, V, R> function) {
+  public <T, V, R> FuncForTaskBuilder tasks(String name, LoopFunction<T, V, R> function) {
     this.items.add(
         new TaskItem(
             name,
@@ -77,12 +77,12 @@ public <T, V, R> ForTaskJavaBuilder tasks(String name, LoopFunction<T, V, R> fun
     return this;
   }
 
-  public <T, V, R> ForTaskJavaBuilder tasks(LoopFunction<T, V, R> function) {
+  public <T, V, R> FuncForTaskBuilder tasks(LoopFunction<T, V, R> function) {
     return this.tasks(UUID.randomUUID().toString(), function);
   }
 
-  public ForTaskJavaBuilder tasks(Consumer<TaskItemListJavaBuilder> consumer) {
-    final TaskItemListJavaBuilder builder = new TaskItemListJavaBuilder();
+  public FuncForTaskBuilder tasks(Consumer<FuncTaskItemListBuilder> consumer) {
+    final FuncTaskItemListBuilder builder = new FuncTaskItemListBuilder();
     consumer.accept(builder);
     this.items.addAll(builder.build());
     return this;
diff --git a/fluent/java/src/main/java/io/serverlessworkflow/fluent/java/SwitchTaskJavaBuilder.java b/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncSwitchTaskBuilder.java
similarity index 84%
rename from fluent/java/src/main/java/io/serverlessworkflow/fluent/java/SwitchTaskJavaBuilder.java
rename to fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncSwitchTaskBuilder.java
index 8b9d98e6..da010f7c 100644
--- a/fluent/java/src/main/java/io/serverlessworkflow/fluent/java/SwitchTaskJavaBuilder.java
+++ b/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncSwitchTaskBuilder.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.serverlessworkflow.fluent.java;
+package io.serverlessworkflow.fluent.func;
 
 import io.serverlessworkflow.api.types.FlowDirective;
 import io.serverlessworkflow.api.types.FlowDirectiveEnum;
@@ -21,35 +21,35 @@
 import io.serverlessworkflow.api.types.SwitchCaseFunction;
 import io.serverlessworkflow.api.types.SwitchItem;
 import io.serverlessworkflow.api.types.SwitchTask;
-import io.serverlessworkflow.fluent.standard.TaskBaseBuilder;
+import io.serverlessworkflow.fluent.spec.TaskBaseBuilder;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 
-public class SwitchTaskJavaBuilder extends TaskBaseBuilder<SwitchTaskJavaBuilder>
-    implements JavaTransformationHandlers<SwitchTaskJavaBuilder> {
+public class FuncSwitchTaskBuilder extends TaskBaseBuilder<FuncSwitchTaskBuilder>
+    implements FuncTransformations<FuncSwitchTaskBuilder> {
 
   private final SwitchTask switchTask;
   private final List<SwitchItem> switchItems;
 
-  SwitchTaskJavaBuilder() {
+  FuncSwitchTaskBuilder() {
     this.switchTask = new SwitchTask();
     this.switchItems = new ArrayList<>();
     super.setTask(switchTask);
   }
 
   @Override
-  protected SwitchTaskJavaBuilder self() {
+  protected FuncSwitchTaskBuilder self() {
     return this;
   }
 
-  public SwitchTaskJavaBuilder items(Consumer<SwitchCaseJavaBuilder> consumer) {
+  public FuncSwitchTaskBuilder items(Consumer<SwitchCaseJavaBuilder> consumer) {
     return this.items(UUID.randomUUID().toString(), consumer);
   }
 
-  public SwitchTaskJavaBuilder items(String name, Consumer<SwitchCaseJavaBuilder> consumer) {
+  public FuncSwitchTaskBuilder items(String name, Consumer<SwitchCaseJavaBuilder> consumer) {
     final SwitchCaseJavaBuilder switchCase = new SwitchCaseJavaBuilder();
     consumer.accept(switchCase);
     this.switchItems.add(new SwitchItem(name, switchCase.build()));
diff --git a/fluent/java/src/main/java/io/serverlessworkflow/fluent/java/TaskItemListJavaBuilder.java b/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncTaskItemListBuilder.java
similarity index 55%
rename from fluent/java/src/main/java/io/serverlessworkflow/fluent/java/TaskItemListJavaBuilder.java
rename to fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncTaskItemListBuilder.java
index 40fa250b..e11063da 100644
--- a/fluent/java/src/main/java/io/serverlessworkflow/fluent/java/TaskItemListJavaBuilder.java
+++ b/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncTaskItemListBuilder.java
@@ -13,61 +13,61 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.serverlessworkflow.fluent.java;
+package io.serverlessworkflow.fluent.func;
 
 import io.serverlessworkflow.api.types.Task;
 import io.serverlessworkflow.api.types.TaskItem;
-import io.serverlessworkflow.fluent.standard.BaseTaskItemListBuilder;
+import io.serverlessworkflow.fluent.spec.BaseTaskItemListBuilder;
 import java.util.UUID;
 import java.util.function.Consumer;
 
-public class TaskItemListJavaBuilder extends BaseTaskItemListBuilder<TaskItemListJavaBuilder> {
+public class FuncTaskItemListBuilder extends BaseTaskItemListBuilder<FuncTaskItemListBuilder> {
 
-  TaskItemListJavaBuilder() {
+  FuncTaskItemListBuilder() {
     super();
   }
 
   @Override
-  protected TaskItemListJavaBuilder self() {
+  protected FuncTaskItemListBuilder self() {
     return this;
   }
 
   @Override
-  protected TaskItemListJavaBuilder newItemListBuilder() {
-    return new TaskItemListJavaBuilder();
+  protected FuncTaskItemListBuilder newItemListBuilder() {
+    return new FuncTaskItemListBuilder();
   }
 
-  public TaskItemListJavaBuilder callJava(String name, Consumer<CallTaskJavaBuilder> consumer) {
+  public FuncTaskItemListBuilder callJava(String name, Consumer<FuncCallTaskBuilder> consumer) {
     this.requireNameAndConfig(name, consumer);
-    final CallTaskJavaBuilder callTaskJavaBuilder = new CallTaskJavaBuilder();
+    final FuncCallTaskBuilder callTaskJavaBuilder = new FuncCallTaskBuilder();
     consumer.accept(callTaskJavaBuilder);
     return addTaskItem(new TaskItem(name, new Task().withCallTask(callTaskJavaBuilder.build())));
   }
 
-  public TaskItemListJavaBuilder callJava(Consumer<CallTaskJavaBuilder> consumer) {
+  public FuncTaskItemListBuilder callJava(Consumer<FuncCallTaskBuilder> consumer) {
     return this.callJava(UUID.randomUUID().toString(), consumer);
   }
 
-  public TaskItemListJavaBuilder forFn(String name, Consumer<ForTaskJavaBuilder> consumer) {
+  public FuncTaskItemListBuilder forFn(String name, Consumer<FuncForTaskBuilder> consumer) {
     this.requireNameAndConfig(name, consumer);
-    final ForTaskJavaBuilder forTaskJavaBuilder = new ForTaskJavaBuilder();
+    final FuncForTaskBuilder forTaskJavaBuilder = new FuncForTaskBuilder();
     consumer.accept(forTaskJavaBuilder);
     return this.addTaskItem(new TaskItem(name, new Task().withForTask(forTaskJavaBuilder.build())));
   }
 
-  public TaskItemListJavaBuilder forFn(Consumer<ForTaskJavaBuilder> consumer) {
+  public FuncTaskItemListBuilder forFn(Consumer<FuncForTaskBuilder> consumer) {
     return this.forFn(UUID.randomUUID().toString(), consumer);
   }
 
-  public TaskItemListJavaBuilder switchFn(String name, Consumer<SwitchTaskJavaBuilder> consumer) {
+  public FuncTaskItemListBuilder switchFn(String name, Consumer<FuncSwitchTaskBuilder> consumer) {
     this.requireNameAndConfig(name, consumer);
-    final SwitchTaskJavaBuilder switchTaskJavaBuilder = new SwitchTaskJavaBuilder();
-    consumer.accept(switchTaskJavaBuilder);
+    final FuncSwitchTaskBuilder funcSwitchTaskBuilder = new FuncSwitchTaskBuilder();
+    consumer.accept(funcSwitchTaskBuilder);
     return this.addTaskItem(
-        new TaskItem(name, new Task().withSwitchTask(switchTaskJavaBuilder.build())));
+        new TaskItem(name, new Task().withSwitchTask(funcSwitchTaskBuilder.build())));
   }
 
-  public TaskItemListJavaBuilder switchFn(Consumer<SwitchTaskJavaBuilder> consumer) {
+  public FuncTaskItemListBuilder switchFn(Consumer<FuncSwitchTaskBuilder> consumer) {
     return this.switchFn(UUID.randomUUID().toString(), consumer);
   }
 }
diff --git a/fluent/java/src/main/java/io/serverlessworkflow/fluent/java/JavaTransformationHandlers.java b/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncTransformations.java
similarity index 74%
rename from fluent/java/src/main/java/io/serverlessworkflow/fluent/java/JavaTransformationHandlers.java
rename to fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncTransformations.java
index c8651b83..df0ba767 100644
--- a/fluent/java/src/main/java/io/serverlessworkflow/fluent/java/JavaTransformationHandlers.java
+++ b/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncTransformations.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.serverlessworkflow.fluent.java;
+package io.serverlessworkflow.fluent.func;
 
 import io.serverlessworkflow.api.types.Export;
 import io.serverlessworkflow.api.types.ExportAsFunction;
@@ -21,24 +21,24 @@
 import io.serverlessworkflow.api.types.InputFromFunction;
 import io.serverlessworkflow.api.types.Output;
 import io.serverlessworkflow.api.types.OutputAsFunction;
-import io.serverlessworkflow.fluent.standard.TransformationHandlers;
+import io.serverlessworkflow.fluent.spec.TransformationHandlers;
 import java.util.function.Function;
 
-public interface JavaTransformationHandlers<B extends JavaTransformationHandlers<B>>
+public interface FuncTransformations<SELF extends FuncTransformations<SELF>>
     extends TransformationHandlers {
 
-  default <T, V> B exportAsFn(Function<T, V> function) {
+  default <T, V> SELF exportAsFn(Function<T, V> function) {
     setExport(new Export().withAs(new ExportAsFunction().withFunction(function)));
-    return (B) this;
+    return (SELF) this;
   }
 
-  default <T, V> B inputFrom(Function<T, V> function) {
+  default <T, V> SELF inputFrom(Function<T, V> function) {
     setInput(new Input().withFrom(new InputFromFunction().withFunction(function)));
-    return (B) this;
+    return (SELF) this;
   }
 
-  default <T, V> B outputAs(Function<T, V> function) {
+  default <T, V> SELF outputAs(Function<T, V> function) {
     setOutput(new Output().withAs(new OutputAsFunction().withFunction(function)));
-    return (B) this;
+    return (SELF) this;
   }
 }
diff --git a/fluent/java/src/main/java/io/serverlessworkflow/fluent/java/JavaWorkflowBuilder.java b/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncWorkflowBuilder.java
similarity index 52%
rename from fluent/java/src/main/java/io/serverlessworkflow/fluent/java/JavaWorkflowBuilder.java
rename to fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncWorkflowBuilder.java
index 5d90b598..aad21591 100644
--- a/fluent/java/src/main/java/io/serverlessworkflow/fluent/java/JavaWorkflowBuilder.java
+++ b/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncWorkflowBuilder.java
@@ -13,39 +13,39 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.serverlessworkflow.fluent.java;
+package io.serverlessworkflow.fluent.func;
 
-import io.serverlessworkflow.fluent.standard.BaseWorkflowBuilder;
+import io.serverlessworkflow.fluent.spec.BaseWorkflowBuilder;
 import java.util.UUID;
 
-public class JavaWorkflowBuilder
-    extends BaseWorkflowBuilder<JavaWorkflowBuilder, DoTaskJavaBuilder, TaskItemListJavaBuilder>
-    implements JavaTransformationHandlers<JavaWorkflowBuilder> {
+public class FuncWorkflowBuilder
+    extends BaseWorkflowBuilder<FuncWorkflowBuilder, FuncDoTaskBuilder, FuncTaskItemListBuilder>
+    implements FuncTransformations<FuncWorkflowBuilder> {
 
-  private JavaWorkflowBuilder(final String name, final String namespace, final String version) {
+  private FuncWorkflowBuilder(final String name, final String namespace, final String version) {
     super(name, namespace, version);
   }
 
-  public static JavaWorkflowBuilder workflow(final String name, final String namespace) {
-    return new JavaWorkflowBuilder(name, namespace, DEFAULT_VERSION);
+  public static FuncWorkflowBuilder workflow(final String name, final String namespace) {
+    return new FuncWorkflowBuilder(name, namespace, DEFAULT_VERSION);
   }
 
-  public static JavaWorkflowBuilder workflow(final String name) {
-    return new JavaWorkflowBuilder(name, DEFAULT_NAMESPACE, DEFAULT_VERSION);
+  public static FuncWorkflowBuilder workflow(final String name) {
+    return new FuncWorkflowBuilder(name, DEFAULT_NAMESPACE, DEFAULT_VERSION);
   }
 
-  public static JavaWorkflowBuilder workflow() {
-    return new JavaWorkflowBuilder(
+  public static FuncWorkflowBuilder workflow() {
+    return new FuncWorkflowBuilder(
         UUID.randomUUID().toString(), DEFAULT_NAMESPACE, DEFAULT_VERSION);
   }
 
   @Override
-  protected DoTaskJavaBuilder newDo() {
-    return new DoTaskJavaBuilder();
+  protected FuncDoTaskBuilder newDo() {
+    return new FuncDoTaskBuilder();
   }
 
   @Override
-  protected JavaWorkflowBuilder self() {
+  protected FuncWorkflowBuilder self() {
     return this;
   }
 }
diff --git a/fluent/java/src/test/java/io/serverlessworkflow/fluent/java/JavaWorkflowBuilderTest.java b/fluent/func/src/test/java/io/serverlessworkflow/fluent/func/JavaWorkflowBuilderTest.java
similarity index 93%
rename from fluent/java/src/test/java/io/serverlessworkflow/fluent/java/JavaWorkflowBuilderTest.java
rename to fluent/func/src/test/java/io/serverlessworkflow/fluent/func/JavaWorkflowBuilderTest.java
index ef037cad..a087972d 100644
--- a/fluent/java/src/test/java/io/serverlessworkflow/fluent/java/JavaWorkflowBuilderTest.java
+++ b/fluent/func/src/test/java/io/serverlessworkflow/fluent/func/JavaWorkflowBuilderTest.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.serverlessworkflow.fluent.java;
+package io.serverlessworkflow.fluent.func;
 
 import static org.junit.jupiter.api.Assertions.*;
 
 import io.serverlessworkflow.api.types.*;
-import io.serverlessworkflow.fluent.standard.BaseWorkflowBuilder;
+import io.serverlessworkflow.fluent.spec.BaseWorkflowBuilder;
 // if you reuse anything
 import java.util.List;
 import java.util.Map;
@@ -26,13 +26,13 @@
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
-/** Tests for JavaWorkflowBuilder + Java DSL extensions. */
+/** Tests for FuncWorkflowBuilder + Java DSL extensions. */
 class JavaWorkflowBuilderTest {
 
   @Test
   @DisplayName("Default Java workflow has auto-generated name and default namespace/version")
   void testDefaults() {
-    Workflow wf = JavaWorkflowBuilder.workflow().build();
+    Workflow wf = FuncWorkflowBuilder.workflow().build();
     assertNotNull(wf);
     Document doc = wf.getDocument();
     assertNotNull(doc);
@@ -46,7 +46,7 @@ void testDefaults() {
   @DisplayName("Spec style forE still works inside Java workflow")
   void testSpecForEachInJavaWorkflow() {
     Workflow wf =
-        JavaWorkflowBuilder.workflow("specLoopFlow")
+        FuncWorkflowBuilder.workflow("specLoopFlow")
             .tasks(
                 d ->
                     d.forEach(f -> f.each("pet").in("$.pets"))
@@ -69,7 +69,7 @@ void testSpecForEachInJavaWorkflow() {
   @DisplayName("Java style forE with collection + whileC builds ForTaskFunction")
   void testJavaForEach() {
     Workflow wf =
-        JavaWorkflowBuilder.workflow("javaLoopFlow")
+        FuncWorkflowBuilder.workflow("javaLoopFlow")
             .tasks(
                 d ->
                     d.forFn(
@@ -100,7 +100,7 @@ void testJavaForEach() {
   @DisplayName("Mixed spec and Java loops in one workflow")
   void testMixedLoops() {
     Workflow wf =
-        JavaWorkflowBuilder.workflow("mixed")
+        FuncWorkflowBuilder.workflow("mixed")
             .tasks(
                 d ->
                     d.forEach(f -> f.each("item").in("$.array")) // spec
@@ -126,7 +126,7 @@ void testJavaFunctionalIO() {
     AtomicBoolean outputCalled = new AtomicBoolean(false);
 
     Workflow wf =
-        JavaWorkflowBuilder.workflow("fnIO")
+        FuncWorkflowBuilder.workflow("fnIO")
             .tasks(
                 d ->
                     d.set("init", s -> s.expr("$.x = 1"))
@@ -189,13 +189,13 @@ void testJavaFunctionalIO() {
   @DisplayName("callJava task added and retains name + CallTask union")
   void testCallJavaTask() {
     Workflow wf =
-        JavaWorkflowBuilder.workflow("callJavaFlow")
+        FuncWorkflowBuilder.workflow("callJavaFlow")
             .tasks(
                 d ->
                     d.callFn(
                         "invokeHandler",
                         cj -> {
-                          // configure your CallTaskJavaBuilder here
+                          // configure your FuncCallTaskBuilder here
                           // e.g., cj.className("com.acme.Handler").arg("key", "value");
                         }))
             .build();
@@ -207,7 +207,7 @@ void testCallJavaTask() {
     assertEquals("invokeHandler", ti.getName());
     Task task = ti.getTask();
     assertNotNull(task.getCallTask(), "CallTask should be present for callJava");
-    // Additional assertions if CallTaskJavaBuilder populates fields
+    // Additional assertions if FuncCallTaskBuilder populates fields
     // e.g., assertEquals("com.acme.Handler", task.getCallTask().getCallJava().getClassName());
   }
 
@@ -215,7 +215,7 @@ void testCallJavaTask() {
   @DisplayName("switchCaseFn (Java variant) coexists with spec tasks")
   void testSwitchCaseJava() {
     Workflow wf =
-        JavaWorkflowBuilder.workflow("switchJava")
+        FuncWorkflowBuilder.workflow("switchJava")
             .tasks(
                 d ->
                     d.set("prepare", s -> s.expr("$.ready = true"))
@@ -239,7 +239,7 @@ void testSwitchCaseJava() {
   @DisplayName("Combined: spec set + java forE + callJava inside nested do")
   void testCompositeScenario() {
     Workflow wf =
-        JavaWorkflowBuilder.workflow("composite")
+        FuncWorkflowBuilder.workflow("composite")
             .tasks(
                 d ->
                     d.set("init", s -> s.expr("$.val = 0"))
diff --git a/fluent/pom.xml b/fluent/pom.xml
index 1af30562..ff19f4d5 100644
--- a/fluent/pom.xml
+++ b/fluent/pom.xml
@@ -32,15 +32,15 @@
             </dependency>
             <dependency>
                 <groupId>io.serverlessworkflow</groupId>
-                <artifactId>serverlessworkflow-fluent-standard</artifactId>
+                <artifactId>serverlessworkflow-fluent-spec</artifactId>
                 <version>${project.version}</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
 
     <modules>
-        <module>standard</module>
-        <module>java</module>
+        <module>spec</module>
+        <module>func</module>
     </modules>
 
 </project>
\ No newline at end of file
diff --git a/fluent/standard/pom.xml b/fluent/spec/pom.xml
similarity index 89%
rename from fluent/standard/pom.xml
rename to fluent/spec/pom.xml
index 570d9665..5ec62a98 100644
--- a/fluent/standard/pom.xml
+++ b/fluent/spec/pom.xml
@@ -8,8 +8,8 @@
         <artifactId>serverlessworkflow-fluent</artifactId>
         <version>8.0.0-SNAPSHOT</version>
     </parent>
-    <name>Serverless Workflow :: Fluent :: Standard</name>
-    <artifactId>serverlessworkflow-fluent-standard</artifactId>
+    <name>Serverless Workflow :: Fluent :: Spec</name>
+    <artifactId>serverlessworkflow-fluent-spec</artifactId>
 
     <properties>
         <maven.compiler.source>17</maven.compiler.source>
diff --git a/fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/AuthenticationPolicyUnionBuilder.java b/fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/AuthenticationPolicyUnionBuilder.java
similarity index 98%
rename from fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/AuthenticationPolicyUnionBuilder.java
rename to fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/AuthenticationPolicyUnionBuilder.java
index 2699c809..82f84a74 100644
--- a/fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/AuthenticationPolicyUnionBuilder.java
+++ b/fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/AuthenticationPolicyUnionBuilder.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.serverlessworkflow.fluent.standard;
+package io.serverlessworkflow.fluent.spec;
 
 import io.serverlessworkflow.api.types.AuthenticationPolicyUnion;
 import java.util.function.Consumer;
diff --git a/fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/BaseDoTaskBuilder.java b/fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/BaseDoTaskBuilder.java
similarity index 98%
rename from fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/BaseDoTaskBuilder.java
rename to fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/BaseDoTaskBuilder.java
index fab86cdd..d4c70aec 100644
--- a/fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/BaseDoTaskBuilder.java
+++ b/fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/BaseDoTaskBuilder.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.serverlessworkflow.fluent.standard;
+package io.serverlessworkflow.fluent.spec;
 
 import io.serverlessworkflow.api.types.DoTask;
 import java.util.function.Consumer;
diff --git a/fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/BaseTaskItemListBuilder.java b/fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/BaseTaskItemListBuilder.java
similarity index 99%
rename from fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/BaseTaskItemListBuilder.java
rename to fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/BaseTaskItemListBuilder.java
index 566b493a..bb2a34dc 100644
--- a/fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/BaseTaskItemListBuilder.java
+++ b/fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/BaseTaskItemListBuilder.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.serverlessworkflow.fluent.standard;
+package io.serverlessworkflow.fluent.spec;
 
 import io.serverlessworkflow.api.types.CallTask;
 import io.serverlessworkflow.api.types.Task;
diff --git a/fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/BaseWorkflowBuilder.java b/fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/BaseWorkflowBuilder.java
similarity index 89%
rename from fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/BaseWorkflowBuilder.java
rename to fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/BaseWorkflowBuilder.java
index b93bdda0..e286d5fb 100644
--- a/fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/BaseWorkflowBuilder.java
+++ b/fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/BaseWorkflowBuilder.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.serverlessworkflow.fluent.standard;
+package io.serverlessworkflow.fluent.spec;
 
 import io.serverlessworkflow.api.types.Document;
 import io.serverlessworkflow.api.types.Export;
@@ -23,9 +23,9 @@
 import java.util.function.Consumer;
 
 public abstract class BaseWorkflowBuilder<
-        SELF extends BaseWorkflowBuilder<SELF, DO, LIST>,
-        DO extends BaseDoTaskBuilder<DO, LIST>,
-        LIST extends BaseTaskItemListBuilder<LIST>>
+        SELF extends BaseWorkflowBuilder<SELF, DBuilder, IListBuilder>,
+        DBuilder extends BaseDoTaskBuilder<DBuilder, IListBuilder>,
+        IListBuilder extends BaseTaskItemListBuilder<IListBuilder>>
     implements TransformationHandlers {
 
   public static final String DSL = "1.0.0";
@@ -45,7 +45,7 @@ protected BaseWorkflowBuilder(final String name, final String namespace, final S
     this.workflow.setDocument(this.document);
   }
 
-  protected abstract DO newDo();
+  protected abstract DBuilder newDo();
 
   protected abstract SELF self();
 
@@ -79,8 +79,8 @@ public SELF use(Consumer<UseBuilder> useBuilderConsumer) {
     return self();
   }
 
-  public SELF tasks(Consumer<DO> doTaskConsumer) {
-    final DO doTaskBuilder = newDo();
+  public SELF tasks(Consumer<DBuilder> doTaskConsumer) {
+    final DBuilder doTaskBuilder = newDo();
     doTaskConsumer.accept(doTaskBuilder);
     this.workflow.setDo(doTaskBuilder.build().getDo());
     return self();
diff --git a/fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/BasicAuthenticationPolicyBuilder.java b/fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/BasicAuthenticationPolicyBuilder.java
similarity index 97%
rename from fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/BasicAuthenticationPolicyBuilder.java
rename to fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/BasicAuthenticationPolicyBuilder.java
index c121f18f..780a976c 100644
--- a/fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/BasicAuthenticationPolicyBuilder.java
+++ b/fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/BasicAuthenticationPolicyBuilder.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.serverlessworkflow.fluent.standard;
+package io.serverlessworkflow.fluent.spec;
 
 import io.serverlessworkflow.api.types.BasicAuthenticationPolicy;
 import io.serverlessworkflow.api.types.BasicAuthenticationPolicyConfiguration;
diff --git a/fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/BearerAuthenticationPolicyBuilder.java b/fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/BearerAuthenticationPolicyBuilder.java
similarity index 97%
rename from fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/BearerAuthenticationPolicyBuilder.java
rename to fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/BearerAuthenticationPolicyBuilder.java
index 08e52522..04e76b41 100644
--- a/fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/BearerAuthenticationPolicyBuilder.java
+++ b/fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/BearerAuthenticationPolicyBuilder.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.serverlessworkflow.fluent.standard;
+package io.serverlessworkflow.fluent.spec;
 
 import io.serverlessworkflow.api.types.BearerAuthenticationPolicy;
 import io.serverlessworkflow.api.types.BearerAuthenticationPolicyConfiguration;
diff --git a/fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/CallHTTPTaskBuilder.java b/fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/CallHTTPTaskBuilder.java
similarity index 99%
rename from fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/CallHTTPTaskBuilder.java
rename to fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/CallHTTPTaskBuilder.java
index f2603903..95819162 100644
--- a/fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/CallHTTPTaskBuilder.java
+++ b/fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/CallHTTPTaskBuilder.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.serverlessworkflow.fluent.standard;
+package io.serverlessworkflow.fluent.spec;
 
 import io.serverlessworkflow.api.types.CallHTTP;
 import io.serverlessworkflow.api.types.Endpoint;
diff --git a/fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/DigestAuthenticationPolicyBuilder.java b/fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/DigestAuthenticationPolicyBuilder.java
similarity index 97%
rename from fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/DigestAuthenticationPolicyBuilder.java
rename to fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/DigestAuthenticationPolicyBuilder.java
index 8405a48b..a28f6a84 100644
--- a/fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/DigestAuthenticationPolicyBuilder.java
+++ b/fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/DigestAuthenticationPolicyBuilder.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.serverlessworkflow.fluent.standard;
+package io.serverlessworkflow.fluent.spec;
 
 import io.serverlessworkflow.api.types.DigestAuthenticationPolicy;
 import io.serverlessworkflow.api.types.DigestAuthenticationPolicyConfiguration;
diff --git a/fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/DoTaskBuilder.java b/fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/DoTaskBuilder.java
similarity index 94%
rename from fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/DoTaskBuilder.java
rename to fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/DoTaskBuilder.java
index dee523b3..a9d4f6cb 100644
--- a/fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/DoTaskBuilder.java
+++ b/fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/DoTaskBuilder.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.serverlessworkflow.fluent.standard;
+package io.serverlessworkflow.fluent.spec;
 
 public class DoTaskBuilder extends BaseDoTaskBuilder<DoTaskBuilder, TaskItemListBuilder> {
 
diff --git a/fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/DocumentBuilder.java b/fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/DocumentBuilder.java
similarity index 98%
rename from fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/DocumentBuilder.java
rename to fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/DocumentBuilder.java
index de6d9ee3..afb13916 100644
--- a/fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/DocumentBuilder.java
+++ b/fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/DocumentBuilder.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.serverlessworkflow.fluent.standard;
+package io.serverlessworkflow.fluent.spec;
 
 import io.serverlessworkflow.api.types.Document;
 import io.serverlessworkflow.api.types.WorkflowMetadata;
diff --git a/fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/DurationInlineBuilder.java b/fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/DurationInlineBuilder.java
similarity index 96%
rename from fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/DurationInlineBuilder.java
rename to fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/DurationInlineBuilder.java
index 23730731..f4933bb4 100644
--- a/fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/DurationInlineBuilder.java
+++ b/fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/DurationInlineBuilder.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.serverlessworkflow.fluent.standard;
+package io.serverlessworkflow.fluent.spec;
 
 import io.serverlessworkflow.api.types.DurationInline;
 
diff --git a/fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/EmitTaskBuilder.java b/fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/EmitTaskBuilder.java
similarity index 97%
rename from fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/EmitTaskBuilder.java
rename to fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/EmitTaskBuilder.java
index 77ea9d98..7a043c0a 100644
--- a/fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/EmitTaskBuilder.java
+++ b/fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/EmitTaskBuilder.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.serverlessworkflow.fluent.standard;
+package io.serverlessworkflow.fluent.spec;
 
 import io.serverlessworkflow.api.types.EmitEventDefinition;
 import io.serverlessworkflow.api.types.EmitTask;
diff --git a/fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/EventPropertiesBuilder.java b/fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/EventPropertiesBuilder.java
similarity index 97%
rename from fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/EventPropertiesBuilder.java
rename to fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/EventPropertiesBuilder.java
index 86863804..ccfccfec 100644
--- a/fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/EventPropertiesBuilder.java
+++ b/fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/EventPropertiesBuilder.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.serverlessworkflow.fluent.standard;
+package io.serverlessworkflow.fluent.spec;
 
 import io.serverlessworkflow.api.types.EventData;
 import io.serverlessworkflow.api.types.EventProperties;
diff --git a/fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/ForTaskBuilder.java b/fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/ForTaskBuilder.java
similarity index 97%
rename from fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/ForTaskBuilder.java
rename to fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/ForTaskBuilder.java
index ba0cec7c..70e97c64 100644
--- a/fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/ForTaskBuilder.java
+++ b/fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/ForTaskBuilder.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.serverlessworkflow.fluent.standard;
+package io.serverlessworkflow.fluent.spec;
 
 import io.serverlessworkflow.api.types.ForTask;
 import io.serverlessworkflow.api.types.ForTaskConfiguration;
diff --git a/fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/ForkTaskBuilder.java b/fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/ForkTaskBuilder.java
similarity index 97%
rename from fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/ForkTaskBuilder.java
rename to fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/ForkTaskBuilder.java
index 59754ed8..51557259 100644
--- a/fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/ForkTaskBuilder.java
+++ b/fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/ForkTaskBuilder.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.serverlessworkflow.fluent.standard;
+package io.serverlessworkflow.fluent.spec;
 
 import io.serverlessworkflow.api.types.ForkTask;
 import io.serverlessworkflow.api.types.ForkTaskConfiguration;
diff --git a/fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/InputBuilder.java b/fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/InputBuilder.java
similarity index 97%
rename from fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/InputBuilder.java
rename to fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/InputBuilder.java
index 81ebfcc0..1161c82a 100644
--- a/fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/InputBuilder.java
+++ b/fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/InputBuilder.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.serverlessworkflow.fluent.standard;
+package io.serverlessworkflow.fluent.spec;
 
 import io.serverlessworkflow.api.types.Endpoint;
 import io.serverlessworkflow.api.types.ExternalResource;
diff --git a/fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/ListenTaskBuilder.java b/fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/ListenTaskBuilder.java
similarity index 99%
rename from fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/ListenTaskBuilder.java
rename to fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/ListenTaskBuilder.java
index 16791cab..5c722cb5 100644
--- a/fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/ListenTaskBuilder.java
+++ b/fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/ListenTaskBuilder.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.serverlessworkflow.fluent.standard;
+package io.serverlessworkflow.fluent.spec;
 
 import io.serverlessworkflow.api.types.AllEventConsumptionStrategy;
 import io.serverlessworkflow.api.types.AnyEventConsumptionStrategy;
diff --git a/fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/OAuth2AuthenticationPolicyBuilder.java b/fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/OAuth2AuthenticationPolicyBuilder.java
similarity index 97%
rename from fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/OAuth2AuthenticationPolicyBuilder.java
rename to fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/OAuth2AuthenticationPolicyBuilder.java
index 7eac31b4..af76983d 100644
--- a/fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/OAuth2AuthenticationPolicyBuilder.java
+++ b/fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/OAuth2AuthenticationPolicyBuilder.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.serverlessworkflow.fluent.standard;
+package io.serverlessworkflow.fluent.spec;
 
 import io.serverlessworkflow.api.types.OAuth2AuthenticationPolicy;
 import io.serverlessworkflow.api.types.OAuth2AuthenticationPolicyConfiguration;
diff --git a/fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/OIDCBuilder.java b/fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/OIDCBuilder.java
similarity index 99%
rename from fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/OIDCBuilder.java
rename to fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/OIDCBuilder.java
index e757de8f..f12ffbaf 100644
--- a/fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/OIDCBuilder.java
+++ b/fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/OIDCBuilder.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.serverlessworkflow.fluent.standard;
+package io.serverlessworkflow.fluent.spec;
 
 import io.serverlessworkflow.api.types.AuthenticationPolicy;
 import io.serverlessworkflow.api.types.OAuth2AutenthicationData;
diff --git a/fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/OpenIdConnectAuthenticationPolicyBuilder.java b/fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/OpenIdConnectAuthenticationPolicyBuilder.java
similarity index 96%
rename from fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/OpenIdConnectAuthenticationPolicyBuilder.java
rename to fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/OpenIdConnectAuthenticationPolicyBuilder.java
index 98b9152b..b5271006 100644
--- a/fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/OpenIdConnectAuthenticationPolicyBuilder.java
+++ b/fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/OpenIdConnectAuthenticationPolicyBuilder.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.serverlessworkflow.fluent.standard;
+package io.serverlessworkflow.fluent.spec;
 
 import io.serverlessworkflow.api.types.OpenIdConnectAuthenticationPolicy;
 import io.serverlessworkflow.api.types.OpenIdConnectAuthenticationPolicyConfiguration;
diff --git a/fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/OutputBuilder.java b/fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/OutputBuilder.java
similarity index 97%
rename from fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/OutputBuilder.java
rename to fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/OutputBuilder.java
index 797f8872..58791172 100644
--- a/fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/OutputBuilder.java
+++ b/fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/OutputBuilder.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.serverlessworkflow.fluent.standard;
+package io.serverlessworkflow.fluent.spec;
 
 import io.serverlessworkflow.api.types.Endpoint;
 import io.serverlessworkflow.api.types.ExternalResource;
diff --git a/fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/RaiseTaskBuilder.java b/fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/RaiseTaskBuilder.java
similarity index 98%
rename from fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/RaiseTaskBuilder.java
rename to fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/RaiseTaskBuilder.java
index f2d370e9..a036cb05 100644
--- a/fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/RaiseTaskBuilder.java
+++ b/fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/RaiseTaskBuilder.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.serverlessworkflow.fluent.standard;
+package io.serverlessworkflow.fluent.spec;
 
 import io.serverlessworkflow.api.types.ErrorDetails;
 import io.serverlessworkflow.api.types.ErrorTitle;
diff --git a/fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/SetTaskBuilder.java b/fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/SetTaskBuilder.java
similarity index 97%
rename from fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/SetTaskBuilder.java
rename to fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/SetTaskBuilder.java
index 6c43ddfc..a3166127 100644
--- a/fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/SetTaskBuilder.java
+++ b/fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/SetTaskBuilder.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.serverlessworkflow.fluent.standard;
+package io.serverlessworkflow.fluent.spec;
 
 import io.serverlessworkflow.api.types.Set;
 import io.serverlessworkflow.api.types.SetTask;
diff --git a/fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/SwitchTaskBuilder.java b/fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/SwitchTaskBuilder.java
similarity index 98%
rename from fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/SwitchTaskBuilder.java
rename to fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/SwitchTaskBuilder.java
index fca04cdf..e82b42c5 100644
--- a/fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/SwitchTaskBuilder.java
+++ b/fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/SwitchTaskBuilder.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.serverlessworkflow.fluent.standard;
+package io.serverlessworkflow.fluent.spec;
 
 import io.serverlessworkflow.api.types.FlowDirective;
 import io.serverlessworkflow.api.types.FlowDirectiveEnum;
diff --git a/fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/TaskBaseBuilder.java b/fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/TaskBaseBuilder.java
similarity index 98%
rename from fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/TaskBaseBuilder.java
rename to fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/TaskBaseBuilder.java
index e4b9a623..2bd068ce 100644
--- a/fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/TaskBaseBuilder.java
+++ b/fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/TaskBaseBuilder.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.serverlessworkflow.fluent.standard;
+package io.serverlessworkflow.fluent.spec;
 
 import io.serverlessworkflow.api.types.Endpoint;
 import io.serverlessworkflow.api.types.Export;
diff --git a/fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/TaskItemListBuilder.java b/fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/TaskItemListBuilder.java
similarity index 95%
rename from fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/TaskItemListBuilder.java
rename to fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/TaskItemListBuilder.java
index ebc3353c..66cd59e2 100644
--- a/fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/TaskItemListBuilder.java
+++ b/fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/TaskItemListBuilder.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.serverlessworkflow.fluent.standard;
+package io.serverlessworkflow.fluent.spec;
 
 public class TaskItemListBuilder extends BaseTaskItemListBuilder<TaskItemListBuilder> {
 
diff --git a/fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/TransformationHandlers.java b/fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/TransformationHandlers.java
similarity index 95%
rename from fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/TransformationHandlers.java
rename to fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/TransformationHandlers.java
index 298f2fbe..f677fe22 100644
--- a/fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/TransformationHandlers.java
+++ b/fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/TransformationHandlers.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.serverlessworkflow.fluent.standard;
+package io.serverlessworkflow.fluent.spec;
 
 import io.serverlessworkflow.api.types.Export;
 import io.serverlessworkflow.api.types.Input;
diff --git a/fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/TryTaskBuilder.java b/fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/TryTaskBuilder.java
similarity index 99%
rename from fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/TryTaskBuilder.java
rename to fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/TryTaskBuilder.java
index 677a36f0..a707e916 100644
--- a/fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/TryTaskBuilder.java
+++ b/fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/TryTaskBuilder.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.serverlessworkflow.fluent.standard;
+package io.serverlessworkflow.fluent.spec;
 
 import io.serverlessworkflow.api.types.CatchErrors;
 import io.serverlessworkflow.api.types.Constant;
diff --git a/fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/UriTemplateBuilder.java b/fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/UriTemplateBuilder.java
similarity index 95%
rename from fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/UriTemplateBuilder.java
rename to fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/UriTemplateBuilder.java
index da95f6b7..5fb74102 100644
--- a/fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/UriTemplateBuilder.java
+++ b/fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/UriTemplateBuilder.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.serverlessworkflow.fluent.standard;
+package io.serverlessworkflow.fluent.spec;
 
 import io.serverlessworkflow.api.types.UriTemplate;
 import java.net.URI;
diff --git a/fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/UseAuthenticationsBuilder.java b/fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/UseAuthenticationsBuilder.java
similarity index 96%
rename from fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/UseAuthenticationsBuilder.java
rename to fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/UseAuthenticationsBuilder.java
index f24fec2f..d865c802 100644
--- a/fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/UseAuthenticationsBuilder.java
+++ b/fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/UseAuthenticationsBuilder.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.serverlessworkflow.fluent.standard;
+package io.serverlessworkflow.fluent.spec;
 
 import io.serverlessworkflow.api.types.UseAuthentications;
 import java.util.function.Consumer;
diff --git a/fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/UseBuilder.java b/fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/UseBuilder.java
similarity index 96%
rename from fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/UseBuilder.java
rename to fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/UseBuilder.java
index 5b4dd836..66833111 100644
--- a/fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/UseBuilder.java
+++ b/fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/UseBuilder.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.serverlessworkflow.fluent.standard;
+package io.serverlessworkflow.fluent.spec;
 
 import io.serverlessworkflow.api.types.Use;
 import java.util.List;
diff --git a/fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/WorkflowBuilder.java b/fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/WorkflowBuilder.java
similarity index 97%
rename from fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/WorkflowBuilder.java
rename to fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/WorkflowBuilder.java
index 278e1df8..374a519f 100644
--- a/fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/WorkflowBuilder.java
+++ b/fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/WorkflowBuilder.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.serverlessworkflow.fluent.standard;
+package io.serverlessworkflow.fluent.spec;
 
 import java.util.UUID;
 
diff --git a/fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/WorkflowBuilderConsumers.java b/fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/WorkflowBuilderConsumers.java
similarity index 96%
rename from fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/WorkflowBuilderConsumers.java
rename to fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/WorkflowBuilderConsumers.java
index 28652c5f..e0dbb54c 100644
--- a/fluent/standard/src/main/java/io/serverlessworkflow/fluent/standard/WorkflowBuilderConsumers.java
+++ b/fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/WorkflowBuilderConsumers.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.serverlessworkflow.fluent.standard;
+package io.serverlessworkflow.fluent.spec;
 
 import java.util.function.Consumer;
 
diff --git a/fluent/standard/src/test/java/io/serverlessworkflow/fluent/standard/WorkflowBuilderTest.java b/fluent/spec/src/test/java/io/serverlessworkflow/fluent/spec/WorkflowBuilderTest.java
similarity index 99%
rename from fluent/standard/src/test/java/io/serverlessworkflow/fluent/standard/WorkflowBuilderTest.java
rename to fluent/spec/src/test/java/io/serverlessworkflow/fluent/spec/WorkflowBuilderTest.java
index cdf1c3ba..49d41dbb 100644
--- a/fluent/standard/src/test/java/io/serverlessworkflow/fluent/standard/WorkflowBuilderTest.java
+++ b/fluent/spec/src/test/java/io/serverlessworkflow/fluent/spec/WorkflowBuilderTest.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.serverlessworkflow.fluent.standard;
+package io.serverlessworkflow.fluent.spec;
 
-import static io.serverlessworkflow.fluent.standard.WorkflowBuilderConsumers.authBasic;
+import static io.serverlessworkflow.fluent.spec.WorkflowBuilderConsumers.authBasic;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertInstanceOf;
 import static org.junit.jupiter.api.Assertions.assertNotNull;