diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index f72d02bcbfd..62e18e48c15 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -669,6 +669,11 @@
     github = "bstrik";
     name = "Berno Strik";
   };
+  buffet = {
+    email = "niclas@countingsort.com";
+    github = "buffet";
+    name = "Niclas Meyer";
+  };
   bugworm = {
     email = "bugworm@zoho.com";
     github = "bugworm";
@@ -927,11 +932,6 @@
     github = "couchemar";
     name = "Andrey Pavlov";
   };
-  countingsort = {
-    email = "niclas@countingsort.com";
-    github = "countingsort";
-    name = "Niclas Meyer";
-  };
   cpages = {
     email = "page@ruiec.cat";
     github = "cpages";
diff --git a/pkgs/tools/package-management/bunny/default.nix b/pkgs/tools/package-management/bunny/default.nix
index cb99e5af055..0f45084f3c0 100644
--- a/pkgs/tools/package-management/bunny/default.nix
+++ b/pkgs/tools/package-management/bunny/default.nix
@@ -20,6 +20,6 @@ stdenv.mkDerivation rec {
     homepage = https://gitlab.com/tim241/bunny;
     license = licenses.gpl3;
     platforms = platforms.all;
-    maintainers = with maintainers; [ countingsort ];
+    maintainers = with maintainers; [ buffet ];
   };
 }