diff --git a/CHANGELOG.md b/CHANGELOG.md
index 00fc2466..f5f26803 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,3 @@
 # Changelog
 
-See https://github.com/charliesome/better_errors/releases
+See https://github.com/BetterErrors/better_errors/releases
diff --git a/README.md b/README.md
index 89de164c..7ddee48b 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
-[![Build Status](https://travis-ci.org/charliesome/better_errors.svg)](https://travis-ci.org/charliesome/better_errors)
-[![Codacy Badge](https://api.codacy.com/project/badge/Grade/6bc3e7d6118d47e6959b16690b815909)](https://www.codacy.com/app/BetterErrors/better_errors?utm_source=github.com&utm_medium=referral&utm_content=charliesome/better_errors&utm_campaign=Badge_Grade)
-[![Coverage](https://coveralls.io/repos/github/charliesome/better_errors/badge.svg?branch=master)](https://coveralls.io/github/charliesome/better_errors?branch=master)
+[![Build Status](https://travis-ci.org/BetterErrors/better_errors.svg)](https://travis-ci.org/BetterErrors/better_errors)
+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/6bc3e7d6118d47e6959b16690b815909)](https://www.codacy.com/app/BetterErrors/better_errors?utm_source=github.com&utm_medium=referral&utm_content=BetterErrors/better_errors&utm_campaign=Badge_Grade)
+[![Coverage](https://coveralls.io/repos/github/BetterErrors/better_errors/badge.svg?branch=master)](https://coveralls.io/github/BetterErrors/better_errors?branch=master)
 [![Gem Version](https://img.shields.io/gem/v/better_errors.svg)](https://rubygems.org/gems/better_errors)
 
 # Better Errors
@@ -11,7 +11,7 @@ Better Errors replaces the standard Rails error page with a much better and more
 
 ## Features
 
-For screenshots of these features, [see the wiki](https://github.com/charliesome/better_errors/wiki).
+For screenshots of these features, [see the wiki](https://github.com/BetterErrors/better_errors/wiki).
 
 * Full stack trace
 * Source code inspection for all stack frames (with highlighting)
@@ -43,7 +43,7 @@ _Note: If you discover that Better Errors isn't working - particularly after upg
 You will notice that the only machine that gets the Better Errors page is localhost, which means you get the default error page if you are developing on a remote host (or a virtually remote host, such as a Vagrant box).
 Obviously, the REPL is not something you want to expose to the public, and there may be sensitive information available in the backtrace.
 
-For more information on how to configure access, see [the wiki](https://github.com/charliesome/better_errors/wiki/Allowing-access-to-the-console).
+For more information on how to configure access, see [the wiki](https://github.com/BetterErrors/better_errors/wiki/Allowing-access-to-the-console).
 
 ## Usage
 
@@ -53,7 +53,7 @@ If you're using Rails, there's nothing else you need to do.
 
 If you're not using Rails, you need to insert `BetterErrors::Middleware` into your middleware stack, and optionally set `BetterErrors.application_root` if you'd like Better Errors to abbreviate filenames within your application.
 
-For instructions for your specific middleware, [see the wiki](https://github.com/charliesome/better_errors/wiki/Non-Rails-frameworks).
+For instructions for your specific middleware, [see the wiki](https://github.com/BetterErrors/better_errors/wiki/Non-Rails-frameworks).
 
 ### Plain text requests
 
@@ -78,7 +78,7 @@ to troubleshoot an issue in development.
 
 Better Errors includes a link to your editor for the file and line of code that is being shown.
 By default, it uses your environment to determine which editor should be opened.
-See [the wiki for instructions on configuring the editor](https://github.com/charliesome/better_errors/wiki/Link-to-your-editor).
+See [the wiki for instructions on configuring the editor](https://github.com/BetterErrors/better_errors/wiki/Link-to-your-editor).
 
 
 ## Set maximum variable size for inspector.
diff --git a/better_errors.gemspec b/better_errors.gemspec
index 7b5164bd..74093c25 100644
--- a/better_errors.gemspec
+++ b/better_errors.gemspec
@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.email         = ["charlie@charliesomerville.com"]
   s.description   = %q{Provides a better error page for Rails and other Rack apps. Includes source code inspection, a live REPL and local/instance variable inspection for all stack frames.}
   s.summary       = %q{Better error page for Rails and other Rack apps}
-  s.homepage      = "https://github.com/charliesome/better_errors"
+  s.homepage      = "https://github.com/BetterErrors/better_errors"
   s.license       = "MIT"
 
   s.files         = `git ls-files -z`.split("\x0").reject do |f|
diff --git a/lib/better_errors.rb b/lib/better_errors.rb
index e9649e53..27a13d67 100644
--- a/lib/better_errors.rb
+++ b/lib/better_errors.rb
@@ -129,7 +129,7 @@ def self.editor=(editor)
   # Enables experimental Pry support in the inline REPL
   #
   # If you encounter problems while using Pry, *please* file a bug report at
-  # https://github.com/charliesome/better_errors/issues
+  # https://github.com/BetterErrors/better_errors/issues
   def self.use_pry!
     REPL::PROVIDERS.unshift const: :Pry, impl: "better_errors/repl/pry"
   end
diff --git a/lib/better_errors/templates/main.erb b/lib/better_errors/templates/main.erb
index f0041177..b373f2f6 100644
--- a/lib/better_errors/templates/main.erb
+++ b/lib/better_errors/templates/main.erb
@@ -953,7 +953,7 @@
                     if(response.explanation) {
                       el.innerHTML += "<p class='explanation'>" + escapeHTML(response.explanation) + "</p>";
                     }
-                    el.innerHTML += "<p><a target='_new' href='https://github.com/charliesome/better_errors'>More about Better Errors</a></p>";
+                    el.innerHTML += "<p><a target='_new' href='https://github.com/BetterErrors/better_errors'>More about Better Errors</a></p>";
                 } else {
                     el.innerHTML = response.html;