diff --git a/.authors.yml b/.authors.yml
index 157cfee88..5b8156672 100644
--- a/.authors.yml
+++ b/.authors.yml
@@ -25,13 +25,13 @@
   first_commit: 2016-04-23 15:08:17
   github: lucasicf
 - name: Jamie Bliss
-  email: astronouth7303@gmail.com
+  email: jamie@ivylav.es
   aliases:
   - James Bliss
   alternate_emails:
   - jamie.bliss@ilq.com
   - jbliss@nextgenerationenrollment.com
-  - jamie@ivyleav.es
+  - astronouth7303@gmail.com
   num_commits: 213
   first_commit: 2016-07-20 14:05:08
   github: astronouth7303
diff --git a/.mailmap b/.mailmap
index eb9332192..8daab9297 100644
--- a/.mailmap
+++ b/.mailmap
@@ -17,9 +17,9 @@ Gil Forsyth <gilforsyth@gmail.com> Gil Forsyth <gforsyth@gwu.edu>
 Gil Forsyth <gilforsyth@gmail.com> Gil Forsyth <gil@forsyth.dev>
 Morten Enemark Lund <melund@gmail.com>
 Konstantinos Tsakiltzidis <laerusk@gmail.com> laerus <laerusk@gmail.com>
-Jamie Bliss <astronouth7303@gmail.com> James Bliss <jamie.bliss@ilq.com>
-Jamie Bliss <astronouth7303@gmail.com> James Bliss <jbliss@nextgenerationenrollment.com>
-Jamie Bliss <astronouth7303@gmail.com> James Bliss <jamie@ivyleav.es>
+Jamie Bliss <jamie@ivyleav.es> James Bliss <jamie.bliss@ilq.com>
+Jamie Bliss <jamie@ivyleav.es> James Bliss <jbliss@nextgenerationenrollment.com>
+Jamie Bliss <jamie@ivyleav.es> James Bliss <astronouth7303@gmail.com>
 Hugo Wang <w@mitnk.com>
 David Strobach <lalochcz@gmail.com> laloch <lalochcz@gmail.com>
 Bob Hyman <bob.hyman@bobssoftwareworks.com> Bob Hyman <bob.hyman@gmail.com>
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index af02c7b2a..493581793 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2977,7 +2977,7 @@ v0.4.7
 **Added:**
 
 * Define alias for 'echo' on startup for Windows only.
-* New coredev `astronouth7303 <https://github.com/astronouth7303>`_ added
+* New coredev `AstraLuma <https://github.com/AstraLuma>`_ added
 * ``which -a`` now searches in ``__xonsh_ctx__`` too
 * Info about the xontrib cookiecutter template on xontrib tutorial
 * xonsh's optional dependencies may now be installed with the pip extras ``ptk``, ``proctitle``, ``linux``, ``mac``, and ``win``.
@@ -3179,7 +3179,7 @@ v0.4.5
   the xonsh FAQ for more information on trade-offs and mitigation strategies.
 * ``which -v`` now calls superhelp, which will print highlighted source.
 * Added xontribs:
-  * `z (Tracks your most used directories, based on 'frecency'.) <https://github.com/astronouth7303/xontrib-z>`_
+  * `z (Tracks your most used directories, based on 'frecency'.) <https://github.com/AstraLuma/xontrib-z>`_
 * amalgamate.py now supports relative imports.
 * ``history show`` args ``-t``, ``-f``, ``-T`` ``+T`` to filter commands by timestamp
 
diff --git a/xonsh/xontribs.json b/xonsh/xontribs.json
index 322d33eb7..377d08d5c 100644
--- a/xonsh/xontribs.json
+++ b/xonsh/xontribs.json
@@ -35,7 +35,7 @@
  },
  {"name": "avox",
   "package": "xontrib-avox",
-  "url": "https://github.com/astronouth7303/xontrib-avox",
+  "url": "https://github.com/AstraLuma/xontrib-avox",
   "description": ["Automatic (de)activation of virtual environments as you cd around"]
  },
  {"name": "bashisms",
@@ -196,7 +196,7 @@
  },
  {"name": "schedule",
   "package": "xontrib-schedule",
-  "url": "https://github.com/astronouth7303/xontrib-schedule",
+  "url": "https://github.com/AstraLuma/xontrib-schedule",
   "description": ["Xonsh Task Scheduling"]
  },
  {"name": "scrapy_tabcomplete",
@@ -251,7 +251,7 @@
   },
  {"name": "z",
   "package": "xontrib-z",
-  "url": "https://github.com/astronouth7303/xontrib-z",
+  "url": "https://github.com/AstraLuma/xontrib-z",
   "description": ["Tracks your most used directories, based on 'frecency'."]
  }
  ],
@@ -330,7 +330,7 @@
   },
   "xontrib-avox": {
    "license": "GPLv3",
-   "url": "https://github.com/astronouth7303/xontrib-avox",
+   "url": "https://github.com/AstraLuma/xontrib-avox",
    "install": {
     "pip": "xpip install xontrib-avox"
    }
@@ -394,7 +394,7 @@
   },
   "xontrib-schedule": {
    "license": "MIT",
-   "url": "https://github.com/astronouth7303/xontrib-schedule",
+   "url": "https://github.com/AstraLuma/xontrib-schedule",
    "install": {
     "pip": "xpip install xontrib-schedule"
    }
@@ -422,7 +422,7 @@
   },
   "xontrib-z": {
    "license": "GPLv3",
-   "url": "https://github.com/astronouth7303/xontrib-z",
+   "url": "https://github.com/AstraLuma/xontrib-z",
    "install": {
     "pip": "xpip install xontrib-z"
    }