diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index de01874a8..417c45b13 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -1,5 +1,5 @@
 {
-	"ImportPath": "github.com/umbel/pilosa",
+	"ImportPath": "github.com/pilosa/pilosa",
 	"GoVersion": "go1.7",
 	"GodepVersion": "v75",
 	"Packages": [
diff --git a/README-dev.md b/README-dev.md
index ed782db59..958b03e20 100644
--- a/README-dev.md
+++ b/README-dev.md
@@ -4,21 +4,21 @@ Development Environment
 
 Install Go versions 1.6.2+ or 1.7 for your platform.
 
-Fork `github.com/umbel/pilosa` to your own account. The forked repo will be private.
+Fork `github.com/pilosa/pilosa` to your own account. The forked repo will be private.
 
 Make sure `$GOPATH` environment variable points to your Go working directory and `$PATH` incudes `$GOPATH/bin`.
 
-Create a directory (note that we use `github.com/umbel`, NOT `github.com/USER`) and clone your own Pilosa repo:
+Create a directory (note that we use `github.com/pilosa`, NOT `github.com/USER`) and clone your own Pilosa repo:
 
 ```sh
-mkdir -p ${GOPATH}/src/github.com/umbel && cd $_
+mkdir -p ${GOPATH}/src/github.com/pilosa && cd $_
 git clone git@github.com:${USER}/pilosa.git
 ```
 
 `cd` to your pilosa directory:
 
 ```sh
-cd ${GOPATH}/src/github.com/umbel/pilosa
+cd ${GOPATH}/src/github.com/pilosa/pilosa
 ```
 
 Install `godep` to manage dependencies:
@@ -30,16 +30,16 @@ go get -u github.com/tools/godep
 Install Pilosa command line tools:
 
 ```sh
-go install github.com/umbel/pilosa/...
+go install github.com/pilosa/pilosa/...
 ```
 
 Running `pilosa` should now run a Pilosa instance.
 
-In order to sync your fork with upstream Umbel repo, add an *upstream* to your repo:
+In order to sync your fork with upstream Pilosa repo, add an *upstream* to your repo:
 
 ```sh
-cd ${GOPATH}/src/github.com/umbel/pilosa
-git remote add upstream git@github.com:umbel/pilosa.git
+cd ${GOPATH}/src/github.com/pilosa/pilosa
+git remote add upstream git@github.com:pilosa/pilosa.git
 ```
 
 Before starting to work on a task, sync your branch with the upstream:
diff --git a/README.md b/README.md
index 27813afbe..ec39dfcd0 100644
--- a/README.md
+++ b/README.md
@@ -10,13 +10,13 @@ Pilosa requires Go 1.7 or greater.
 You can download the source by running `go get`:
 
 ```sh
-$ go get github.com/umbel/pilosa
+$ go get github.com/pilosa/pilosa
 ```
 
 Now you can install the `pilosa` binary:
 
 ```sh
-$ go install github.com/umbel/pilosa/...
+$ go install github.com/pilosa/pilosa/...
 ```
 
 Now run `pilosa` with the default configuration:
diff --git a/attr.go b/attr.go
index abd1baabb..dacbf9bbb 100644
--- a/attr.go
+++ b/attr.go
@@ -11,7 +11,7 @@ import (
 
 	"github.com/boltdb/bolt"
 	"github.com/gogo/protobuf/proto"
-	"github.com/umbel/pilosa/internal"
+	"github.com/pilosa/pilosa/internal"
 )
 
 // AttrBlockSize is the size of attribute blocks for anti-entropy.
diff --git a/attr_test.go b/attr_test.go
index 20c57a51c..e69b8df2e 100644
--- a/attr_test.go
+++ b/attr_test.go
@@ -6,7 +6,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/umbel/pilosa"
+	"github.com/pilosa/pilosa"
 )
 
 // Ensure database can set and retrieve profile attributes.
diff --git a/bitmap.go b/bitmap.go
index 8e96f84b2..b3d8d0096 100644
--- a/bitmap.go
+++ b/bitmap.go
@@ -6,8 +6,8 @@ import (
 	"encoding/json"
 	"sort"
 
-	"github.com/umbel/pilosa/internal"
-	"github.com/umbel/pilosa/roaring"
+	"github.com/pilosa/pilosa/internal"
+	"github.com/pilosa/pilosa/roaring"
 )
 
 // Bitmap represents a set of bits.
diff --git a/cache.go b/cache.go
index 803aac078..4efce34f0 100644
--- a/cache.go
+++ b/cache.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/gogo/protobuf/proto"
 	"github.com/golang/groupcache/lru"
-	"github.com/umbel/pilosa/internal"
+	"github.com/pilosa/pilosa/internal"
 )
 
 // Cache represents a cache for bitmap counts.
