diff --git a/.mailmap b/.mailmap
index 2f1a49124a7c8d..a10ee3dc8869f5 100644
--- a/.mailmap
+++ b/.mailmap
@@ -387,6 +387,7 @@ Suraiya Hameed <hameedsuraiya@gmail.com>
 Suramya shah <shah.suramya@gmail.com> ss22ever <ss22ever@users.noreply.github.com>
 Surya Panikkal <surya.com@gmail.com>
 Tadashi SAWADA <cesare@mayverse.jp>
+Tadhg Creedon <tadhgcreedon@gmail.com> <tadhg.creedon@rangle.io>
 Taehee Kang <hugnosis@gmail.com>
 Takahiro ANDO <takahiro.ando@gmail.com>
 Tanuja-Sawant <f2013658@goa.bits-pilani.ac.in> <thinkbigtanu@gmail.com>
@@ -402,7 +403,9 @@ Thomas Watson <w@tson.dk>
 Tierney Cyren <hello@bnb.im>
 Tierney Cyren <hello@bnb.im> &! (bitandbang) <tieliaco@gmail.com>
 Tim Caswell <tim@creationix.com> <tim@0-26-8-e9-4c-e1.dyn.utdallas.edu>
+Tim Costa <tim@timcosta.io> <tjsail33@gmail.com>
 Tim Price <timprice@mangoraft.com>
+Tim Ruffles <timruffles@googlemail.com> <oi@truffles.me.uk>
 Tim Smart <timehandgod@gmail.com>
 Tim Smart <timehandgod@gmail.com> <tim@fostle.com>
 Timothy Leverett <zzzzBov@gmail.com>
diff --git a/AUTHORS b/AUTHORS
index 3990eb9e001fbc..9678ba406986c4 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -652,7 +652,7 @@ Ben Burns <benjamin.c.burns@gmail.com>
 Julian Duque <julianduquej@gmail.com>
 Teppei Sato <teppeis@gmail.com>
 Rudi Cilibrasi <cilibrar@morefuntechnologies.com>
-Tim Ruffles <oi@truffles.me.uk>
+Tim Ruffles <timruffles@googlemail.com>
 CGavrila <cristi_gavrila1@yahoo.com>
 Aleksey Smolenchuk <aleksey@uber.com>
 Caitlin Potter <caitpotter88@gmail.com>
@@ -1664,7 +1664,7 @@ Miguel Martins <mmartins@uphold.com>
 Yury Popov <github@phoenix.dj>
 George Bezerra <georgelione@gmail.com>
 Benjamin Coe <bencoe@gmail.com>
-Tim Costa <tjsail33@gmail.com>
+Tim Costa <tim@timcosta.io>
 Rahul Mishra <mishra.rahul1712@gmail.com>
 Damien O'Reilly <damienreilly@gmail.com>
 Tuan Anh Tran <me@tuananh.org>
@@ -2270,7 +2270,6 @@ prayag21 <10997858+prayag21@users.noreply.github.com>
 Bruno Pinho <bpinhosilva@gmail.com>
 Anto Aravinth <anto.aravinth.cse@gmail.com>
 Helio Frota <00hf11@gmail.com>
-Tim Ruffles <timruffles@googlemail.com>
 Jacob Page <jpage@godaddy.com>
 sagulati <sagulati@adobe.com>
 conectado <gabrielalejandro7@gmail.com>
@@ -2498,7 +2497,7 @@ Jerome Covington <jeromecovington@gmail.com>
 Rob Reynolds <ferventcoder@gmail.com>
 warnerp18 <warnerp18@gmail.com>
 chux0519 <chuxdesign@hotmail.com>
-Tadhg Creedon <tadhg.creedon@rangle.io>
+Tadhg Creedon <tadhgcreedon@gmail.com>
 Petar Dodev <petar.dodev@gmail.com>
 mzucker <michaeljzucker@gmail.com>
 Morgan Roderick <morgan@roderick.dk>
@@ -2620,7 +2619,6 @@ grimrose <grimrose@users.noreply.github.com>
 timothy searcy <timmyzsearcy@gmail.com>
 nakashima <nakashima1711@gmail.com>
 /Jesse <jesse.katsumata@gmail.com>
-Tadhg Creedon <tadhgcreedon@gmail.com>
 exoego <mogami@exoego.net>
 sigwyg <sigwyg>
 pastak <pasta0915@gmail.com>
@@ -2959,7 +2957,6 @@ Rosen Penev <rosenp@gmail.com>
 Jeremy Albright <myrlin1@gmail.com>
 Giovanni Campagna <gcampagn@cs.stanford.edu>
 Donggeon Lim <ooqwe486@gmail.com>
-Tim Costa <tim@timcosta.io>
 rene.herrmann <rene.herrmann@share-now.com>
 Derek Lewis <DerekNonGeneric@inf.is>
 Kirill Ponomarev <shacaron@gmail.com>