diff --git a/branch/starter/main.go b/branch/starter/main.go
index fdbca494..12fd847e 100644
--- a/branch/starter/main.go
+++ b/branch/starter/main.go
@@ -6,7 +6,7 @@ import (
 
 	"go.temporal.io/sdk/client"
 
-	"github.com/temporalio/temporal-go-samples/branch"
+	"github.com/temporalio/samples-go/branch"
 )
 
 func main() {
diff --git a/branch/worker/main.go b/branch/worker/main.go
index f203039e..56724dca 100644
--- a/branch/worker/main.go
+++ b/branch/worker/main.go
@@ -6,7 +6,7 @@ import (
 	"go.temporal.io/sdk/client"
 	"go.temporal.io/sdk/worker"
 
-	"github.com/temporalio/temporal-go-samples/branch"
+	"github.com/temporalio/samples-go/branch"
 )
 
 func main() {
diff --git a/cancelactivity/starter/main.go b/cancelactivity/starter/main.go
index 19908b54..bb4a58aa 100644
--- a/cancelactivity/starter/main.go
+++ b/cancelactivity/starter/main.go
@@ -7,7 +7,7 @@ import (
 
 	"go.temporal.io/sdk/client"
 
-	"github.com/temporalio/temporal-go-samples/cancelactivity"
+	"github.com/temporalio/samples-go/cancelactivity"
 )
 
 func main() {
diff --git a/cancelactivity/worker/main.go b/cancelactivity/worker/main.go
index b183ff0f..f6df3589 100644
--- a/cancelactivity/worker/main.go
+++ b/cancelactivity/worker/main.go
@@ -6,7 +6,7 @@ import (
 	"go.temporal.io/sdk/client"
 	"go.temporal.io/sdk/worker"
 
-	"github.com/temporalio/temporal-go-samples/cancelactivity"
+	"github.com/temporalio/samples-go/cancelactivity"
 )
 
 func main() {
diff --git a/child-workflow-continue-as-new/starter/main.go b/child-workflow-continue-as-new/starter/main.go
index 326c71a0..9fa62ebd 100644
--- a/child-workflow-continue-as-new/starter/main.go
+++ b/child-workflow-continue-as-new/starter/main.go
@@ -7,7 +7,7 @@ import (
 	"github.com/pborman/uuid"
 	"go.temporal.io/sdk/client"
 
-	cw "github.com/temporalio/temporal-go-samples/child-workflow-continue-as-new"
+	cw "github.com/temporalio/samples-go/child-workflow-continue-as-new"
 )
 
 func main() {
diff --git a/child-workflow-continue-as-new/worker/main.go b/child-workflow-continue-as-new/worker/main.go
index a72c99a0..2097f95d 100644
--- a/child-workflow-continue-as-new/worker/main.go
+++ b/child-workflow-continue-as-new/worker/main.go
@@ -6,7 +6,7 @@ import (
 	"go.temporal.io/sdk/client"
 	"go.temporal.io/sdk/worker"
 
-	cw "github.com/temporalio/temporal-go-samples/child-workflow-continue-as-new"
+	cw "github.com/temporalio/samples-go/child-workflow-continue-as-new"
 )
 
 func main() {
diff --git a/child-workflow/starter/main.go b/child-workflow/starter/main.go
index f6135199..cb008dee 100644
--- a/child-workflow/starter/main.go
+++ b/child-workflow/starter/main.go
@@ -7,7 +7,7 @@ import (
 	"github.com/pborman/uuid"
 	"go.temporal.io/sdk/client"
 
-	child_workflow "github.com/temporalio/temporal-go-samples/child-workflow"
+	child_workflow "github.com/temporalio/samples-go/child-workflow"
 )
 
 func main() {
diff --git a/child-workflow/worker/main.go b/child-workflow/worker/main.go
index 6629d0ba..88cc3cf5 100644
--- a/child-workflow/worker/main.go
+++ b/child-workflow/worker/main.go
@@ -6,7 +6,7 @@ import (
 	"go.temporal.io/sdk/client"
 	"go.temporal.io/sdk/worker"
 
-	child_workflow "github.com/temporalio/temporal-go-samples/child-workflow"
+	child_workflow "github.com/temporalio/samples-go/child-workflow"
 )
 
 func main() {
diff --git a/choice-exclusive/starter/main.go b/choice-exclusive/starter/main.go
index 63a316b6..5ed774cb 100644
--- a/choice-exclusive/starter/main.go
+++ b/choice-exclusive/starter/main.go
@@ -7,7 +7,7 @@ import (
 	"github.com/pborman/uuid"
 	"go.temporal.io/sdk/client"
 
-	choice "github.com/temporalio/temporal-go-samples/choice-exclusive"
+	choice "github.com/temporalio/samples-go/choice-exclusive"
 )
 
 func main() {
diff --git a/choice-exclusive/worker/main.go b/choice-exclusive/worker/main.go
index 699b3654..b0337ca4 100644
--- a/choice-exclusive/worker/main.go
+++ b/choice-exclusive/worker/main.go
@@ -6,7 +6,7 @@ import (
 	"go.temporal.io/sdk/client"
 	"go.temporal.io/sdk/worker"
 
-	choice "github.com/temporalio/temporal-go-samples/choice-exclusive"
+	choice "github.com/temporalio/samples-go/choice-exclusive"
 )
 
 func main() {
diff --git a/choice-multi/starter/main.go b/choice-multi/starter/main.go
index e8d94e0e..50fe9195 100644
--- a/choice-multi/starter/main.go
+++ b/choice-multi/starter/main.go
@@ -7,7 +7,7 @@ import (
 	"github.com/pborman/uuid"
 	"go.temporal.io/sdk/client"
 
-	choice_multi "github.com/temporalio/temporal-go-samples/choice-multi"
+	choice_multi "github.com/temporalio/samples-go/choice-multi"
 )
 
 func main() {
diff --git a/choice-multi/worker/main.go b/choice-multi/worker/main.go
index 65d41a19..4e9d7096 100644
--- a/choice-multi/worker/main.go
+++ b/choice-multi/worker/main.go
@@ -6,7 +6,7 @@ import (
 	"go.temporal.io/sdk/client"
 	"go.temporal.io/sdk/worker"
 
-	choice_multi "github.com/temporalio/temporal-go-samples/choice-multi"
+	choice_multi "github.com/temporalio/samples-go/choice-multi"
 )
 
 func main() {
diff --git a/cron/starter/main.go b/cron/starter/main.go
index 2ca6cae9..3fd18ad2 100644
--- a/cron/starter/main.go
+++ b/cron/starter/main.go
@@ -7,7 +7,7 @@ import (
 	"github.com/pborman/uuid"
 	"go.temporal.io/sdk/client"
 
-	"github.com/temporalio/temporal-go-samples/cron"
+	"github.com/temporalio/samples-go/cron"
 )
 
 func main() {
diff --git a/cron/worker/main.go b/cron/worker/main.go
index ddc29b97..34b75282 100644
--- a/cron/worker/main.go
+++ b/cron/worker/main.go
@@ -6,7 +6,7 @@ import (
 	"go.temporal.io/sdk/client"
 	"go.temporal.io/sdk/worker"
 
-	"github.com/temporalio/temporal-go-samples/cron"
+	"github.com/temporalio/samples-go/cron"
 )
 
 func main() {
diff --git a/ctxpropagation/starter/main.go b/ctxpropagation/starter/main.go
index ec88b14d..23cb9dc8 100644
--- a/ctxpropagation/starter/main.go
+++ b/ctxpropagation/starter/main.go
@@ -8,7 +8,7 @@ import (
 	"go.temporal.io/sdk/client"
 	"go.temporal.io/sdk/workflow"
 
-	"github.com/temporalio/temporal-go-samples/ctxpropagation"
+	"github.com/temporalio/samples-go/ctxpropagation"
 )
 
 func main() {
diff --git a/ctxpropagation/worker/main.go b/ctxpropagation/worker/main.go
index 9ed42a63..fc4f2578 100644
--- a/ctxpropagation/worker/main.go
+++ b/ctxpropagation/worker/main.go
@@ -7,7 +7,7 @@ import (
 	"go.temporal.io/sdk/worker"
 	"go.temporal.io/sdk/workflow"
 
-	"github.com/temporalio/temporal-go-samples/ctxpropagation"
+	"github.com/temporalio/samples-go/ctxpropagation"
 )
 
 func main() {
diff --git a/dsl/starter/main.go b/dsl/starter/main.go
index 06d9b140..6d0813b4 100644
--- a/dsl/starter/main.go
+++ b/dsl/starter/main.go
@@ -8,9 +8,9 @@ import (
 
 	"github.com/pborman/uuid"
 	"go.temporal.io/sdk/client"
-	"gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"
 
-	"github.com/temporalio/temporal-go-samples/dsl"
+	"github.com/temporalio/samples-go/dsl"
 )
 
 func main() {
diff --git a/dsl/worker/main.go b/dsl/worker/main.go
index dd9d54df..d2631698 100644
--- a/dsl/worker/main.go
+++ b/dsl/worker/main.go
@@ -6,7 +6,7 @@ import (
 	"go.temporal.io/sdk/client"
 	"go.temporal.io/sdk/worker"
 
-	"github.com/temporalio/temporal-go-samples/dsl"
+	"github.com/temporalio/samples-go/dsl"
 )
 
 func main() {
diff --git a/dynamic/worker/main.go b/dynamic/worker/main.go
index 715d4596..fe3db573 100644
--- a/dynamic/worker/main.go
+++ b/dynamic/worker/main.go
@@ -6,7 +6,7 @@ import (
 	"go.temporal.io/sdk/client"
 	"go.temporal.io/sdk/worker"
 
-	"github.com/temporalio/temporal-go-samples/dynamic"
+	"github.com/temporalio/samples-go/dynamic"
 )
 
 func main() {
diff --git a/expense/starter/main.go b/expense/starter/main.go
index 8a508e27..dc00d427 100644
--- a/expense/starter/main.go
+++ b/expense/starter/main.go
@@ -7,7 +7,7 @@ import (
 	"github.com/pborman/uuid"
 	"go.temporal.io/sdk/client"
 
-	"github.com/temporalio/temporal-go-samples/expense"
+	"github.com/temporalio/samples-go/expense"
 )
 
 func main() {
diff --git a/expense/worker/main.go b/expense/worker/main.go
index da4eeddb..e588ed23 100644
--- a/expense/worker/main.go
+++ b/expense/worker/main.go
@@ -6,7 +6,7 @@ import (
 	"go.temporal.io/sdk/client"
 	"go.temporal.io/sdk/worker"
 
-	"github.com/temporalio/temporal-go-samples/expense"
+	"github.com/temporalio/samples-go/expense"
 )
 
 func main() {
diff --git a/fileprocessing/starter/main.go b/fileprocessing/starter/main.go
index 895c5fb7..ce432fe8 100644
--- a/fileprocessing/starter/main.go
+++ b/fileprocessing/starter/main.go
@@ -7,7 +7,7 @@ import (
 	"github.com/pborman/uuid"
 	"go.temporal.io/sdk/client"
 
-	"github.com/temporalio/temporal-go-samples/fileprocessing"
+	"github.com/temporalio/samples-go/fileprocessing"
 )
 
 func main() {
diff --git a/fileprocessing/worker/main.go b/fileprocessing/worker/main.go
index f64dd6e0..448eb5b5 100644
--- a/fileprocessing/worker/main.go
+++ b/fileprocessing/worker/main.go
@@ -6,7 +6,7 @@ import (
 	"go.temporal.io/sdk/client"
 	"go.temporal.io/sdk/worker"
 
-	"github.com/temporalio/temporal-go-samples/fileprocessing"
+	"github.com/temporalio/samples-go/fileprocessing"
 )
 
 func main() {
diff --git a/go.mod b/go.mod
index 214401ef..310f1749 100644
--- a/go.mod
+++ b/go.mod
@@ -1,16 +1,19 @@
-module github.com/temporalio/temporal-go-samples
+module github.com/temporalio/samples-go
 
-go 1.13
+go 1.14
 
 require (
 	github.com/golang/mock v1.4.4
+	github.com/google/uuid v1.1.2 // indirect
 	github.com/opentracing/opentracing-go v1.2.0 // indirect
-	github.com/pborman/uuid v1.2.0
+	github.com/pborman/uuid v1.2.1
+	github.com/stretchr/objx v0.3.0 // indirect
 	github.com/stretchr/testify v1.6.1
-	go.temporal.io/api v0.30.0
-	go.temporal.io/sdk v0.30.0
-	golang.org/x/mod v0.3.0 // indirect
+	go.temporal.io/api v0.31.0
+	go.temporal.io/sdk v0.31.0
+	go.uber.org/atomic v1.7.0 // indirect
+	golang.org/x/sys v0.0.0-20200922070232-aee5d888a860 // indirect
 	golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e // indirect
-	gopkg.in/yaml.v2 v2.3.0
-	gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 // indirect
+	google.golang.org/genproto v0.0.0-20200923140941-5646d36feee1 // indirect
+	gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776
 )
diff --git a/go.sum b/go.sum
index 48fdbe93..54098f9e 100644
--- a/go.sum
+++ b/go.sum
@@ -49,6 +49,8 @@ github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY=
 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y=
+github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
@@ -64,6 +66,8 @@ github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+
 github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc=
 github.com/pborman/uuid v1.2.0 h1:J7Q5mO4ysT1dv8hyrUGHb9+ooztCXu1D8MY8DZYsu3g=
 github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k=
+github.com/pborman/uuid v1.2.1 h1:+ZZIw58t/ozdjRaXh/3awHfmWRbzYxJoAdNJxe/3pvw=
+github.com/pborman/uuid v1.2.1/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
@@ -74,6 +78,8 @@ github.com/robfig/cron v1.2.0/go.mod h1:JGuDeoQd7Z6yL4zQhZ3OPEVHB7fL6Ka6skscFHfm
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48=
 github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
+github.com/stretchr/objx v0.3.0 h1:NGXK3lHquSN08v5vWalVI/L8XU9hdzE/G6xsrze47As=
+github.com/stretchr/objx v0.3.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
@@ -85,12 +91,14 @@ github.com/uber/jaeger-client-go v2.23.1+incompatible/go.mod h1:WVhlPFC8FDjOFMMW
 github.com/uber/jaeger-lib v2.2.0+incompatible h1:MxZXOiR2JuoANZ3J6DE/U0kSFv/eJ/GfSYVCjK7dyaw=
 github.com/uber/jaeger-lib v2.2.0+incompatible/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6+uUTzImX/AauajbLI56U=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-go.temporal.io/api v0.30.0 h1:N/nZVkn9TpqpYMsvhQ/3uVXr5xYGDsi0qxMcjGYWIYI=
-go.temporal.io/api v0.30.0/go.mod h1:GiSuP5N3W5gQIN2A5ELDMwxOeHpEuJ5mUVsI0KflOwM=
-go.temporal.io/sdk v0.30.0 h1:2aYgbQvnWTDV6Kzy8UqJVxdlL/k5AEzT+ksQFiQ9yq0=
-go.temporal.io/sdk v0.30.0/go.mod h1:G4iJDpNMpkxdFwGd1Q+5FjKpRkrMthV/Jb2P4n6t6H4=
+go.temporal.io/api v0.31.0 h1:aUcs7APtSLJYeq9YuB7hGO//KTWIlb8mblJyUPSEz40=
+go.temporal.io/api v0.31.0/go.mod h1:e1cHmNtmBsTHkeicHQeDs4GrWy9xsGIiXvWN53QAvq0=
+go.temporal.io/sdk v0.31.0 h1:Zq8e18fYqcnZ7zJ9qRvUgzXMQS/I06pTfWTO7c0464I=
+go.temporal.io/sdk v0.31.0/go.mod h1:iKODFRWJx5XZCpmhT6FaPojCF4LF7hJb0fSZ6l51rec=
 go.uber.org/atomic v1.6.0 h1:Ezj3JGmsOnG1MoRWQkPBsKLe9DwWD9QeXzTRzzldNVk=
 go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
+go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw=
+go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
 go.uber.org/goleak v1.0.0/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
@@ -104,8 +112,6 @@ golang.org/x/lint v0.0.0-20200302205851-738671d3881b h1:Wh+f8QHJXR411sJR8/vRBTZ7
 golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
 golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.3.0 h1:RM4zey1++hCTbCVQfnWeKs9/IEsaBLA8vTkd0WVtmH4=
-golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -113,8 +119,8 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200822124328-c89045814202 h1:VvcQYSHwXgi7W+TpUR6A9g6Up98WAHf3f/ulnJ62IyA=
-golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+golang.org/x/net v0.0.0-20200904194848-62affa334b73 h1:MXfv8rhZWmFeqX3GNZRsd6vOLoaCHjYEX3qkRo3YBUA=
+golang.org/x/net v0.0.0-20200904194848-62affa334b73/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -125,8 +131,10 @@ golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200831180312-196b9ba8737a h1:i47hUS795cOydZI4AwJQCKXOr4BvxzvikwDoDtHhP2Y=
-golang.org/x/sys v0.0.0-20200831180312-196b9ba8737a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200917073148-efd3b9a0ff20 h1:4X356008q5SA3YXu8PiRap39KFmy4Lf6sGlceJKZQsU=
+golang.org/x/sys v0.0.0-20200917073148-efd3b9a0ff20/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200922070232-aee5d888a860 h1:YEu4SMq7D0cmT7CBbXfcH0NZeuChAXwsHe/9XueUO6o=
+golang.org/x/sys v0.0.0-20200922070232-aee5d888a860/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
@@ -157,15 +165,17 @@ google.golang.org/genproto v0.0.0-20180518175338-11a468237815/go.mod h1:JiN7NxoA
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20200831141814-d751682dd103 h1:z46CEPU+LlO0kGGwrH8h5epkkJhRZbAHYWOWD9JhLPI=
-google.golang.org/genproto v0.0.0-20200831141814-d751682dd103/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20200917134801-bb4cff56e0d0 h1:uslsjIdqvZYANxSBQjTI47vZfwMaTN3mLELkMnMIY/A=
+google.golang.org/genproto v0.0.0-20200917134801-bb4cff56e0d0/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20200923140941-5646d36feee1 h1:TU5GbVQeo+Ze5VMgDsSsq/21Q9QPjumrK/dVlpMZsFo=
+google.golang.org/genproto v0.0.0-20200923140941-5646d36feee1/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/grpc v1.12.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
 google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
-google.golang.org/grpc v1.31.1 h1:SfXqXS5hkufcdZ/mHtYCh53P2b+92WQq/DZcKLgsFRs=
-google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
+google.golang.org/grpc v1.32.0 h1:zWTV+LMdc3kaiJMSTOFz2UgSBgx8RNQoTGiZu3fR9S0=
+google.golang.org/grpc v1.32.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
@@ -183,8 +193,6 @@ gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8
 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
-gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.0-20200605160147-a5ece683394c h1:grhR+C34yXImVGp7EzNk+DTIk+323eIUWOmEevy6bDo=
 gopkg.in/yaml.v3 v3.0.0-20200605160147-a5ece683394c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/greetings/starter/main.go b/greetings/starter/main.go
index 539e2fa8..74fb3992 100644
--- a/greetings/starter/main.go
+++ b/greetings/starter/main.go
@@ -7,7 +7,7 @@ import (
 	"github.com/pborman/uuid"
 	"go.temporal.io/sdk/client"
 
-	"github.com/temporalio/temporal-go-samples/greetings"
+	"github.com/temporalio/samples-go/greetings"
 )
 
 func main() {
diff --git a/greetings/worker/main.go b/greetings/worker/main.go
index 574e2291..f2fd500f 100644
--- a/greetings/worker/main.go
+++ b/greetings/worker/main.go
@@ -6,7 +6,7 @@ import (
 	"go.temporal.io/sdk/client"
 	"go.temporal.io/sdk/worker"
 
-	"github.com/temporalio/temporal-go-samples/greetings"
+	"github.com/temporalio/samples-go/greetings"
 )
 
 func main() {
diff --git a/helloworld/starter/main.go b/helloworld/starter/main.go
index 13f2927a..4bff0419 100644
--- a/helloworld/starter/main.go
+++ b/helloworld/starter/main.go
@@ -6,7 +6,7 @@ import (
 
 	"go.temporal.io/sdk/client"
 
-	"github.com/temporalio/temporal-go-samples/helloworld"
+	"github.com/temporalio/samples-go/helloworld"
 )
 
 func main() {
diff --git a/helloworld/worker/main.go b/helloworld/worker/main.go
index 8f1e237c..85af0982 100644
--- a/helloworld/worker/main.go
+++ b/helloworld/worker/main.go
@@ -6,7 +6,7 @@ import (
 	"go.temporal.io/sdk/client"
 	"go.temporal.io/sdk/worker"
 
-	"github.com/temporalio/temporal-go-samples/helloworld"
+	"github.com/temporalio/samples-go/helloworld"
 )
 
 func main() {
diff --git a/mutex/starter/main.go b/mutex/starter/main.go
index 7c0b2dd6..1bb944b4 100644
--- a/mutex/starter/main.go
+++ b/mutex/starter/main.go
@@ -7,7 +7,7 @@ import (
 	"github.com/pborman/uuid"
 	"go.temporal.io/sdk/client"
 
-	"github.com/temporalio/temporal-go-samples/mutex"
+	"github.com/temporalio/samples-go/mutex"
 )
 
 func main() {
diff --git a/mutex/worker/main.go b/mutex/worker/main.go
index 4d75097a..fcaede2f 100644
--- a/mutex/worker/main.go
+++ b/mutex/worker/main.go
@@ -7,7 +7,7 @@ import (
 	"go.temporal.io/sdk/client"
 	"go.temporal.io/sdk/worker"
 
-	"github.com/temporalio/temporal-go-samples/mutex"
+	"github.com/temporalio/samples-go/mutex"
 )
 
 func main() {
diff --git a/parallel/starter/main.go b/parallel/starter/main.go
index 0a8cad18..fac20da4 100644
--- a/parallel/starter/main.go
+++ b/parallel/starter/main.go
@@ -6,7 +6,7 @@ import (
 
 	"go.temporal.io/sdk/client"
 
-	"github.com/temporalio/temporal-go-samples/parallel"
+	"github.com/temporalio/samples-go/parallel"
 )
 
 func main() {
diff --git a/parallel/worker/main.go b/parallel/worker/main.go
index 59e20b6c..6ff49a9f 100644
--- a/parallel/worker/main.go
+++ b/parallel/worker/main.go
@@ -6,7 +6,7 @@ import (
 	"go.temporal.io/sdk/client"
 	"go.temporal.io/sdk/worker"
 
-	"github.com/temporalio/temporal-go-samples/parallel"
+	"github.com/temporalio/samples-go/parallel"
 )
 
 func main() {
diff --git a/pickfirst/starter/main.go b/pickfirst/starter/main.go
index 455b7ce8..cc6813bd 100644
--- a/pickfirst/starter/main.go
+++ b/pickfirst/starter/main.go
@@ -7,7 +7,7 @@ import (
 	"github.com/pborman/uuid"
 	"go.temporal.io/sdk/client"
 
-	"github.com/temporalio/temporal-go-samples/pickfirst"
+	"github.com/temporalio/samples-go/pickfirst"
 )
 
 func main() {
diff --git a/pickfirst/worker/main.go b/pickfirst/worker/main.go
index 38878d97..312900e8 100644
--- a/pickfirst/worker/main.go
+++ b/pickfirst/worker/main.go
@@ -6,7 +6,7 @@ import (
 	"go.temporal.io/sdk/client"
 	"go.temporal.io/sdk/worker"
 
-	"github.com/temporalio/temporal-go-samples/pickfirst"
+	"github.com/temporalio/samples-go/pickfirst"
 )
 
 func main() {
diff --git a/pso/query/main.go b/pso/query/main.go
index bba2a09f..22b17020 100644
--- a/pso/query/main.go
+++ b/pso/query/main.go
@@ -7,7 +7,7 @@ import (
 
 	"go.temporal.io/sdk/client"
 
-	"github.com/temporalio/temporal-go-samples/pso"
+	"github.com/temporalio/samples-go/pso"
 )
 
 func main() {
diff --git a/pso/starter/main.go b/pso/starter/main.go
index 7808ff03..4d03d7b2 100644
--- a/pso/starter/main.go
+++ b/pso/starter/main.go
@@ -8,7 +8,7 @@ import (
 	"github.com/pborman/uuid"
 	"go.temporal.io/sdk/client"
 
-	"github.com/temporalio/temporal-go-samples/pso"
+	"github.com/temporalio/samples-go/pso"
 )
 
 func main() {
diff --git a/pso/worker/main.go b/pso/worker/main.go
index e1b26df0..f5244e1e 100644
--- a/pso/worker/main.go
+++ b/pso/worker/main.go
@@ -7,7 +7,7 @@ import (
 	"go.temporal.io/sdk/client"
 	"go.temporal.io/sdk/worker"
 
-	"github.com/temporalio/temporal-go-samples/pso"
+	"github.com/temporalio/samples-go/pso"
 )
 
 func main() {
diff --git a/query/starter/main.go b/query/starter/main.go
index 6d106772..b84d9305 100644
--- a/query/starter/main.go
+++ b/query/starter/main.go
@@ -6,7 +6,7 @@ import (
 
 	"go.temporal.io/sdk/client"
 
-	"github.com/temporalio/temporal-go-samples/query"
+	"github.com/temporalio/samples-go/query"
 )
 
 func main() {
diff --git a/query/worker/main.go b/query/worker/main.go
index d748e577..7d0b7ba4 100644
--- a/query/worker/main.go
+++ b/query/worker/main.go
@@ -6,7 +6,7 @@ import (
 	"go.temporal.io/sdk/client"
 	"go.temporal.io/sdk/worker"
 
-	"github.com/temporalio/temporal-go-samples/query"
+	"github.com/temporalio/samples-go/query"
 )
 
 func main() {
diff --git a/recovery/query/main.go b/recovery/query/main.go
index 6047d62a..ad2d729f 100644
--- a/recovery/query/main.go
+++ b/recovery/query/main.go
@@ -7,7 +7,7 @@ import (
 
 	"go.temporal.io/sdk/client"
 
-	"github.com/temporalio/temporal-go-samples/recovery"
+	"github.com/temporalio/samples-go/recovery"
 )
 
 func main() {
diff --git a/recovery/recovery_workflow.go b/recovery/recovery_workflow.go
index a21a3406..2173eeac 100644
--- a/recovery/recovery_workflow.go
+++ b/recovery/recovery_workflow.go
@@ -16,7 +16,7 @@ import (
 	"go.temporal.io/sdk/temporal"
 	"go.temporal.io/sdk/workflow"
 
-	"github.com/temporalio/temporal-go-samples/recovery/cache"
+	"github.com/temporalio/samples-go/recovery/cache"
 )
 
 type (
diff --git a/recovery/signal/main.go b/recovery/signal/main.go
index 644baf6a..68fe326f 100644
--- a/recovery/signal/main.go
+++ b/recovery/signal/main.go
@@ -8,7 +8,7 @@ import (
 
 	"go.temporal.io/sdk/client"
 
-	"github.com/temporalio/temporal-go-samples/recovery"
+	"github.com/temporalio/samples-go/recovery"
 )
 
 func main() {
diff --git a/recovery/starter/main.go b/recovery/starter/main.go
index 9fb0b4a4..497f7756 100644
--- a/recovery/starter/main.go
+++ b/recovery/starter/main.go
@@ -8,7 +8,7 @@ import (
 
 	"go.temporal.io/sdk/client"
 
-	"github.com/temporalio/temporal-go-samples/recovery"
+	"github.com/temporalio/samples-go/recovery"
 )
 
 func main() {
diff --git a/recovery/worker/main.go b/recovery/worker/main.go
index edad9a45..c5658d64 100644
--- a/recovery/worker/main.go
+++ b/recovery/worker/main.go
@@ -8,8 +8,8 @@ import (
 	"go.temporal.io/sdk/worker"
 	"go.temporal.io/sdk/workflow"
 
-	"github.com/temporalio/temporal-go-samples/recovery"
-	"github.com/temporalio/temporal-go-samples/recovery/cache"
+	"github.com/temporalio/samples-go/recovery"
+	"github.com/temporalio/samples-go/recovery/cache"
 )
 
 func main() {
diff --git a/retryactivity/starter/main.go b/retryactivity/starter/main.go
index acdad28d..ba87a352 100644
--- a/retryactivity/starter/main.go
+++ b/retryactivity/starter/main.go
@@ -7,7 +7,7 @@ import (
 	"github.com/pborman/uuid"
 	"go.temporal.io/sdk/client"
 
-	"github.com/temporalio/temporal-go-samples/retryactivity"
+	"github.com/temporalio/samples-go/retryactivity"
 )
 
 func main() {
diff --git a/retryactivity/worker/main.go b/retryactivity/worker/main.go
index 55f7e54c..ca0e722a 100644
--- a/retryactivity/worker/main.go
+++ b/retryactivity/worker/main.go
@@ -6,7 +6,7 @@ import (
 	"go.temporal.io/sdk/client"
 	"go.temporal.io/sdk/worker"
 
-	"github.com/temporalio/temporal-go-samples/retryactivity"
+	"github.com/temporalio/samples-go/retryactivity"
 )
 
 func main() {
diff --git a/searchattributes/starter/main.go b/searchattributes/starter/main.go
index a7e94c5d..4f1042d1 100644
--- a/searchattributes/starter/main.go
+++ b/searchattributes/starter/main.go
@@ -7,7 +7,7 @@ import (
 	"github.com/pborman/uuid"
 	"go.temporal.io/sdk/client"
 
-	"github.com/temporalio/temporal-go-samples/searchattributes"
+	"github.com/temporalio/samples-go/searchattributes"
 )
 
 func main() {
diff --git a/searchattributes/worker/main.go b/searchattributes/worker/main.go
index 3e19d98e..0aa5fb95 100644
--- a/searchattributes/worker/main.go
+++ b/searchattributes/worker/main.go
@@ -7,7 +7,7 @@ import (
 	"go.temporal.io/sdk/client"
 	"go.temporal.io/sdk/worker"
 
-	"github.com/temporalio/temporal-go-samples/searchattributes"
+	"github.com/temporalio/samples-go/searchattributes"
 )
 
 func main() {
diff --git a/splitmerge/starter/main.go b/splitmerge/starter/main.go
index 7fc700ce..596e86c0 100644
--- a/splitmerge/starter/main.go
+++ b/splitmerge/starter/main.go
@@ -7,7 +7,7 @@ import (
 	"github.com/pborman/uuid"
 	"go.temporal.io/sdk/client"
 
-	"github.com/temporalio/temporal-go-samples/splitmerge"
+	"github.com/temporalio/samples-go/splitmerge"
 )
 
 func main() {
diff --git a/splitmerge/worker/main.go b/splitmerge/worker/main.go
index 9ccb3c68..e639aab5 100644
--- a/splitmerge/worker/main.go
+++ b/splitmerge/worker/main.go
@@ -6,7 +6,7 @@ import (
 	"go.temporal.io/sdk/client"
 	"go.temporal.io/sdk/worker"
 
-	"github.com/temporalio/temporal-go-samples/splitmerge"
+	"github.com/temporalio/samples-go/splitmerge"
 )
 
 func main() {
diff --git a/timer/starter/main.go b/timer/starter/main.go
index 1536da42..9c26f31d 100644
--- a/timer/starter/main.go
+++ b/timer/starter/main.go
@@ -8,7 +8,7 @@ import (
 	"github.com/pborman/uuid"
 	"go.temporal.io/sdk/client"
 
-	"github.com/temporalio/temporal-go-samples/timer"
+	"github.com/temporalio/samples-go/timer"
 )
 
 func main() {
diff --git a/timer/worker/main.go b/timer/worker/main.go
index d5b54aa4..9ea87a71 100644
--- a/timer/worker/main.go
+++ b/timer/worker/main.go
@@ -6,7 +6,7 @@ import (
 	"go.temporal.io/sdk/client"
 	"go.temporal.io/sdk/worker"
 
-	"github.com/temporalio/temporal-go-samples/timer"
+	"github.com/temporalio/samples-go/timer"
 )
 
 func main() {