diff --git a/AUTHORS.md b/AUTHORS.md
index 9e5a01494..6b734589d 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -191,7 +191,7 @@ Contributions include user testing, debugging, improving documentation, reviewin
 
 - Adam Chainz ([@adamchainz](https://github.com/adamchainz))
 - Andrew Ittner ([@tephyr](https://github.com/tephyr))
-- Audrey Roy Greenfeld ([@audreyr](https://github.com/audreyr))
+- Audrey Roy Greenfeld ([@audreyr](https://github.com/audreyfeldroy))
 - Carol Willing ([@willingc](https://github.com/willingc))
 - Christopher Clarke ([@chrisdev](https://github.com/chrisdev))
 - Citlalli Murillo ([@citmusa](https://github.com/citmusa))
diff --git a/HISTORY.md b/HISTORY.md
index 5f647aa3a..097509753 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -226,7 +226,7 @@ Other Changes:
 * Tests update: use sys.executable when invoking python in python 3 only environment thanks to [@vincentbernat](https://github.com/vincentbernat) (#1221)
 * Prevent `click` API v7.0 from showing choices when already shown, thanks to [@rly](https://github.com/rly) and [@luzfcb](https://github.com/luzfcb) (#1168)
 * Test the codebase with python3.8 beta on tox and travis-ci (#1206), thanks to [@mihrab34](https://github.com/mihrab34)
-* Add a [CODE\_OF\_CONDUCT.md](https://github.com/audreyr/cookiecutter/blob/master/CODE_OF_CONDUCT.md) file to the project, thanks to [@andreagrandi](https://github.com/andreagrandi) (#1009)
+* Add a [CODE\_OF\_CONDUCT.md](https://github.com/audreyfeldroy/cookiecutter/blob/master/CODE_OF_CONDUCT.md) file to the project, thanks to [@andreagrandi](https://github.com/andreagrandi) (#1009)
 * Update docstrings in `cookiecutter/main.py`, `cookiecutter/__init__.py`, and `cookiecutter/log.py` to follow the PEP 257 style guide, thanks to [@meahow](https://github.com/meahow) (#998, #999, #1000)
 * Update docstrings in `cookiecutter/utils.py` to follow the PEP 257 style guide, thanks to [@dornheimer](https://github.com/dornheimer)(#1026)
 * Fix grammar in *Choice Variables* documentation, thanks to [@jubrilissa](https://github.com/jubrilissa) (#1011)
@@ -403,7 +403,7 @@ Other Changes:
 * Refactor cookiecutter template identification, thanks to [@michaeljoseph](https://github.com/michaeljoseph) (#777)
 * Add a `cli_runner` test fixture to simplify CLI tests, thanks to [@hackebrot](https://github.com/hackebrot) (#790)
 * Add a check to ensure cookiecutter repositories have JSON context, thanks to [@michaeljoseph](https://github.com/michaeljoseph)(#782)
-* Rename the internal function that determines whether a file should be rendered, thanks to [@audreyr](https://github.com/audreyr) for raising the issue and [@hackebrot](https://github.com/hackebrot)for the PR (#741, #802)
+* Rename the internal function that determines whether a file should be rendered, thanks to [@audreyr](https://github.com/audreyfeldroy) for raising the issue and [@hackebrot](https://github.com/hackebrot)for the PR (#741, #802)
 * Fix typo in docs, thanks to [@mwarkentin](https://github.com/mwarkentin) (#828)
 * Fix broken link to *Invoke* docs, thanks to [@B3QL](https://github.com/B3QL) (#820)
 * Add documentation to `render_variable` function in `prompt.py`, thanks to [@pydanny](https://github.com/pydanny) (#678)
@@ -481,11 +481,11 @@ Other Changes:
 * Removed xfail in test\_cookiecutters, thanks to [@hackebrot](https://github.com/hackebrot) (#618)
 * Removed django-cms-plugin on account of 404 error, thanks to [@mativs](https://github.com/mativs) and [@pydanny](https://github.com/pydanny) (#593)
 * Fixed docs/usage.rst, thanks to [@macrotim](https://github.com/macrotim) (#604)
-* Update .gitignore to latest Python.gitignore and ignore PyCharm files, thanks to [@audreyr](https://github.com/audreyr)
+* Update .gitignore to latest Python.gitignore and ignore PyCharm files, thanks to [@audreyr](https://github.com/audreyfeldroy)
 * Use open context manager to read context\_file in generate() function, thanks to [@hackebrot](https://github.com/hackebrot)
 (#607, #608)
 * Added documentation for choice variables, thanks to [@maiksensi](https://github.com/maiksensi) (#611)
-* Set up Scrutinizer to check code quality, thanks to [@audreyr](https://github.com/audreyr)
+* Set up Scrutinizer to check code quality, thanks to [@audreyr](https://github.com/audreyfeldroy)
 * Drop distutils support in setup.py, thanks to [@hackebrot](https://github.com/hackebrot) (#606, #609)
 * Change cookiecutter-pypackage-minimal link, thanks to [@kragniz](https://github.com/kragniz) (#614)
 * Fix typo in one of the template\'s description, thanks to [@ryanfreckleton](https://github.com/ryanfreckleton) (#643)
@@ -548,7 +548,7 @@ Other Changes:
 
 * Enable py35 support on Travis by using Python 3.5 as base Python ([@maiksensi](https://github.com/maiksensi) / #540)
 * If a filename is empty, do not generate. Log instead ([@iljabauer](https://github.com/iljabauer) / #444)
-* Fix tests as per last changes in [cookiecutter-pypackage](https://github.com/audreyr/cookiecutter-pypackage), thanks to [@eliasdorneles](https://github.com/eliasdorneles)(#555).
+* Fix tests as per last changes in [cookiecutter-pypackage](https://github.com/audreyfeldroy/cookiecutter-pypackage), thanks to [@eliasdorneles](https://github.com/eliasdorneles)(#555).
 * Removed deprecated cookiecutter-pylibrary-minimal from the list, thanks to [@ionelmc](https://github.com/ionelmc) (#556)
 * Moved to using rualmel.yaml instead of PyYAML, except for Windows users on Python 2.7, thanks
     to [@pydanny](https://github.com/pydanny) (#557)
@@ -671,7 +671,7 @@ The goal of this release was to allow for injection of extra context via the Coo
 
 Features:
 
-* cookiecutter() now takes an optional extra\_context parameter, thanks to [@michaeljoseph](https://github.com/michaeljoseph), [@fcurella](https://github.com/fcurella), [@aventurella](https://github.com/aventurella),  [@emonty](https://github.com/emonty), [@schacki](https://github.com/schacki), [@ryanolson](https://github.com/ryanolson), [@pfmoore](https://github.com/pfmoore), [@pydanny](https://github.com/pydanny), [@audreyr](https://github.com/audreyr) (#260).
+* cookiecutter() now takes an optional extra\_context parameter, thanks to [@michaeljoseph](https://github.com/michaeljoseph), [@fcurella](https://github.com/fcurella), [@aventurella](https://github.com/aventurella),  [@emonty](https://github.com/emonty), [@schacki](https://github.com/schacki), [@ryanolson](https://github.com/ryanolson), [@pfmoore](https://github.com/pfmoore), [@pydanny](https://github.com/pydanny), [@audreyr](https://github.com/audreyfeldroy) (#260).
 * Context is now injected into hooks, thanks to [@michaeljoseph](https://github.com/michaeljoseph) and [@dinopetrone](https://github.com/dinopetrone).
 * Moved all Python 2/3 compatibility code into cookiecutter.compat, making the eventual move to six easier, thanks to [@michaeljoseph](https://github.com/michaeljoseph) (#60, #102).
 * Added cookiecutterrc defined aliases for cookiecutters, thanks to [@pfmoore](https://github.com/pfmoore) (#246)
@@ -711,12 +711,12 @@ Bug Fixes:
 
 Other Changes:
 
-* [@audreyr](https://github.com/audreyr) formally accepted position as **BDFL of cookiecutter**.
+* [@audreyr](https://github.com/audreyfeldroy) formally accepted position as **BDFL of cookiecutter**.
 * Elevated [@pydanny](https://github.com/pydanny), [@michaeljoseph](https://github.com/michaeljoseph), and [@pfmoore](https://github.com/pfmoore) to core committer status.
-* Added Core Committer guide, by [@audreyr](https://github.com/audreyr).
-* Generated apidocs from make docs, by [@audreyr](https://github.com/audreyr).
+* Added Core Committer guide, by [@audreyr](https://github.com/audreyfeldroy).
+* Generated apidocs from make docs, by [@audreyr](https://github.com/audreyfeldroy).
 * Added contributing command to the makedocs function, by [@pydanny](https://github.com/pydanny).
-* Refactored contributing documentation, included adding core committer instructions, by [@pydanny](https://github.com/pydanny) and [@audreyr](https://github.com/audreyr).
+* Refactored contributing documentation, included adding core committer instructions, by [@pydanny](https://github.com/pydanny) and [@audreyr](https://github.com/audreyfeldroy).
 * Do not convert input prompt to bytes, thanks to [@uranusjr](https://github.com/uranusjr) (#192).
 * Added troubleshooting info about Python 3.3 tests and tox.
 * Added documentation about command line arguments, thanks to [@saxix](https://github.com/saxix).
@@ -823,8 +823,8 @@ Other changes:
     # Create project from the cookiecutter-pypackage/ template
     $ cookiecutter cookiecutter-pypackage/
     # Create project from the cookiecutter-pypackage.git repo template
-    $ cookiecutter https://github.com/audreyr/cookiecutter-pypackage.git
-```
+    $ cookiecutter https://github.com/audreyfeldroy/cookiecutter-pypackage.git
+```  
 
 * Can now use Cookiecutter from Python as a package:
 
@@ -835,7 +835,7 @@ Other changes:
     cookiecutter('cookiecutter-pypackage/')
 
     # Create project from the cookiecutter-pypackage.git repo template
-    cookiecutter('https://github.com/audreyr/cookiecutter-pypackage.git')
+    cookiecutter('https://github.com/audreyfeldroy/cookiecutter-pypackage.git')
 ```
 
 * Internal refactor to remove any code that changes the working
diff --git a/docs/advanced/calling_from_python.rst b/docs/advanced/calling_from_python.rst
index b497b6bf0..c51b09f0b 100644
--- a/docs/advanced/calling_from_python.rst
+++ b/docs/advanced/calling_from_python.rst
@@ -13,7 +13,7 @@ You can use Cookiecutter from Python:
     cookiecutter('cookiecutter-pypackage/')
 
     # Create project from the cookiecutter-pypackage.git repo template
-    cookiecutter('https://github.com/audreyr/cookiecutter-pypackage.git')
+    cookiecutter('https://github.com/audreyfeldroy/cookiecutter-pypackage.git')
 
 This is useful if, for example, you're writing a web framework and need to provide developers with a tool similar to `django-admin.py startproject` or `npm init`.
 
diff --git a/docs/advanced/user_config.rst b/docs/advanced/user_config.rst
index c7a8e9826..59063b291 100644
--- a/docs/advanced/user_config.rst
+++ b/docs/advanced/user_config.rst
@@ -36,7 +36,7 @@ Example user config:
     cookiecutters_dir: "/home/audreyr/my-custom-cookiecutters-dir/"
     replay_dir: "/home/audreyr/my-custom-replay-dir/"
     abbreviations:
-        pp: https://github.com/audreyr/cookiecutter-pypackage.git
+        pp: https://github.com/audreyfeldroy/cookiecutter-pypackage.git
         gh: https://github.com/{0}.git
         bb: https://bitbucket.org/{0}
 
diff --git a/docs/overview.rst b/docs/overview.rst
index dd06999ef..6c75f77fe 100644
--- a/docs/overview.rst
+++ b/docs/overview.rst
@@ -32,7 +32,7 @@ You must have:
 
 Beyond that, you can have whatever files/directories you want.
 
-See https://github.com/audreyr/cookiecutter-pypackage for a real-world example
+See https://github.com/audreyfeldroy/cookiecutter-pypackage for a real-world example
 of this.
 
 Output
diff --git a/docs/tutorials/index.rst b/docs/tutorials/index.rst
index 81e1b0dff..88848a848 100644
--- a/docs/tutorials/index.rst
+++ b/docs/tutorials/index.rst
@@ -30,7 +30,7 @@ External Links
 .. _`Extending our Cookiecutter template`: https://raphael.codes/blog/extending-our-cookiecutter-template/
 .. _`Wrapping up our Cookiecutter template`: https://raphael.codes/blog/wrapping-up-our-cookiecutter-template/
 
-.. _`@audreyr`: https://github.com/audreyr
+.. _`@audreyr`: https://github.com/audreyfeldroy
 .. _`@pydanny`: https://github.com/pydanny
 .. _`@hackebrot`: https://github.com/hackebrot
 .. _`@BruceEckel`: https://github.com/BruceEckel
diff --git a/docs/tutorials/tutorial1.rst b/docs/tutorials/tutorial1.rst
index 0871ca696..e7133fe91 100644
--- a/docs/tutorials/tutorial1.rst
+++ b/docs/tutorials/tutorial1.rst
@@ -14,9 +14,8 @@ Case Study: cookiecutter-pypackage
 
 *cookiecutter-pypackage* is a cookiecutter template that creates the starter boilerplate for a Python package.
 
-.. note::
-    There are several variations of it.
-    For this tutorial we'll use the original version at https://github.com/audreyr/cookiecutter-pypackage/.
+.. note:: There are several variations of it, but for this tutorial we'll use
+   the original version at https://github.com/audreyfeldroy/cookiecutter-pypackage/.
 
 Step 1: Generate a Python Package Project
 ------------------------------------------
@@ -27,7 +26,7 @@ At the command line, run the cookiecutter command, passing in the link to cookie
 
 .. code-block:: bash
 
-    $ cookiecutter https://github.com/audreyr/cookiecutter-pypackage.git
+    $ cookiecutter https://github.com/audreyfeldroy/cookiecutter-pypackage.git
 
 Local Cloning of Project Template
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -95,8 +94,7 @@ How did that work?
 Step 3: Observe How It Was Generated
 ------------------------------------
 
-Let's take a look at cookiecutter-pypackage together.
-Open https://github.com/audreyr/cookiecutter-pypackage in a new browser window.
+Let's take a look at cookiecutter-pypackage together. Open https://github.com/audreyfeldroy/cookiecutter-pypackage in a new browser window.
 
 {{ cookiecutter.project_slug }}
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -111,7 +109,8 @@ This happens in `find.py`, where the `find_template()` method looks for the firs
 AUTHORS.rst
 ~~~~~~~~~~~
 
-Look at the raw version of `{{ cookiecutter.project_slug }}/AUTHORS.rst`, at https://raw.github.com/audreyr/cookiecutter-pypackage/master/%7B%7Bcookiecutter.project_slug%7D%7D/AUTHORS.rst.
+Look at the raw version of `{{ cookiecutter.project_slug }}/AUTHORS.rst`, at
+https://raw.github.com/audreyfeldroy/cookiecutter-pypackage/master/%7B%7Bcookiecutter.project_slug%7D%7D/AUTHORS.rst.
 
 Observe how it corresponds to the `AUTHORS.rst` file that you generated.
 
@@ -142,7 +141,8 @@ You should see JSON that corresponds to the prompts and default values shown ear
 Questions?
 ----------
 
-If anything needs better explanation, please take a moment to file an issue at https://github.com/audreyr/cookiecutter/issues with what could be improved about this tutorial.
+If anything needs better explanation, please take a moment to file an issue at https://github.com/audreyfeldroy/cookiecutter/issues with what could be improved
+about this tutorial.
 
 Summary
 -------
diff --git a/docs/usage.rst b/docs/usage.rst
index 9b7b95fe5..872cbe2b7 100644
--- a/docs/usage.rst
+++ b/docs/usage.rst
@@ -7,7 +7,7 @@ Grab a Cookiecutter template
 
 First, clone a Cookiecutter project template::
 
-    $ git clone git@github.com:audreyr/cookiecutter-pypackage.git
+    $ git clone https://github.com/audreyfeldroy/cookiecutter-pypackage.git
 
 Make your changes
 -----------------
@@ -40,14 +40,14 @@ Works directly with git and hg (mercurial) repos too
 
 To create a project from the cookiecutter-pypackage.git repo template::
 
-    $ cookiecutter gh:audreyr/cookiecutter-pypackage
+    $ cookiecutter gh:audreyfeldroy/cookiecutter-pypackage
 
 Cookiecutter knows abbreviations for Github (``gh``), Bitbucket (``bb``), and
 GitLab (``gl``) projects, but you can also give it the full URL to any
 repository::
 
-    $ cookiecutter https://github.com/audreyr/cookiecutter-pypackage.git
-    $ cookiecutter git+ssh://git@github.com/audreyr/cookiecutter-pypackage.git
+    $ cookiecutter https://github.com/audreyfeldroy/cookiecutter-pypackage.git
+    $ cookiecutter git+ssh://git@github.com/audreyfeldroy/cookiecutter-pypackage.git
     $ cookiecutter hg+ssh://hg@bitbucket.org/audreyr/cookiecutter-pypackage
 
 You will be prompted to enter a bunch of project config values. (These are
@@ -58,7 +58,7 @@ that you entered. It will be placed in your current directory.
 
 And if you want to specify a branch you can do that with::
 
-    $ cookiecutter https://github.com/audreyr/cookiecutter-pypackage.git --checkout develop
+    $ cookiecutter https://github.com/audreyfeldroy/cookiecutter-pypackage.git --checkout develop
 
 Works with private repos
 ------------------------
diff --git a/tests/repository/test_is_repo_url.py b/tests/repository/test_is_repo_url.py
index 64238e02e..5591be0fc 100644
--- a/tests/repository/test_is_repo_url.py
+++ b/tests/repository/test_is_repo_url.py
@@ -25,8 +25,8 @@ def test_is_zip_file(zipfile):
 @pytest.fixture(
     params=[
         'gitolite@server:team/repo',
-        'git@github.com:audreyr/cookiecutter.git',
-        'https://github.com/audreyr/cookiecutter.git',
+        'git@github.com:audreyfeldroy/cookiecutter.git',
+        'https://github.com/cookiecutter/cookiecutter.git',
         'git+https://private.com/gitrepo',
         'hg+https://private.com/mercurialrepo',
         'https://bitbucket.org/pokoli/cookiecutter.hg',
@@ -65,7 +65,7 @@ def test_is_repo_url_for_local_urls(local_repo_url):
 
 def test_expand_abbreviations():
     """Validate `repository.expand_abbreviations` correctly translate url."""
-    template = 'gh:audreyr/cookiecutter-pypackage'
+    template = 'gh:audreyfeldroy/cookiecutter-pypackage'
 
     # This is not a valid repo url just yet!
     # First `repository.expand_abbreviations` needs to translate it
diff --git a/tests/vcs/test_identify_repo.py b/tests/vcs/test_identify_repo.py
index fe264edcd..bfb3d56a2 100644
--- a/tests/vcs/test_identify_repo.py
+++ b/tests/vcs/test_identify_repo.py
@@ -24,14 +24,14 @@
         ),
         ('https://bitbucket.org/foo/bar.hg', 'hg', 'https://bitbucket.org/foo/bar.hg'),
         (
-            'https://github.com/audreyr/cookiecutter-pypackage.git',
+            'https://github.com/audreyfeldroy/cookiecutter-pypackage.git',
             'git',
-            'https://github.com/audreyr/cookiecutter-pypackage.git',
+            'https://github.com/audreyfeldroy/cookiecutter-pypackage.git',
         ),
         (
-            'https://github.com/audreyr/cookiecutter-pypackage',
+            'https://github.com/audreyfeldroy/cookiecutter-pypackage',
             'git',
-            'https://github.com/audreyr/cookiecutter-pypackage',
+            'https://github.com/audreyfeldroy/cookiecutter-pypackage',
         ),
         (
             'git@gitorious.org:cookiecutter-gitorious/cookiecutter-gitorious.git',