6 files changed, 18 insertions, 18 deletions
diff --git a/src/nvim/api/buffer.h b/src/nvim/api/buffer.h
index e8b0e596a5..59370b3c18 100644
--- a/src/nvim/api/buffer.h
+++ b/src/nvim/api/buffer.h
@@ -1,5 +1,5 @@
-#ifndef NEOVIM_API_BUFFER_H
-#define NEOVIM_API_BUFFER_H
+#ifndef NVIM_API_BUFFER_H
+#define NVIM_API_BUFFER_H
 
 #include <stdint.h>
 #include <stdbool.h>
@@ -141,5 +141,5 @@ void buffer_insert(Buffer buffer, int64_t index, StringArray lines, Error *err);
 /// @return The (row, col) tuple
 Position buffer_get_mark(Buffer buffer, String name, Error *err);
 
-#endif  // NEOVIM_API_BUFFER_H
+#endif  // NVIM_API_BUFFER_H
 
diff --git a/src/nvim/api/defs.h b/src/nvim/api/defs.h
index 0ac2e790d2..d451667a6c 100644
--- a/src/nvim/api/defs.h
+++ b/src/nvim/api/defs.h
@@ -1,5 +1,5 @@
-#ifndef NEOVIM_API_DEFS_H
-#define NEOVIM_API_DEFS_H
+#ifndef NVIM_API_DEFS_H
+#define NVIM_API_DEFS_H
 
 #include <stdint.h>
 #include <string.h>
@@ -70,5 +70,5 @@ struct key_value_pair {
 };
 
 
-#endif  // NEOVIM_API_DEFS_H
+#endif  // NVIM_API_DEFS_H
 
diff --git a/src/nvim/api/helpers.h b/src/nvim/api/helpers.h
index a3b264256b..c9c7e9cdc8 100644
--- a/src/nvim/api/helpers.h
+++ b/src/nvim/api/helpers.h
@@ -1,5 +1,5 @@
-#ifndef NEOVIM_API_HELPERS_H
-#define NEOVIM_API_HELPERS_H
+#ifndef NVIM_API_HELPERS_H
+#define NVIM_API_HELPERS_H
 
 #include <stdbool.h>
 
@@ -86,5 +86,5 @@ win_T * find_window(Window window, Error *err);
 /// @return the tabpage pointer
 tabpage_T * find_tab(Tabpage tabpage, Error *err);
 
-#endif  // NEOVIM_API_HELPERS_H
+#endif  // NVIM_API_HELPERS_H
 
diff --git a/src/nvim/api/tabpage.h b/src/nvim/api/tabpage.h
index f4c0d2eac7..54ed70a6f6 100644
--- a/src/nvim/api/tabpage.h
+++ b/src/nvim/api/tabpage.h
@@ -1,5 +1,5 @@
-#ifndef NEOVIM_API_TABPAGE_H
-#define NEOVIM_API_TABPAGE_H
+#ifndef NVIM_API_TABPAGE_H
+#define NVIM_API_TABPAGE_H
 
 #include <stdint.h>
 #include <stdbool.h>
@@ -43,5 +43,5 @@ Window tabpage_get_window(Tabpage tabpage, Error *err);
 /// @return true if the tab page is valid, false otherwise
 bool tabpage_is_valid(Tabpage tabpage);
 
-#endif  // NEOVIM_API_TABPAGE_H
+#endif  // NVIM_API_TABPAGE_H
 
diff --git a/src/nvim/api/vim.h b/src/nvim/api/vim.h
index 27e2639b34..3db9d4d6f6 100644
--- a/src/nvim/api/vim.h
+++ b/src/nvim/api/vim.h
@@ -1,5 +1,5 @@
-#ifndef NEOVIM_API_VIM_H
-#define NEOVIM_API_VIM_H
+#ifndef NVIM_API_VIM_H
+#define NVIM_API_VIM_H
 
 #include <stdint.h>
 #include <stdbool.h>
@@ -154,5 +154,5 @@ Tabpage vim_get_current_tabpage(void);
 /// @param[out] err Details of an error that may have occurred
 void vim_set_current_tabpage(Tabpage tabpage, Error *err);
 
-#endif  // NEOVIM_API_VIM_H
+#endif  // NVIM_API_VIM_H
 
diff --git a/src/nvim/api/window.h b/src/nvim/api/window.h
index 9a85601015..f0e485884a 100644
--- a/src/nvim/api/window.h
+++ b/src/nvim/api/window.h
@@ -1,5 +1,5 @@
-#ifndef NEOVIM_API_WINDOW_H
-#define NEOVIM_API_WINDOW_H
+#ifndef NVIM_API_WINDOW_H
+#define NVIM_API_WINDOW_H
 
 #include <stdint.h>
 #include <stdbool.h>
@@ -111,5 +111,5 @@ Tabpage window_get_tabpage(Window window, Error *err);
 /// @return true if the window is valid, false otherwise
 bool window_is_valid(Window window);
 
-#endif  // NEOVIM_API_WINDOW_H
+#endif  // NVIM_API_WINDOW_H