diff --git a/.mailmap b/.mailmap
index d8c98a817ca30..2e4bce355d5ac 100644
--- a/.mailmap
+++ b/.mailmap
@@ -24,8 +24,8 @@ David Burns <david.burns@theautomatedtester.co.uk> Davis Burns
 Eran Messeri <eran.mes@gmail.com> Eran Mes
 Haw-bin Chai <hbchai@gmail.com> hbchai@gmail.com
 Ivan De Marino <detronizator@gmail.com> IvanDeMarino
-Jason Lebya <jmleyba@gmail.com> Jason Leyba
-Jim Evans <james.h.evans.jr@gmail.com> Jim
+Jason Huggins <jrhuggins@gmail.com> Anonymous Coward <anonymous@example.com>
+Jim Evans <james.h.evans.jr@gmail.com> <james.evans@salesforce.com>
 Leo Laskin <llaskin@gmail.com> Leo Laskin@gmail.com
 Luke Inman-Semerau <luke.semerau@gmail.com> Luke Semerau
 Paul Hammant <phammant@gmail.com> <PaulHammant@gmail.com>
diff --git a/AUTHORS b/AUTHORS
index 1acda0b95e38f..f1bdfdc292b5f 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -14,7 +14,6 @@ Andras Hatvani <andras.hatvani@gmail.com>
 Andreas Tolfsen <ato@mozilla.com>
 Andrei Solntsev <andrei.solntsev@gmail.com>
 Andy Duncan <aduncan@thoughtworks.com>
-Anonymous Coward <anonymous@example.com>
 Aslak Hellesøy <aslak.hellesoy@gmail.com>
 AutomatedTester <david.burns@theautomatedtester.co.uk>
 Baran Ozgul <baran.ozgul@test.com>
@@ -71,7 +70,6 @@ Jennifer Bevan <jbevan@google.com>
 Jeremy Herault <jeremy.herault@gmail.com>
 Jiayao Yu <Jiayao.Yu@test.com>
 Jie Tina Wang <jwang@example.com>
-Jim <james.h.evans.jr@gmail.com>
 Jim Evans <james.h.evans.jr@gmail.com>
 jmuramatsu <jmuramatsu@gmail.com>
 Joe Walnes