diff --git a/plugins/by-name/surround/default.nix b/plugins/by-name/vim-surround/default.nix
similarity index 87%
rename from plugins/by-name/surround/default.nix
rename to plugins/by-name/vim-surround/default.nix
index 0bd53eb7..a9e937cd 100644
--- a/plugins/by-name/surround/default.nix
+++ b/plugins/by-name/vim-surround/default.nix
@@ -4,7 +4,7 @@
   ...
 }:
 helpers.vim-plugin.mkVimPlugin {
-  name = "surround";
+  name = "vim-surround";
   originalName = "surround.vim";
   package = "vim-surround";
 
diff --git a/plugins/deprecation.nix b/plugins/deprecation.nix
index 83878fb2..f81dcbc4 100644
--- a/plugins/deprecation.nix
+++ b/plugins/deprecation.nix
@@ -10,13 +10,31 @@ let
       - `:PreviewQuery` to open the Query Editor (Nvim 0.10+)
     '';
   };
+  renamed = {
+    # Added 2024-09-17
+    surround = "vim-surround";
+  };
 in
 {
-  imports = lib.mapAttrsToList (
-    name:
-    lib.mkRemovedOptionModule [
-      "plugins"
-      name
-    ]
-  ) removed;
+
+  imports =
+    (lib.mapAttrsToList (
+      name:
+      lib.mkRemovedOptionModule [
+        "plugins"
+        name
+      ]
+    ) removed)
+    ++ (lib.mapAttrsToList (
+      old: new:
+      lib.mkRenamedOptionModule
+        [
+          "plugins"
+          old
+        ]
+        [
+          "plugins"
+          new
+        ]
+    ) renamed);
 }
diff --git a/tests/test-sources/plugins/by-name/surround/default.nix b/tests/test-sources/plugins/by-name/surround/default.nix
deleted file mode 100644
index c5bad8e6..00000000
--- a/tests/test-sources/plugins/by-name/surround/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  empty = {
-    plugins.surround.enable = true;
-  };
-}
diff --git a/tests/test-sources/plugins/by-name/vim-surround/default.nix b/tests/test-sources/plugins/by-name/vim-surround/default.nix
new file mode 100644
index 00000000..b50e0376
--- /dev/null
+++ b/tests/test-sources/plugins/by-name/vim-surround/default.nix
@@ -0,0 +1,5 @@
+{
+  empty = {
+    plugins.vim-surround.enable = true;
+  };
+}