diff --git a/lib/vim-plugin.nix b/lib/vim-plugin.nix
index efadb636..f7001e32 100644
--- a/lib/vim-plugin.nix
+++ b/lib/vim-plugin.nix
@@ -9,7 +9,7 @@ with lib; {
     maintainers ? [],
     imports ? [],
     # options
-    description ? null,
+    originalName ? name,
     package ? null,
     options ? {},
     settingsOptions ? {},
@@ -80,11 +80,7 @@ with lib; {
     meta.maintainers = maintainers;
     options.${namespace}.${name} =
       {
-        enable = mkEnableOption (
-          if description == null
-          then name
-          else description
-        );
+        enable = mkEnableOption originalName;
       }
       // settingsOption
       // packageOption
diff --git a/plugins/completion/copilot-vim.nix b/plugins/completion/copilot-vim.nix
index 44ba8f11..62f5f1c0 100644
--- a/plugins/completion/copilot-vim.nix
+++ b/plugins/completion/copilot-vim.nix
@@ -9,7 +9,7 @@ with lib;
 with helpers.vim-plugin;
   helpers.vim-plugin.mkVimPlugin config {
     name = "copilot-vim";
-    description = "copilot.vim";
+    originalName = "copilot.vim";
     package = pkgs.vimPlugins.copilot-vim;
     globalPrefix = "copilot_";
     addExtraConfigRenameWarning = true;
diff --git a/plugins/git/committia.nix b/plugins/git/committia.nix
index c6762426..79454746 100644
--- a/plugins/git/committia.nix
+++ b/plugins/git/committia.nix
@@ -7,7 +7,7 @@
 }:
 helpers.vim-plugin.mkVimPlugin config {
   name = "committia";
-  description = "committia.vim";
+  originalName = "committia.vim";
   package = pkgs.vimPlugins.committia-vim;
   globalPrefix = "committia_";
   extraPackages = [pkgs.git];
diff --git a/plugins/git/fugitive.nix b/plugins/git/fugitive.nix
index df0a256b..7532be4a 100644
--- a/plugins/git/fugitive.nix
+++ b/plugins/git/fugitive.nix
@@ -6,7 +6,7 @@
 }:
 helpers.vim-plugin.mkVimPlugin config {
   name = "fugitive";
-  description = "vim-fugitive";
+  originalName = "vim-fugitive";
   package = pkgs.vimPlugins.vim-fugitive;
   extraPackages = [pkgs.git];
 
diff --git a/plugins/languages/ledger.nix b/plugins/languages/ledger.nix
index 9cb81193..caf71870 100644
--- a/plugins/languages/ledger.nix
+++ b/plugins/languages/ledger.nix
@@ -9,7 +9,7 @@ with lib;
 with helpers.vim-plugin;
   mkVimPlugin config {
     name = "ledger";
-    description = "ledger language features";
+    originalName = "vim-ledger";
     package = pkgs.vimPlugins.vim-ledger;
     globalPrefix = "ledger_";
     addExtraConfigRenameWarning = true;
diff --git a/plugins/languages/markdown-preview.nix b/plugins/languages/markdown-preview.nix
index b4bb712d..e79ea52a 100644
--- a/plugins/languages/markdown-preview.nix
+++ b/plugins/languages/markdown-preview.nix
@@ -9,7 +9,7 @@ with lib;
 with helpers.vim-plugin;
   mkVimPlugin config {
     name = "markdown-preview";
-    description = "markdown-preview.nvim";
+    originalName = "markdown-preview.nvim";
     package = pkgs.vimPlugins.markdown-preview-nvim;
     globalPrefix = "mkdp_";
     addExtraConfigRenameWarning = true;
diff --git a/plugins/languages/nix.nix b/plugins/languages/nix.nix
index 5239509b..0f8ee14e 100644
--- a/plugins/languages/nix.nix
+++ b/plugins/languages/nix.nix
@@ -6,7 +6,7 @@
 }:
 helpers.vim-plugin.mkVimPlugin config {
   name = "nix";
-  description = "vim-nix";
+  originalName = "vim-nix";
   package = pkgs.vimPlugins.vim-nix;
 
   # Possibly add option to disable Treesitter highlighting if this is installed
diff --git a/plugins/languages/zig.nix b/plugins/languages/zig.nix
index 5a1c10ea..a77f11c7 100644
--- a/plugins/languages/zig.nix
+++ b/plugins/languages/zig.nix
@@ -9,7 +9,7 @@ with lib;
 with helpers.vim-plugin;
   mkVimPlugin config {
     name = "zig";
-    description = "zig.vim";
+    originalName = "zig.vim";
     package = pkgs.vimPlugins.zig-vim;
     globalPrefix = "zig_";
     addExtraConfigRenameWarning = true;
diff --git a/plugins/statuslines/airline.nix b/plugins/statuslines/airline.nix
index bcdd7480..eca32105 100644
--- a/plugins/statuslines/airline.nix
+++ b/plugins/statuslines/airline.nix
@@ -9,7 +9,7 @@ with lib;
 with helpers.vim-plugin;
   mkVimPlugin config {
     name = "airline";
-    description = "vim-airline";
+    originalName = "vim-airline";
     package = pkgs.vimPlugins.vim-airline;
     globalPrefix = "airline_";
     addExtraConfigRenameWarning = true;
diff --git a/plugins/utils/emmet.nix b/plugins/utils/emmet.nix
index 169278ff..341bfd6a 100644
--- a/plugins/utils/emmet.nix
+++ b/plugins/utils/emmet.nix
@@ -9,6 +9,7 @@ with lib;
 with helpers.vim-plugin;
   mkVimPlugin config {
     name = "emmet";
+    originalName = "emmet-vim";
     package = pkgs.vimPlugins.emmet-vim;
     globalPrefix = "user_emmet_";
     addExtraConfigRenameWarning = true;
diff --git a/plugins/utils/endwise.nix b/plugins/utils/endwise.nix
index 10da8b3b..b08c37c5 100644
--- a/plugins/utils/endwise.nix
+++ b/plugins/utils/endwise.nix
@@ -6,7 +6,7 @@
 }:
 helpers.vim-plugin.mkVimPlugin config {
   name = "endwise";
-  description = "vim-endwise";
+  originalName = "vim-endwise";
   package = pkgs.vimPlugins.vim-endwise;
 
   # Yes it's really not configurable
diff --git a/plugins/utils/goyo.nix b/plugins/utils/goyo.nix
index 95631380..4ed301d3 100644
--- a/plugins/utils/goyo.nix
+++ b/plugins/utils/goyo.nix
@@ -9,7 +9,7 @@ with helpers.vim-plugin;
 with lib;
   mkVimPlugin config {
     name = "goyo";
-    description = "goyo.vim";
+    originalName = "goyo.vim";
     package = pkgs.vimPlugins.goyo-vim;
     globalPrefix = "goyo_";
     addExtraConfigRenameWarning = true;
diff --git a/plugins/utils/instant.nix b/plugins/utils/instant.nix
index 091546f0..5111b8b8 100644
--- a/plugins/utils/instant.nix
+++ b/plugins/utils/instant.nix
@@ -9,7 +9,7 @@ with lib;
 with helpers.vim-plugin;
   mkVimPlugin config {
     name = "instant";
-    description = "instant.nvim";
+    originalName = "instant.nvim";
     package = pkgs.vimPlugins.instant-nvim;
     globalPrefix = "instant_";
     addExtraConfigRenameWarning = true;
diff --git a/plugins/utils/magma-nvim.nix b/plugins/utils/magma-nvim.nix
index 6f9ce379..2c531cd4 100644
--- a/plugins/utils/magma-nvim.nix
+++ b/plugins/utils/magma-nvim.nix
@@ -9,7 +9,7 @@ with lib;
 with helpers.vim-plugin;
   mkVimPlugin config {
     name = "magma-nvim";
-    description = "magma-nvim";
+    originalName = "magma-nvim";
     package = pkgs.vimPlugins.magma-nvim-goose;
     globalPrefix = "magma_";
     addExtraConfigRenameWarning = true;
diff --git a/plugins/utils/molten.nix b/plugins/utils/molten.nix
index 3389be78..76c14e80 100644
--- a/plugins/utils/molten.nix
+++ b/plugins/utils/molten.nix
@@ -9,7 +9,7 @@ with lib;
 with helpers.vim-plugin;
   mkVimPlugin config {
     name = "molten";
-    description = "molten-nvim";
+    originalName = "molten-nvim";
     package = pkgs.vimPlugins.molten-nvim;
     globalPrefix = "molten_";
     addExtraConfigRenameWarning = true;
diff --git a/plugins/utils/startify.nix b/plugins/utils/startify.nix
index 74d2a742..43f30adc 100644
--- a/plugins/utils/startify.nix
+++ b/plugins/utils/startify.nix
@@ -9,6 +9,7 @@ with lib;
 with helpers.vim-plugin;
   mkVimPlugin config {
     name = "startify";
+    originalName = "vim-startify";
     package = pkgs.vimPlugins.vim-startify;
     globalPrefix = "startify_";
     addExtraConfigRenameWarning = true;
diff --git a/plugins/utils/surround.nix b/plugins/utils/surround.nix
index 7be390b7..f90cb515 100644
--- a/plugins/utils/surround.nix
+++ b/plugins/utils/surround.nix
@@ -6,8 +6,6 @@
 }:
 helpers.vim-plugin.mkVimPlugin config {
   name = "surround";
-  description = "surround.vim";
+  originalName = "surround.vim";
   package = pkgs.vimPlugins.surround;
-
-  options = {};
 }