diff --git a/autoload/nimrod.vim b/autoload/nim.vim
similarity index 100%
rename from autoload/nimrod.vim
rename to autoload/nim.vim
diff --git a/autoload/nimrod_vim.py b/autoload/nim_vim.py
similarity index 100%
rename from autoload/nimrod_vim.py
rename to autoload/nim_vim.py
diff --git a/compiler/nimrod.vim b/compiler/nim.vim
similarity index 100%
rename from compiler/nimrod.vim
rename to compiler/nim.vim
diff --git a/ftdetect/nimrod.vim b/ftdetect/nim.vim
similarity index 100%
rename from ftdetect/nimrod.vim
rename to ftdetect/nim.vim
diff --git a/ftplugin/nimrod.vim b/ftplugin/nim.vim
similarity index 100%
rename from ftplugin/nimrod.vim
rename to ftplugin/nim.vim
diff --git a/indent/nimrod.vim b/indent/nim.vim
similarity index 100%
rename from indent/nimrod.vim
rename to indent/nim.vim
diff --git a/syntax/nimrod.vim b/syntax/nim.vim
similarity index 100%
rename from syntax/nimrod.vim
rename to syntax/nim.vim