diff --git a/client.go b/client.go
index 9744ae96d..8fe8ee7d8 100644
--- a/client.go
+++ b/client.go
@@ -18,7 +18,7 @@ import (
 	"time"
 
 	"github.com/gogo/protobuf/proto"
-	"github.com/umbel/pilosa/internal"
+	"github.com/pilosa/pilosa/internal"
 )
 
 // Client represents a client to the Pilosa cluster.
diff --git a/client_test.go b/client_test.go
index 7ba630755..d81e42a72 100644
--- a/client_test.go
+++ b/client_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 
 	"github.com/davecgh/go-spew/spew"
-	"github.com/umbel/pilosa"
+	"github.com/pilosa/pilosa"
 )
 
 // Ensure client can bulk import data.
diff --git a/cluster_test.go b/cluster_test.go
index 7b47ff2af..00d78e609 100644
--- a/cluster_test.go
+++ b/cluster_test.go
@@ -8,7 +8,7 @@ import (
 	"testing/quick"
 
 	"github.com/davecgh/go-spew/spew"
-	"github.com/umbel/pilosa"
+	"github.com/pilosa/pilosa"
 )
 
 // Ensure the cluster can fairly distribute partitions across the nodes.
diff --git a/cmd/pilosa-bench/main.go b/cmd/pilosa-bench/main.go
index c059576bd..157a255df 100644
--- a/cmd/pilosa-bench/main.go
+++ b/cmd/pilosa-bench/main.go
@@ -11,7 +11,7 @@ import (
 	"path/filepath"
 	"strconv"
 
-	"github.com/umbel/pilosa"
+	"github.com/pilosa/pilosa"
 )
 
 // BasePort is the initial port used when generating a cluster.
diff --git a/cmd/pilosa-bench/main_test.go b/cmd/pilosa-bench/main_test.go
index 4cc7d67c1..b1ecd0d92 100644
--- a/cmd/pilosa-bench/main_test.go
+++ b/cmd/pilosa-bench/main_test.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"testing"
 
-	main "github.com/umbel/pilosa/cmd/pilosa-bench"
+	main "github.com/pilosa/pilosa/cmd/pilosa-bench"
 )
 
 // Ensure server count flag can be parsed.
diff --git a/cmd/pilosa/main.go b/cmd/pilosa/main.go
index 1cff219c7..5821a475b 100644
--- a/cmd/pilosa/main.go
+++ b/cmd/pilosa/main.go
@@ -14,7 +14,7 @@ import (
 	"time"
 
 	"github.com/BurntSushi/toml"
-	"github.com/umbel/pilosa"
+	"github.com/pilosa/pilosa"
 )
 
 // Build holds the build information passed in at compile time.
diff --git a/cmd/pilosa/main_test.go b/cmd/pilosa/main_test.go
index 931660d7b..0eaabd96d 100644
--- a/cmd/pilosa/main_test.go
+++ b/cmd/pilosa/main_test.go
@@ -17,8 +17,8 @@ import (
 	"testing/quick"
 
 	"github.com/BurntSushi/toml"
-	"github.com/umbel/pilosa"
-	main "github.com/umbel/pilosa/cmd/pilosa"
+	"github.com/pilosa/pilosa"
+	main "github.com/pilosa/pilosa/cmd/pilosa"
 )
 
 // Ensure program can process queries and maintain consistency.
