diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 3e415ae32f7..5f47b01ec13 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -316,7 +316,7 @@
   };
   amorsillo = {
     email = "andrew.morsillo@gmail.com";
-    github = "amorsillo";
+    github = "AndrewMorsillo";
     name = "Andrew Morsillo";
   };
   anderspapitto = {
@@ -331,7 +331,7 @@
   };
   andres = {
     email = "ksnixos@andres-loeh.de";
-    github = "andres";
+    github = "kosmikus";
     name = "Andres Loeh";
   };
   andrestylianos = {
@@ -396,7 +396,7 @@
   };
   aristid = {
     email = "aristidb@gmail.com";
-    github = "aristid";
+    github = "aristidb";
     name = "Aristid Breitkreuz";
   };
   arobyn = {
@@ -476,7 +476,6 @@
   };
   balajisivaraman = {
     email = "sivaraman.balaji@gmail.com";
-    github = "balajisivaraman";
     name = "Balaji Sivaraman";
   };
   barrucadu = {
@@ -690,7 +689,6 @@
   };
   chattered = {
     email = "me@philscotted.com";
-    github = "chattered";
     name = "Phil Scott";
   };
   chiiruno = {
@@ -780,7 +778,7 @@
   };
   coconnor = {
     email = "coreyoconnor@gmail.com";
-    github = "coconnor";
+    github = "coreyoconnor";
     name = "Corey O'Connor";
   };
   codsl = {
@@ -875,7 +873,6 @@
   };
   dasuxullebt = {
     email = "christoph.senjak@googlemail.com";
-    github = "dasuxullebt";
     name = "Christoph-Simon Senjak";
   };
   david50407 = {
@@ -920,7 +917,7 @@
   };
   derchris = {
     email = "derchris@me.com";
-    github = "derchris";
+    github = "derchrisuk";
     name = "Christian Gerbrandt";
   };
   dermetfan = {
@@ -1020,7 +1017,6 @@
   };
   drewkett = {
     email = "burkett.andrew@gmail.com";
-    github = "drewkett";
     name = "Andrew Burkett";
   };
   dsferruzza = {
@@ -1090,7 +1086,7 @@
   };
   eelco = {
     email = "eelco.dolstra@logicblox.com";
-    github = "eelco";
+    github = "edolstra";
     name = "Eelco Dolstra";
   };
   ehegnes = {
@@ -1100,7 +1096,6 @@
   };
   ehmry = {
     email = "emery@vfemail.net";
-    github = "ehmry";
     name = "Emery Hemingway";
   };
   eikek = {
@@ -1120,7 +1115,7 @@
   };
   eleanor = {
     email = "dejan@proteansec.com";
-    github = "eleanor";
+    github = "proteansec";
     name = "Dejan Lukan";
   };
   elijahcaine = {
@@ -1150,7 +1145,6 @@
   };
   epitrochoid = {
     email = "mpcervin@uncg.edu";
-    github = "epitrochoid";
     name = "Mabry Cervin";
   };
   eqyiel = {
@@ -1319,7 +1313,6 @@
   };
   fuzzy-id = {
     email = "hacking+nixos@babibo.de";
-    github = "fuzzy-id";
     name = "Thomas Bach";
   };
   fxfactorial = {
@@ -1334,7 +1327,7 @@
   };
   gal_bolle = {
     email = "florent.becker@ens-lyon.org";
-    github = "galbolle";
+    github = "FlorentBecker";
     name = "Florent Becker";
   };
   garbas = {
@@ -1349,7 +1342,7 @@
   };
   gavin = {
     email = "gavin@praxeology.co.uk";
-    github = "gavin";
+    github = "gavinrogers";
     name = "Gavin Rogers";
   };
   gebner = {
@@ -1364,7 +1357,7 @@
   };
   genesis = {
     email = "ronan@aimao.org";
-    github = "genesis";
+    github = "bignaux";
     name = "Ronan Bignaux";
   };
   georgewhewell = {
@@ -1499,17 +1492,16 @@
   };
   hhm = {
     email = "heehooman+nixpkgs@gmail.com";
-    github = "hhm";
+    github = "hhm0";
     name = "hhm";
   };
   hinton = {
     email = "t@larkery.com";
-    github = "hinton";
     name = "Tom Hinton";
   };
   hodapp = {
     email = "hodapp87@gmail.com";
-    github = "hodapp";
+    github = "Hodapp87";
     name = "Chris Hodapp";
   };
   hrdinka = {
@@ -1569,7 +1561,6 @@
   };
   ivan-tkatchev = {
     email = "tkatchev@gmail.com";
-    github = "ivan-tkatchev";
     name = "Ivan Tkatchev";
   };
   ixmatus = {
@@ -1624,7 +1615,6 @@
   };
   jcumming = {
     email = "jack@mudshark.org";
-    github = "jcumming";
     name = "Jack Cummings";
   };
   jdagilliland = {
@@ -1709,7 +1699,6 @@
   };
   joelteon = {
     email = "me@joelt.io";
-    github = "joelteon";
     name = "Joel Taylor";
   };
   johbo = {
@@ -1784,7 +1773,6 @@
   };
   jwilberding = {
     email = "jwilberding@afiniate.com";
-    github = "jwilberding";
     name = "Jordan Wilberding";
   };
   jyp = {
@@ -1814,7 +1802,6 @@
   };
   karolchmist = {
     email = "info+nix@chmist.com";
-    github = "karolchmist";
     name = "karolchmist";
   };
   kentjames = {
@@ -1863,7 +1850,7 @@
   };
   koral = {
     email = "koral@mailoo.org";
-    github = "koral";
+    github = "k0ral";
     name = "Koral";
   };
   kovirobi = {
@@ -1903,7 +1890,7 @@
   };
   lassulus = {
     email = "lassulus@gmail.com";
-    github = "lassulus";
+    github = "Lassulus";
     name = "Lassulus";
   };
   layus = {
@@ -1983,7 +1970,7 @@
   };
   linus = {
     email = "linusarver@gmail.com";
-    github = "linus";
+    github = "listx";
     name = "Linus Arver";
   };
   lluchs = {
@@ -2072,7 +2059,6 @@
   };
   m3tti = {
     email = "mathaeus.peter.sander@gmail.com";
-    github = "m3tti";
     name = "Mathaeus Sander";
   };
   ma27 = {
@@ -2221,7 +2207,6 @@
   };
   metabar = {
     email = "softs@metabarcoding.org";
-    github = "metabar";
     name = "Celine Mercier";
   };
   mgdelacroix = {
@@ -2281,7 +2266,6 @@
   };
   miltador = {
     email = "miltador@yandex.ua";
-    github = "miltador";
     name = "Vasiliy Solovey";
   };
   mimadrid = {
@@ -2359,11 +2343,6 @@
     github = "moretea";
     name = "Maarten Hoogendoorn";
   };
