diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 66140126..8e1e45d9 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -42,7 +42,7 @@ When updating the protobuf definitions in `internal/durabletask-protobuf/protos/
 ./gradlew publishToMavenLocal
 ```
 
-or simply `./gradlew build publishToMavenLocal`
+or simply `./gradlew build publishToMavenLocal -PskipSigning`
 
 Check if it was released locally with:
 ```shell
diff --git a/azurefunctions/README.md b/azurefunctions/README.md
index 43ff0ffd..00b103c1 100644
--- a/azurefunctions/README.md
+++ b/azurefunctions/README.md
@@ -79,7 +79,7 @@ import java.util.Optional;
 import com.microsoft.azure.functions.*;
 import com.microsoft.azure.functions.annotation.*;
 
-import com.microsoft.durabletask.*;
+import io.dapr.durabletask.*;
 import com.microsoft.durabletask.azurefunctions.*;
 
 public class DurableFunctionsSample {
diff --git a/azurefunctions/src/main/java/com/microsoft/durabletask/azurefunctions/DurableClientContext.java b/azurefunctions/src/main/java/com/microsoft/durabletask/azurefunctions/DurableClientContext.java
index a952db68..a03d419b 100644
--- a/azurefunctions/src/main/java/com/microsoft/durabletask/azurefunctions/DurableClientContext.java
+++ b/azurefunctions/src/main/java/com/microsoft/durabletask/azurefunctions/DurableClientContext.java
@@ -7,10 +7,10 @@
 import com.microsoft.azure.functions.HttpResponseMessage;
 
 import com.microsoft.azure.functions.HttpStatus;
-import com.microsoft.durabletask.DurableTaskClient;
-import com.microsoft.durabletask.DurableTaskGrpcClientBuilder;
-import com.microsoft.durabletask.OrchestrationMetadata;
-import com.microsoft.durabletask.OrchestrationRuntimeStatus;
+import io.dapr.durabletask.DurableTaskClient;
+import io.dapr.durabletask.DurableTaskGrpcClientBuilder;
+import io.dapr.durabletask.OrchestrationMetadata;
+import io.dapr.durabletask.OrchestrationRuntimeStatus;
 
 import java.io.UnsupportedEncodingException;
 import java.net.MalformedURLException;
diff --git a/azurefunctions/src/main/java/com/microsoft/durabletask/azurefunctions/internal/middleware/OrchestrationMiddleware.java b/azurefunctions/src/main/java/com/microsoft/durabletask/azurefunctions/internal/middleware/OrchestrationMiddleware.java
index 02be55f4..125d3ee1 100644
--- a/azurefunctions/src/main/java/com/microsoft/durabletask/azurefunctions/internal/middleware/OrchestrationMiddleware.java
+++ b/azurefunctions/src/main/java/com/microsoft/durabletask/azurefunctions/internal/middleware/OrchestrationMiddleware.java
@@ -9,12 +9,12 @@
 import com.microsoft.azure.functions.internal.spi.middleware.Middleware;
 import com.microsoft.azure.functions.internal.spi.middleware.MiddlewareChain;
 import com.microsoft.azure.functions.internal.spi.middleware.MiddlewareContext;
-import com.microsoft.durabletask.CompositeTaskFailedException;
-import com.microsoft.durabletask.DataConverter;
-import com.microsoft.durabletask.OrchestrationRunner;
-import com.microsoft.durabletask.TaskFailedException;
-import com.microsoft.durabletask.interruption.ContinueAsNewInterruption;
-import com.microsoft.durabletask.interruption.OrchestratorBlockedException;
+import io.dapr.durabletask.CompositeTaskFailedException;
+import io.dapr.durabletask.DataConverter;
+import io.dapr.durabletask.OrchestrationRunner;
+import io.dapr.durabletask.TaskFailedException;
+import io.dapr.durabletask.interruption.ContinueAsNewInterruption;
+import io.dapr.durabletask.interruption.OrchestratorBlockedException;
 
 /**
  * Durable Function Orchestration Middleware
diff --git a/azuremanaged/src/main/java/com/microsoft/durabletask/azuremanaged/DurableTaskSchedulerClientExtensions.java b/azuremanaged/src/main/java/com/microsoft/durabletask/azuremanaged/DurableTaskSchedulerClientExtensions.java
index ffc7d446..e42bbb13 100644
--- a/azuremanaged/src/main/java/com/microsoft/durabletask/azuremanaged/DurableTaskSchedulerClientExtensions.java
+++ b/azuremanaged/src/main/java/com/microsoft/durabletask/azuremanaged/DurableTaskSchedulerClientExtensions.java
@@ -3,7 +3,7 @@
 
 package com.microsoft.durabletask.azuremanaged;
 
-import com.microsoft.durabletask.DurableTaskGrpcClientBuilder;
+import io.dapr.durabletask.DurableTaskGrpcClientBuilder;
 import com.azure.core.credential.TokenCredential;
 import io.grpc.Channel;
 import java.util.Objects;
diff --git a/azuremanaged/src/main/java/com/microsoft/durabletask/azuremanaged/DurableTaskSchedulerWorkerExtensions.java b/azuremanaged/src/main/java/com/microsoft/durabletask/azuremanaged/DurableTaskSchedulerWorkerExtensions.java
index 0ea9b5be..7e6554ff 100644
--- a/azuremanaged/src/main/java/com/microsoft/durabletask/azuremanaged/DurableTaskSchedulerWorkerExtensions.java
+++ b/azuremanaged/src/main/java/com/microsoft/durabletask/azuremanaged/DurableTaskSchedulerWorkerExtensions.java
@@ -4,7 +4,7 @@
 package com.microsoft.durabletask.azuremanaged;
 
 import com.azure.core.credential.TokenCredential;
-import com.microsoft.durabletask.DurableTaskGrpcWorkerBuilder;
+import io.dapr.durabletask.DurableTaskGrpcWorkerBuilder;
 
 import io.grpc.Channel;
 import java.util.Objects;
diff --git a/azuremanaged/src/test/java/com/microsoft/durabletask/azuremanaged/DurableTaskSchedulerClientExtensionsTest.java b/azuremanaged/src/test/java/com/microsoft/durabletask/azuremanaged/DurableTaskSchedulerClientExtensionsTest.java
index a486dd4d..f83031ed 100644
--- a/azuremanaged/src/test/java/com/microsoft/durabletask/azuremanaged/DurableTaskSchedulerClientExtensionsTest.java
+++ b/azuremanaged/src/test/java/com/microsoft/durabletask/azuremanaged/DurableTaskSchedulerClientExtensionsTest.java
@@ -1,7 +1,7 @@
 package com.microsoft.durabletask.azuremanaged;
 
 import com.azure.core.credential.TokenCredential;
-import com.microsoft.durabletask.DurableTaskGrpcClientBuilder;
+import io.dapr.durabletask.DurableTaskGrpcClientBuilder;
 import io.grpc.Channel;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
diff --git a/azuremanaged/src/test/java/com/microsoft/durabletask/azuremanaged/DurableTaskSchedulerClientExtensionsUserAgentTest.java b/azuremanaged/src/test/java/com/microsoft/durabletask/azuremanaged/DurableTaskSchedulerClientExtensionsUserAgentTest.java
index 24a2513c..e0e448dd 100644
--- a/azuremanaged/src/test/java/com/microsoft/durabletask/azuremanaged/DurableTaskSchedulerClientExtensionsUserAgentTest.java
+++ b/azuremanaged/src/test/java/com/microsoft/durabletask/azuremanaged/DurableTaskSchedulerClientExtensionsUserAgentTest.java
@@ -1,8 +1,8 @@
 package com.microsoft.durabletask.azuremanaged;
 
-import com.microsoft.durabletask.DurableTaskClient;
-import com.microsoft.durabletask.DurableTaskGrpcClientBuilder;
-import com.microsoft.durabletask.NewOrchestrationInstanceOptions;
+import io.dapr.durabletask.DurableTaskClient;
+import io.dapr.durabletask.DurableTaskGrpcClientBuilder;
+import io.dapr.durabletask.NewOrchestrationInstanceOptions;
 import io.grpc.*;
 import io.grpc.stub.ServerCalls;
 import io.grpc.stub.StreamObserver;
diff --git a/azuremanaged/src/test/java/com/microsoft/durabletask/azuremanaged/DurableTaskSchedulerWorkerExtensionsTest.java b/azuremanaged/src/test/java/com/microsoft/durabletask/azuremanaged/DurableTaskSchedulerWorkerExtensionsTest.java
index 9ad18281..1aff28f4 100644
--- a/azuremanaged/src/test/java/com/microsoft/durabletask/azuremanaged/DurableTaskSchedulerWorkerExtensionsTest.java
+++ b/azuremanaged/src/test/java/com/microsoft/durabletask/azuremanaged/DurableTaskSchedulerWorkerExtensionsTest.java
@@ -1,7 +1,7 @@
 package com.microsoft.durabletask.azuremanaged;
 
 import com.azure.core.credential.TokenCredential;
-import com.microsoft.durabletask.DurableTaskGrpcWorkerBuilder;
+import io.dapr.durabletask.DurableTaskGrpcWorkerBuilder;
 import io.grpc.Channel;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
diff --git a/client/build.gradle b/client/build.gradle
index bab0b189..07885db6 100644
--- a/client/build.gradle
+++ b/client/build.gradle
@@ -11,7 +11,7 @@ plugins {
 }
 
 group 'io.dapr'
-version = '1.5.8'
+version = '1.5.9'
 archivesBaseName = 'durabletask-client'
 
 def grpcVersion = '1.69.0'
diff --git a/client/src/main/java/io/dapr/durabletask/TaskOrchestrationExecutor.java b/client/src/main/java/io/dapr/durabletask/TaskOrchestrationExecutor.java
index 6405a114..b3822db4 100644
--- a/client/src/main/java/io/dapr/durabletask/TaskOrchestrationExecutor.java
+++ b/client/src/main/java/io/dapr/durabletask/TaskOrchestrationExecutor.java
@@ -292,13 +292,15 @@ public <V> Task<V> callActivity(
             // Add target app ID if specified in options
             if (options != null && options.hasAppID()) {
                 String targetAppId = options.getAppID();
-                routerBuilder.setTargetAppID(targetAppId);
+                TaskRouter router = TaskRouter.newBuilder()
+                    .setSourceAppID(this.appId)
+                    .setTargetAppID(targetAppId)
+                    .build();
+                scheduleTaskBuilder.setRouter(router);
                 this.logger.fine(() -> String.format(
-                "cross app routing detected: source=%s, target=%s",
-                this.appId, targetAppId));
-        }
-            TaskRouter router = routerBuilder.build();
-            scheduleTaskBuilder.setRouter(router);
+                    "cross app routing detected: source=%s, target=%s",
+                    this.appId, targetAppId));
+            }
             TaskFactory<V> taskFactory = () -> {
                 int id = this.sequenceNumber++;
                 
@@ -306,14 +308,16 @@ public <V> Task<V> callActivity(
                 OrchestratorAction.Builder actionBuilder = OrchestratorAction.newBuilder()
                         .setId(id)
                         .setScheduleTask(scheduleTaskBuilder);
-                TaskRouter.Builder actionRouterBuilder = TaskRouter.newBuilder()
-                        .setSourceAppID(this.appId);
+                
                 if (options != null && options.hasAppID()) {
                     String targetAppId = options.getAppID();
-                    actionRouterBuilder.setTargetAppID(targetAppId);
+                    TaskRouter actionRouter = TaskRouter.newBuilder()
+                        .setSourceAppID(this.appId)
+                        .setTargetAppID(targetAppId)
+                        .build();
+                    actionBuilder.setRouter(actionRouter);
                 }
                 
-                actionBuilder.setRouter(actionRouterBuilder.build());
                 this.pendingActions.put(id, actionBuilder.build());
 
                 if (!this.isReplaying) {
diff --git a/endtoendtests/src/main/java/com/functions/AzureFunctions.java b/endtoendtests/src/main/java/com/functions/AzureFunctions.java
index a198ec73..24ff1d4d 100644
--- a/endtoendtests/src/main/java/com/functions/AzureFunctions.java
+++ b/endtoendtests/src/main/java/com/functions/AzureFunctions.java
@@ -4,7 +4,7 @@
 import com.microsoft.azure.functions.*;
 import java.util.*;
 
-import com.microsoft.durabletask.*;
+import io.dapr.durabletask.*;
 import com.microsoft.durabletask.azurefunctions.DurableActivityTrigger;
 import com.microsoft.durabletask.azurefunctions.DurableClientContext;
 import com.microsoft.durabletask.azurefunctions.DurableClientInput;
diff --git a/endtoendtests/src/main/java/com/functions/ContinueAsNew.java b/endtoendtests/src/main/java/com/functions/ContinueAsNew.java
index a8c177e3..490b7665 100644
--- a/endtoendtests/src/main/java/com/functions/ContinueAsNew.java
+++ b/endtoendtests/src/main/java/com/functions/ContinueAsNew.java
@@ -7,9 +7,9 @@
 import com.microsoft.azure.functions.annotation.AuthorizationLevel;
 import com.microsoft.azure.functions.annotation.FunctionName;
 import com.microsoft.azure.functions.annotation.HttpTrigger;
-import com.microsoft.durabletask.DurableTaskClient;
-import com.microsoft.durabletask.Task;
-import com.microsoft.durabletask.TaskOrchestrationContext;
+import io.dapr.durabletask.DurableTaskClient;
+import io.dapr.durabletask.Task;
+import io.dapr.durabletask.TaskOrchestrationContext;
 import com.microsoft.durabletask.azurefunctions.DurableClientContext;
 import com.microsoft.durabletask.azurefunctions.DurableClientInput;
 import com.microsoft.durabletask.azurefunctions.DurableOrchestrationTrigger;
diff --git a/endtoendtests/src/main/java/com/functions/DeserializeErrorTest.java b/endtoendtests/src/main/java/com/functions/DeserializeErrorTest.java
index 7e376d24..236a3750 100644
--- a/endtoendtests/src/main/java/com/functions/DeserializeErrorTest.java
+++ b/endtoendtests/src/main/java/com/functions/DeserializeErrorTest.java
@@ -7,9 +7,9 @@
 import com.microsoft.azure.functions.annotation.AuthorizationLevel;
 import com.microsoft.azure.functions.annotation.FunctionName;
 import com.microsoft.azure.functions.annotation.HttpTrigger;
-import com.microsoft.durabletask.DurableTaskClient;
-import com.microsoft.durabletask.Task;
-import com.microsoft.durabletask.TaskOrchestrationContext;
+import io.dapr.durabletask.DurableTaskClient;
+import io.dapr.durabletask.Task;
+import io.dapr.durabletask.TaskOrchestrationContext;
 import com.microsoft.durabletask.azurefunctions.DurableClientContext;
 import com.microsoft.durabletask.azurefunctions.DurableClientInput;
 import com.microsoft.durabletask.azurefunctions.DurableOrchestrationTrigger;
diff --git a/endtoendtests/src/main/java/com/functions/ParallelFunctions.java b/endtoendtests/src/main/java/com/functions/ParallelFunctions.java
index 852b3be9..cb2b991e 100644
--- a/endtoendtests/src/main/java/com/functions/ParallelFunctions.java
+++ b/endtoendtests/src/main/java/com/functions/ParallelFunctions.java
@@ -7,11 +7,11 @@
 import java.util.*;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import com.microsoft.durabletask.*;
 import com.microsoft.durabletask.azurefunctions.DurableActivityTrigger;
 import com.microsoft.durabletask.azurefunctions.DurableClientContext;
 import com.microsoft.durabletask.azurefunctions.DurableClientInput;
 import com.microsoft.durabletask.azurefunctions.DurableOrchestrationTrigger;
+import io.dapr.durabletask.*;
 
 public class ParallelFunctions {
 
diff --git a/endtoendtests/src/main/java/com/functions/ResumeSuspend.java b/endtoendtests/src/main/java/com/functions/ResumeSuspend.java
index a715d66e..0795c86d 100644
--- a/endtoendtests/src/main/java/com/functions/ResumeSuspend.java
+++ b/endtoendtests/src/main/java/com/functions/ResumeSuspend.java
@@ -7,8 +7,8 @@
 import com.microsoft.azure.functions.annotation.AuthorizationLevel;
 import com.microsoft.azure.functions.annotation.FunctionName;
 import com.microsoft.azure.functions.annotation.HttpTrigger;
-import com.microsoft.durabletask.DurableTaskClient;
-import com.microsoft.durabletask.TaskOrchestrationContext;
+import io.dapr.durabletask.DurableTaskClient;
+import io.dapr.durabletask.TaskOrchestrationContext;
 import com.microsoft.durabletask.azurefunctions.DurableClientContext;
 import com.microsoft.durabletask.azurefunctions.DurableClientInput;
 import com.microsoft.durabletask.azurefunctions.DurableOrchestrationTrigger;
diff --git a/endtoendtests/src/main/java/com/functions/RetriableTask.java b/endtoendtests/src/main/java/com/functions/RetriableTask.java
index 9b267ef2..7bea58ea 100644
--- a/endtoendtests/src/main/java/com/functions/RetriableTask.java
+++ b/endtoendtests/src/main/java/com/functions/RetriableTask.java
@@ -7,10 +7,10 @@
 import com.microsoft.azure.functions.annotation.AuthorizationLevel;
 import com.microsoft.azure.functions.annotation.FunctionName;
 import com.microsoft.azure.functions.annotation.HttpTrigger;
-import com.microsoft.durabletask.DurableTaskClient;
-import com.microsoft.durabletask.RetryPolicy;
-import com.microsoft.durabletask.TaskOptions;
-import com.microsoft.durabletask.TaskOrchestrationContext;
+import io.dapr.durabletask.DurableTaskClient;
+import io.dapr.durabletask.RetryPolicy;
+import io.dapr.durabletask.TaskOptions;
+import io.dapr.durabletask.TaskOrchestrationContext;
 import com.microsoft.durabletask.azurefunctions.DurableActivityTrigger;
 import com.microsoft.durabletask.azurefunctions.DurableClientContext;
 import com.microsoft.durabletask.azurefunctions.DurableClientInput;
diff --git a/endtoendtests/src/main/java/com/functions/ThenChain.java b/endtoendtests/src/main/java/com/functions/ThenChain.java
index ca9b1b6b..3ee305d2 100644
--- a/endtoendtests/src/main/java/com/functions/ThenChain.java
+++ b/endtoendtests/src/main/java/com/functions/ThenChain.java
@@ -7,8 +7,8 @@
 import com.microsoft.azure.functions.annotation.AuthorizationLevel;
 import com.microsoft.azure.functions.annotation.FunctionName;
 import com.microsoft.azure.functions.annotation.HttpTrigger;
-import com.microsoft.durabletask.DurableTaskClient;
-import com.microsoft.durabletask.TaskOrchestrationContext;
+import io.dapr.durabletask.DurableTaskClient;
+import io.dapr.durabletask.TaskOrchestrationContext;
 import com.microsoft.durabletask.azurefunctions.DurableClientContext;
 import com.microsoft.durabletask.azurefunctions.DurableClientInput;
 import com.microsoft.durabletask.azurefunctions.DurableOrchestrationTrigger;
diff --git a/samples-azure-functions/src/main/java/com/functions/AzureFunctions.java b/samples-azure-functions/src/main/java/com/functions/AzureFunctions.java
index 755e50ac..c109d9f1 100644
--- a/samples-azure-functions/src/main/java/com/functions/AzureFunctions.java
+++ b/samples-azure-functions/src/main/java/com/functions/AzureFunctions.java
@@ -5,7 +5,7 @@
 import com.microsoft.azure.functions.*;
 import java.util.*;
 
-import com.microsoft.durabletask.*;
+import io.dapr.durabletask.*;
 import com.microsoft.durabletask.azurefunctions.DurableActivityTrigger;
 import com.microsoft.durabletask.azurefunctions.DurableClientContext;
 import com.microsoft.durabletask.azurefunctions.DurableClientInput;
diff --git a/samples-azure-functions/src/main/java/com/functions/ContinueAsNew.java b/samples-azure-functions/src/main/java/com/functions/ContinueAsNew.java
index a8c177e3..490b7665 100644
--- a/samples-azure-functions/src/main/java/com/functions/ContinueAsNew.java
+++ b/samples-azure-functions/src/main/java/com/functions/ContinueAsNew.java
@@ -7,9 +7,9 @@
 import com.microsoft.azure.functions.annotation.AuthorizationLevel;
 import com.microsoft.azure.functions.annotation.FunctionName;
 import com.microsoft.azure.functions.annotation.HttpTrigger;
-import com.microsoft.durabletask.DurableTaskClient;
-import com.microsoft.durabletask.Task;
-import com.microsoft.durabletask.TaskOrchestrationContext;
+import io.dapr.durabletask.DurableTaskClient;
+import io.dapr.durabletask.Task;
+import io.dapr.durabletask.TaskOrchestrationContext;
 import com.microsoft.durabletask.azurefunctions.DurableClientContext;
 import com.microsoft.durabletask.azurefunctions.DurableClientInput;
 import com.microsoft.durabletask.azurefunctions.DurableOrchestrationTrigger;
diff --git a/samples-azure-functions/src/main/java/com/functions/ParallelFunctions.java b/samples-azure-functions/src/main/java/com/functions/ParallelFunctions.java
index 74f4e399..61edca63 100644
--- a/samples-azure-functions/src/main/java/com/functions/ParallelFunctions.java
+++ b/samples-azure-functions/src/main/java/com/functions/ParallelFunctions.java
@@ -7,7 +7,7 @@
 import java.util.*;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import com.microsoft.durabletask.*;
+import io.dapr.durabletask.*;
 import com.microsoft.durabletask.azurefunctions.DurableActivityTrigger;
 import com.microsoft.durabletask.azurefunctions.DurableClientContext;
 import com.microsoft.durabletask.azurefunctions.DurableClientInput;
diff --git a/samples-azure-functions/src/main/java/com/functions/ResumeSuspend.java b/samples-azure-functions/src/main/java/com/functions/ResumeSuspend.java
index a715d66e..0795c86d 100644
--- a/samples-azure-functions/src/main/java/com/functions/ResumeSuspend.java
+++ b/samples-azure-functions/src/main/java/com/functions/ResumeSuspend.java
@@ -7,8 +7,8 @@
 import com.microsoft.azure.functions.annotation.AuthorizationLevel;
 import com.microsoft.azure.functions.annotation.FunctionName;
 import com.microsoft.azure.functions.annotation.HttpTrigger;
-import com.microsoft.durabletask.DurableTaskClient;
-import com.microsoft.durabletask.TaskOrchestrationContext;
+import io.dapr.durabletask.DurableTaskClient;
+import io.dapr.durabletask.TaskOrchestrationContext;
 import com.microsoft.durabletask.azurefunctions.DurableClientContext;
 import com.microsoft.durabletask.azurefunctions.DurableClientInput;
 import com.microsoft.durabletask.azurefunctions.DurableOrchestrationTrigger;
diff --git a/samples-azure-functions/src/main/java/com/functions/RetriableTask.java b/samples-azure-functions/src/main/java/com/functions/RetriableTask.java
index 9b267ef2..7bea58ea 100644
--- a/samples-azure-functions/src/main/java/com/functions/RetriableTask.java
+++ b/samples-azure-functions/src/main/java/com/functions/RetriableTask.java
@@ -7,10 +7,10 @@
 import com.microsoft.azure.functions.annotation.AuthorizationLevel;
 import com.microsoft.azure.functions.annotation.FunctionName;
 import com.microsoft.azure.functions.annotation.HttpTrigger;
-import com.microsoft.durabletask.DurableTaskClient;
-import com.microsoft.durabletask.RetryPolicy;
-import com.microsoft.durabletask.TaskOptions;
-import com.microsoft.durabletask.TaskOrchestrationContext;
+import io.dapr.durabletask.DurableTaskClient;
+import io.dapr.durabletask.RetryPolicy;
+import io.dapr.durabletask.TaskOptions;
+import io.dapr.durabletask.TaskOrchestrationContext;
 import com.microsoft.durabletask.azurefunctions.DurableActivityTrigger;
 import com.microsoft.durabletask.azurefunctions.DurableClientContext;
 import com.microsoft.durabletask.azurefunctions.DurableClientInput;
diff --git a/samples-azure-functions/src/main/java/com/functions/SubOrchestrator.java b/samples-azure-functions/src/main/java/com/functions/SubOrchestrator.java
index f082acc7..ece631a7 100644
--- a/samples-azure-functions/src/main/java/com/functions/SubOrchestrator.java
+++ b/samples-azure-functions/src/main/java/com/functions/SubOrchestrator.java
@@ -8,8 +8,8 @@
 import com.microsoft.azure.functions.annotation.AuthorizationLevel;
 import com.microsoft.azure.functions.annotation.FunctionName;
 import com.microsoft.azure.functions.annotation.HttpTrigger;
-import com.microsoft.durabletask.DurableTaskClient;
-import com.microsoft.durabletask.TaskOrchestrationContext;
+import io.dapr.durabletask.DurableTaskClient;
+import io.dapr.durabletask.TaskOrchestrationContext;
 import com.microsoft.durabletask.azurefunctions.DurableClientContext;
 import com.microsoft.durabletask.azurefunctions.DurableClientInput;
 import com.microsoft.durabletask.azurefunctions.DurableOrchestrationTrigger;
diff --git a/samples-azure-functions/src/main/java/com/functions/ThenChain.java b/samples-azure-functions/src/main/java/com/functions/ThenChain.java
index ca9b1b6b..3ee305d2 100644
--- a/samples-azure-functions/src/main/java/com/functions/ThenChain.java
+++ b/samples-azure-functions/src/main/java/com/functions/ThenChain.java
@@ -7,8 +7,8 @@
 import com.microsoft.azure.functions.annotation.AuthorizationLevel;
 import com.microsoft.azure.functions.annotation.FunctionName;
 import com.microsoft.azure.functions.annotation.HttpTrigger;
-import com.microsoft.durabletask.DurableTaskClient;
-import com.microsoft.durabletask.TaskOrchestrationContext;
+import io.dapr.durabletask.DurableTaskClient;
+import io.dapr.durabletask.TaskOrchestrationContext;
 import com.microsoft.durabletask.azurefunctions.DurableClientContext;
 import com.microsoft.durabletask.azurefunctions.DurableClientInput;
 import com.microsoft.durabletask.azurefunctions.DurableOrchestrationTrigger;
diff --git a/samples-azure-functions/src/main/java/com/functions/WaitExternalEvent.java b/samples-azure-functions/src/main/java/com/functions/WaitExternalEvent.java
index 88fba1ce..29d1c93a 100644
--- a/samples-azure-functions/src/main/java/com/functions/WaitExternalEvent.java
+++ b/samples-azure-functions/src/main/java/com/functions/WaitExternalEvent.java
@@ -7,9 +7,9 @@
 import com.microsoft.azure.functions.annotation.AuthorizationLevel;
 import com.microsoft.azure.functions.annotation.FunctionName;
 import com.microsoft.azure.functions.annotation.HttpTrigger;
-import com.microsoft.durabletask.DurableTaskClient;
-import com.microsoft.durabletask.Task;
-import com.microsoft.durabletask.TaskOrchestrationContext;
+import io.dapr.durabletask.DurableTaskClient;
+import io.dapr.durabletask.Task;
+import io.dapr.durabletask.TaskOrchestrationContext;
 import com.microsoft.durabletask.azurefunctions.DurableClientContext;
 import com.microsoft.durabletask.azurefunctions.DurableClientInput;
 import com.microsoft.durabletask.azurefunctions.DurableOrchestrationTrigger;
diff --git a/samples/src/main/java/io/durabletask/samples/ChainingPattern.java b/samples/src/main/java/io/durabletask/samples/ChainingPattern.java
index 485f6685..2d50aaf4 100644
--- a/samples/src/main/java/io/durabletask/samples/ChainingPattern.java
+++ b/samples/src/main/java/io/durabletask/samples/ChainingPattern.java
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 package io.durabletask.samples;
 
-import com.microsoft.durabletask.*;
+import io.dapr.durabletask.*;
 
 import java.io.IOException;
 import java.time.Duration;
diff --git a/samples/src/main/java/io/durabletask/samples/FanOutFanInPattern.java b/samples/src/main/java/io/durabletask/samples/FanOutFanInPattern.java
index 96dd294e..a121243e 100644
--- a/samples/src/main/java/io/durabletask/samples/FanOutFanInPattern.java
+++ b/samples/src/main/java/io/durabletask/samples/FanOutFanInPattern.java
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 package io.durabletask.samples;
 
-import com.microsoft.durabletask.*;
+import io.dapr.durabletask.*;
 
 import java.io.IOException;
 import java.time.Duration;
diff --git a/samples/src/main/java/io/durabletask/samples/OrchestrationController.java b/samples/src/main/java/io/durabletask/samples/OrchestrationController.java
index 43cc7290..1f3f91a9 100644
--- a/samples/src/main/java/io/durabletask/samples/OrchestrationController.java
+++ b/samples/src/main/java/io/durabletask/samples/OrchestrationController.java
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 package io.durabletask.samples;
 
-import com.microsoft.durabletask.*;
+import io.dapr.durabletask.*;
 
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestParam;
diff --git a/samples/src/main/java/io/durabletask/samples/WebAppToDurableTaskSchedulerSample.java b/samples/src/main/java/io/durabletask/samples/WebAppToDurableTaskSchedulerSample.java
index d09fdd69..b3c52e8f 100644
--- a/samples/src/main/java/io/durabletask/samples/WebAppToDurableTaskSchedulerSample.java
+++ b/samples/src/main/java/io/durabletask/samples/WebAppToDurableTaskSchedulerSample.java
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 package io.durabletask.samples;
 
-import com.microsoft.durabletask.*;
+import io.dapr.durabletask.*;
 import com.microsoft.durabletask.azuremanaged.DurableTaskSchedulerClientExtensions;
 import com.microsoft.durabletask.azuremanaged.DurableTaskSchedulerWorkerExtensions;
 import org.springframework.boot.SpringApplication;
diff --git a/samples/src/main/java/io/durabletask/samples/WebApplication.java b/samples/src/main/java/io/durabletask/samples/WebApplication.java
index b9c4bcc5..939e3ad4 100644
--- a/samples/src/main/java/io/durabletask/samples/WebApplication.java
+++ b/samples/src/main/java/io/durabletask/samples/WebApplication.java
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 package io.durabletask.samples;
 
-import com.microsoft.durabletask.*;
+import io.dapr.durabletask.*;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;