diff --git a/cmd/pilosactl/main.go b/cmd/pilosactl/main.go
index fa7986e1e..b7ab3247f 100644
--- a/cmd/pilosactl/main.go
+++ b/cmd/pilosactl/main.go
@@ -21,8 +21,8 @@ import (
 	"time"
 	"unsafe"
 
-	"github.com/umbel/pilosa"
-	"github.com/umbel/pilosa/roaring"
+	"github.com/pilosa/pilosa"
+	"github.com/pilosa/pilosa/roaring"
 )
 
 var (
diff --git a/datadog/datadog.go b/datadog/datadog.go
index 227f020f4..ff5e728b5 100644
--- a/datadog/datadog.go
+++ b/datadog/datadog.go
@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"github.com/DataDog/datadog-go/statsd"
-	"github.com/umbel/pilosa"
+	"github.com/pilosa/pilosa"
 )
 
 const (
diff --git a/datadog/datadog_test.go b/datadog/datadog_test.go
index fcfb6b6ae..00c4bf69a 100644
--- a/datadog/datadog_test.go
+++ b/datadog/datadog_test.go
@@ -4,7 +4,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/umbel/pilosa/datadog"
+	"github.com/pilosa/pilosa/datadog"
 )
 
 func TestStatsClient_WithTags(t *testing.T) {
diff --git a/db_test.go b/db_test.go
index 5405b07bb..5ffc68392 100644
--- a/db_test.go
+++ b/db_test.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/umbel/pilosa"
+	"github.com/pilosa/pilosa"
 )
 
 // Ensure database can open and retrieve a frame.
diff --git a/executor.go b/executor.go
index 5da490208..f966a78ec 100644
--- a/executor.go
+++ b/executor.go
@@ -12,8 +12,8 @@ import (
 	"time"
 
 	"github.com/gogo/protobuf/proto"
-	"github.com/umbel/pilosa/internal"
-	"github.com/umbel/pilosa/pql"
+	"github.com/pilosa/pilosa/internal"
+	"github.com/pilosa/pilosa/pql"
 )
 
 // DefaultFrame is the frame used if one is not specified.
diff --git a/executor_test.go b/executor_test.go
index bd4870db8..fc53f6c0a 100644
--- a/executor_test.go
+++ b/executor_test.go
@@ -7,8 +7,8 @@ import (
 	"testing"
 
 	"github.com/davecgh/go-spew/spew"
-	"github.com/umbel/pilosa"
-	"github.com/umbel/pilosa/pql"
+	"github.com/pilosa/pilosa"
+	"github.com/pilosa/pilosa/pql"
 )
 
 // Ensure a bitmap query can be executed.
diff --git a/fragment.go b/fragment.go
index 443788d41..d0bb2e73e 100644
--- a/fragment.go
+++ b/fragment.go
@@ -22,8 +22,8 @@ import (
 	"unsafe"
 
 	"github.com/gogo/protobuf/proto"
-	"github.com/umbel/pilosa/internal"
-	"github.com/umbel/pilosa/roaring"
+	"github.com/pilosa/pilosa/internal"
+	"github.com/pilosa/pilosa/roaring"
 )
 
 const (
diff --git a/fragment_test.go b/fragment_test.go
index 339c83f56..11ce52dca 100644
--- a/fragment_test.go
+++ b/fragment_test.go
@@ -10,7 +10,7 @@ import (
 	"testing"
 
 	"github.com/davecgh/go-spew/spew"
-	"github.com/umbel/pilosa"
+	"github.com/pilosa/pilosa"
 )
 
 // Test flags
diff --git a/frame_test.go b/frame_test.go
index 60eab3113..01d508ef9 100644
--- a/frame_test.go
+++ b/frame_test.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/umbel/pilosa"
+	"github.com/pilosa/pilosa"
 )
 
 // Ensure frame can open and retrieve a fragment.
diff --git a/handler.go b/handler.go
index d14faf31e..153548414 100644
--- a/handler.go
+++ b/handler.go
@@ -18,8 +18,8 @@ import (
 	"time"
 
 	"github.com/gogo/protobuf/proto"
-	"github.com/umbel/pilosa/internal"
-	"github.com/umbel/pilosa/pql"
+	"github.com/pilosa/pilosa/internal"
+	"github.com/pilosa/pilosa/pql"
 )
 
 // Handler represents an HTTP handler.
