diff --git a/gql/lexer.go b/gql/lexer.go
index 3a30e4a7eba10f58d3cae04b3ffa07b4098de834..d16b5bf32fcbd9bf527844d9446ef8044ff4ab4c 100644
--- a/gql/lexer.go
+++ b/gql/lexer.go
@@ -21,7 +21,7 @@ import (
 	"unicode/utf8"
 
 	"github.com/Sirupsen/logrus"
-	"github.com/manishrjain/dgraph/x"
+	"github.com/dgraph-io/dgraph/x"
 )
 
 var glog = x.Log("lexer")
diff --git a/gql/parser.go b/gql/parser.go
index 5b3f2753071948a739a6116289ebc50dee2f46b0..1d654023c34a90f45b37834a5b2d41bcb7ceda0f 100644
--- a/gql/parser.go
+++ b/gql/parser.go
@@ -21,8 +21,8 @@ import (
 	"fmt"
 	"strconv"
 
-	"github.com/manishrjain/dgraph/query"
-	"github.com/manishrjain/dgraph/x"
+	"github.com/dgraph-io/dgraph/query"
+	"github.com/dgraph-io/dgraph/x"
 )
 
 func Parse(input string) (sg *query.SubGraph, rerr error) {
diff --git a/gql/parser_test.go b/gql/parser_test.go
index e4dab4ee25524640f43c8548fb685efc5eaeb504..b1acd0c5095ccd714ee1199ead272a76ffb9768c 100644
--- a/gql/parser_test.go
+++ b/gql/parser_test.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/manishrjain/dgraph/query"
+	"github.com/dgraph-io/dgraph/query"
 )
 
 func checkAttr(g *query.SubGraph, attr string) error {
diff --git a/posting/list.go b/posting/list.go
index 5b290654b3c207a07b529be6b258fb61334781ea..e0cd79927ffef1c5100906d92107666498b6bf2c 100644
--- a/posting/list.go
+++ b/posting/list.go
@@ -27,9 +27,9 @@ import (
 	"sync"
 
 	"github.com/google/flatbuffers/go"
-	"github.com/manishrjain/dgraph/posting/types"
-	"github.com/manishrjain/dgraph/store"
-	"github.com/manishrjain/dgraph/x"
+	"github.com/dgraph-io/dgraph/posting/types"
+	"github.com/dgraph-io/dgraph/store"
+	"github.com/dgraph-io/dgraph/x"
 
 	linked "container/list"
 )
diff --git a/posting/list_test.go b/posting/list_test.go
index 10aa5940b5f96e0cfab9528ce44fbda95ff4f76f..c6c1dee3f8a7ff2ab429c7c66689e295d7978afd 100644
--- a/posting/list_test.go
+++ b/posting/list_test.go
@@ -24,9 +24,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/manishrjain/dgraph/posting/types"
-	"github.com/manishrjain/dgraph/store"
-	"github.com/manishrjain/dgraph/x"
+	"github.com/dgraph-io/dgraph/posting/types"
+	"github.com/dgraph-io/dgraph/store"
+	"github.com/dgraph-io/dgraph/x"
 )
 
 func checkUids(t *testing.T, l List, uids ...uint64) error {
diff --git a/posting/lists.go b/posting/lists.go
index fa68a310b451d5c2032db4f03c296a84532768fe..65bfb4000a83a31894712e6d3e4cc133d4a25abb 100644
--- a/posting/lists.go
+++ b/posting/lists.go
@@ -20,7 +20,7 @@ import (
 	"sync"
 
 	"github.com/dgryski/go-farm"
-	"github.com/manishrjain/dgraph/store"
+	"github.com/dgraph-io/dgraph/store"
 )
 
 var lmutex sync.RWMutex
diff --git a/posting/worker.go b/posting/worker.go
index 56529b78301bb63b0da3e8524adcfeaff4bda551..acee33c971be7c6df33cf27e6746057b63cb1765 100644
--- a/posting/worker.go
+++ b/posting/worker.go
@@ -4,7 +4,7 @@ import (
 	"container/heap"
 
 	"github.com/google/flatbuffers/go"
-	"github.com/manishrjain/dgraph/task"
+	"github.com/dgraph-io/dgraph/task"
 )
 
 type elem struct {
diff --git a/posting/worker_test.go b/posting/worker_test.go
index 010afc5f981c10f138d63ae565b4680aa5dd9a19..9ed5ba1d071829aa2c3a18ca06656433c6cdc993 100644
--- a/posting/worker_test.go
+++ b/posting/worker_test.go
@@ -8,9 +8,9 @@ import (
 
 	"github.com/Sirupsen/logrus"
 	"github.com/google/flatbuffers/go"
-	"github.com/manishrjain/dgraph/store"
-	"github.com/manishrjain/dgraph/task"
-	"github.com/manishrjain/dgraph/x"
+	"github.com/dgraph-io/dgraph/store"
+	"github.com/dgraph-io/dgraph/task"
+	"github.com/dgraph-io/dgraph/x"
 )
 
 func TestPush(t *testing.T) {
diff --git a/query/query.go b/query/query.go
index 1cec4f2e30091152a79e88ebe0b09f6d89113fcf..90a76e74ad2430ff0d0415e938111c70d8ed2862 100644
--- a/query/query.go
+++ b/query/query.go
@@ -20,10 +20,10 @@ import (
 	"fmt"
 
 	"github.com/google/flatbuffers/go"
-	"github.com/manishrjain/dgraph/posting"
-	"github.com/manishrjain/dgraph/task"
-	"github.com/manishrjain/dgraph/uid"
-	"github.com/manishrjain/dgraph/x"
+	"github.com/dgraph-io/dgraph/posting"
+	"github.com/dgraph-io/dgraph/task"
+	"github.com/dgraph-io/dgraph/uid"
+	"github.com/dgraph-io/dgraph/x"
 )
 
 /*
diff --git a/query/query_test.go b/query/query_test.go
index d827306565451c8ab24b60808245e776c92d3550..6efd9a8deb3089e8208c71241ba224e9b1bdecec 100644
--- a/query/query_test.go
+++ b/query/query_test.go
@@ -24,10 +24,10 @@ import (
 
 	"github.com/Sirupsen/logrus"
 	"github.com/google/flatbuffers/go"
-	"github.com/manishrjain/dgraph/posting"
-	"github.com/manishrjain/dgraph/store"
-	"github.com/manishrjain/dgraph/task"
-	"github.com/manishrjain/dgraph/x"
+	"github.com/dgraph-io/dgraph/posting"
+	"github.com/dgraph-io/dgraph/store"
+	"github.com/dgraph-io/dgraph/task"
+	"github.com/dgraph-io/dgraph/x"
 )
 
 func setErr(err *error, nerr error) {
diff --git a/store/store.go b/store/store.go
index 33628bce964e137f9b2fdf4294e34761329770e7..e29abdeefa097252a6f569ee0334459876a171c7 100644
--- a/store/store.go
+++ b/store/store.go
@@ -17,7 +17,7 @@
 package store
 
 import (
-	"github.com/manishrjain/gocrud/x"
+	"github.com/dgraph-io/dgraph/x"
 	"github.com/syndtr/goleveldb/leveldb"
 	"github.com/syndtr/goleveldb/leveldb/opt"
 )
@@ -33,7 +33,7 @@ func (s *Store) Init(filepath string) {
 	var err error
 	s.db, err = leveldb.OpenFile(filepath, s.opt)
 	if err != nil {
-		x.LogErr(log, err).WithField("filepath", filepath).
+		x.Err(log, err).WithField("filepath", filepath).
 			Fatal("While opening store")
 		return
 	}
diff --git a/store/store_test.go b/store/store_test.go
index cffc93cac556a759e555498f840c3b273a4eac24..a8860d527059c87ee9955861269653233a072c31 100644
--- a/store/store_test.go
+++ b/store/store_test.go
@@ -33,7 +33,7 @@ func TestGet(t *testing.T) {
 
 	var s Store
 	s.Init(path)
-	k := Key("name", 1)
+	k := []byte("mykey")
 	if err := s.SetOne(k, []byte("neo")); err != nil {
 		t.Error(err)
 		t.Fail()
diff --git a/uid/assigner.go b/uid/assigner.go
index 9c26695d0d4691a33ce8c11f84cf2c5f0beecb8e..9c61a86057550e101a87e8fc7b6423097df2ca83 100644
--- a/uid/assigner.go
+++ b/uid/assigner.go
@@ -23,9 +23,9 @@ import (
 	"time"
 
 	"github.com/dgryski/go-farm"
-	"github.com/manishrjain/dgraph/posting"
-	"github.com/manishrjain/dgraph/posting/types"
-	"github.com/manishrjain/dgraph/x"
+	"github.com/dgraph-io/dgraph/posting"
+	"github.com/dgraph-io/dgraph/posting/types"
+	"github.com/dgraph-io/dgraph/x"
 )
 
 var log = x.Log("uid")
diff --git a/uid/assigner_test.go b/uid/assigner_test.go
index 715a0217ba01f0fd1cbe630731828a4c16ae100d..8d9d85e4f040eeb6e6fbf13e774e4bbb68428f2c 100644
--- a/uid/assigner_test.go
+++ b/uid/assigner_test.go
@@ -22,8 +22,8 @@ import (
 	"testing"
 
 	"github.com/Sirupsen/logrus"
-	"github.com/manishrjain/dgraph/posting"
-	"github.com/manishrjain/dgraph/store"
+	"github.com/dgraph-io/dgraph/posting"
+	"github.com/dgraph-io/dgraph/store"
 )
 
 func NewStore(t *testing.T) string {