diff --git a/mvcc/backend/backend.go b/mvcc/backend/backend.go
index 4ba8ec568..880a48dd4 100644
--- a/mvcc/backend/backend.go
+++ b/mvcc/backend/backend.go
@@ -42,7 +42,7 @@ var (
 	// This only works for linux.
 	initialMmapSize = uint64(10 * 1024 * 1024 * 1024)
 
-	plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "mvcc/backend")
+	plog = capnslog.NewPackageLogger("go.etcd.io/etcd", "mvcc/backend")
 
 	// minSnapshotWarningTimeout is the minimum threshold to trigger a long running snapshot warning.
 	minSnapshotWarningTimeout = 30 * time.Second
diff --git a/mvcc/kv.go b/mvcc/kv.go
index 2dad3ad8e..8e898a5ad 100644
--- a/mvcc/kv.go
+++ b/mvcc/kv.go
@@ -15,9 +15,9 @@
 package mvcc
 
 import (
-	"github.com/coreos/etcd/lease"
-	"github.com/coreos/etcd/mvcc/backend"
-	"github.com/coreos/etcd/mvcc/mvccpb"
+	"go.etcd.io/etcd/lease"
+	"go.etcd.io/etcd/mvcc/backend"
+	"go.etcd.io/etcd/mvcc/mvccpb"
 )
 
 type RangeOptions struct {
diff --git a/mvcc/kv_test.go b/mvcc/kv_test.go
index 97d216311..2c02ec089 100644
--- a/mvcc/kv_test.go
+++ b/mvcc/kv_test.go
@@ -21,10 +21,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/coreos/etcd/lease"
-	"github.com/coreos/etcd/mvcc/backend"
-	"github.com/coreos/etcd/mvcc/mvccpb"
-	"github.com/coreos/etcd/pkg/testutil"
+	"go.etcd.io/etcd/lease"
+	"go.etcd.io/etcd/mvcc/backend"
+	"go.etcd.io/etcd/mvcc/mvccpb"
+	"go.etcd.io/etcd/pkg/testutil"
 
 	"github.com/prometheus/client_golang/prometheus"
 	dto "github.com/prometheus/client_model/go"
diff --git a/mvcc/kv_view.go b/mvcc/kv_view.go
index 1e869c25b..bd2e77729 100644
--- a/mvcc/kv_view.go
+++ b/mvcc/kv_view.go
@@ -14,7 +14,7 @@
 
 package mvcc
 
-import "github.com/coreos/etcd/lease"
+import "go.etcd.io/etcd/lease"
 
 type readView struct{ kv KV }
 
diff --git a/mvcc/kvstore.go b/mvcc/kvstore.go
index 9c7f5c3ad..183e720e2 100644
--- a/mvcc/kvstore.go
+++ b/mvcc/kvstore.go
@@ -25,10 +25,10 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/coreos/etcd/lease"
-	"github.com/coreos/etcd/mvcc/backend"
-	"github.com/coreos/etcd/mvcc/mvccpb"
-	"github.com/coreos/etcd/pkg/schedule"
+	"go.etcd.io/etcd/lease"
+	"go.etcd.io/etcd/mvcc/backend"
+	"go.etcd.io/etcd/mvcc/mvccpb"
+	"go.etcd.io/etcd/pkg/schedule"
 
 	"github.com/coreos/pkg/capnslog"
 	"go.uber.org/zap"
@@ -47,7 +47,7 @@ var (
 	ErrCanceled  = errors.New("mvcc: watcher is canceled")
 	ErrClosed    = errors.New("mvcc: closed")
 
-	plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "mvcc")
+	plog = capnslog.NewPackageLogger("go.etcd.io/etcd", "mvcc")
 )
 
 const (
diff --git a/mvcc/kvstore_bench_test.go b/mvcc/kvstore_bench_test.go
index 6d38cd74e..0467ee7b1 100644
--- a/mvcc/kvstore_bench_test.go
+++ b/mvcc/kvstore_bench_test.go
@@ -18,8 +18,8 @@ import (
 	"sync/atomic"
 	"testing"
 
-	"github.com/coreos/etcd/lease"
-	"github.com/coreos/etcd/mvcc/backend"
+	"go.etcd.io/etcd/lease"
+	"go.etcd.io/etcd/mvcc/backend"
 
 	"go.uber.org/zap"
 )
diff --git a/mvcc/kvstore_compaction_test.go b/mvcc/kvstore_compaction_test.go
index 546578c5a..dde51db8a 100644
--- a/mvcc/kvstore_compaction_test.go
+++ b/mvcc/kvstore_compaction_test.go
@@ -20,8 +20,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/coreos/etcd/lease"
-	"github.com/coreos/etcd/mvcc/backend"
+	"go.etcd.io/etcd/lease"
+	"go.etcd.io/etcd/mvcc/backend"
 	"go.uber.org/zap"
 )
 
