diff --git a/plugins/colorschemes/gruvbox-material.nix b/plugins/colorschemes/gruvbox-material-nvim.nix
similarity index 88%
rename from plugins/colorschemes/gruvbox-material.nix
rename to plugins/colorschemes/gruvbox-material-nvim.nix
index 3daac2f9..4abbb0d4 100644
--- a/plugins/colorschemes/gruvbox-material.nix
+++ b/plugins/colorschemes/gruvbox-material-nvim.nix
@@ -1,11 +1,9 @@
-{
-  lib,
-  config,
-  ...
-}:
+{ lib, ... }:
 lib.nixvim.plugins.mkNeovimPlugin {
-  name = "gruvbox-material";
+  name = "gruvbox-material-nvim";
   isColorscheme = true;
+  colorscheme = "gruvbox-material";
+  moduleName = "gruvbox-material";
   packPathName = "gruvbox-material.nvim";
   package = "gruvbox-material-nvim";
 
diff --git a/plugins/default.nix b/plugins/default.nix
index f9eaf515..c1c118c6 100644
--- a/plugins/default.nix
+++ b/plugins/default.nix
@@ -12,7 +12,7 @@
     ./colorschemes/everforest.nix
     ./colorschemes/github-theme.nix
     ./colorschemes/gruvbox.nix
-    ./colorschemes/gruvbox-material.nix
+    ./colorschemes/gruvbox-material-nvim.nix
     ./colorschemes/kanagawa.nix
     ./colorschemes/kanagawa-paper.nix
     ./colorschemes/melange.nix
diff --git a/plugins/deprecation.nix b/plugins/deprecation.nix
index 19784e53..76a74265 100644
--- a/plugins/deprecation.nix
+++ b/plugins/deprecation.nix
@@ -7,7 +7,7 @@ let
       It is recommended to use `rustaceanvim` instead.
     '';
   };
-  removed = {
+  removed.plugins = {
     # Added 2023-08-29
     treesitter-playground = ''
       The `treesitter-playground` plugin has been deprecated since the functionality is included in Neovim.
@@ -23,7 +23,13 @@ let
       It is recommended to use `plugins.pckr` or `plugins.lazy` instead.
     '';
   };
-  renamed = {
+  renamed.colorschemes = {
+    # Added 2025-07-15
+    # NOTE: The old name is not in a stable version and was only in unstable for a few weeks,
+    # so we can remove this alias more quickly than usual.
+    gruvbox-material = "gruvbox-material-nvim";
+  };
+  renamed.plugins = {
     # Added 2024-09-17
     surround = "vim-surround";
   };
@@ -46,43 +52,25 @@ in
 {
 
   imports =
-    (lib.mapAttrsToList (
-      name:
-      lib.mkRemovedOptionModule [
-        "plugins"
-        name
-      ]
-    ) removed)
-    ++ (lib.mapAttrsToList (
-      old: new: lib.mkRenamedOptionModule [ "plugins" old ] [ "plugins" new ]
-    ) renamed)
     # TODO: introduced 2025-04-19
-    ++ [
+    [
       (lib.mkRenamedOptionModule
-        [
-          "plugins"
-          "codeium-nvim"
-          "enable"
-        ]
-        [
-          "plugins"
-          "windsurf-nvim"
-          "enable"
-        ]
+        [ "plugins" "codeium-nvim" "enable" ]
+        [ "plugins" "windsurf-nvim" "enable" ]
       )
       (lib.mkRenamedOptionModule
-        [
-          "plugins"
-          "codeium-vim"
-          "enable"
-        ]
-        [
-          "plugins"
-          "windsurf-vim"
-          "enable"
-        ]
+        [ "plugins" "codeium-vim" "enable" ]
+        [ "plugins" "windsurf-vim" "enable" ]
       )
     ]
+    ++ lib.foldlAttrs (
+      acc: scope: removed':
+      acc ++ lib.mapAttrsToList (name: msg: lib.mkRemovedOptionModule [ scope name ] msg) removed'
+    ) [ ] removed
+    ++ lib.foldlAttrs (
+      acc: scope: renamed':
+      acc ++ lib.mapAttrsToList (old: new: lib.mkRenamedOptionModule [ scope old ] [ scope new ]) renamed'
+    ) [ ] renamed
     ++ builtins.map (
       name:
       lib.mkRemovedOptionModule [ "plugins" name "iconsPackage" ] ''
diff --git a/tests/test-sources/plugins/colorschemes/gruvbox-material.nix b/tests/test-sources/plugins/colorschemes/gruvbox-material-nvim.nix
similarity index 91%
rename from tests/test-sources/plugins/colorschemes/gruvbox-material.nix
rename to tests/test-sources/plugins/colorschemes/gruvbox-material-nvim.nix
index d620fa48..ef158cf7 100644
--- a/tests/test-sources/plugins/colorschemes/gruvbox-material.nix
+++ b/tests/test-sources/plugins/colorschemes/gruvbox-material-nvim.nix
@@ -1,11 +1,11 @@
 { lib, ... }:
 {
   empty = {
-    colorschemes.gruvbox-material.enable = true;
+    colorschemes.gruvbox-material-nvim.enable = true;
   };
 
   defaults = {
-    colorschemes.gruvbox-material = {
+    colorschemes.gruvbox-material-nvim = {
       enable = true;
 
       settings = {
@@ -31,7 +31,7 @@
   };
 
   example = {
-    colorschemes.gruvbox-material = {
+    colorschemes.gruvbox-material-nvim = {
       enable = true;
 
       settings = {