diff --git a/home-manager/common/software/cli/nixvim-base.nix b/home-manager/common/software/cli/nixvim-base.nix
index 6b3b22ae..7137c596 100644
--- a/home-manager/common/software/cli/nixvim-base.nix
+++ b/home-manager/common/software/cli/nixvim-base.nix
@@ -59,15 +59,14 @@
             (nmap "<leader>wl"  ":wincmd l<CR>" // desc "Move right")
             (nmap "<leader>wj"  ":wincmd j<CR>" // desc "Move down")
             (nmap "<leader>wk"  ":wincmd k<CR>" // desc "Move up")
-            (nmap "<leader>wp"  ":wincmd p<CR>" // desc "Move to [p]revious")
-            (nmap "<leader>wn"  ":wincmd n<CR>" // desc "Move to [n]ext")
+            (nmap "<leader>wn"  ":wincmd w<CR>" // desc "Move to next")
+            (nmap "<leader>wN"  ":wincmd p<CR>" // desc "Move to previous")
             (nmap "<leader>wc"  ":wincmd c<CR>" // desc "[C]lose active window")
-            (nmap "<leader>ww"  ":wincmd w<CR>" // desc "Switch [w]indows")
-            (nmap "<leader>wNh" ":wincmd n<CR>" // desc "New [H]orizontal window")
-            (nmap "<leader>wNv" ":wincmd v<CR>" // desc "New [V]ertical window")
+            (nmap "<leader>woh" ":wincmd n<CR>" // desc "Open [H]orizontal window")
+            (nmap "<leader>wov" ":wincmd v<CR>" // desc "Open [V]ertical window")
             # Buffer Management
             (nmap "<leader>bn" ":bnext<CR>"   // desc "Next buffer")
-            (nmap "<leader>bp" ":bNext<CR>"   // desc "Previous buffer")
+            (nmap "<leader>bN" ":bNext<CR>"   // desc "Previous buffer")
             (nmap "<leader>bc" ":bdelete<CR>" // desc "[c]lose buffer")
         ];