diff --git a/ChangeLog.md b/ChangeLog.md
index 8c457703..ba9cbce6 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -47,7 +47,7 @@ release no longer compiles with Go `1.0.x`.
  * #91 - add consumer `DisconnectFrom*`
  * #87 - allow `heartbeat_interval` and `output_buffer_timeout` to be disabled
  * #86 - pluggable `nsqlookupd` behaviors
- * #83 - send `RDY` before `FIN`/`REQ` (forwards compatibility with bitly/nsq#404)
+ * #83 - send `RDY` before `FIN`/`REQ` (forwards compatibility with nsqio/nsq#404)
  * #82 - fix panic when conn isn't assigned
  * #75/#76 - minor config related bug fixes
  * #75/#77/#78 - add `tls-cert` and `tls-key` config options
diff --git a/README.md b/README.md
index aa1ca9b8..43b6c182 100644
--- a/README.md
+++ b/README.md
@@ -2,9 +2,9 @@
 
 The official Go package for [NSQ][nsq].
 
-[![Build Status](https://secure.travis-ci.org/bitly/go-nsq.png?branch=master)][travis] [![GoDoc](https://godoc.org/github.com/bitly/go-nsq?status.svg)](https://godoc.org/github.com/bitly/go-nsq)
+[![Build Status](https://secure.travis-ci.org/nsqio/go-nsq.png?branch=master)][travis] [![GoDoc](https://godoc.org/github.com/nsqio/go-nsq?status.svg)](https://godoc.org/github.com/nsqio/go-nsq)
 
-The latest stable release is **[1.0.4][latest_tag]**.
+The latest stable release is **[1.0.4][latest_tag]**
 
 NOTE: The public API has been refactored as of `v1.0.0` and is not backwards compatible with
 previous releases. **[0.3.7][legacy]** is the last stable release compatible with the legacy API.
@@ -16,13 +16,12 @@ See [godoc][nsq_gopkgdoc].
 
 See the [main repo apps][apps] directory for examples of clients built using this package.
 
-[nsq]: https://github.com/bitly/nsq
-[nsq_gopkgdoc]: http://godoc.org/github.com/bitly/go-nsq
-[protocol]: http://bitly.github.io/nsq/clients/tcp_protocol_spec.html
-[apps]: https://github.com/bitly/nsq/tree/master/apps
-[consumer]: http://godoc.org/github.com/bitly/go-nsq#Consumer
-[producer]: http://godoc.org/github.com/bitly/go-nsq#Producer
-[pr30]: https://github.com/bitly/go-nsq/pull/30
-[legacy]: https://github.com/bitly/go-nsq/releases/tag/v0.3.7
-[travis]: http://travis-ci.org/bitly/go-nsq
-[latest_tag]: https://github.com/bitly/go-nsq/releases/tag/v1.0.4
+[nsq]: https://github.com/nsqio/nsq
+[nsq_gopkgdoc]: http://godoc.org/github.com/nsqio/go-nsq
+[apps]: https://github.com/nsqio/nsq/tree/master/apps
+[consumer]: http://godoc.org/github.com/nsqio/go-nsq#Consumer
+[producer]: http://godoc.org/github.com/nsqio/go-nsq#Producer
+[pr30]: https://github.com/nsqio/go-nsq/pull/30
+[legacy]: https://github.com/nsqio/go-nsq/releases/tag/v0.3.7
+[travis]: http://travis-ci.org/nsqio/go-nsq
+[latest_tag]: https://github.com/nsqio/go-nsq/releases/tag/v1.0.4
diff --git a/UPGRADING.md b/UPGRADING.md
index d229aaaa..ad2e7cd0 100644
--- a/UPGRADING.md
+++ b/UPGRADING.md
@@ -10,9 +10,9 @@ We've learned a lot over the last 2 years and we wanted `go-nsq` to reflect the
 had working with the library as well as the general Go conventions and best practices we picked up
 along the way.
 
-The diff can be seen via: https://github.com/bitly/go-nsq/compare/v0.3.7...HEAD
+The diff can be seen via: https://github.com/nsqio/go-nsq/compare/v0.3.7...HEAD
 
-The bulk of the refactoring came via: https://github.com/bitly/go-nsq/pull/30
+The bulk of the refactoring came via: https://github.com/nsqio/go-nsq/pull/30
 
 #### Naming
 
diff --git a/config_flag_test.go b/config_flag_test.go
index 399d5a24..37a745dc 100644
--- a/config_flag_test.go
+++ b/config_flag_test.go
@@ -3,19 +3,19 @@ package nsq_test
 import (
 	"flag"
 
-	"github.com/bitly/go-nsq"
+	"github.com/nsqio/go-nsq"
 )
 
 func ExampleConfigFlag() {
 	cfg := nsq.NewConfig()
 	flagSet := flag.NewFlagSet("", flag.ExitOnError)
 
-	flagSet.Var(&nsq.ConfigFlag{cfg}, "consumer.options", "option to passthrough to nsq.Consumer (may be given multiple times, http://godoc.org/github.com/bitly/go-nsq#Config.Set)")
+	flagSet.Var(&nsq.ConfigFlag{cfg}, "consumer-opt", "option to pass through to nsq.Consumer (may be given multiple times)")
 	flagSet.PrintDefaults()
 
 	err := flagSet.Parse([]string{
-		"-consumer.options=heartbeat_interval,1s",
-		"-consumer.options=max_attempts,10",
+		"--consumer-opt=heartbeat_interval,1s",
+		"--consumer-opt=max_attempts,10",
 	})
 	if err != nil {
 		panic(err.Error())