diff --git a/blocks/set/dbset.go b/blocks/set/dbset.go
index 187ca8ac6..fe7fd55cc 100644
--- a/blocks/set/dbset.go
+++ b/blocks/set/dbset.go
@@ -1,7 +1,7 @@
 package set
 
 import (
-	ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/datastore.go"
+	ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
 	"github.com/jbenet/go-ipfs/blocks/bloom"
 	"github.com/jbenet/go-ipfs/util"
 )
diff --git a/blocks/set/set.go b/blocks/set/set.go
index 7288e26c3..a2b83d840 100644
--- a/blocks/set/set.go
+++ b/blocks/set/set.go
@@ -3,7 +3,7 @@ package set
 import (
 	"errors"
 
-	ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/datastore.go"
+	ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
 
 	"github.com/jbenet/go-ipfs/blocks/bloom"
 	"github.com/jbenet/go-ipfs/util"
diff --git a/pin/indirect.go b/pin/indirect.go
index bff1e545f..27b11292c 100644
--- a/pin/indirect.go
+++ b/pin/indirect.go
@@ -3,7 +3,7 @@ package pin
 import (
 	"errors"
 
-	ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/datastore.go"
+	ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
 	"github.com/jbenet/go-ipfs/blocks/set"
 	"github.com/jbenet/go-ipfs/util"
 )
diff --git a/pin/pin.go b/pin/pin.go
index a63dcff57..1c02fd038 100644
--- a/pin/pin.go
+++ b/pin/pin.go
@@ -7,8 +7,8 @@ import (
 	"encoding/json"
 	"sync"
 
-	ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/datastore.go"
-	nsds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/datastore.go/namespace"
+	ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
+	nsds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/namespace"
 	"github.com/jbenet/go-ipfs/blocks/set"
 	mdag "github.com/jbenet/go-ipfs/merkledag"
 	"github.com/jbenet/go-ipfs/util"
diff --git a/pin/pin_test.go b/pin/pin_test.go
index 72c15d90d..00c9c6f3c 100644
--- a/pin/pin_test.go
+++ b/pin/pin_test.go
@@ -3,7 +3,7 @@ package pin
 import (
 	"testing"
 
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/datastore.go"
+	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
 	bs "github.com/jbenet/go-ipfs/blockservice"
 	mdag "github.com/jbenet/go-ipfs/merkledag"
 	"github.com/jbenet/go-ipfs/util"