-  mornfall = {
-    email = "me@mornfall.net";
-    github = "mornfall";
-    name = "Petr Ročkai";
-  };
   mounium = {
     email = "muoniurn@gmail.com";
     github = "mounium";
@@ -2396,7 +2375,6 @@
   };
   msackman = {
     email = "matthew@wellquite.org";
-    github = "msackman";
     name = "Matthew Sackman";
   };
   mschristiansen = {
@@ -2421,12 +2399,12 @@
   };
   mtreskin = {
     email = "zerthurd@gmail.com";
-    github = "mtreskin";
+    github = "Zert";
     name = "Max Treskin";
   };
   mudri = {
     email = "lamudri@gmail.com";
-    github = "mudri";
+    github = "laMudri";
     name = "James Wood";
   };
   muflax = {
@@ -2575,7 +2553,7 @@
   };
   offline = {
     email = "jakahudoklin@gmail.com";
-    github = "offline";
+    github = "offlinehacker";
     name = "Jaka Hudoklin";
   };
   oida = {
@@ -2664,7 +2642,7 @@
   };
   pashev = {
     email = "pashev.igor@gmail.com";
-    github = "pashev";
+    github = "ip1981";
     name = "Igor Pashev";
   };
   patternspandemic = {
@@ -2749,7 +2727,6 @@
   };
   piotr = {
     email = "ppietrasa@gmail.com";
-    github = "piotr";
     name = "Piotr Pietraszkiewicz";
   };
   pjbarnoy = {
@@ -2784,7 +2761,7 @@
   };
   pmeunier = {
     email = "pierre-etienne.meunier@inria.fr";
-    github = "pmeunier";
+    github = "P-E-Meunier";
     name = "Pierre-Étienne Meunier";
   };
   pmiddend = {
@@ -2834,7 +2811,6 @@
   };
   pstn = {
     email = "philipp@xndr.de";
-    github = "pstn";
     name = "Philipp Steinpaß";
   };
   puffnfresh = {
@@ -2853,7 +2829,7 @@
   };
   ragge = {
     email = "r.dahlen@gmail.com";
-    github = "ragge";
+    github = "ragnard";
     name = "Ragnar Dahlen";
   };
   ralith = {
@@ -2878,17 +2854,16 @@
   };
   raskin = {
     email = "7c6f434c@mail.ru";
-    github = "raskin";
+    github = "7c6f434c";
     name = "Michael Raskin";
   };
   ravloony = {
     email = "ravloony@gmail.com";
-    github = "ravloony";
     name = "Tom Macdonald";
   };
   razvan = {
     email = "razvan.panda@gmail.com";
-    github = "razvan";
+    github = "razvan-panda";
     name = "Răzvan Flavius Panda";
   };
   rbasso = {
@@ -2923,7 +2898,7 @@
   };
   renzo = {
     email = "renzocarbonara@gmail.com";
-    github = "renzo";
+    github = "k0001";
     name = "Renzo Carbonara";
   };
   retrry = {
@@ -3108,7 +3083,7 @@
   };
   sander = {
     email = "s.vanderburg@tudelft.nl";
-    github = "sander";
+    github = "svanderburg";
     name = "Sander van der Burg";
   };
   sargon = {
@@ -3192,7 +3167,7 @@
   };
   shell = {
     email = "cam.turn@gmail.com";
-    github = "shell";
+    github = "VShell";
     name = "Shell Turner";
   };
   shlevy = {
@@ -3237,7 +3212,6 @@
   };
   sjourdois = {
     email = "sjourdois@gmail.com";
-    github = "sjourdois";
     name = "Stéphane ‘kwisatz’ Jourdois";
   };
   skeidel = {
@@ -3247,7 +3221,6 @@
   };
   skrzyp = {
     email = "jot.skrzyp@gmail.com";
-    github = "skrzyp";
     name = "Jakub Skrzypnik";
   };
   sleexyz = {
@@ -3257,7 +3230,7 @@
   };
   smironov = {
     email = "grrwlf@gmail.com";
-    github = "smironov";
+    github = "grwlf";
     name = "Sergey Mironov";
   };
   snyh = {
@@ -3382,7 +3355,7 @@
   };
   taeer = {
     email = "taeer@necsi.edu";
-    github = "taeer";
+    github = "Radvendii";
     name = "Taeer Bar-Yam";
   };
   tailhook = {
@@ -3447,7 +3420,7 @@
   };
   thammers = {
     email = "jawr@gmx.de";
-    github = "thammers";
+    github = "tobias-hammerschmidt";
     name = "Tobias Hammerschmidt";
   };
   thanegill = {
@@ -3462,7 +3435,7 @@
   };
   theuni = {
     email = "ct@flyingcircus.io";
-    github = "theuni";
+    github = "ctheune";
     name = "Christian Theune";
   };
   thoughtpolice = {
@@ -3537,12 +3510,12 @@
   };
   trevorj = {
     email = "nix@trevor.joynson.io";
-    github = "trevorj";
+    github = "akatrevorjay";
     name = "Trevor Joynson";
   };
   trino = {
     email = "muehlhans.hubert@ekodia.de";
-    github = "trino";
+    github = "hmuehlhans";
     name = "Hubert Mühlhans";
   };
   troydm = {
@@ -3552,7 +3525,6 @@
   };
   tstrobel = {
     email = "4ZKTUB6TEP74PYJOPWIR013S2AV29YUBW5F9ZH2F4D5UMJUJ6S@hash.domains";
-    github = "tstrobel";
     name = "Thomas Strobel";
   };
   ttuegel = {
@@ -3577,7 +3549,7 @@
   };
   tweber = {
     email = "tw+nixpkgs@360vier.de";
-    github = "tweber";
+    github = "thorstenweber83";
     name = "Thorsten Weber";
   };
   twey = {
@@ -3741,7 +3713,6 @@
   };
   wedens = {
     email = "kirill.wedens@gmail.com";
-    github = "wedens";
     name = "wedens";
   };
   willibutz = {
@@ -3751,12 +3722,10 @@
   };
   willtim = {
     email = "tim.williams.public@gmail.com";
-    github = "willtim";
     name = "Tim Philip Williams";
   };
   winden = {
     email = "windenntw@gmail.com";
-    github = "winden";
     name = "Antonio Vargas Gonzalez";
   };
   wizeman = {
@@ -3896,7 +3865,7 @@
   };
   zalakain = {
     email = "contact@unaizalakain.info";
-    github = "zalakain";
+    github = "umazalakain";
     name = "Unai Zalakain";
   };
   zarelit = {