diff --git a/.mailmap b/.mailmap
index d8ec4f8f51..e2123c35dc 100644
--- a/.mailmap
+++ b/.mailmap
@@ -21,7 +21,8 @@ jeckyhl <jeckyhl@sourceforge.net> jeckyll <jeckyll@mantisbt.org>
 Jim Hanley <dgtlrift@users.sourceforge.net>
 Johan Guilbaud <git@lapinkiller.fr>
 Johan Guilbaud <git@lapinkiller.fr> Lapinkiller <lapinkiller@hotmail.fr>
-John Reese <john@noswap.com> <jreese@leetcode.net>
+Amethyst Reese <amethyst@n7.gg> <john@noswap.com>
+Amethyst Reese <amethyst@n7.gg> <jreese@leetcode.net>
 Kornel Lesinski <kornel@aardvarkmedia.co.uk>
 Lincoln Maskey <narcissus@users.sourceforge.net>
 Luke Lee <luke@mantishub.net>
diff --git a/core/event_api.php b/core/event_api.php
index 82b8873277..1e7da747fe 100644
--- a/core/event_api.php
+++ b/core/event_api.php
@@ -19,7 +19,7 @@
  *
  * @package CoreAPI
  * @subpackage EventAPI
- * @author John Reese
+ * @author Amethyst Reese
  * @copyright Copyright 2002  MantisBT Team - mantisbt-dev@lists.sourceforge.net
  * @link http://www.mantisbt.org
  *
diff --git a/core/tag_api.php b/core/tag_api.php
index 6b712ade19..5ad3b4cb3a 100644
--- a/core/tag_api.php
+++ b/core/tag_api.php
@@ -19,7 +19,7 @@
  *
  * @package CoreAPI
  * @subpackage TagAPI
- * @author John Reese
+ * @author Amethyst Reese
  * @copyright Copyright 2000 - 2002  Kenzaburo Ito - kenito@300baud.org
  * @copyright Copyright 2002  MantisBT Team - mantisbt-dev@lists.sourceforge.net
  * @link http://www.mantisbt.org
diff --git a/doc/CREDITS b/doc/CREDITS
index c84f838889..7a7187e07f 100644
--- a/doc/CREDITS
+++ b/doc/CREDITS
@@ -40,7 +40,7 @@ David Hicks (dhx)
 Daryn Warriner (daryn, dwarrine)
 Gianluca Sforna (giallu)
 Glenn Henshaw (thraxisp)
-John Reese (jreese, nuclear_eclipse)
+Amethyst Reese (jreese, nuclear_eclipse)
 Paul Richards (grangeway, paulr, minimoo, prichards)
 Robert Munteanu (rombert)
 Siebrand Mazeland (siebrand)
@@ -60,7 +60,7 @@ Glenn Henshaw
 Roland Becker
 Julian Fitzell
 David Hicks
-John Reese
+Amethyst Reese
 translatewiki.net
 Rafik Robeal
 Jeroen Latour
diff --git a/lang/strings_english.txt b/lang/strings_english.txt
index 0152f52e3d..e181af07c1 100644
--- a/lang/strings_english.txt
+++ b/lang/strings_english.txt
@@ -46,7 +46,7 @@
  * @author Glenn Henshaw
  * @author Jeroen Latour
  * @author Jim Hanley
- * @author John Reese
+ * @author Amethyst Reese
  * @author Julian Fitzell
  * @author Kenzaburo Ito
  * @author Lincoln Maskey
diff --git a/plugins/MantisCoreFormatting/lang/strings_english.txt b/plugins/MantisCoreFormatting/lang/strings_english.txt
index 707dd99cbc..bfe5dd6061 100644
--- a/plugins/MantisCoreFormatting/lang/strings_english.txt
+++ b/plugins/MantisCoreFormatting/lang/strings_english.txt
@@ -39,7 +39,7 @@
  *
  * @author Damien Regad
  * @author David Hicks
- * @author John Reese
+ * @author Amethyst Reese
  * @author Siebrand Mazeland
  */