diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 478e7b06e75f36b0730a6d396aae055bf55a134a..d3c54ebeb5d6d3f94b7219798f7603800dc8d421 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -1,5 +1,5 @@
 {
-	"ImportPath": "github.com/eris-ltd/erisdb",
+	"ImportPath": "github.com/eris-ltd/eris-db",
 	"GoVersion": "go1.4.2",
 	"Packages": [
 		"./..."
diff --git a/cmd/erisdb/main.go b/cmd/erisdb/main.go
index 77edaebee3d67288c18f5ae4ff0f4fd7c10f33c0..9de6b6b69c4df0b177acc0c039669760bff2b711 100644
--- a/cmd/erisdb/main.go
+++ b/cmd/erisdb/main.go
@@ -2,7 +2,7 @@ package main
 
 import (
 	"fmt"
-	edb "github.com/eris-ltd/erisdb/erisdb"
+	edb "github.com/eris-ltd/eris-db/erisdb"
 	"os"
 )
 
diff --git a/cmd/erisdbss/main.go b/cmd/erisdbss/main.go
index f5f85266af1898b14394aaf7435aebbf8cd7f3e4..f86752014a8f070cdaa6b2afd3bb681e3cb42325 100644
--- a/cmd/erisdbss/main.go
+++ b/cmd/erisdbss/main.go
@@ -1,8 +1,8 @@
 package main
 
 import (
-	ess "github.com/eris-ltd/erisdb/erisdb/erisdbss"
-	"github.com/eris-ltd/erisdb/server"
+	ess "github.com/eris-ltd/eris-db/erisdb/erisdbss"
+	"github.com/eris-ltd/eris-db/server"
 	"github.com/gin-gonic/gin"
 	"os"
 	"path"
diff --git a/erisdb/codec.go b/erisdb/codec.go
index 73848b24f8ef901c50e179ac0792cfd48f043d3e..a08048bea8277e05c22083e19c8847ff232cb325 100644
--- a/erisdb/codec.go
+++ b/erisdb/codec.go
@@ -1,7 +1,7 @@
 package erisdb
 
 import (
-	rpc "github.com/eris-ltd/erisdb/rpc"
+	rpc "github.com/eris-ltd/eris-db/rpc"
 	"github.com/tendermint/tendermint/binary"
 	"io"
 	"io/ioutil"
diff --git a/erisdb/erisdbss/http.go b/erisdb/erisdbss/http.go
index 8774897d6a02a3771b79b3ab078792b0633613b0..b1878657db4b54eb09be0612aeb26396e0c9a439 100644
--- a/erisdb/erisdbss/http.go
+++ b/erisdb/erisdbss/http.go
@@ -3,7 +3,7 @@ package erisdbss
 import (
 	"bytes"
 	"encoding/json"
-	"github.com/eris-ltd/erisdb/server"
+	"github.com/eris-ltd/eris-db/server"
 	"github.com/gin-gonic/gin"
 	"github.com/tendermint/tendermint/binary"
 	. "github.com/tendermint/tendermint/common"
diff --git a/erisdb/erisdbss/server_manager.go b/erisdb/erisdbss/server_manager.go
index ae3c0e1bdbe7db78a7b79e96bae7fcb2e47590ab..f8b0344f8a81df2faa4576427ab18b40f3157355 100644
--- a/erisdb/erisdbss/server_manager.go
+++ b/erisdb/erisdbss/server_manager.go
@@ -3,8 +3,8 @@ package erisdbss
 import (
 	"bufio"
 	"fmt"
-	"github.com/eris-ltd/erisdb/files"
-	"github.com/eris-ltd/erisdb/server"
+	"github.com/eris-ltd/eris-db/files"
+	"github.com/eris-ltd/eris-db/server"
 	"github.com/tendermint/tendermint/binary"
 	. "github.com/tendermint/tendermint/common"
 	"os"
diff --git a/erisdb/event_cache.go b/erisdb/event_cache.go
index 733b1ee9f6f1623bf48e7ba19b616726761a0e33..b00f435dbe999b669a1f2a8d785a586789567176 100644
--- a/erisdb/event_cache.go
+++ b/erisdb/event_cache.go
@@ -2,7 +2,7 @@ package erisdb
 
 import (
 	"fmt"
-	ep "github.com/eris-ltd/erisdb/erisdb/pipe"
+	ep "github.com/eris-ltd/eris-db/erisdb/pipe"
 	"sync"
 	"time"
 )
diff --git a/erisdb/json_service.go b/erisdb/json_service.go
index ef3176697be49b68ff6e37d06c28a4d48578c1fd..f8b750003fa3604c3db7ee0392c02b9acfb47a34 100644
--- a/erisdb/json_service.go
+++ b/erisdb/json_service.go
@@ -3,9 +3,9 @@ package erisdb
 import (
 	"encoding/json"
 	"fmt"
-	ep "github.com/eris-ltd/erisdb/erisdb/pipe"
-	rpc "github.com/eris-ltd/erisdb/rpc"
-	"github.com/eris-ltd/erisdb/server"
+	ep "github.com/eris-ltd/eris-db/erisdb/pipe"
+	rpc "github.com/eris-ltd/eris-db/rpc"
+	"github.com/eris-ltd/eris-db/server"
 	"github.com/gin-gonic/gin"
 	"net/http"
 )
diff --git a/erisdb/methods.go b/erisdb/methods.go
index 13fd826f193c37920b51889bf583d13e5f7735a2..29cdf3ac4acbdba28e8c6bf6a68a6be315be7dbd 100644
--- a/erisdb/methods.go
+++ b/erisdb/methods.go
@@ -4,8 +4,8 @@ import (
 	"crypto/rand"
 	"encoding/hex"
 	"fmt"
-	ep "github.com/eris-ltd/erisdb/erisdb/pipe"
-	rpc "github.com/eris-ltd/erisdb/rpc"
+	ep "github.com/eris-ltd/eris-db/erisdb/pipe"
+	rpc "github.com/eris-ltd/eris-db/rpc"
 	"github.com/tendermint/tendermint/types"
 	"strings"
 )
diff --git a/erisdb/middleware_test.go b/erisdb/middleware_test.go
index 30b3597ab1b4b8c12cfe9f0f895658c536ed3f1e..75a091868b85915569a3e10ea14e80b2555d9898 100644
--- a/erisdb/middleware_test.go
+++ b/erisdb/middleware_test.go
@@ -1,7 +1,7 @@
 package erisdb
 
 import (
-	ep "github.com/eris-ltd/erisdb/erisdb/pipe"
+	ep "github.com/eris-ltd/eris-db/erisdb/pipe"
 	"github.com/stretchr/testify/assert"
 	"testing"
 )
diff --git a/erisdb/params.go b/erisdb/params.go
index b5d8b6d4145b3c828dda38a085b437f54f27835a..25ac97b615a244fc5dd2cb5e991db24f2434f03d 100644
--- a/erisdb/params.go
+++ b/erisdb/params.go
@@ -1,7 +1,7 @@
 package erisdb
 
 import (
-	"github.com/eris-ltd/erisdb/erisdb/pipe"
+	"github.com/eris-ltd/eris-db/erisdb/pipe"
 	"github.com/tendermint/tendermint/account"
 	"github.com/tendermint/tendermint/types"
 )
diff --git a/erisdb/restServer.go b/erisdb/restServer.go
index 2ad00cd7e56bca6900085e91ddee70a83048d412..9e81aed889a27fe1793060a3a0f1953244c96047 100644
--- a/erisdb/restServer.go
+++ b/erisdb/restServer.go
@@ -3,10 +3,10 @@ package erisdb
 import (
 	"encoding/hex"
 	"fmt"
-	ep "github.com/eris-ltd/erisdb/erisdb/pipe"
-	rpc "github.com/eris-ltd/erisdb/rpc"
-	"github.com/eris-ltd/erisdb/server"
-	"github.com/eris-ltd/erisdb/util"
+	ep "github.com/eris-ltd/eris-db/erisdb/pipe"
+	rpc "github.com/eris-ltd/eris-db/rpc"
+	"github.com/eris-ltd/eris-db/server"
+	"github.com/eris-ltd/eris-db/util"
 	"github.com/gin-gonic/gin"
 	"github.com/tendermint/tendermint/types"
 	"strconv"
diff --git a/erisdb/serve.go b/erisdb/serve.go
index 1a173e6579fc73c4bdf5a12ade3bdd43096d2f2c..810ecf5a866e51a309e88953da75b7b9b6fb27c2 100644
--- a/erisdb/serve.go
+++ b/erisdb/serve.go
@@ -3,8 +3,8 @@
 package erisdb
 
 import (
-	ep "github.com/eris-ltd/erisdb/erisdb/pipe"
-	"github.com/eris-ltd/erisdb/server"
+	ep "github.com/eris-ltd/eris-db/erisdb/pipe"
+	"github.com/eris-ltd/eris-db/server"
 	"github.com/tendermint/log15"
 	. "github.com/tendermint/tendermint/common"
 	cfg "github.com/tendermint/tendermint/config"
@@ -14,7 +14,7 @@ import (
 	"path"
 )
 
-const ERISDB_VERSION = "0.9.1"
+const ERISDB_VERSION = "0.10.0"
 const TENDERMINT_VERSION = "0.3.0"
 
 var log = log15.New("module", "eris/erisdb_server")
diff --git a/erisdb/wsService.go b/erisdb/wsService.go
index e7f5af3a297fbcca8df9398518c0fbd193b9ec3a..215dc4d6ee7428f2b09eb986fb8dfea7c25c7c50 100644
--- a/erisdb/wsService.go
+++ b/erisdb/wsService.go
@@ -2,9 +2,9 @@ package erisdb
 
 import (
 	"fmt"
-	ep "github.com/eris-ltd/erisdb/erisdb/pipe"
-	rpc "github.com/eris-ltd/erisdb/rpc"
-	"github.com/eris-ltd/erisdb/server"
+	ep "github.com/eris-ltd/eris-db/erisdb/pipe"
+	rpc "github.com/eris-ltd/eris-db/rpc"
+	"github.com/eris-ltd/eris-db/server"
 	"encoding/json"
 )
 
diff --git a/server/config.go b/server/config.go
index acb67361a6bbb4d1f919b3b423048eea85b5d6fc..0fa49d6a8a58ab0ea1d8a6126578268fc7e2db26 100644
--- a/server/config.go
+++ b/server/config.go
@@ -1,7 +1,7 @@
 package server
 
 import (
-	"github.com/eris-ltd/erisdb/files"
+	"github.com/eris-ltd/eris-db/files"
 	"github.com/naoina/toml"
 )
 
diff --git a/test/filters/filter_test.go b/test/filters/filter_test.go
index 0163301748195b4df2c212f44598ed655ad0e52a..13caed45a8514bfa5f4be6834b67e473566f1811 100644
--- a/test/filters/filter_test.go
+++ b/test/filters/filter_test.go
@@ -5,7 +5,7 @@ import (
 	"github.com/stretchr/testify/suite"
 	"testing"
 	"sync"
-	. "github.com/eris-ltd/erisdb/erisdb/pipe"
+	. "github.com/eris-ltd/eris-db/erisdb/pipe"
 )
 
 const OBJECTS = 100
diff --git a/test/mock/mock_web_api_test.go b/test/mock/mock_web_api_test.go
index 0f9ddf6ffb5369737750d97f5c2dec9ed860f333..7e07c745bf579c0782aed4283f5f96688ac434d4 100644
--- a/test/mock/mock_web_api_test.go
+++ b/test/mock/mock_web_api_test.go
@@ -5,11 +5,11 @@ import (
 	"bytes"
 	"fmt"
 	// edb "github.com/eris-ltd/erisdb/erisdb"
-	edb "github.com/eris-ltd/erisdb/erisdb"
-	ep "github.com/eris-ltd/erisdb/erisdb/pipe"
-	"github.com/eris-ltd/erisdb/rpc"
-	"github.com/eris-ltd/erisdb/server"
-	td "github.com/eris-ltd/erisdb/test/testdata/testdata"
+	edb "github.com/eris-ltd/eris-db/erisdb"
+	ep "github.com/eris-ltd/eris-db/erisdb/pipe"
+	"github.com/eris-ltd/eris-db/rpc"
+	"github.com/eris-ltd/eris-db/server"
+	td "github.com/eris-ltd/eris-db/test/testdata/testdata"
 	"github.com/gin-gonic/gin"
 	"github.com/stretchr/testify/suite"
 	"github.com/tendermint/tendermint/account"
diff --git a/test/mock/pipe.go b/test/mock/pipe.go
index 20628373105871e3b799239b34da8dbbd1187ceb..05c687ef0479d4564e4c94ca59874a5e70047856 100644
--- a/test/mock/pipe.go
+++ b/test/mock/pipe.go
@@ -1,8 +1,8 @@
 package mock
 
 import (
-	ep "github.com/eris-ltd/erisdb/erisdb/pipe"
-	td "github.com/eris-ltd/erisdb/test/testdata/testdata"
+	ep "github.com/eris-ltd/eris-db/erisdb/pipe"
+	td "github.com/eris-ltd/eris-db/test/testdata/testdata"
 	"github.com/tendermint/tendermint/account"
 	"github.com/tendermint/tendermint/types"
 )
diff --git a/test/server/scumbag.go b/test/server/scumbag.go
index 6ba0dfcd86c271f2b8bc35909b8a3363acaeb828..bc43809271ef4d3b11c158ca1284e29f313a0daf 100644
--- a/test/server/scumbag.go
+++ b/test/server/scumbag.go
@@ -2,8 +2,8 @@ package server
 
 import (
 	"encoding/json"
-	"github.com/eris-ltd/erisdb/rpc"
-	"github.com/eris-ltd/erisdb/server"
+	"github.com/eris-ltd/eris-db/rpc"
+	"github.com/eris-ltd/eris-db/server"
 	"github.com/gin-gonic/gin"
 	"github.com/tendermint/log15"
 	"os"
diff --git a/test/server/ws_burst_test.go b/test/server/ws_burst_test.go
index 451c580ee9f6420b6fa0a4abaec421e4c003feb2..67212437029af21491ac9386e630b07d4a60ae2e 100644
--- a/test/server/ws_burst_test.go
+++ b/test/server/ws_burst_test.go
@@ -1,8 +1,8 @@
 package server
 
 import (
-	"github.com/eris-ltd/erisdb/client"
-	"github.com/eris-ltd/erisdb/server"
+	"github.com/eris-ltd/eris-db/client"
+	"github.com/eris-ltd/eris-db/server"
 	"github.com/stretchr/testify/assert"
 	"testing"
 	"time"
diff --git a/test/testdata/filters/testdata_filters.go b/test/testdata/filters/testdata_filters.go
index ecab8cd32fe671c34d47e466fc990a1fa148e0b3..a6ab388e76f10316d21c6f484ffc8bb25903c3c6 100644
--- a/test/testdata/filters/testdata_filters.go
+++ b/test/testdata/filters/testdata_filters.go
@@ -1,8 +1,8 @@
 package filters
 
 import (
-	edb "github.com/eris-ltd/erisdb/erisdb"
-	ep "github.com/eris-ltd/erisdb/erisdb/pipe"
+	edb "github.com/eris-ltd/eris-db/erisdb"
+	ep "github.com/eris-ltd/eris-db/erisdb/pipe"
 	"github.com/tendermint/tendermint/state"
 )
 
diff --git a/test/testdata/testdata/testdata.go b/test/testdata/testdata/testdata.go
index 78e3613a58cd83f562642867be87d74f4eb238ed..9b818cfa7cce59fc1d709f1575645cbb7ea76b1e 100644
--- a/test/testdata/testdata/testdata.go
+++ b/test/testdata/testdata/testdata.go
@@ -1,8 +1,8 @@
 package testdata
 
 import (
-	edb "github.com/eris-ltd/erisdb/erisdb"
-	ep "github.com/eris-ltd/erisdb/erisdb/pipe"
+	edb "github.com/eris-ltd/eris-db/erisdb"
+	ep "github.com/eris-ltd/eris-db/erisdb/pipe"
 	"github.com/tendermint/tendermint/account"
 	"github.com/tendermint/tendermint/state"
 	"github.com/tendermint/tendermint/types"
diff --git a/test/web_api/query_test.go b/test/web_api/query_test.go
index 4002579412f528cbfa73b6a52df01b6a875329c7..d0f5f7016094f4a0d98adf155ad77374e71f0040 100644
--- a/test/web_api/query_test.go
+++ b/test/web_api/query_test.go
@@ -4,12 +4,12 @@ package web_api
 import (
 	"bytes"
 	"fmt"
-	edb "github.com/eris-ltd/erisdb/erisdb"
-	ess "github.com/eris-ltd/erisdb/erisdb/erisdbss"
-	ep "github.com/eris-ltd/erisdb/erisdb/pipe"
-	"github.com/eris-ltd/erisdb/rpc"
-	"github.com/eris-ltd/erisdb/server"
-	fd "github.com/eris-ltd/erisdb/test/testdata/filters"
+	edb "github.com/eris-ltd/eris-db/erisdb"
+	ess "github.com/eris-ltd/eris-db/erisdb/erisdbss"
+	ep "github.com/eris-ltd/eris-db/erisdb/pipe"
+	"github.com/eris-ltd/eris-db/rpc"
+	"github.com/eris-ltd/eris-db/server"
+	fd "github.com/eris-ltd/eris-db/test/testdata/filters"
 	"github.com/stretchr/testify/suite"
 	"net/http"
 	"os"
diff --git a/test/web_api/web_api_test.go b/test/web_api/web_api_test.go
index 3aacb3580d501133eacdc0ffd478282dc094d532..c453fd7707aa384c0f95d6286d6f7adaacaff76a 100644
--- a/test/web_api/web_api_test.go
+++ b/test/web_api/web_api_test.go
@@ -5,12 +5,12 @@ import (
 	"bytes"
 	"fmt"
 	// edb "github.com/eris-ltd/erisdb/erisdb"
-	edb "github.com/eris-ltd/erisdb/erisdb"
-	ess "github.com/eris-ltd/erisdb/erisdb/erisdbss"
-	ep "github.com/eris-ltd/erisdb/erisdb/pipe"
-	"github.com/eris-ltd/erisdb/rpc"
-	"github.com/eris-ltd/erisdb/server"
-	td "github.com/eris-ltd/erisdb/test/testdata/testdata"
+	edb "github.com/eris-ltd/eris-db/erisdb"
+	ess "github.com/eris-ltd/eris-db/erisdb/erisdbss"
+	ep "github.com/eris-ltd/eris-db/erisdb/pipe"
+	"github.com/eris-ltd/eris-db/rpc"
+	"github.com/eris-ltd/eris-db/server"
+	td "github.com/eris-ltd/eris-db/test/testdata/testdata"
 	"github.com/gin-gonic/gin"
 	"github.com/stretchr/testify/suite"
 	"github.com/tendermint/tendermint/account"