diff --git a/src/reviewers.rs b/src/reviewers.rs
index 7693ea2c..67a0e1cd 100644
--- a/src/reviewers.rs
+++ b/src/reviewers.rs
@@ -20,24 +20,18 @@ impl Reviewers {
             }
         }
 
-        let aatch = a("James Miller", "james@aatch.net");
         let alexcrichton = a("Alex Crichton", "alex@alexcrichton.com");
         let amanieu = a("Amanieu d'Antras", "amanieu@gmail.com");
         let arielb1 = a("Ariel Ben-Yehuda", "ariel.byd@gmail.com");
         let brson = a("Brian Anderson", "andersrb@gmail.com");
-        let burntsushi = a("Andrew Gallant", "jamslam@gmail.com");
-        let centril = a("Mazdak Farrokhzad", "twingoow@gmail.com");
         let cramertj = a("Taylor Cramer", "cramertj@google.com");
         let ecstaticmorse = a("Dylan MacKenzie", "ecstaticmorse@gmail.com");
         let frewsxcv = a("Corey Farwell", "coreyf@rwell.org");
-        let gankro = a("Alexis Beingessner", "a.beingessner@gmail.com");
         let guillaumegomez = a("Guillaume Gomez", "guillaume1.gomez@gmail.com");
         let hanna_kruppe = a("Hanna Kruppe", "hanna.kruppe@gmail.com");
         let huonw = a("Huon Wilson", "wilson.huon@gmail.com");
         let jakub = a("Jakub Kądziołka", "kuba@kadziolka.net");
-        let joshtriplett = a("Josh Triplett", "josh@joshtriplett.org");
         let jyn514 = a("Joshua Nelson", "jyn514@gmail.com");
-        let kodraus = a("Ashley Mannix", "ashleymannix@live.com.au");
         let llogiq = a("Andre Bogus", "bogusandre@gmail.com");
         let manishearth = a("Manish Goregaokar", "manishsmail@gmail.com");
         let michaelwoerister = a("Michael Woerister", "michaelwoerister@posteo.net");
