diff --git a/plugins/by-name/codeium-nvim/deprecations.nix b/plugins/by-name/codeium-nvim/deprecations.nix
deleted file mode 100644
index a5c32845..00000000
--- a/plugins/by-name/codeium-nvim/deprecations.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  deprecateExtraOptions = true;
-  optionsRenamedToSettings = [
-    "configPath"
-    "binPath"
-    [
-      "api"
-      "host"
-    ]
-    [
-      "api"
-      "port"
-    ]
-    [
-      "tools"
-      "uname"
-    ]
-    [
-      "tools"
-      "uuidgen"
-    ]
-    [
-      "tools"
-      "curl"
-    ]
-    [
-      "tools"
-      "gzip"
-    ]
-    [
-      "tools"
-      "languageServer"
-    ]
-    "wrapper"
-  ];
-}
diff --git a/plugins/by-name/codeium-nvim/default.nix b/plugins/by-name/windsurf-nvim/default.nix
similarity index 74%
rename from plugins/by-name/codeium-nvim/default.nix
rename to plugins/by-name/windsurf-nvim/default.nix
index d40846c1..4bc56217 100644
--- a/plugins/by-name/codeium-nvim/default.nix
+++ b/plugins/by-name/windsurf-nvim/default.nix
@@ -3,8 +3,8 @@
   ...
 }:
 lib.nixvim.plugins.mkNeovimPlugin {
-  name = "codeium-nvim";
-  packPathName = "codeium.nvim";
+  name = "windsurf-nvim";
+  packPathName = "windsurf.nvim";
   moduleName = "codeium";
 
   maintainers = with lib.maintainers; [
@@ -18,13 +18,10 @@ lib.nixvim.plugins.mkNeovimPlugin {
     You are free to configure `dependencies.*.enable` and `dependencies.*.package` to disable or customize this behavior, respectively.
   '';
 
-  # TODO: added 2024-09-03 remove after 24.11
-  inherit (import ./deprecations.nix) deprecateExtraOptions optionsRenamedToSettings;
-
-  # Register nvim-cmp association
   imports = [
-    { cmpSourcePlugins.codeium = "codeium-nvim"; }
-  ];
+    # Register nvim-cmp association
+    { cmpSourcePlugins.codeium = "windsurf-nvim"; }
+  ] ++ (import ./deprecations.nix { inherit lib; }).imports;
 
   settingsExample = {
     enable_chat = true;
diff --git a/plugins/by-name/windsurf-nvim/deprecations.nix b/plugins/by-name/windsurf-nvim/deprecations.nix
new file mode 100644
index 00000000..27fd9318
--- /dev/null
+++ b/plugins/by-name/windsurf-nvim/deprecations.nix
@@ -0,0 +1,56 @@
+{
+  lib,
+  ...
+}:
+{
+  imports =
+    # TODO: added 2024-09-03 remove after 24.11
+    lib.nixvim.deprecation.mkSettingsRenamedOptionModules [ "plugins" "codeium-nvim" ]
+      [ "plugins" "windsurf-nvim" "settings" ]
+      [
+        "configPath"
+        "binPath"
+        [
+          "api"
+          "host"
+        ]
+        [
+          "api"
+          "port"
+        ]
+        [
+          "tools"
+          "uname"
+        ]
+        [
+          "tools"
+          "uuidgen"
+        ]
+        [
+          "tools"
+          "curl"
+        ]
+        [
+          "tools"
+          "gzip"
+        ]
+        [
+          "tools"
+          "languageServer"
+        ]
+        "wrapper"
+      ]
+    # TODO: introduced 2025-04-19
+    ++
+      lib.nixvim.deprecation.mkSettingsRenamedOptionModules [ "plugins" "codeium-nvim" ]
+        [ "plugins" "windsurf-nvim" ]
+        [
+          "enable"
+          "package"
+          "settings"
+          {
+            old = "extraOptions";
+            new = "settings";
+          }
+        ];
+}
diff --git a/tests/test-sources/plugins/by-name/codeium-nvim/default.nix b/tests/test-sources/plugins/by-name/windsurf-nvim/default.nix
similarity index 97%
rename from tests/test-sources/plugins/by-name/codeium-nvim/default.nix
rename to tests/test-sources/plugins/by-name/windsurf-nvim/default.nix
index 7fc22797..f6ef7912 100644
--- a/tests/test-sources/plugins/by-name/codeium-nvim/default.nix
+++ b/tests/test-sources/plugins/by-name/windsurf-nvim/default.nix
@@ -1,6 +1,6 @@
 {
   empty = {
-    plugins.codeium-nvim = {
+    plugins.windsurf-nvim = {
       enable = true;
       settings.enable_cmp_source = false;
     };
@@ -18,7 +18,7 @@
     plugins = {
       cmp.enable = true;
 
-      codeium-nvim = {
+      windsurf-nvim = {
         enable = true;
 
         settings = {