diff --git a/plugins/by-name/codeium-vim/default.nix b/plugins/by-name/windsurf-vim/default.nix
similarity index 91%
rename from plugins/by-name/codeium-vim/default.nix
rename to plugins/by-name/windsurf-vim/default.nix
index 91a75796..80a108f7 100644
--- a/plugins/by-name/codeium-vim/default.nix
+++ b/plugins/by-name/windsurf-vim/default.nix
@@ -35,24 +35,14 @@ let
   };
 in
 lib.nixvim.plugins.mkVimPlugin {
-  name = "codeium-vim";
-  packPathName = "codeium.vim";
+  name = "windsurf-vim";
+  packPathName = "windsurf.vim";
   globalPrefix = "codeium_";
 
   maintainers = [ maintainers.GaetanLepage ];
 
-  # TODO introduced 2024-02-19: remove 2024-03-19
-  deprecateExtraConfig = true;
-  optionsRenamedToSettings = [
-    "bin"
-    "filetypes"
-    "manual"
-    "noMapTab"
-    "idleDelay"
-    "render"
-    "tabFallback"
-    "disableBindings"
-  ];
+  # TODO: introduced 2024-02-19: remove 2024-03-19
+  inherit ((import ./deprecations.nix { inherit lib; })) imports;
 
   settingsOptions = {
     bin = mkOption {
@@ -114,7 +104,7 @@ lib.nixvim.plugins.mkVimPlugin {
   };
 
   extraConfig = cfg: {
-    plugins.codeium-vim.settings.enabled = true;
+    plugins.windsurf-vim.settings.enabled = true;
 
     keymaps =
       let
diff --git a/plugins/by-name/windsurf-vim/deprecations.nix b/plugins/by-name/windsurf-vim/deprecations.nix
new file mode 100644
index 00000000..1657eedf
--- /dev/null
+++ b/plugins/by-name/windsurf-vim/deprecations.nix
@@ -0,0 +1,34 @@
+{
+  lib,
+  ...
+}:
+{
+  imports =
+    # TODO: introduced 2024-02-19: remove 2024-03-19
+    lib.nixvim.deprecation.mkSettingsRenamedOptionModules [ "plugins" "codeium-vim" ]
+      [ "plugins" "windsurf-vim" "settings" ]
+      [
+        "bin"
+        "filetypes"
+        "manual"
+        "noMapTab"
+        "idleDelay"
+        "render"
+        "tabFallback"
+        "disableBindings"
+      ]
+    # TODO: introduced 2025-04-19
+    ++
+      lib.nixvim.deprecation.mkSettingsRenamedOptionModules [ "plugins" "codeium-vim" ]
+        [ "plugins" "windsurf-vim" ]
+        [
+          "enable"
+          "package"
+          "settings"
+          "keymaps"
+          {
+            old = "extraConfig";
+            new = "settings";
+          }
+        ];
+}
diff --git a/tests/test-sources/plugins/by-name/codeium-vim/default.nix b/tests/test-sources/plugins/by-name/windsurf-vim/default.nix
similarity index 92%
rename from tests/test-sources/plugins/by-name/codeium-vim/default.nix
rename to tests/test-sources/plugins/by-name/windsurf-vim/default.nix
index b1ee1a00..a6ace381 100644
--- a/tests/test-sources/plugins/by-name/codeium-vim/default.nix
+++ b/tests/test-sources/plugins/by-name/windsurf-vim/default.nix
@@ -3,14 +3,14 @@
     # For some reason, nvim hangs when using codeium-vim. After checking, it doesn't look like a bug though.
     test.runNvim = false;
 
-    plugins.codeium-vim.enable = true;
+    plugins.windsurf-vim.enable = true;
   };
 
   example = {
     # For some reason, nvim hangs when using codeium-vim. After checking, it doesn't look like a bug though.
     test.runNvim = false;
 
-    plugins.codeium-vim = {
+    plugins.windsurf-vim = {
       enable = true;
 
       keymaps = {