diff --git a/lua/astrocommunity/git/octo/README.md b/lua/astrocommunity/git/octo-nvim/README.md
similarity index 100%
rename from lua/astrocommunity/git/octo/README.md
rename to lua/astrocommunity/git/octo-nvim/README.md
diff --git a/lua/astrocommunity/git/octo/octo.lua b/lua/astrocommunity/git/octo-nvim/octo.lua
similarity index 100%
rename from lua/astrocommunity/git/octo/octo.lua
rename to lua/astrocommunity/git/octo-nvim/octo.lua
diff --git a/lua/astrocommunity/git/openingh/README.md b/lua/astrocommunity/git/openingh-nvim/README.md
similarity index 100%
rename from lua/astrocommunity/git/openingh/README.md
rename to lua/astrocommunity/git/openingh-nvim/README.md
diff --git a/lua/astrocommunity/git/openingh/openingh.lua b/lua/astrocommunity/git/openingh-nvim/openingh.lua
similarity index 100%
rename from lua/astrocommunity/git/openingh/openingh.lua
rename to lua/astrocommunity/git/openingh-nvim/openingh.lua
diff --git a/lua/astrocommunity/lsp/inc-rename/README.md b/lua/astrocommunity/lsp/inc-rename-nvim/README.md
similarity index 100%
rename from lua/astrocommunity/lsp/inc-rename/README.md
rename to lua/astrocommunity/lsp/inc-rename-nvim/README.md
diff --git a/lua/astrocommunity/lsp/inc-rename/inc-rename.lua b/lua/astrocommunity/lsp/inc-rename-nvim/inc-rename.lua
similarity index 100%
rename from lua/astrocommunity/lsp/inc-rename/inc-rename.lua
rename to lua/astrocommunity/lsp/inc-rename-nvim/inc-rename.lua
diff --git a/lua/astrocommunity/motion/grapple/README.md b/lua/astrocommunity/motion/grapple-nvim/README.md
similarity index 100%
rename from lua/astrocommunity/motion/grapple/README.md
rename to lua/astrocommunity/motion/grapple-nvim/README.md
diff --git a/lua/astrocommunity/motion/grapple/grapple.lua b/lua/astrocommunity/motion/grapple-nvim/grapple.lua
similarity index 100%
rename from lua/astrocommunity/motion/grapple/grapple.lua
rename to lua/astrocommunity/motion/grapple-nvim/grapple.lua