diff --git a/mvcc/kvstore_test.go b/mvcc/kvstore_test.go
index f4d0fdfe3..267c01b44 100644
--- a/mvcc/kvstore_test.go
+++ b/mvcc/kvstore_test.go
@@ -26,11 +26,11 @@ import (
 	"testing"
 	"time"
 
-	"github.com/coreos/etcd/lease"
-	"github.com/coreos/etcd/mvcc/backend"
-	"github.com/coreos/etcd/mvcc/mvccpb"
-	"github.com/coreos/etcd/pkg/schedule"
-	"github.com/coreos/etcd/pkg/testutil"
+	"go.etcd.io/etcd/lease"
+	"go.etcd.io/etcd/mvcc/backend"
+	"go.etcd.io/etcd/mvcc/mvccpb"
+	"go.etcd.io/etcd/pkg/schedule"
+	"go.etcd.io/etcd/pkg/testutil"
 
 	"go.uber.org/zap"
 )
diff --git a/mvcc/kvstore_txn.go b/mvcc/kvstore_txn.go
index b520f7887..e56c679c9 100644
--- a/mvcc/kvstore_txn.go
+++ b/mvcc/kvstore_txn.go
@@ -15,9 +15,9 @@
 package mvcc
 
 import (
-	"github.com/coreos/etcd/lease"
-	"github.com/coreos/etcd/mvcc/backend"
-	"github.com/coreos/etcd/mvcc/mvccpb"
+	"go.etcd.io/etcd/lease"
+	"go.etcd.io/etcd/mvcc/backend"
+	"go.etcd.io/etcd/mvcc/mvccpb"
 	"go.uber.org/zap"
 )
 
diff --git a/mvcc/metrics_txn.go b/mvcc/metrics_txn.go
index 6a96be764..b4a29bc95 100644
--- a/mvcc/metrics_txn.go
+++ b/mvcc/metrics_txn.go
@@ -14,7 +14,7 @@
 
 package mvcc
 
