diff --git a/client/build.gradle b/client/build.gradle
index 04cf4000..7b29b4a6 100644
--- a/client/build.gradle
+++ b/client/build.gradle
@@ -13,7 +13,7 @@ version = '1.5.2'
 archivesBaseName = 'durabletask-client'
 
 def grpcVersion = '1.59.0'
-def protocVersion = '3.12.0'
+def protocVersion = '3.19.0'
 def jacksonVersion = '2.15.3'
 // When build on local, you need to set this value to your local jdk11 directory.
 // Java11 is used to compile and run all the tests.
@@ -58,14 +58,14 @@ task downloadProtoFiles {
         protoDir.mkdirs()
 
         // Download the proto file
-        new URL("https://raw.githubusercontent.com/microsoft/durabletask-protobuf/${ext.branch}/protos/orchestrator_service.proto")
+        new URL("https://raw.githubusercontent.com/dapr/durabletask-protobuf/${ext.branch}/protos/orchestrator_service.proto")
             .withInputStream { i -> 
                 new File(protoDir, 'orchestrator_service.proto').withOutputStream { it << i }
             }
 
         // Get and save the commit hash
         def commitHashFile = new File("${rootProject.projectDir}/internal/durabletask-protobuf/PROTO_SOURCE_COMMIT_HASH")
-        def commitApiUrl = new URL("https://api.github.com/repos/microsoft/durabletask-protobuf/commits?path=protos/orchestrator_service.proto&sha=${ext.branch}&per_page=1")
+        def commitApiUrl = new URL("https://api.github.com/repos/dapr/durabletask-protobuf/commits?path=protos/orchestrator_service.proto&sha=${ext.branch}&per_page=1")
         def connection = commitApiUrl.openConnection()
         connection.setRequestProperty('Accept', 'application/vnd.github.v3+json')
         def commitHash = new groovy.json.JsonSlurper().parse(connection.inputStream)[0].sha
@@ -74,7 +74,9 @@ task downloadProtoFiles {
 }
 
 protobuf {
-    protoc { artifact = "com.google.protobuf:protoc:${protocVersion}" }
+    protoc { 
+        artifact = "com.google.protobuf:protoc:${protocVersion}"
+    }
     plugins {
         grpc { artifact = "io.grpc:protoc-gen-grpc-java:${grpcVersion}" }
     }
@@ -136,7 +138,7 @@ publishing {
             pom {
                 name = 'Durable Task Client SDK for Java'
                 description = 'This package contains classes and interfaces for building Durable Task orchestrations in Java.'
-                url = "https://github.com/microsoft/durabletask-java/tree/main/client"
+                url = "https://github.com/dapr/durabletask-java/tree/main/client"
                 licenses {
                     license {
                         name = "MIT License"
@@ -146,14 +148,14 @@ publishing {
                 }
                 developers {
                     developer {
-                        id = "Microsoft"
-                        name = "Microsoft Corporation"
+                        id = "Dapr"
+                        name = "Dapr"
                     }
                 }
                 scm {
-                    connection = "scm:git:https://github.com/microsoft/durabletask-java"
-                    developerConnection = "scm:git:git@github.com:microsoft/durabletask-java"
-                    url = "https://github.com/microsoft/durabletask-java/tree/main/client"
+                    connection = "scm:git:https://github.com/dapr/durabletask-java"
+                    developerConnection = "scm:git:git@github.com:dapr/durabletask-java"
+                    url = "https://github.com/dapr/durabletask-java/tree/main/client"
                 }
                 // use below script to include compile-only dependencies when generated pom file.
                 // This is pain point when we onboard API docs as the missing compile-only dependencies crash the
@@ -174,8 +176,11 @@ publishing {
 }
 
 signing {
-   required = !project.hasProperty("skipSigning")
-   sign publishing.publications.mavenJava
+    sign publishing.publications.mavenJava
+    useInMemoryPgpKeys(
+            findProperty("GPG_KEY"),
+            findProperty("GPG_PWD")
+    )
 }
 
 java {
diff --git a/client/spotbugs-exclude.xml b/client/spotbugs-exclude.xml
index d3dbb24a..1b746d5b 100644
--- a/client/spotbugs-exclude.xml
+++ b/client/spotbugs-exclude.xml
@@ -2,7 +2,7 @@
 <FindBugsFilter>
     <!-- Exclude generated protobuf code -->
     <Match>
-        <Package name="com.microsoft.durabletask.protobuf"/>
+        <Package name="io.dapr.durabletask.protobuf"/>
     </Match>
     
     <!-- Exclude test classes -->
diff --git a/client/src/main/java/com/microsoft/durabletask/CompositeTaskFailedException.java b/client/src/main/java/io/dapr/durabletask/CompositeTaskFailedException.java
similarity index 98%
rename from client/src/main/java/com/microsoft/durabletask/CompositeTaskFailedException.java
rename to client/src/main/java/io/dapr/durabletask/CompositeTaskFailedException.java
index d765f52c..194c3328 100644
--- a/client/src/main/java/com/microsoft/durabletask/CompositeTaskFailedException.java
+++ b/client/src/main/java/io/dapr/durabletask/CompositeTaskFailedException.java
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.microsoft.durabletask;
+package io.dapr.durabletask;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/client/src/main/java/com/microsoft/durabletask/DataConverter.java b/client/src/main/java/io/dapr/durabletask/DataConverter.java
similarity index 98%
rename from client/src/main/java/com/microsoft/durabletask/DataConverter.java
rename to client/src/main/java/io/dapr/durabletask/DataConverter.java
index 2a362317..2bdcbf40 100644
--- a/client/src/main/java/com/microsoft/durabletask/DataConverter.java
+++ b/client/src/main/java/io/dapr/durabletask/DataConverter.java
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.microsoft.durabletask;
+package io.dapr.durabletask;
 
 import com.google.protobuf.Timestamp;
 
diff --git a/client/src/main/java/com/microsoft/durabletask/DurableTaskClient.java b/client/src/main/java/io/dapr/durabletask/DurableTaskClient.java
similarity index 99%
rename from client/src/main/java/com/microsoft/durabletask/DurableTaskClient.java
rename to client/src/main/java/io/dapr/durabletask/DurableTaskClient.java
index 4590277f..3136d80e 100644
--- a/client/src/main/java/com/microsoft/durabletask/DurableTaskClient.java
+++ b/client/src/main/java/io/dapr/durabletask/DurableTaskClient.java
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.microsoft.durabletask;
+package io.dapr.durabletask;
 
 import javax.annotation.Nullable;
 import java.time.Duration;
diff --git a/client/src/main/java/com/microsoft/durabletask/DurableTaskGrpcClient.java b/client/src/main/java/io/dapr/durabletask/DurableTaskGrpcClient.java
similarity index 98%
rename from client/src/main/java/com/microsoft/durabletask/DurableTaskGrpcClient.java
rename to client/src/main/java/io/dapr/durabletask/DurableTaskGrpcClient.java
index 11152ef6..c058563a 100644
--- a/client/src/main/java/com/microsoft/durabletask/DurableTaskGrpcClient.java
+++ b/client/src/main/java/io/dapr/durabletask/DurableTaskGrpcClient.java
@@ -1,12 +1,12 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.microsoft.durabletask;
+package io.dapr.durabletask;
 
 import com.google.protobuf.StringValue;
 import com.google.protobuf.Timestamp;
-import com.microsoft.durabletask.implementation.protobuf.OrchestratorService.*;
-import com.microsoft.durabletask.implementation.protobuf.TaskHubSidecarServiceGrpc;
-import com.microsoft.durabletask.implementation.protobuf.TaskHubSidecarServiceGrpc.*;
+import io.dapr.durabletask.implementation.protobuf.OrchestratorService.*;
+import io.dapr.durabletask.implementation.protobuf.TaskHubSidecarServiceGrpc;
+import io.dapr.durabletask.implementation.protobuf.TaskHubSidecarServiceGrpc.*;
 
 import io.grpc.*;
 
diff --git a/client/src/main/java/com/microsoft/durabletask/DurableTaskGrpcClientBuilder.java b/client/src/main/java/io/dapr/durabletask/DurableTaskGrpcClientBuilder.java
similarity index 95%
rename from client/src/main/java/com/microsoft/durabletask/DurableTaskGrpcClientBuilder.java
rename to client/src/main/java/io/dapr/durabletask/DurableTaskGrpcClientBuilder.java
index 4ccd8b02..050758fc 100644
--- a/client/src/main/java/com/microsoft/durabletask/DurableTaskGrpcClientBuilder.java
+++ b/client/src/main/java/io/dapr/durabletask/DurableTaskGrpcClientBuilder.java
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.microsoft.durabletask;
+package io.dapr.durabletask;
 
 import io.grpc.Channel;
 
diff --git a/client/src/main/java/com/microsoft/durabletask/DurableTaskGrpcWorker.java b/client/src/main/java/io/dapr/durabletask/DurableTaskGrpcWorker.java
similarity index 97%
rename from client/src/main/java/com/microsoft/durabletask/DurableTaskGrpcWorker.java
rename to client/src/main/java/io/dapr/durabletask/DurableTaskGrpcWorker.java
index 5ba7907f..616fac5a 100644
--- a/client/src/main/java/com/microsoft/durabletask/DurableTaskGrpcWorker.java
+++ b/client/src/main/java/io/dapr/durabletask/DurableTaskGrpcWorker.java
@@ -1,13 +1,13 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.microsoft.durabletask;
+package io.dapr.durabletask;
 
 import com.google.protobuf.StringValue;
 
-import com.microsoft.durabletask.implementation.protobuf.TaskHubSidecarServiceGrpc;
-import com.microsoft.durabletask.implementation.protobuf.OrchestratorService.*;
-import com.microsoft.durabletask.implementation.protobuf.OrchestratorService.WorkItem.RequestCase;
-import com.microsoft.durabletask.implementation.protobuf.TaskHubSidecarServiceGrpc.*;
+import io.dapr.durabletask.implementation.protobuf.TaskHubSidecarServiceGrpc;
+import io.dapr.durabletask.implementation.protobuf.OrchestratorService.*;
+import io.dapr.durabletask.implementation.protobuf.OrchestratorService.WorkItem.RequestCase;
+import io.dapr.durabletask.implementation.protobuf.TaskHubSidecarServiceGrpc.*;
 
 import io.grpc.*;
 
diff --git a/client/src/main/java/com/microsoft/durabletask/DurableTaskGrpcWorkerBuilder.java b/client/src/main/java/io/dapr/durabletask/DurableTaskGrpcWorkerBuilder.java
similarity index 96%
rename from client/src/main/java/com/microsoft/durabletask/DurableTaskGrpcWorkerBuilder.java
rename to client/src/main/java/io/dapr/durabletask/DurableTaskGrpcWorkerBuilder.java
index 111071c3..8ef0df8d 100644
--- a/client/src/main/java/com/microsoft/durabletask/DurableTaskGrpcWorkerBuilder.java
+++ b/client/src/main/java/io/dapr/durabletask/DurableTaskGrpcWorkerBuilder.java
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.microsoft.durabletask;
+package io.dapr.durabletask;
 
 import io.grpc.Channel;
 
diff --git a/client/src/main/java/com/microsoft/durabletask/FailureDetails.java b/client/src/main/java/io/dapr/durabletask/FailureDetails.java
similarity index 97%
rename from client/src/main/java/com/microsoft/durabletask/FailureDetails.java
rename to client/src/main/java/io/dapr/durabletask/FailureDetails.java
index ad3f1ba1..f1c90370 100644
--- a/client/src/main/java/com/microsoft/durabletask/FailureDetails.java
+++ b/client/src/main/java/io/dapr/durabletask/FailureDetails.java
@@ -1,9 +1,9 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.microsoft.durabletask;
+package io.dapr.durabletask;
 
 import com.google.protobuf.StringValue;
-import com.microsoft.durabletask.implementation.protobuf.OrchestratorService.TaskFailureDetails;
+import io.dapr.durabletask.implementation.protobuf.OrchestratorService.TaskFailureDetails;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
diff --git a/client/src/main/java/com/microsoft/durabletask/Helpers.java b/client/src/main/java/io/dapr/durabletask/Helpers.java
similarity index 98%
rename from client/src/main/java/com/microsoft/durabletask/Helpers.java
rename to client/src/main/java/io/dapr/durabletask/Helpers.java
index deed6e02..a15bcf65 100644
--- a/client/src/main/java/com/microsoft/durabletask/Helpers.java
+++ b/client/src/main/java/io/dapr/durabletask/Helpers.java
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.microsoft.durabletask;
+package io.dapr.durabletask;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
diff --git a/client/src/main/java/com/microsoft/durabletask/JacksonDataConverter.java b/client/src/main/java/io/dapr/durabletask/JacksonDataConverter.java
similarity index 97%
rename from client/src/main/java/com/microsoft/durabletask/JacksonDataConverter.java
rename to client/src/main/java/io/dapr/durabletask/JacksonDataConverter.java
index 1b8009c1..9661b1bd 100644
--- a/client/src/main/java/com/microsoft/durabletask/JacksonDataConverter.java
+++ b/client/src/main/java/io/dapr/durabletask/JacksonDataConverter.java
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.microsoft.durabletask;
+package io.dapr.durabletask;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/client/src/main/java/com/microsoft/durabletask/NewOrchestrationInstanceOptions.java b/client/src/main/java/io/dapr/durabletask/NewOrchestrationInstanceOptions.java
similarity index 98%
rename from client/src/main/java/com/microsoft/durabletask/NewOrchestrationInstanceOptions.java
rename to client/src/main/java/io/dapr/durabletask/NewOrchestrationInstanceOptions.java
index 01a466fa..53c97396 100644
--- a/client/src/main/java/com/microsoft/durabletask/NewOrchestrationInstanceOptions.java
+++ b/client/src/main/java/io/dapr/durabletask/NewOrchestrationInstanceOptions.java
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.microsoft.durabletask;
+package io.dapr.durabletask;
 
 import java.time.Instant;
 
diff --git a/client/src/main/java/com/microsoft/durabletask/NonDeterministicOrchestratorException.java b/client/src/main/java/io/dapr/durabletask/NonDeterministicOrchestratorException.java
similarity index 88%
rename from client/src/main/java/com/microsoft/durabletask/NonDeterministicOrchestratorException.java
rename to client/src/main/java/io/dapr/durabletask/NonDeterministicOrchestratorException.java
index 32cf4da3..577912fc 100644
--- a/client/src/main/java/com/microsoft/durabletask/NonDeterministicOrchestratorException.java
+++ b/client/src/main/java/io/dapr/durabletask/NonDeterministicOrchestratorException.java
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.microsoft.durabletask;
+package io.dapr.durabletask;
 
 final class NonDeterministicOrchestratorException extends RuntimeException {
     public NonDeterministicOrchestratorException(String message) {
diff --git a/client/src/main/java/com/microsoft/durabletask/OrchestrationMetadata.java b/client/src/main/java/io/dapr/durabletask/OrchestrationMetadata.java
similarity index 97%
rename from client/src/main/java/com/microsoft/durabletask/OrchestrationMetadata.java
rename to client/src/main/java/io/dapr/durabletask/OrchestrationMetadata.java
index ba632c6a..73a77e40 100644
--- a/client/src/main/java/com/microsoft/durabletask/OrchestrationMetadata.java
+++ b/client/src/main/java/io/dapr/durabletask/OrchestrationMetadata.java
@@ -1,13 +1,13 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.microsoft.durabletask;
+package io.dapr.durabletask;
 
-import com.microsoft.durabletask.implementation.protobuf.OrchestratorService;
-import com.microsoft.durabletask.implementation.protobuf.OrchestratorService.OrchestrationState;
+import io.dapr.durabletask.implementation.protobuf.OrchestratorService;
+import io.dapr.durabletask.implementation.protobuf.OrchestratorService.OrchestrationState;
 
 import java.time.Instant;
 
-import static com.microsoft.durabletask.Helpers.isNullOrEmpty;
+import static io.dapr.durabletask.Helpers.isNullOrEmpty;
 
 /**
  * Represents a snapshot of an orchestration instance's current state, including metadata.
diff --git a/client/src/main/java/com/microsoft/durabletask/OrchestrationRunner.java b/client/src/main/java/io/dapr/durabletask/OrchestrationRunner.java
similarity index 98%
rename from client/src/main/java/com/microsoft/durabletask/OrchestrationRunner.java
rename to client/src/main/java/io/dapr/durabletask/OrchestrationRunner.java
index 13904901..de6530f9 100644
--- a/client/src/main/java/com/microsoft/durabletask/OrchestrationRunner.java
+++ b/client/src/main/java/io/dapr/durabletask/OrchestrationRunner.java
@@ -1,10 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.microsoft.durabletask;
+package io.dapr.durabletask;
 
 import com.google.protobuf.InvalidProtocolBufferException;
 import com.google.protobuf.StringValue;
-import com.microsoft.durabletask.implementation.protobuf.OrchestratorService;
+import io.dapr.durabletask.implementation.protobuf.OrchestratorService;
 
 import java.time.Duration;
 import java.util.Base64;
diff --git a/client/src/main/java/com/microsoft/durabletask/OrchestrationRuntimeStatus.java b/client/src/main/java/io/dapr/durabletask/OrchestrationRuntimeStatus.java
similarity index 92%
rename from client/src/main/java/com/microsoft/durabletask/OrchestrationRuntimeStatus.java
rename to client/src/main/java/io/dapr/durabletask/OrchestrationRuntimeStatus.java
index a205ccc7..cd4a4758 100644
--- a/client/src/main/java/com/microsoft/durabletask/OrchestrationRuntimeStatus.java
+++ b/client/src/main/java/io/dapr/durabletask/OrchestrationRuntimeStatus.java
@@ -1,9 +1,9 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.microsoft.durabletask;
+package io.dapr.durabletask;
 
-import com.microsoft.durabletask.implementation.protobuf.OrchestratorService.*;
-import static com.microsoft.durabletask.implementation.protobuf.OrchestratorService.OrchestrationStatus.*;
+import io.dapr.durabletask.implementation.protobuf.OrchestratorService.*;
+import static io.dapr.durabletask.implementation.protobuf.OrchestratorService.OrchestrationStatus.*;
 
 /**
  * Enum describing the runtime status of the orchestration.
diff --git a/client/src/main/java/com/microsoft/durabletask/OrchestrationStatusQuery.java b/client/src/main/java/io/dapr/durabletask/OrchestrationStatusQuery.java
similarity index 96%
rename from client/src/main/java/com/microsoft/durabletask/OrchestrationStatusQuery.java
rename to client/src/main/java/io/dapr/durabletask/OrchestrationStatusQuery.java
index 6e05cd0f..82a766c2 100644
--- a/client/src/main/java/com/microsoft/durabletask/OrchestrationStatusQuery.java
+++ b/client/src/main/java/io/dapr/durabletask/OrchestrationStatusQuery.java
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.microsoft.durabletask;
+package io.dapr.durabletask;
 
 import javax.annotation.Nullable;
 import java.time.Instant;
diff --git a/client/src/main/java/com/microsoft/durabletask/OrchestrationStatusQueryResult.java b/client/src/main/java/io/dapr/durabletask/OrchestrationStatusQueryResult.java
similarity index 95%
rename from client/src/main/java/com/microsoft/durabletask/OrchestrationStatusQueryResult.java
rename to client/src/main/java/io/dapr/durabletask/OrchestrationStatusQueryResult.java
index 9ecfea5b..87d0b194 100644
--- a/client/src/main/java/com/microsoft/durabletask/OrchestrationStatusQueryResult.java
+++ b/client/src/main/java/io/dapr/durabletask/OrchestrationStatusQueryResult.java
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.microsoft.durabletask;
+package io.dapr.durabletask;
 
 import javax.annotation.Nullable;
 import java.util.List;
diff --git a/client/src/main/java/com/microsoft/durabletask/OrchestratorFunction.java b/client/src/main/java/io/dapr/durabletask/OrchestratorFunction.java
similarity index 96%
rename from client/src/main/java/com/microsoft/durabletask/OrchestratorFunction.java
rename to client/src/main/java/io/dapr/durabletask/OrchestratorFunction.java
index e5ffa316..505b7c8b 100644
--- a/client/src/main/java/com/microsoft/durabletask/OrchestratorFunction.java
+++ b/client/src/main/java/io/dapr/durabletask/OrchestratorFunction.java
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.microsoft.durabletask;
+package io.dapr.durabletask;
 
 /**
  * Functional interface for inline orchestrator functions.
diff --git a/client/src/main/java/com/microsoft/durabletask/PurgeInstanceCriteria.java b/client/src/main/java/io/dapr/durabletask/PurgeInstanceCriteria.java
similarity index 99%
rename from client/src/main/java/com/microsoft/durabletask/PurgeInstanceCriteria.java
rename to client/src/main/java/io/dapr/durabletask/PurgeInstanceCriteria.java
index 8a5f2695..a18f0c06 100644
--- a/client/src/main/java/com/microsoft/durabletask/PurgeInstanceCriteria.java
+++ b/client/src/main/java/io/dapr/durabletask/PurgeInstanceCriteria.java
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.microsoft.durabletask;
+package io.dapr.durabletask;
 
 import javax.annotation.Nullable;
 import java.time.Duration;
diff --git a/client/src/main/java/com/microsoft/durabletask/PurgeResult.java b/client/src/main/java/io/dapr/durabletask/PurgeResult.java
similarity index 95%
rename from client/src/main/java/com/microsoft/durabletask/PurgeResult.java
rename to client/src/main/java/io/dapr/durabletask/PurgeResult.java
index 3685a1f9..fa466ef7 100644
--- a/client/src/main/java/com/microsoft/durabletask/PurgeResult.java
+++ b/client/src/main/java/io/dapr/durabletask/PurgeResult.java
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.microsoft.durabletask;
+package io.dapr.durabletask;
 
 /**
  * Class representing the results of an orchestration state purge operation.
diff --git a/client/src/main/java/com/microsoft/durabletask/RetryContext.java b/client/src/main/java/io/dapr/durabletask/RetryContext.java
similarity index 98%
rename from client/src/main/java/com/microsoft/durabletask/RetryContext.java
rename to client/src/main/java/io/dapr/durabletask/RetryContext.java
index 5b4011e9..700bc8e2 100644
--- a/client/src/main/java/com/microsoft/durabletask/RetryContext.java
+++ b/client/src/main/java/io/dapr/durabletask/RetryContext.java
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.microsoft.durabletask;
+package io.dapr.durabletask;
 
 import java.time.Duration;
 
diff --git a/client/src/main/java/com/microsoft/durabletask/RetryHandler.java b/client/src/main/java/io/dapr/durabletask/RetryHandler.java
similarity index 95%
rename from client/src/main/java/com/microsoft/durabletask/RetryHandler.java
rename to client/src/main/java/io/dapr/durabletask/RetryHandler.java
index ca785845..cb7c6f96 100644
--- a/client/src/main/java/com/microsoft/durabletask/RetryHandler.java
+++ b/client/src/main/java/io/dapr/durabletask/RetryHandler.java
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.microsoft.durabletask;
+package io.dapr.durabletask;
 
 /**
  * Functional interface for implementing custom task retry handlers.
diff --git a/client/src/main/java/com/microsoft/durabletask/RetryPolicy.java b/client/src/main/java/io/dapr/durabletask/RetryPolicy.java
similarity index 99%
rename from client/src/main/java/com/microsoft/durabletask/RetryPolicy.java
rename to client/src/main/java/io/dapr/durabletask/RetryPolicy.java
index 5ab764c9..6f1bc4b2 100644
--- a/client/src/main/java/com/microsoft/durabletask/RetryPolicy.java
+++ b/client/src/main/java/io/dapr/durabletask/RetryPolicy.java
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.microsoft.durabletask;
+package io.dapr.durabletask;
 
 import javax.annotation.Nullable;
 import java.time.Duration;
diff --git a/client/src/main/java/com/microsoft/durabletask/Task.java b/client/src/main/java/io/dapr/durabletask/Task.java
similarity index 96%
rename from client/src/main/java/com/microsoft/durabletask/Task.java
rename to client/src/main/java/io/dapr/durabletask/Task.java
index 296e2f04..4d57866a 100644
--- a/client/src/main/java/com/microsoft/durabletask/Task.java
+++ b/client/src/main/java/io/dapr/durabletask/Task.java
@@ -1,8 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.microsoft.durabletask;
+package io.dapr.durabletask;
 
-import com.microsoft.durabletask.interruption.OrchestratorBlockedException;
+import io.dapr.durabletask.interruption.OrchestratorBlockedException;
 
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Consumer;
diff --git a/client/src/main/java/com/microsoft/durabletask/TaskActivity.java b/client/src/main/java/io/dapr/durabletask/TaskActivity.java
similarity index 98%
rename from client/src/main/java/com/microsoft/durabletask/TaskActivity.java
rename to client/src/main/java/io/dapr/durabletask/TaskActivity.java
index bb460cd9..bf2664a1 100644
--- a/client/src/main/java/com/microsoft/durabletask/TaskActivity.java
+++ b/client/src/main/java/io/dapr/durabletask/TaskActivity.java
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.microsoft.durabletask;
+package io.dapr.durabletask;
 
 /**
  * Common interface for task activity implementations.
diff --git a/client/src/main/java/com/microsoft/durabletask/TaskActivityContext.java b/client/src/main/java/io/dapr/durabletask/TaskActivityContext.java
similarity index 95%
rename from client/src/main/java/com/microsoft/durabletask/TaskActivityContext.java
rename to client/src/main/java/io/dapr/durabletask/TaskActivityContext.java
index c366acf4..5db3ba5e 100644
--- a/client/src/main/java/com/microsoft/durabletask/TaskActivityContext.java
+++ b/client/src/main/java/io/dapr/durabletask/TaskActivityContext.java
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.microsoft.durabletask;
+package io.dapr.durabletask;
 
 /**
  * Interface that provides {@link TaskActivity} implementations with activity context, such as an activity's name and
diff --git a/client/src/main/java/com/microsoft/durabletask/TaskActivityExecutor.java b/client/src/main/java/io/dapr/durabletask/TaskActivityExecutor.java
similarity index 98%
rename from client/src/main/java/com/microsoft/durabletask/TaskActivityExecutor.java
rename to client/src/main/java/io/dapr/durabletask/TaskActivityExecutor.java
index d91560bf..1d394545 100644
--- a/client/src/main/java/com/microsoft/durabletask/TaskActivityExecutor.java
+++ b/client/src/main/java/io/dapr/durabletask/TaskActivityExecutor.java
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.microsoft.durabletask;
+package io.dapr.durabletask;
 
 import java.util.HashMap;
 import java.util.logging.Logger;
diff --git a/client/src/main/java/com/microsoft/durabletask/TaskActivityFactory.java b/client/src/main/java/io/dapr/durabletask/TaskActivityFactory.java
similarity index 93%
rename from client/src/main/java/com/microsoft/durabletask/TaskActivityFactory.java
rename to client/src/main/java/io/dapr/durabletask/TaskActivityFactory.java
index 6df29031..abc35fbc 100644
--- a/client/src/main/java/com/microsoft/durabletask/TaskActivityFactory.java
+++ b/client/src/main/java/io/dapr/durabletask/TaskActivityFactory.java
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.microsoft.durabletask;
+package io.dapr.durabletask;
 
 /**
  * Factory interface for producing {@link TaskActivity} implementations.
diff --git a/client/src/main/java/com/microsoft/durabletask/TaskCanceledException.java b/client/src/main/java/io/dapr/durabletask/TaskCanceledException.java
similarity index 94%
rename from client/src/main/java/com/microsoft/durabletask/TaskCanceledException.java
rename to client/src/main/java/io/dapr/durabletask/TaskCanceledException.java
index 74e09371..7c6276cf 100644
--- a/client/src/main/java/com/microsoft/durabletask/TaskCanceledException.java
+++ b/client/src/main/java/io/dapr/durabletask/TaskCanceledException.java
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.microsoft.durabletask;
+package io.dapr.durabletask;
 
 // TODO: This should inherit from Exception, not TaskFailedException
 /**
diff --git a/client/src/main/java/com/microsoft/durabletask/TaskFailedException.java b/client/src/main/java/io/dapr/durabletask/TaskFailedException.java
similarity index 98%
rename from client/src/main/java/com/microsoft/durabletask/TaskFailedException.java
rename to client/src/main/java/io/dapr/durabletask/TaskFailedException.java
index d8b10eb2..07e98f40 100644
--- a/client/src/main/java/com/microsoft/durabletask/TaskFailedException.java
+++ b/client/src/main/java/io/dapr/durabletask/TaskFailedException.java
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.microsoft.durabletask;
+package io.dapr.durabletask;
 
 /**
  * Exception that gets thrown when awaiting a {@link Task} for an activity or sub-orchestration that fails with an
diff --git a/client/src/main/java/com/microsoft/durabletask/TaskOptions.java b/client/src/main/java/io/dapr/durabletask/TaskOptions.java
similarity index 97%
rename from client/src/main/java/com/microsoft/durabletask/TaskOptions.java
rename to client/src/main/java/io/dapr/durabletask/TaskOptions.java
index a4b14a83..cafb669c 100644
--- a/client/src/main/java/com/microsoft/durabletask/TaskOptions.java
+++ b/client/src/main/java/io/dapr/durabletask/TaskOptions.java
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.microsoft.durabletask;
+package io.dapr.durabletask;
 
 /**
  * Options that can be used to control the behavior of orchestrator and activity task execution.
diff --git a/client/src/main/java/com/microsoft/durabletask/TaskOrchestration.java b/client/src/main/java/io/dapr/durabletask/TaskOrchestration.java
similarity index 99%
rename from client/src/main/java/com/microsoft/durabletask/TaskOrchestration.java
rename to client/src/main/java/io/dapr/durabletask/TaskOrchestration.java
index fb5c3819..09945ddb 100644
--- a/client/src/main/java/com/microsoft/durabletask/TaskOrchestration.java
+++ b/client/src/main/java/io/dapr/durabletask/TaskOrchestration.java
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.microsoft.durabletask;
+package io.dapr.durabletask;
 
 /**
  * Common interface for task orchestrator implementations.
diff --git a/client/src/main/java/com/microsoft/durabletask/TaskOrchestrationContext.java b/client/src/main/java/io/dapr/durabletask/TaskOrchestrationContext.java
similarity index 99%
rename from client/src/main/java/com/microsoft/durabletask/TaskOrchestrationContext.java
rename to client/src/main/java/io/dapr/durabletask/TaskOrchestrationContext.java
index 88adf875..921522ee 100644
--- a/client/src/main/java/com/microsoft/durabletask/TaskOrchestrationContext.java
+++ b/client/src/main/java/io/dapr/durabletask/TaskOrchestrationContext.java
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.microsoft.durabletask;
+package io.dapr.durabletask;
 
 import javax.annotation.Nullable;
 import java.time.Duration;
@@ -72,7 +72,7 @@ public interface TaskOrchestrationContext {
 
     // TODO: Update the description of allOf to be more specific about the exception behavior.
 
-    //       https://github.com/microsoft/durabletask-java/issues/54
+    //       https://github.io.dapr.durabletask-java/issues/54
     /**
      * Returns a new {@code Task} that is completed when all the given {@code Task}s complete. If any of the given
      * {@code Task}s complete with an exception, the returned {@code Task} will also complete with an {@link CompositeTaskFailedException}
diff --git a/client/src/main/java/com/microsoft/durabletask/TaskOrchestrationExecutor.java b/client/src/main/java/io/dapr/durabletask/TaskOrchestrationExecutor.java
similarity index 99%
rename from client/src/main/java/com/microsoft/durabletask/TaskOrchestrationExecutor.java
rename to client/src/main/java/io/dapr/durabletask/TaskOrchestrationExecutor.java
index 4b55bd41..388de14f 100644
--- a/client/src/main/java/com/microsoft/durabletask/TaskOrchestrationExecutor.java
+++ b/client/src/main/java/io/dapr/durabletask/TaskOrchestrationExecutor.java
@@ -1,14 +1,14 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.microsoft.durabletask;
+package io.dapr.durabletask;
 
 import com.google.protobuf.StringValue;
 import com.google.protobuf.Timestamp;
-import com.microsoft.durabletask.interruption.ContinueAsNewInterruption;
-import com.microsoft.durabletask.interruption.OrchestratorBlockedException;
-import com.microsoft.durabletask.implementation.protobuf.OrchestratorService.*;
-import com.microsoft.durabletask.implementation.protobuf.OrchestratorService.ScheduleTaskAction.Builder;
-import com.microsoft.durabletask.util.UUIDGenerator;
+import io.dapr.durabletask.interruption.ContinueAsNewInterruption;
+import io.dapr.durabletask.interruption.OrchestratorBlockedException;
+import io.dapr.durabletask.implementation.protobuf.OrchestratorService.*;
+import io.dapr.durabletask.implementation.protobuf.OrchestratorService.ScheduleTaskAction.Builder;
+import io.dapr.durabletask.util.UUIDGenerator;
 
 import javax.annotation.Nullable;
 import java.time.Duration;
diff --git a/client/src/main/java/com/microsoft/durabletask/TaskOrchestrationFactory.java b/client/src/main/java/io/dapr/durabletask/TaskOrchestrationFactory.java
similarity index 93%
rename from client/src/main/java/com/microsoft/durabletask/TaskOrchestrationFactory.java
rename to client/src/main/java/io/dapr/durabletask/TaskOrchestrationFactory.java
index 736c3d4f..7305936f 100644
--- a/client/src/main/java/com/microsoft/durabletask/TaskOrchestrationFactory.java
+++ b/client/src/main/java/io/dapr/durabletask/TaskOrchestrationFactory.java
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.microsoft.durabletask;
+package io.dapr.durabletask;
 
 /**
  * Factory interface for producing {@link TaskOrchestration} implementations.
diff --git a/client/src/main/java/com/microsoft/durabletask/TaskOrchestratorResult.java b/client/src/main/java/io/dapr/durabletask/TaskOrchestratorResult.java
similarity index 85%
rename from client/src/main/java/com/microsoft/durabletask/TaskOrchestratorResult.java
rename to client/src/main/java/io/dapr/durabletask/TaskOrchestratorResult.java
index 6f909577..6408dfe0 100644
--- a/client/src/main/java/com/microsoft/durabletask/TaskOrchestratorResult.java
+++ b/client/src/main/java/io/dapr/durabletask/TaskOrchestratorResult.java
@@ -1,6 +1,6 @@
-package com.microsoft.durabletask;
+package io.dapr.durabletask;
 
-import com.microsoft.durabletask.implementation.protobuf.OrchestratorService;
+import io.dapr.durabletask.implementation.protobuf.OrchestratorService;
 
 import java.util.Collection;
 import java.util.Collections;
diff --git a/client/src/main/java/com/microsoft/durabletask/interruption/ContinueAsNewInterruption.java b/client/src/main/java/io/dapr/durabletask/interruption/ContinueAsNewInterruption.java
similarity index 85%
rename from client/src/main/java/com/microsoft/durabletask/interruption/ContinueAsNewInterruption.java
rename to client/src/main/java/io/dapr/durabletask/interruption/ContinueAsNewInterruption.java
index 335038a7..474f6075 100644
--- a/client/src/main/java/com/microsoft/durabletask/interruption/ContinueAsNewInterruption.java
+++ b/client/src/main/java/io/dapr/durabletask/interruption/ContinueAsNewInterruption.java
@@ -1,6 +1,6 @@
-package com.microsoft.durabletask.interruption;
+package io.dapr.durabletask.interruption;
 
-import com.microsoft.durabletask.TaskOrchestrationContext;
+import io.dapr.durabletask.TaskOrchestrationContext;
 
 /**
  * Control flow {@code Throwable} class for orchestrator when invoke {@link TaskOrchestrationContext#continueAsNew}.
diff --git a/client/src/main/java/com/microsoft/durabletask/interruption/OrchestratorBlockedException.java b/client/src/main/java/io/dapr/durabletask/interruption/OrchestratorBlockedException.java
similarity index 90%
rename from client/src/main/java/com/microsoft/durabletask/interruption/OrchestratorBlockedException.java
rename to client/src/main/java/io/dapr/durabletask/interruption/OrchestratorBlockedException.java
index 48b63a48..a9b1f8ac 100644
--- a/client/src/main/java/com/microsoft/durabletask/interruption/OrchestratorBlockedException.java
+++ b/client/src/main/java/io/dapr/durabletask/interruption/OrchestratorBlockedException.java
@@ -1,8 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.microsoft.durabletask.interruption;
+package io.dapr.durabletask.interruption;
 
-import com.microsoft.durabletask.Task;
+import io.dapr.durabletask.Task;
 
 /**
  * Control flow {@code Throwable} class for orchestrator functions. This {@code Throwable} must never be caught by user
diff --git a/client/src/main/java/com/microsoft/durabletask/util/UUIDGenerator.java b/client/src/main/java/io/dapr/durabletask/util/UUIDGenerator.java
similarity index 96%
rename from client/src/main/java/com/microsoft/durabletask/util/UUIDGenerator.java
rename to client/src/main/java/io/dapr/durabletask/util/UUIDGenerator.java
index af93a5c9..d6fab950 100644
--- a/client/src/main/java/com/microsoft/durabletask/util/UUIDGenerator.java
+++ b/client/src/main/java/io/dapr/durabletask/util/UUIDGenerator.java
@@ -1,4 +1,4 @@
-package com.microsoft.durabletask.util;
+package io.dapr.durabletask.util;
 
 import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
diff --git a/client/src/test/java/com/microsoft/durabletask/ErrorHandlingIntegrationTests.java b/client/src/test/java/io/dapr/durabletask/ErrorHandlingIntegrationTests.java
similarity index 97%
rename from client/src/test/java/com/microsoft/durabletask/ErrorHandlingIntegrationTests.java
rename to client/src/test/java/io/dapr/durabletask/ErrorHandlingIntegrationTests.java
index e2d4afa3..c779f816 100644
--- a/client/src/test/java/com/microsoft/durabletask/ErrorHandlingIntegrationTests.java
+++ b/client/src/test/java/io/dapr/durabletask/ErrorHandlingIntegrationTests.java
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-package com.microsoft.durabletask;
+package io.dapr.durabletask;
 
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
@@ -104,7 +104,7 @@ void activityException(boolean handleException) throws TimeoutException {
                         activityName,
                         errorMessage);
                 assertEquals(expectedMessage, details.getErrorMessage());
-                assertEquals("com.microsoft.durabletask.TaskFailedException", details.getErrorType());
+                assertEquals("io.dapr.durabletask.TaskFailedException", details.getErrorType());
                 assertNotNull(details.getStackTrace());
                 // CONSIDER: Additional validation of getErrorDetails?
             }
@@ -185,7 +185,7 @@ void subOrchestrationException(boolean handleException) throws TimeoutException
                         subOrchestratorName,
                         errorMessage);
                 assertEquals(expectedMessage, details.getErrorMessage());
-                assertEquals("com.microsoft.durabletask.TaskFailedException", details.getErrorType());
+                assertEquals("io.dapr.durabletask.TaskFailedException", details.getErrorType());
                 assertNotNull(details.getStackTrace());
                 // CONSIDER: Additional validation of getStackTrace?
             }
@@ -312,7 +312,7 @@ private FailureDetails retryOnFailuresCoreTest(
                     expectedTaskId,
                     expectedExceptionMessage);
             assertEquals(expectedMessage, details.getErrorMessage());
-            assertEquals("com.microsoft.durabletask.TaskFailedException", details.getErrorType());
+            assertEquals("io.dapr.durabletask.TaskFailedException", details.getErrorType());
             assertNotNull(details.getStackTrace());
             return details;
         }
diff --git a/client/src/test/java/com/microsoft/durabletask/IntegrationTestBase.java b/client/src/test/java/io/dapr/durabletask/IntegrationTestBase.java
similarity index 98%
rename from client/src/test/java/com/microsoft/durabletask/IntegrationTestBase.java
rename to client/src/test/java/io/dapr/durabletask/IntegrationTestBase.java
index ce64f215..4ca2d569 100644
--- a/client/src/test/java/com/microsoft/durabletask/IntegrationTestBase.java
+++ b/client/src/test/java/io/dapr/durabletask/IntegrationTestBase.java
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-package com.microsoft.durabletask;
+package io.dapr.durabletask;
 
 import org.junit.jupiter.api.AfterEach;
 
diff --git a/client/src/test/java/com/microsoft/durabletask/IntegrationTests.java b/client/src/test/java/io/dapr/durabletask/IntegrationTests.java
similarity index 99%
rename from client/src/test/java/com/microsoft/durabletask/IntegrationTests.java
rename to client/src/test/java/io/dapr/durabletask/IntegrationTests.java
index 467151d6..c402b4bd 100644
--- a/client/src/test/java/com/microsoft/durabletask/IntegrationTests.java
+++ b/client/src/test/java/io/dapr/durabletask/IntegrationTests.java
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.microsoft.durabletask;
+package io.dapr.durabletask;
 
 import java.io.IOException;
 import java.time.*;
@@ -1268,7 +1268,7 @@ void activityFanOutWithException() throws TimeoutException {
             FailureDetails details = instance.getFailureDetails();
             assertNotNull(details);
             assertEquals(exceptionMessage, details.getErrorMessage());
-            assertEquals("com.microsoft.durabletask.CompositeTaskFailedException", details.getErrorType());
+            assertEquals("io.dapr.durabletask.CompositeTaskFailedException", details.getErrorType());
             assertNotNull(details.getStackTrace());
         }
     }
diff --git a/client/src/test/java/com/microsoft/durabletask/RetryingParameterizedTest.java b/client/src/test/java/io/dapr/durabletask/RetryingParameterizedTest.java
similarity index 95%
rename from client/src/test/java/com/microsoft/durabletask/RetryingParameterizedTest.java
rename to client/src/test/java/io/dapr/durabletask/RetryingParameterizedTest.java
index aeb72ded..50dbd3fe 100644
--- a/client/src/test/java/com/microsoft/durabletask/RetryingParameterizedTest.java
+++ b/client/src/test/java/io/dapr/durabletask/RetryingParameterizedTest.java
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-package com.microsoft.durabletask;
+package io.dapr.durabletask;
 
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.params.ParameterizedTest;
diff --git a/client/src/test/java/com/microsoft/durabletask/RetryingTest.java b/client/src/test/java/io/dapr/durabletask/RetryingTest.java
similarity index 94%
rename from client/src/test/java/com/microsoft/durabletask/RetryingTest.java
rename to client/src/test/java/io/dapr/durabletask/RetryingTest.java
index da6a3ae5..b71f0b51 100644
--- a/client/src/test/java/com/microsoft/durabletask/RetryingTest.java
+++ b/client/src/test/java/io/dapr/durabletask/RetryingTest.java
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-package com.microsoft.durabletask;
+package io.dapr.durabletask;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
diff --git a/client/src/test/java/com/microsoft/durabletask/TestRetryExtension.java b/client/src/test/java/io/dapr/durabletask/TestRetryExtension.java
similarity index 98%
rename from client/src/test/java/com/microsoft/durabletask/TestRetryExtension.java
rename to client/src/test/java/io/dapr/durabletask/TestRetryExtension.java
index 405e0d3f..b8214e5c 100644
--- a/client/src/test/java/com/microsoft/durabletask/TestRetryExtension.java
+++ b/client/src/test/java/io/dapr/durabletask/TestRetryExtension.java
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-package com.microsoft.durabletask;
+package io.dapr.durabletask;
 
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.api.extension.TestExecutionExceptionHandler;
diff --git a/internal/durabletask-protobuf/PROTO_SOURCE_COMMIT_HASH b/internal/durabletask-protobuf/PROTO_SOURCE_COMMIT_HASH
index 3d3f9e98..a84ead2a 100644
--- a/internal/durabletask-protobuf/PROTO_SOURCE_COMMIT_HASH
+++ b/internal/durabletask-protobuf/PROTO_SOURCE_COMMIT_HASH
@@ -1 +1 @@
-fbe5bb20835678099fc51a44993ed9b045dee5a6
\ No newline at end of file
+cc00765eeb3307f8fdac7da610915d3a0757702b
\ No newline at end of file
diff --git a/internal/durabletask-protobuf/protos/orchestrator_service.proto b/internal/durabletask-protobuf/protos/orchestrator_service.proto
index 88928c3b..90d7f918 100644
--- a/internal/durabletask-protobuf/protos/orchestrator_service.proto
+++ b/internal/durabletask-protobuf/protos/orchestrator_service.proto
@@ -4,14 +4,13 @@
 syntax = "proto3";
 
 option csharp_namespace = "Microsoft.DurableTask.Protobuf";
-option java_package = "com.microsoft.durabletask.implementation.protobuf";
-option go_package = "/internal/protos";
+option java_package = "io.dapr.durabletask.implementation.protobuf";
+option go_package = "/api/protos";
 
 import "google/protobuf/timestamp.proto";
 import "google/protobuf/duration.proto";
 import "google/protobuf/wrappers.proto";
 import "google/protobuf/empty.proto";
-import "google/protobuf/struct.proto";
 
 message OrchestrationInstance {
     string instanceId = 1;
@@ -127,6 +126,7 @@ message SubOrchestrationInstanceFailedEvent {
 
 message TimerCreatedEvent {
     google.protobuf.Timestamp fireAt = 1;
+    optional string name = 2;
 }
 
 message TimerFiredEvent {
@@ -267,6 +267,7 @@ message CreateSubOrchestrationAction {
 
 message CreateTimerAction {
     google.protobuf.Timestamp fireAt = 1;
+    optional string name = 2;
 }
 
 message SendEventAction {
@@ -319,7 +320,6 @@ message OrchestratorRequest {
     repeated HistoryEvent newEvents = 4;
     OrchestratorEntityParameters entityParameters = 5;
     bool requiresHistoryStreaming = 6;
-    map<string, google.protobuf.Value> properties = 7;
 }
 
 message OrchestratorResponse {
@@ -345,11 +345,17 @@ message CreateInstanceRequest {
     TraceContext parentTraceContext = 9;
 }
 
-message OrchestrationIdReusePolicy {
-    repeated OrchestrationStatus replaceableStatus = 1;
-    reserved 2;
+ message OrchestrationIdReusePolicy {
+    repeated OrchestrationStatus operationStatus = 1;
+    CreateOrchestrationAction action = 2;
 }
 
+enum CreateOrchestrationAction {
+    ERROR = 0;
+    IGNORE = 1;
+    TERMINATE = 2;
+ }
+
 message CreateInstanceResponse {
     string instanceId = 1;
 }
@@ -659,16 +665,16 @@ service TaskHubSidecarService {
 
     // Waits for an orchestration instance to reach a running or completion state.
     rpc WaitForInstanceStart(GetInstanceRequest) returns (GetInstanceResponse);
-    
+
     // Waits for an orchestration instance to reach a completion state (completed, failed, terminated, etc.).
     rpc WaitForInstanceCompletion(GetInstanceRequest) returns (GetInstanceResponse);
 
     // Raises an event to a running orchestration instance.
     rpc RaiseEvent(RaiseEventRequest) returns (RaiseEventResponse);
-    
+
     // Terminates a running orchestration instance.
     rpc TerminateInstance(TerminateRequest) returns (TerminateResponse);
-    
+
     // Suspends a running orchestration instance.
     rpc SuspendInstance(SuspendRequest) returns (SuspendResponse);
 
@@ -714,6 +720,9 @@ service TaskHubSidecarService {
 
     // Abandon an entity work item
     rpc AbandonTaskEntityWorkItem(AbandonEntityTaskRequest) returns (AbandonEntityTaskResponse);
+
+    // Rerun a Workflow from a specific event ID of a workflow instance.
+    rpc RerunWorkflowFromEvent(RerunWorkflowFromEventRequest) returns (RerunWorkflowFromEventResponse);
 }
 
 message GetWorkItemsRequest {
@@ -764,3 +773,34 @@ message StreamInstanceHistoryRequest {
 message HistoryChunk {
     repeated HistoryEvent events = 1;
 }
+
+// RerunWorkflowFromEventRequest is used to rerun a workflow instance from a
+// specific event ID.
+message RerunWorkflowFromEventRequest {
+  // sourceInstanceID is the orchestration instance ID to rerun. Can be a top
+  // level instance, or sub-orchestration instance.
+  string sourceInstanceID = 1;
+
+  // the event id to start the new workflow instance from.
+  uint32 eventID = 2;
+
+  // newInstanceID is the new instance ID to use for the new workflow instance.
+  // If not given, a random instance ID will be given.
+  optional string newInstanceID = 3;
+
+  // input can optionally given to give the new instance a different input to
+  // the next Activity event.
+  google.protobuf.StringValue input = 4;
+
+  // overwrite_input signals that the input to the rerun activity should be
+  // written with input. This is required because of the incorrect typing of
+  // inputs being `StringValue` which cannot be optional, and therefore no nil
+  // value can be signalled or overwritten.
+  bool overwriteInput = 5;
+}
+
+// RerunWorkflowFromEventResponse is the response to executing
+// RerunWorkflowFromEvent.
+message RerunWorkflowFromEventResponse {
+    string newInstanceID = 1;
+}