@@ -47,21 +41,18 @@ impl Reviewers {
         let pcwalton = a("Patrick Walton", "pcwalton@mimiga.net");
         let petrochenkov = a("Vadim Petrochenkov", "vadim.petrochenkov@gmail.com");
         let quietmisdreavus = a("QuietMisdreavus", "grey@quietmisdreavus.net");
-        let ralfjung = a("Ralf Jung", "post@ralfj.de");
         let simulacrum = a("Mark Rousskov", "mark.simulacrum@gmail.com");
         let steveklabnik = a("Steve Klabnik", "steve@steveklabnik.com");
         let withoutboats = a("Without Boats", "boats@mozilla.com");
         let yaahc = a("Jane Lusby", "jlusby42@gmail.com");
-        let zoxc = a("John Kåre Alsaker", "john.kare.alsaker@gmail.com");
 
-        map.insert("Aaron1011", a("Aaron Hill", "aa1ronham@gmail.com"));
-        map.insert("Aaronepower", a("Erin Power", "xampprocky@gmail.com"));
-        map.insert("aatch", aatch.clone());
-        map.insert("Aatch", aatch.clone());
+        map.insert("aaron1011", a("Aaron Hill", "aa1ronham@gmail.com"));
+        map.insert("aaronepower", a("Erin Power", "xampprocky@gmail.com"));
+        map.insert("aatch", a("James Miller", "james@aatch.net"));
         map.insert("abonander", a("Austin Bonander", "austin.bonander@gmail.com"));
         map.insert("achrichto", alexcrichton.clone());
         map.insert("acrichto", alexcrichton.clone());
-        map.insert("aDotInTheVoid", a("Alona Enraght-Moony", "code@alona.page"));
+        map.insert("adotinthevoid", a("Alona Enraght-Moony", "code@alona.page"));
         map.insert("aidanhs", a("Aidan Hobson Sayers", "aidanhs@cantab.net"));
         map.insert("albertlarsan68", a("Albert Larsan", "albert.larsan@gmail.com"));
         map.insert("aleksator", a("Alex Tokarev", "aleksator@gmail.com"));
@@ -73,17 +64,20 @@ impl Reviewers {
         map.insert("alexcricthon", alexcrichton.clone());
         map.insert("alexcricton", alexcrichton.clone());
         map.insert("alexcritchton", alexcrichton.clone());
+        map.insert("alexendoo", a("Alex Macleod", "alex@macleod.io"));
         map.insert("alexheretic", a("Alex Butler", "alexheretic@gmail.com"));
         map.insert("alexreg", a("Alexander Regueiro", "alexreg@me.com"));
-        map.insert("Amaneiu", amanieu.clone());
-        map.insert("Amanieu", amanieu.clone());
+        map.insert("amaneiu", amanieu.clone());
+        map.insert("amanieu", amanieu.clone());
         map.insert("anasazi", a("Eric Reed", "ecreed@cs.washington.edu"));
         map.insert("apasel422", a("Andrew Paseltiner", "apaseltiner@gmail.com"));
         map.insert("apiraino", a("apiraino", "apiraino@users.noreply.github.com"));
         map.insert("arielb1", arielb1.clone());
         map.insert("arielb", arielb1.clone());
+        map.insert("arlosi", a("Arlo Siemsen", "arsiem@microsoft.com"));
         map.insert("arthurprs", a("arthurprs", "arthurprs@gmail.com"));
         map.insert("aturon", a("Aaron Turon", "aturon@mozilla.com"));
+        map.insert("b-naber", a("b-naber", "b_naber@gmx.de"));
         map.insert("badboy", a("Jan-Erik Rediger", "janerik@fnordig.de"));
         map.insert("bblum", a("Ben Blum", "bblum@andrew.cmu.edu"));
         map.insert("bjorn3", a("bjorn3", "bjorn3@users.noreply.github.com"));
@@ -94,9 +88,8 @@ impl Reviewers {
         map.insert("bson", brson.clone());
         map.insert("bstrie", a("Ben Striegel", "ben.striegel@gmail.com"));
         map.insert("bugadani", a("Dániel Buga", "bugadani@gmail.com"));
-        map.insert("burntsushi", burntsushi.clone());
-        map.insert("BurntSushi", burntsushi.clone());
-        map.insert("BoxyUwU", a("Boxy", "supbscripter@gmail.com"));
+        map.insert("burntsushi", a("Andrew Gallant", "jamslam@gmail.com"));
+        map.insert("boxyuwu", a("Boxy", "supbscripter@gmail.com"));
         map.insert("c410-f3r", a("Caio", "c410.f3r@gmail.com"));
         map.insert("calebcartwright", a("Caleb Cartwright", "caleb.cartwright@outlook.com"));
         map.insert("camelid", a("Camelid", "camelidcamel@gmail.com"));
@@ -104,16 +97,16 @@ impl Reviewers {
         map.insert("carllerche", a("Carl Lerche", "me@carllerche.com"));
         map.insert("carols10cents", a("Carol (Nichols || Goulding)", "carol.nichols@gmail.com"));
         map.insert("catamorphism", a("Tim Chevalier", "chevalier@alum.wellesley.edu"));
-        map.insert("CDirkx", a("Christiaan Dirkx", "christiaan@dirkx.email"));
-        map.insert("centril", centril.clone());
-        map.insert("Centril", centril.clone());
+        map.insert("cdirkx", a("Christiaan Dirkx", "christiaan@dirkx.email"));
+        map.insert("centril", a("Mazdak Farrokhzad", "twingoow@gmail.com"));
         map.insert("chris", a("Chris Morgan", "me@chrismorgan.info"));
+        map.insert("chrisdenton", a("Chris Denton", "christophersdenton@gmail.com"));
         map.insert("cjgillot", a("Camille GILLOT", "gillot.camille@gmail.com"));
-        map.insert("Cldfire", a("Jarek Samic", "cldfire3@gmail.com"));
+        map.insert("cldfire", a("Jarek Samic", "cldfire3@gmail.com"));
         map.insert("cmr", a("Corey Richardson", "corey@octayn.net"));
         map.insert("collin5", a("Collins Abitekaniza", "abtcolns@gmail.com"));
         map.insert("compiler-errors", a("Michael Goulet", "michael@errs.io"));
-        map.insert("CraftSpider", a("Rune Tynan", "runetynan@gmail.com"));
+        map.insert("craftspider", a("Rune Tynan", "runetynan@gmail.com"));
         map.insert("cramert", cramertj.clone());
         map.insert("cramertj", cramertj.clone());
         map.insert("csmoe", a("csmoe", "csmoe@msn.com"));
@@ -122,21 +115,25 @@ impl Reviewers {
         map.insert("davidtwco", a("David Wood", "david@davidtw.co"));
         map.insert("dingelish", a("Yu Ding", "dingelish@gmail.com"));
         map.insert("djc", a("Dirkjan Ochtman", "dirkjan@ochtman.nl"));
+        map.insert("djkoloski", a("David Koloski", "djkoloski@gmail.com"));
         map.insert("dns2utf8", a("Stefan Schindler", "dns2utf8@estada.ch"));
         map.insert("dotdash", a("Björn Steinbrink", "bsteinbr@gmail.com"));
+        map.insert("dswij", a("dswij", "dswijj@gmail.com"));
         map.insert("dtolnay", a("David Tolnay", "dtolnay@gmail.com"));
         map.insert("durka", a("Alex Durka", "web@alexburka.com"));
         map.insert("dwijnand", a("Dale Wijnand", "dale.wijnand@gmail.com"));
-        map.insert("Dylan-DPC", a("dylan_DPC", "dylan.dpc@gmail.com"));
+        map.insert("dylan-dpc", a("dylan_DPC", "dylan.dpc@gmail.com"));
         map.insert("ebroto", a("Eduardo Broto", "ebroto@tutanota.com"));
-        map.insert("ecstatic-morse", a("Dylan MacKenzie", "ecstaticmorse@gmail.com"));
         map.insert("ecstatic-morse", ecstaticmorse.clone());
         map.insert("ecstaticmorse", ecstaticmorse.clone());
         map.insert("eddyb", a("Eduard-Mihai Burtescu", "edy.burt@gmail.com"));
+        map.insert("edwin0cheng", a("Edwin Cheng", "edwin0cheng@gmail.com"));
         map.insert("eerden", a("Ercan Erden", "ercerden@gmail.com"));
-        map.insert("Eh2406", a("Eh2406", "YeomanYaacov@gmail.com"));
+        map.insert("eh2406", a("Eh2406", "YeomanYaacov@gmail.com"));
+        map.insert("eholk", a("Eric Holk", "eric@theincredibleholk.org"));
         map.insert("ehuss", a("Eric Huss", "eric@huss.org"));
         map.insert("elichai", a("Elichai Turkel", "elichai.turkel@gmail.com"));
+        map.insert("epage", a("Ed Page", "eopage@gmail.com"));
         map.insert("erickt", a("Erick Tryzelaar", "erick.tryzelaar@gmail.com"));
         map.insert("est31", a("est31", "MTest31@outlook.com"));
         map.insert("estebank", a("Esteban Küber", "esteban@kuber.com.ar"));
@@ -145,86 +142,83 @@ impl Reviewers {
         map.insert("fitzgen", a("Nick Fitzgerald", "fitzgen@gmail.com"));
         map.insert("flaper87", a("Flavio Percoco", "flaper87@gmail.com"));
         map.insert("flip1995", a("flip1995", "hello@philkrones.com"));
+        map.insert("flodiebold", a("Florian Diebold", "flodiebold@gmail.com"));
         map.insert("frewsxcv", frewsxcv.clone());
         map.insert("frewsxcvx", frewsxcv.clone());
         map.insert("frewsxcxv", frewsxcv.clone());
-        map.insert("gankro", gankro.clone());
-        map.insert("Gankro", gankro.clone());
+        map.insert("gankro", a("Alexis Beingessner", "a.beingessner@gmail.com"));
         map.insert("gereeter", a("Jonathan S", "gereeter+code@gmail.com"));
         map.insert("giraffate", a("Takayuki Nakata", "f.seasons017@gmail.com"));
         map.insert("gnzlbg", a("gnzlbg", "gonzalobg88@gmail.com"));
         map.insert("graydon", a("Graydon Hoare", "graydon@pobox.com"));
         map.insert("guillaumegomez", guillaumegomez.clone());
-        map.insert("GuillaumeGomez", guillaumegomez.clone());
-        map.insert("GuilliameGomez", guillaumegomez.clone());
-        map.insert("GuilliaumeGomez", guillaumegomez.clone());
+        map.insert("guilliamegomez", guillaumegomez.clone());
+        map.insert("guilliaumegomez", guillaumegomez.clone());
         map.insert("hanna-kruppe", hanna_kruppe.clone());
         map.insert("hellow554", a("Marcel Hellwig", "github@cookiesoft.de"));
+        map.insert("hi-rustin", a("hi-rustin", "rustin.liu@gmail.com"));
+        map.insert("hkalbasi", a("Hamidreza Kalbasi", "hamidrezakalbasi@protonmail.com"));
         map.insert("huon", huonw.clone());
         map.insert("huonw", huonw.clone());
-        map.insert("ILyoan", a("ILYONG CHO", "ilyoan@gmail.com"));
+        map.insert("ilyoan", a("ILYONG CHO", "ilyoan@gmail.com"));
         map.insert("imperio", guillaumegomez.clone());
         map.insert("jackh726", a("jackh726", "jack.huey@umassmed.edu"));
+        map.insert("jakobdegen", a("Jakob Degen", "jakob.e.degen@gmail.com"));
         map.insert("jakub", jakub.clone());
         map.insert("jakub-", jakub.clone());
         map.insert("jamesmunns", a("James Munns", "james@onevariable.com"));
         map.insert("japaric", a("Jorge Aparicio", "jorge@japaric.io"));
-        map.insert("Jarcho", a("Jason Newcomb", "jsnewcomb@pm.me"));
+        map.insert("jarcho", a("Jason Newcomb", "jsnewcomb@pm.me"));
         map.insert("jbclements", a("John Clements", "clements@racket-lang.org"));
         map.insert("jdm", a("Josh Matthews", "josh@joshmatthews.net"));
         map.insert("jethrogb", a("Jethro Beekman", "jethro@fortanix.com"));
         map.insert("jhpratt", a("Jacob Pratt", "jacob@jhpratt.dev"));
-        map.insert("JohnTitor", a("Yuki Okushi", "huyuumi.dev@gmail.com"));
+        map.insert("johntitor", a("Yuki Okushi", "huyuumi.dev@gmail.com"));
         map.insert("jonas-schievink", a("Jonas Schievink", "jonasschievink@gmail.com"));
         map.insert("jonathandturner", a("Jonathan Turner", "jturner@mozilla.com"));
-        map.insert("joshtriplett", joshtriplett.clone());
-        map.insert("JoshTriplett", joshtriplett.clone());
+        map.insert("joshtriplett", a("Josh Triplett", "josh@joshtriplett.org"));
         map.insert("jroesch", a("Jared Roesch", "roeschinc@gmail.com"));
         map.insert("jseyfried", a("Jeffrey Seyfried", "jeffrey.seyfried@gmail.com"));
         map.insert("jsgf", a("Jeremy Fitzhardinge", "jsgf@fb.com"));
         map.insert("jsha", a("Jacob Hoffman-Andrews", "github@hoffman-andrews.com"));
+        map.insert("jyn", a("Joshua Nelson", "rust@jyn.dev"));
         map.insert("jyn514", jyn514.clone());
         map.insert("jyn541", jyn514.clone());
         map.insert("kballard", a("Lily Ballard", "lily@sb.org"));
         map.insert("keeperofdakeys", a("Josh Driver", "keeperofdakeys@gmail.com"));
         map.insert("kennytm", a("kennytm", "kennytm@gmail.com"));
         map.insert("killercup", a("Pascal Hertleif", "killercup@gmail.com"));
-        map.insert("Kimundi", a("Marvin Löbel", "loebel.marvin@gmail.com"));
+        map.insert("kimundi", a("Marvin Löbel", "loebel.marvin@gmail.com"));
         map.insert("kinnison", a("Daniel Silverstone", "dsilvers@digital-scurf.org"));
         map.insert("kmcallister", a("Keegan McAllister", "mcallister.keegan@gmail.com"));
-        map.insert("kodraus", kodraus.clone());
-        map.insert("kodrAus", kodraus.clone());
-        map.insert("KodrAus", kodraus.clone());
+        map.insert("kodraus", a("Ashley Mannix", "ashleymannix@live.com.au"));
         map.insert("kornelski", a("Kornel", "kornel@geekhood.net"));
         map.insert("lcnr", a("Bastian Kauschke", "bastian_kauschke@hotmail.de"));
-        map.insert("LeSeulArtichaut", a("LeSeulArtichaut", "leseulartichaut@gmail.com"));
-        map.insert("LingMan", a("LingMan", "LingMan@users.noreply.github.com"));
+        map.insert("leseulartichaut", a("LeSeulArtichaut", "leseulartichaut@gmail.com"));
+        map.insert("lingman", a("LingMan", "LingMan@users.noreply.github.com"));
         map.insert("ljedrz", a("ljedrz", "ljedrz@gmail.com"));
         map.insert("llogiq", llogiq.clone());
         map.insert("llogic", llogiq.clone());
         map.insert("lnicola", a("Laurențiu Nicola", "lnicola@dend.ro"));
-        map.insert("Lokathor", a("Lokathor", "zefria@gmail.com"));
+        map.insert("lokathor", a("Lokathor", "zefria@gmail.com"));
+        map.insert("lowr", a("Ryo Yoshida", "low.ryoshida@gmail.com"));
         map.insert("lqd", a("lqd", "remy.rakic+github@gmail.com"));
         map.insert("lukaramu", a("lukaramu", "lukaramu@users.noreply.github.com"));
-        map.insert("LukasKalbertodt", a("Lukas Kalbertodt", "lukas.kalbertodt@gmail.com"));
+        map.insert("lukaskalbertodt", a("Lukas Kalbertodt", "lukas.kalbertodt@gmail.com"));
         map.insert("luqmana", a("Luqman Aden", "laden@csclub.uwaterloo.ca"));
         map.insert("lzutao", a("Lzu Tao", "taolzu@gmail.com"));
         map.insert("malbarbo", a("Marco A L Barbosa", "malbarbo@gmail.com"));
         map.insert("manishearth", manishearth.clone());
-        map.insert("Manishearth", manishearth.clone());
-        map.insert("Manisheart", manishearth.clone());
+        map.insert("manisheart", manishearth.clone());
         map.insert("mark-i-m", a("Mark Mansi", "markm@cs.wisc.edu"));
         map.insert("mark-simulacrum", simulacrum.clone());
-        map.insert("mark-Simulacrum", simulacrum.clone());
-        map.insert("Mark-Simulacrum", simulacrum.clone());
-        map.insert("Mark-Simulacru", simulacrum.clone());
+        map.insert("mark-simulacru", simulacrum.clone());
         map.insert("mark-simulcrum", simulacrum.clone());
-        map.insert("MarkSimulacrum", simulacrum.clone());
+        map.insert("marksimulacrum", simulacrum.clone());
         map.insert("marmeladema", a("marmeladema", "xademax@gmail.com"));
         map.insert("mati865", a("Mateusz Mikuła", "mati865@gmail.com"));
         map.insert("matklad", a("Aleksey Kladov", "aleksey.kladov@gmail.com"));
         map.insert("matthewjasper", a("Matthew Jasper", "mjjasper1@gmail.com"));
-        map.insert("MatthewJasper", a("Matthew Jasper", "mjjasper1@gmail.com"));
         map.insert("matthiaskrgr", a("Matthias Krüger", "matthias.krueger@famsik.de"));
         map.insert("max-heller", a("max-heller", "max.a.heller@gmail.com"));
         map.insert("mcarton", a("mcarton", "cartonmartin+git@gmail.com"));
@@ -235,16 +229,18 @@ impl Reviewers {
         map.insert("mjbshaw", a("Michael Bradshaw", "mjbshaw@google.com"));
         map.insert("m-ou-se", a("Mara Bos", "m-ou.se@m-ou.se"));
         map.insert("msullivan", a("Michael J. Sullivan", "sully@msully.net"));
+        map.insert("muscraft", a("Scott Schafer", "schaferjscott@gmail.com"));
         map.insert("mw", michaelwoerister.clone());
-        map.insert("Nadrieril", a("Nadrieril", "nadrieril+git@gmail.com"));
+        map.insert("nadrieril", a("Nadrieril", "nadrieril+git@gmail.com"));
         map.insert("nagisa", a("Simonas Kazlauskas", "git@kazlauskas.me"));
         map.insert("nbdd0121", a("Gary Guo", "gary@garyguo.net"));
         map.insert("ncr", nrc.clone());
         map.insert("nellshamrell", a("Nell Shamrell-Harrington", "nellshamrell@gmail.com"));
-        map.insert("Nemo157", a("Wim Looman", "git@nemo157.com"));
+        map.insert("nemo157", a("Wim Looman", "git@nemo157.com"));
         map.insert("nick29581", nrc.clone());
         map.insert("nikic", a("Nikita Popov", "nikita.ppv@gmail.com"));
         map.insert("nikomatsakis", nikomatsakis.clone());
+        map.insert("nilstrieb", a("nils", "nilstrieb@gmail.com"));
         map.insert("nmatsakis", nikomatsakis.clone());
         map.insert("nnethercote", a("Nicholas Nethercote", "nnethercote@mozilla.com"));
         map.insert("notriddle", a("Michael Howell", "michael@notriddle.com"));
@@ -253,6 +249,7 @@ impl Reviewers {
         map.insert("oli-obk", oli_obk.clone());
         map.insert("oli", oli_obk.clone());
         map.insert("ollie27", a("Oliver Middleton", "olliemail27@gmail.com"));
+        map.insert("ozkanonur", a("Onur Özkan", "contact@onurozkan.dev"));
         map.insert("pcwalton", pcwalton.clone());
         map.insert("pczarn", a("Piotr Czarnecki", "pioczarn@gmail.com"));
         map.insert("peschkaj", a("Jeremiah Peschka", "jeremiah.peschka@gmail.com"));
@@ -261,28 +258,29 @@ impl Reviewers {
         map.insert("petrochenkov", petrochenkov.clone());
         map.insert("phansch", a("Philipp Hansch", "dev@phansch.net"));
         map.insert("pickfire", a("Ivan Tham", "pickfire@riseup.net"));
+        map.insert("pierwill", a("pierwill", "rust@pierwill.com"));
         map.insert("pietroalbini", a("Pietro Albini", "pietro@pietroalbini.org"));
         map.insert("pnkfelix", a("Felix S Klock II", "pnkfelix@mozilla.com"));
         map.insert("poliorcetics", a("Alexis Bourget", "alexis.bourget@gmail.com"));
         map.insert("pwalton", pcwalton.clone());
         map.insert("quietmisdreavus", quietmisdreavus.clone());
-        map.insert("QuietMisdreavus", quietmisdreavus.clone());
-        map.insert("QuietMisdreqvus", quietmisdreavus.clone());
-        map.insert("ralfjung", ralfjung.clone());
-        map.insert("RalfJung", ralfjung.clone());
+        map.insert("quietmisdreqvus", quietmisdreavus.clone());
+        map.insert("ralfjung", a("Ralf Jung", "post@ralfj.de"));
         map.insert("raoulstrackx", a("Raoul Strackx", "raoul.strackx@fortanix.com"));
         map.insert("rbtcollins", a("Robert Collins", "robertc@robertcollins.net"));
+        map.insert("rcvalle", a("Ramon de C Valle", "als"));
         map.insert("retep998", a("Peter Atashian", "retep998@gmail.com"));
         map.insert("richkadel", a("Rich Kadel", "richkadel@google.com"));
         map.insert("rkruppe", hanna_kruppe.clone());
         map.insert("rylev", a("Ryan Levick", "me@ryanlevick.com"));
+        map.insert("saethlin", a("Ben Kimock", "kimockb@gmail.com"));
         map.insert("sanxiyn", a("Seo Sanghyeon", "sanxiyn@gmail.com"));
         map.insert("scalexm", a("scalexm", "alexandre@scalexm.fr"));
         map.insert("scottmcm", a("Scott McMurray", "scottmcm@users.noreply.github.com"));
         map.insert("seanmonstar", a("Sean McArthur", "sean@seanmonstar.com"));
         map.insert("sfackler", a("Steven Fackler", "sfackler@gmail.com"));
         map.insert("shepmaster", a("Jake Goulding", "jake.goulding@gmail.com"));
-        map.insert("SimonSapin", a("Simon Sapin", "simon.sapin@exyr.org"));
+        map.insert("simonsapin", a("Simon Sapin", "simon.sapin@exyr.org"));
         map.insert("simulacrum", simulacrum.clone());
         map.insert("skade", a("Florian Gilcher", "florian.gilcher@asquera.de"));
         map.insert("spastorino", a("Santiago Pastorino", "spastorino@gmail.com"));
@@ -290,15 +288,17 @@ impl Reviewers {
         map.insert("steveklanik", steveklabnik.clone());
         map.insert("steveklbanik", steveklabnik.clone());
         map.insert("stjepang", a("Stjepan Glavina", "stjepang@gmail.com"));
-        map.insert("Stupremee", a("Justus K", "justus.k@protonmail.com"));
+        map.insert("stupremee", a("Justus K", "justus.k@protonmail.com"));
         map.insert("sunfishcode", a("Dan Gohman", "sunfish@mozilla.com"));
-        map.insert("Susurrus", a("Bryant Mairs", "bryant@mai.rs"));
-        map.insert("Swatinem", a("Arpad Borsos", "swatinem@swatinem.de"));
+        map.insert("susurrus", a("Bryant Mairs", "bryant@mai.rs"));
+        map.insert("swatinem", a("Arpad Borsos", "swatinem@swatinem.de"));
+        map.insert("tako8ki", a("Takayuki Maeda", "takoyaki0316@gmail.com"));
         map.insert("the8472", a("The8472", "git@infinite-source.de"));
         map.insert("thestinger", a("Daniel Micay", "danielmicay@gmail.com"));
-        map.insert("Thomasdezeeuw", a("Thomas de Zeeu", "thomasdezeeuw@gmail.com"));
-        map.insert("TimDiekmann", a("Tim Diekmann", "tim.diekmann@3dvision.de"));
-        map.insert("TimNN", a("Tim Neumann", "timnn@google.com"));
+        map.insert("thomasdezeeuw", a("Thomas de Zeeu", "thomasdezeeuw@gmail.com"));
+        map.insert("thomcc", a("Thom Chiovoloni", "chiovolonit@gmail.com"));
+        map.insert("timdiekmann", a("Tim Diekmann", "tim.diekmann@3dvision.de"));
+        map.insert("timnn", a("Tim Neumann", "timnn@google.com"));
         map.insert("tlively", a("Thomas Lively", "tlively@google.com"));
         map.insert("tmandry", a("Tyler Mandry", "tmandry@gmail.com"));
         map.insert("tmiasko", a("Tomasz Miąsko", "tomasz.miasko@gmail.com"));
@@ -306,26 +306,28 @@ impl Reviewers {
         map.insert("tromey", a("Tom Tromey", "tom@tromey.com"));
         map.insert("vadimcn", a("Vadim Chugunov", "vadimcn@gmail.com"));
         map.insert("varkor", a("varkor", "github@varkor.com"));
+        map.insert("veykril", a("Lukas Wirth", "lukastw97@gmail.com"));
+        map.insert("wafflelapkin", a("Waffle Maybe", "waffle.lapkin@gmail.com"));
+        map.insert("weihanglo", a("Weihang Lo", "me@weihanglo.tw"));
         map.insert("wesleywiser", a("Wesley Wiser", "wwiser@gmail.com"));
+        map.insert("willcrichton", a("Will Crichton", "wcrichto@cs.stanford.edu"));
         map.insert("withouboats", withoutboats.clone());
         map.insert("withoutboats", withoutboats.clone());
-        map.insert("Wodann", a("Wodann", "wodannson@gmail.com"));
+        map.insert("wodann", a("Wodann", "wodannson@gmail.com"));
         map.insert("workingjubilee", a("Jubilee Young", "workingjubilee@gmail.com"));
         map.insert("wycats", a("Yehuda Katz", "wycats@gmail.com"));
-        map.insert("XAMPPRocky", a("Erin Power", "xampprocky@gmail.com"));
-        map.insert("Xanewok", a("Igor Matuszewski", "Xanewok@gmail.com"));
+        map.insert("xampprocky", a("Erin Power", "xampprocky@gmail.com"));
+        map.insert("xanewok", a("Igor Matuszewski", "Xanewok@gmail.com"));
         map.insert("xfix", a("Konrad Borowski", "konrad@borowski.pw"));
-        map.insert("xFrednet", a("xFrednet", "xFrednet@gmail.com"));
+        map.insert("xfrednet", a("xFrednet", "xFrednet@gmail.com"));
         map.insert("yaahallo", yaahc.clone());
         map.insert("yaahc", yaahc.clone());
-        map.insert("Yaahc", yaahc.clone());
         map.insert("yichoi", a("Young-il Choi", "duddlf.choi@samsung.com"));
-        map.insert("Y-Nak", a("Yoshitomo Nakanishi", "yurayura.rounin.3@gmail.com"));
+        map.insert("y-nak", a("Yoshitomo Nakanishi", "yurayura.rounin.3@gmail.com"));
         map.insert("yurydelendik", a("Yury Delendik", "ydelendik@mozilla.com"));
         map.insert("z0w0", a("Zack Corr", "zack@z0w0.me"));
         map.insert("zackmdavis", a("Zack M. Davis", "code@zackmdavis.net"));
-        map.insert("zoxc", zoxc.clone());
-        map.insert("Zoxc", zoxc.clone());
+        map.insert("zoxc", a("John Kåre Alsaker", "john.kare.alsaker@gmail.com"));
 
         Ok(Reviewers { reviewers: map })
     }
@@ -344,10 +346,11 @@ impl Reviewers {
             "nobody",
             "docs",
         ];
-        if skip.contains(&reviewer) {
+        let reviewer = reviewer.to_lowercase();
+        if skip.contains(&reviewer.as_str()) {
             return Ok(None);
         }
-        if let Some(v) = self.reviewers.get(reviewer).cloned() {
+        if let Some(v) = self.reviewers.get(reviewer.as_str()).cloned() {
             return Ok(Some(v));
         }
         Err(UnknownReviewer)