-import "github.com/coreos/etcd/lease"
+import "go.etcd.io/etcd/lease"
 
 type metricsTxnWrite struct {
 	TxnWrite
diff --git a/mvcc/util.go b/mvcc/util.go
index aeb2ea8cb..032621aed 100644
--- a/mvcc/util.go
+++ b/mvcc/util.go
@@ -18,8 +18,8 @@ import (
 	"encoding/binary"
 	"fmt"
 
-	"github.com/coreos/etcd/mvcc/backend"
-	"github.com/coreos/etcd/mvcc/mvccpb"
+	"go.etcd.io/etcd/mvcc/backend"
+	"go.etcd.io/etcd/mvcc/mvccpb"
 )
 
 func UpdateConsistentIndex(be backend.Backend, index uint64) {
diff --git a/mvcc/watchable_store.go b/mvcc/watchable_store.go
index f04fe9943..7ac0df6ba 100644
--- a/mvcc/watchable_store.go
+++ b/mvcc/watchable_store.go
@@ -18,9 +18,9 @@ import (
 	"sync"
 	"time"
 
-	"github.com/coreos/etcd/lease"
-	"github.com/coreos/etcd/mvcc/backend"
-	"github.com/coreos/etcd/mvcc/mvccpb"
+	"go.etcd.io/etcd/lease"
+	"go.etcd.io/etcd/mvcc/backend"
+	"go.etcd.io/etcd/mvcc/mvccpb"
 	"go.uber.org/zap"
 )
 
diff --git a/mvcc/watchable_store_bench_test.go b/mvcc/watchable_store_bench_test.go
index 08010d3ab..07b8f351a 100644
--- a/mvcc/watchable_store_bench_test.go
+++ b/mvcc/watchable_store_bench_test.go
@@ -19,8 +19,8 @@ import (
 	"os"
 	"testing"
 
-	"github.com/coreos/etcd/lease"
-	"github.com/coreos/etcd/mvcc/backend"
+	"go.etcd.io/etcd/lease"
+	"go.etcd.io/etcd/mvcc/backend"
 
 	"go.uber.org/zap"
 )
diff --git a/mvcc/watchable_store_test.go b/mvcc/watchable_store_test.go
index a929e995c..167315f1c 100644
--- a/mvcc/watchable_store_test.go
+++ b/mvcc/watchable_store_test.go
@@ -23,9 +23,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/coreos/etcd/lease"
-	"github.com/coreos/etcd/mvcc/backend"
-	"github.com/coreos/etcd/mvcc/mvccpb"
+	"go.etcd.io/etcd/lease"
+	"go.etcd.io/etcd/mvcc/backend"
+	"go.etcd.io/etcd/mvcc/mvccpb"
 	"go.uber.org/zap"
 )
 
diff --git a/mvcc/watchable_store_txn.go b/mvcc/watchable_store_txn.go
index bc8eb645a..3bcfa4d75 100644
--- a/mvcc/watchable_store_txn.go
+++ b/mvcc/watchable_store_txn.go
@@ -14,7 +14,7 @@
 
 package mvcc
 
-import "github.com/coreos/etcd/mvcc/mvccpb"
+import "go.etcd.io/etcd/mvcc/mvccpb"
 
 func (tw *watchableStoreTxnWrite) End() {
 	changes := tw.Changes()
diff --git a/mvcc/watcher.go b/mvcc/watcher.go
index 886b87d5a..2846d62a5 100644
--- a/mvcc/watcher.go
+++ b/mvcc/watcher.go
@@ -19,7 +19,7 @@ import (
 	"errors"
 	"sync"
 
-	"github.com/coreos/etcd/mvcc/mvccpb"
+	"go.etcd.io/etcd/mvcc/mvccpb"
 )
 
 // AutoWatchID is the watcher ID passed in WatchStream.Watch when no
diff --git a/mvcc/watcher_bench_test.go b/mvcc/watcher_bench_test.go
index c8244f65b..8a2ba61df 100644
--- a/mvcc/watcher_bench_test.go
+++ b/mvcc/watcher_bench_test.go
@@ -18,8 +18,8 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/coreos/etcd/lease"
-	"github.com/coreos/etcd/mvcc/backend"
+	"go.etcd.io/etcd/lease"
+	"go.etcd.io/etcd/mvcc/backend"
 
 	"go.uber.org/zap"
 )
diff --git a/mvcc/watcher_group.go b/mvcc/watcher_group.go
index b65c7bc5e..07029335a 100644
--- a/mvcc/watcher_group.go
+++ b/mvcc/watcher_group.go
@@ -18,8 +18,8 @@ import (
 	"fmt"
 	"math"
 
-	"github.com/coreos/etcd/mvcc/mvccpb"
-	"github.com/coreos/etcd/pkg/adt"
+	"go.etcd.io/etcd/mvcc/mvccpb"
+	"go.etcd.io/etcd/pkg/adt"
 )
 
 var (
diff --git a/mvcc/watcher_test.go b/mvcc/watcher_test.go
index 259968ab2..cb4e13b18 100644
--- a/mvcc/watcher_test.go
+++ b/mvcc/watcher_test.go
@@ -22,9 +22,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/coreos/etcd/lease"
-	"github.com/coreos/etcd/mvcc/backend"
-	"github.com/coreos/etcd/mvcc/mvccpb"
+	"go.etcd.io/etcd/lease"
+	"go.etcd.io/etcd/mvcc/backend"
+	"go.etcd.io/etcd/mvcc/mvccpb"
 	"go.uber.org/zap"
 )