diff --git a/.mailmap b/.mailmap
index 1ff6c1601aad..d652e0f35474 100644
--- a/.mailmap
+++ b/.mailmap
@@ -22,6 +22,7 @@ Lin Jian <me@linj.tech> <75130626+jian-lin@users.noreply.github.com>
 Martin Weinelt <hexa@darmstadt.ccc.de> <mweinelt@users.noreply.github.com>
 Martin Häcker <spamfaenger@gmx.de> <spamfaenger@gmx.de>
 moni <lythe1107@gmail.com> <lythe1107@icloud.com>
+Noah Biewesch <dev@noahbiewesch.com> <90870942+trueNAHO@users.noreply.github.com>
 quantenzitrone <nix@dev.quantenzitrone.eu>
 quantenzitrone <nix@dev.quantenzitrone.eu> <74491719+Quantenzitrone@users.noreply.github.com>
 quantenzitrone <nix@dev.quantenzitrone.eu> <74491719+quantenzitrone@users.noreply.github.com>
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 77c8941cfbc6..b01689d96403 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -19058,12 +19058,6 @@
     github = "nagymathev";
     githubId = 49335802;
   };
-  naho = {
-    github = "trueNAHO";
-    githubId = 90870942;
-    name = "Noah Pierre Biewesch";
-    keys = [ { fingerprint = "5FC6 088A FB1A 609D 4532  F919 0C1C 177B 3B64 68E0"; } ];
-  };
   nalbyuites = {
     email = "ashijit007@gmail.com";
     github = "nalbyuites";
@@ -19884,6 +19878,13 @@
     github = "Noah765";
     githubId = 99338019;
   };
+  noahbiewesch = {
+    github = "trueNAHO";
+    githubId = 90870942;
+    name = "Noah Biewesch";
+    email = "nix@noahbiewesch.com";
+    keys = [ { fingerprint = "5FC6 088A FB1A 609D 4532  F919 0C1C 177B 3B64 68E0"; } ];
+  };
   noahfraiture = {
     name = "Noahcode";
     email = "pro@noahcode.dev";
diff --git a/pkgs/by-name/an/antora-lunr-extension/package.nix b/pkgs/by-name/an/antora-lunr-extension/package.nix
index b0ed88129957..b16f954dc738 100644
--- a/pkgs/by-name/an/antora-lunr-extension/package.nix
+++ b/pkgs/by-name/an/antora-lunr-extension/package.nix
@@ -57,7 +57,7 @@ buildNpmPackage rec {
       key](https://docs.antora.org/antora/3.1/extend/enable-extension).
     '';
 
-    maintainers = [ lib.maintainers.naho ];
+    maintainers = [ lib.maintainers.noahbiewesch ];
     platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/by-name/an/antora-ui-default/package.nix b/pkgs/by-name/an/antora-ui-default/package.nix
index 081758d8493f..e910de74e813 100644
--- a/pkgs/by-name/an/antora-ui-default/package.nix
+++ b/pkgs/by-name/an/antora-ui-default/package.nix
@@ -15,8 +15,8 @@ stdenvNoCC.mkDerivation {
   pname = "antora-ui-default";
   version = "0-unstable-2024-12-26";
 
-  # The UI bundle is fetched from lib.maintainers.naho's antora-ui-default fork
-  # for the following reasons:
+  # The UI bundle is fetched from lib.maintainers.noahbiewesch's
+  # antora-ui-default fork for the following reasons:
   #
   # > The UI bundle is currently unpackaged [1] [2], and only accessible by
   # > fetching the latest GitLab artifact or building from source. Neither
@@ -71,7 +71,7 @@ stdenvNoCC.mkDerivation {
       references.
     '';
 
-    maintainers = [ lib.maintainers.naho ];
+    maintainers = [ lib.maintainers.noahbiewesch ];
     platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/by-name/an/antora/package.nix b/pkgs/by-name/an/antora/package.nix
index 41efaaabff61..176befb9f513 100644
--- a/pkgs/by-name/an/antora/package.nix
+++ b/pkgs/by-name/an/antora/package.nix
@@ -46,7 +46,7 @@ buildNpmPackage rec {
 
     maintainers = with lib.maintainers; [
       ehllie
-      naho
+      noahbiewesch
     ];
 
     platforms = lib.platforms.all;
diff --git a/pkgs/by-name/an/antora/test/default.nix b/pkgs/by-name/an/antora/test/default.nix
index b473a87b1434..f8f552d9face 100644
--- a/pkgs/by-name/an/antora/test/default.nix
+++ b/pkgs/by-name/an/antora/test/default.nix
@@ -60,7 +60,7 @@ stdenvNoCC.mkDerivation {
   meta = {
     description = "Reproducible Antora test framework";
     license = lib.licenses.mit;
-    maintainers = [ lib.maintainers.naho ];
+    maintainers = [ lib.maintainers.noahbiewesch ];
     platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/by-name/mp/mpv/scripts/twitch-chat.nix b/pkgs/by-name/mp/mpv/scripts/twitch-chat.nix
index dc8f8f71091f..42358a60e6e4 100644
--- a/pkgs/by-name/mp/mpv/scripts/twitch-chat.nix
+++ b/pkgs/by-name/mp/mpv/scripts/twitch-chat.nix
@@ -30,6 +30,6 @@ buildLua {
     description = "Show Twitch chat messages as subtitles when watching Twitch VOD with mpv";
     homepage = "https://github.com/CrendKing/mpv-twitch-chat";
     license = lib.licenses.mit;
-    maintainers = [ lib.maintainers.naho ];
+    maintainers = [ lib.maintainers.noahbiewesch ];
   };
 }