diff --git a/handler_test.go b/handler_test.go
index e89d02f65..df157a605 100644
--- a/handler_test.go
+++ b/handler_test.go
@@ -15,9 +15,9 @@ import (
 	"testing"
 
 	"github.com/gogo/protobuf/proto"
-	"github.com/umbel/pilosa"
-	"github.com/umbel/pilosa/internal"
-	"github.com/umbel/pilosa/pql"
+	"github.com/pilosa/pilosa"
+	"github.com/pilosa/pilosa/internal"
+	"github.com/pilosa/pilosa/pql"
 )
 
 // Ensure the handler returns "not found" for invalid paths.
diff --git a/index_test.go b/index_test.go
index 8144e4f73..7392adb5f 100644
--- a/index_test.go
+++ b/index_test.go
@@ -8,8 +8,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/umbel/pilosa"
-	"github.com/umbel/pilosa/pql"
+	"github.com/pilosa/pilosa"
+	"github.com/pilosa/pilosa/pql"
 )
 
 // Ensure index can delete a database and its underlying files.
diff --git a/iterator.go b/iterator.go
index 4293378e6..282cb32ed 100644
--- a/iterator.go
+++ b/iterator.go
@@ -3,7 +3,7 @@ package pilosa
 import (
 	"fmt"
 
-	"github.com/umbel/pilosa/roaring"
+	"github.com/pilosa/pilosa/roaring"
 )
 
 // Iterator is an interface for looping over bitmap/profile pairs.
diff --git a/iterator_test.go b/iterator_test.go
index d18ee102e..c9240b6c5 100644
--- a/iterator_test.go
+++ b/iterator_test.go
@@ -4,7 +4,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/umbel/pilosa"
+	"github.com/pilosa/pilosa"
 )
 
 // Ensure slice iterator and iterate over a set of pairs.
diff --git a/pilosa.go b/pilosa.go
index 7418460a6..4d1fbba41 100644
--- a/pilosa.go
+++ b/pilosa.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 
 	"github.com/gogo/protobuf/proto"
-	"github.com/umbel/pilosa/internal"
+	"github.com/pilosa/pilosa/internal"
 )
 
 //go:generate protoc --gogo_out=. internal/internal.proto
diff --git a/pql/ast_test.go b/pql/ast_test.go
index 208f71dd3..aa2e68e79 100644
--- a/pql/ast_test.go
+++ b/pql/ast_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/umbel/pilosa/pql"
+	"github.com/pilosa/pilosa/pql"
 )
 
 // Ensure the Bitmap call can be converted into a string.
diff --git a/pql/parser_test.go b/pql/parser_test.go
index 3904455d2..f303e9944 100644
--- a/pql/parser_test.go
+++ b/pql/parser_test.go
@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/davecgh/go-spew/spew"
-	"github.com/umbel/pilosa/pql"
+	"github.com/pilosa/pilosa/pql"
 )
 
 // Ensure the parser can parse a "Bitmap()" function with keyed args.
diff --git a/pql/scanner_test.go b/pql/scanner_test.go
index 7432598d5..2f2112fe6 100644
--- a/pql/scanner_test.go
+++ b/pql/scanner_test.go
@@ -4,7 +4,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/umbel/pilosa/pql"
+	"github.com/pilosa/pilosa/pql"
 )
 
 func TestScanner_Scan(t *testing.T) {
diff --git a/roaring/roaring_test.go b/roaring/roaring_test.go
index 1493afa2e..ccbe3b66c 100644
--- a/roaring/roaring_test.go
+++ b/roaring/roaring_test.go
@@ -10,7 +10,7 @@ import (
 	"testing"
 	"testing/quick"
 
-	"github.com/umbel/pilosa/roaring"
+	"github.com/pilosa/pilosa/roaring"
 )
 
 // Ensure an empty bitmap returns false if checking for existence.
diff --git a/server.go b/server.go
index d9399926d..b9f0a38b7 100644
--- a/server.go
+++ b/server.go
@@ -15,7 +15,7 @@ import (
 	"time"
 
 	"github.com/gogo/protobuf/proto"
-	"github.com/umbel/pilosa/internal"
+	"github.com/pilosa/pilosa/internal"
 )
 
 // Default server settings.
diff --git a/time_test.go b/time_test.go
index 2d7644841..aed62849c 100644
--- a/time_test.go
+++ b/time_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/umbel/pilosa"
+	"github.com/pilosa/pilosa"
 )
 
 func TestTimeIDsFromRange_1h_0(t *testing.T) {