diff --git a/config/nvim/after/ftplugin/help.lua b/config/nvim/after/ftplugin/help.lua
index 49fd961..195feb5 100644
--- a/config/nvim/after/ftplugin/help.lua
+++ b/config/nvim/after/ftplugin/help.lua
@@ -1,3 +1,3 @@
-local nmap = require 'fs.util'.buffer_nmap
+local nmap = require 'fs.util'.buf_nmap
 nmap { 'q', '<cmd>q<cr>' }
 
diff --git a/config/nvim/after/ftplugin/lua.lua b/config/nvim/after/ftplugin/lua.lua
index f903a13..4873123 100644
--- a/config/nvim/after/ftplugin/lua.lua
+++ b/config/nvim/after/ftplugin/lua.lua
@@ -1,6 +1,6 @@
 vim.bo.tabstop = 2
 
-local nmap = require 'fs.util'.buffer_nmap
+local nmap = require 'fs.util'.buf_nmap
 
 -- execute the current line
 nmap { '<leader>x', [[<cmd>call luaeval(getline("."))<cr>]] }
diff --git a/config/nvim/lua/fs/config/vim-markdown.lua b/config/nvim/lua/fs/config/vim-markdown.lua
index bf86ea1..c580d0b 100644
--- a/config/nvim/lua/fs/config/vim-markdown.lua
+++ b/config/nvim/lua/fs/config/vim-markdown.lua
@@ -1,4 +1,4 @@
-local nmap = require'fs.util'.buffer_nmap
+local nmap = require'fs.util'.buf_nmap
 
 local setup = function()
   -- Disable concealling on italic, bold, etc.
diff --git a/config/nvim/lua/fs/util.lua b/config/nvim/lua/fs/util.lua
index aac52c6..365c217 100644
--- a/config/nvim/lua/fs/util.lua
+++ b/config/nvim/lua/fs/util.lua
@@ -10,11 +10,11 @@ local buf_map = function(mode, lhs, rhs, opts)
   vim.api.nvim_buf_set_keymap(0, mode, lhs, rhs, opts)
 end
 
-M.nmap        = function(tbl) map('n', tbl[1], tbl[2], tbl[3]) end
-M.imap        = function(tbl) map('i', tbl[1], tbl[2], tbl[3]) end
-M.vmap        = function(tbl) map('v', tbl[1], tbl[2], tbl[3]) end
-M.buffer_nmap = function(tbl) buf_map('n', tbl[1], tbl[2], tbl[3]) end
-M.buffer_imap = function(tbl) buf_map('i', tbl[1], tbl[2], tbl[3]) end
+M.nmap     = function(tbl) map('n', tbl[1], tbl[2], tbl[3]) end
+M.imap     = function(tbl) map('i', tbl[1], tbl[2], tbl[3]) end
+M.vmap     = function(tbl) map('v', tbl[1], tbl[2], tbl[3]) end
+M.buf_nmap = function(tbl) buf_map('n', tbl[1], tbl[2], tbl[3]) end
+M.buf_imap = function(tbl) buf_map('i', tbl[1], tbl[2], tbl[3]) end
 
 M.colors = function(gui)
   if gui or vim.opt.termguicolors:get() then