diff --git a/configure.ac b/configure.ac
index 6337b67d..ccb1caa6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -94,10 +94,10 @@ AS_IF([test "x${enable_asan}" = "xyes" ], [
 
 
 dnl --------------------------------------------------------------------
-dnl DRun dialog
+dnl DRun Mode
 dnl --------------------------------------------------------------------
-AC_ARG_ENABLE([drun], AS_HELP_STRING([--disable-drun],[Disable desktop file run dialog]))
-AS_IF([test "x${enable_drun}" != "xno"], [AC_DEFINE([ENABLE_DRUN], [1], [Enable desktop file run dialog])])
+AC_ARG_ENABLE([drun], AS_HELP_STRING([--disable-drun],[Disable desktop file run mode]))
+AS_IF([test "x${enable_drun}" != "xno"], [AC_DEFINE([ENABLE_DRUN], [1], [Enable desktop file run mode])])
 
 dnl ---------------------------------------------------------------------
 dnl Disable window mode
@@ -176,14 +176,14 @@ AC_OUTPUT
 echo ""
 echo "-------------------------------------"
 if test x$enable_drun != xno; then
-echo "Desktop File drun dialog     Enabled"
+echo "Desktop File drun            Enabled"
 else
-echo "Desktop File drun dialog     Disabled"
+echo "Desktop File drun            Disabled"
 fi
 if test x$enable_windowmode != xno; then
-echo "Window Switcher dialog       Enabled"
+echo "Window switcher mode         Enabled"
 else
-echo "Window Switcher dialog       Disabled"
+echo "Window switcher Mode         Disabled"
 fi
 if test x$enable_asan = xyes; then
 echo "Asan address sanitize        Enabled"
diff --git a/include/modes/combi.h b/include/modes/combi.h
index fbc222d6..0c55e56e 100644
--- a/include/modes/combi.h
+++ b/include/modes/combi.h
@@ -25,8 +25,8 @@
  *
  */
 
-#ifndef ROFI_DIALOG_COMBI_H
-#define ROFI_DIALOG_COMBI_H
+#ifndef ROFI_MODE_COMBI_H
+#define ROFI_MODE_COMBI_H
 #include "mode.h"
 
 /**
@@ -48,4 +48,4 @@
 extern Mode combi_mode;
 
 /**@}*/
-#endif // ROFI_DIALOG_COMBI_H
+#endif // ROFI_MODE_COMBI_H
diff --git a/include/modes/dmenu.h b/include/modes/dmenu.h
index 2b030e17..858641b0 100644
--- a/include/modes/dmenu.h
+++ b/include/modes/dmenu.h
@@ -25,8 +25,8 @@
  *
  */
 
-#ifndef ROFI_DIALOG_DMENU_H
-#define ROFI_DIALOG_DMENU_H
+#ifndef ROFI_MODE_DMENU_H
+#define ROFI_MODE_DMENU_H
 
 /**
  * @defgroup DMENU DMenu
@@ -48,4 +48,4 @@ int dmenu_mode_dialog(void);
 void print_dmenu_options(void);
 
 /**@}*/
-#endif // ROFI_DIALOG_DMENU_H
+#endif // ROFI_MODE_DMENU_H
diff --git a/include/modes/dmenuscriptshared.h b/include/modes/dmenuscriptshared.h
index 27247fa5..6debb7dc 100644
--- a/include/modes/dmenuscriptshared.h
+++ b/include/modes/dmenuscriptshared.h
@@ -1,5 +1,5 @@
-#ifndef ROFI_DIALOGS_DMENU_SCRIPT_SHARED_H
-#define ROFI_DIALOGS_DMENU_SCRIPT_SHARED_H
+#ifndef ROFI_MODES_DMENU_SCRIPT_SHARED_H
+#define ROFI_MODES_DMENU_SCRIPT_SHARED_H
 
 #include <glib.h>
 #include <mode.h>
@@ -32,4 +32,4 @@ typedef struct {
 void dmenuscript_parse_entry_extras(G_GNUC_UNUSED Mode *sw,
                                     DmenuScriptEntry *entry, char *buffer,
                                     size_t length);
-#endif // ROFI_DIALOGS_DMENU_SCRIPT_SHARED_H
+#endif // ROFI_MODES_DMENU_SCRIPT_SHARED_H
diff --git a/include/modes/drun.h b/include/modes/drun.h
index c74a2673..64653be6 100644
--- a/include/modes/drun.h
+++ b/include/modes/drun.h
@@ -25,8 +25,8 @@
  *
  */
 
-#ifndef ROFI_DIALOG_DRUN_H
-#define ROFI_DIALOG_DRUN_H
+#ifndef ROFI_MODE_DRUN_H
+#define ROFI_MODE_DRUN_H
 
 #include "mode.h"
 
@@ -40,4 +40,4 @@
 extern Mode drun_mode;
 #endif // ENABLE_DRUN
 /**@}*/
-#endif // ROFI_DIALOG_DRUN_H
+#endif // ROFI_MODE_DRUN_H
diff --git a/include/modes/filebrowser.h b/include/modes/filebrowser.h
index eca667e0..efe81c28 100644
--- a/include/modes/filebrowser.h
+++ b/include/modes/filebrowser.h
@@ -25,8 +25,8 @@
  *
  */
 
-#ifndef ROFI_DIALOG_FILE_BROWSER_H
-#define ROFI_DIALOG_FILE_BROWSER_H
+#ifndef ROFI_MODE_FILE_BROWSER_H
+#define ROFI_MODE_FILE_BROWSER_H
 #include "mode.h"
 /**
  * @defgroup FileBrowserMode FileBrowser
@@ -55,4 +55,4 @@ Mode *create_new_file_browser(void);
 ModeMode file_browser_mode_completer(Mode *sw, int mretv, char **input,
                                      unsigned int selected_line, char **path);
 /**@}*/
-#endif // ROFI_DIALOG_FILE_BROWSER_H
+#endif // ROFI_MODE_FILE_BROWSER_H
diff --git a/include/modes/help-keys.h b/include/modes/help-keys.h
index 64f0c0b2..996f03be 100644
--- a/include/modes/help-keys.h
+++ b/include/modes/help-keys.h
@@ -25,8 +25,8 @@
  *
  */
 
-#ifndef ROFI_DIALOG_HELPKEYS_H
-#define ROFI_DIALOG_HELPKEYS_H
+#ifndef ROFI_MODE_HELPKEYS_H
+#define ROFI_MODE_HELPKEYS_H
 
 #include "mode.h"
 /**
@@ -42,4 +42,4 @@
  */
 extern Mode help_keys_mode;
 /**@}*/
-#endif // ROFI_DIALOG_HELPKEYS_H
+#endif // ROFI_MODE_HELPKEYS_H
diff --git a/include/modes/run.h b/include/modes/run.h
index 015f5054..30bb05a1 100644
--- a/include/modes/run.h
+++ b/include/modes/run.h
@@ -25,8 +25,8 @@
  *
  */
 
-#ifndef ROFI_DIALOG_RUN_H
-#define ROFI_DIALOG_RUN_H
+#ifndef ROFI_MODE_RUN_H
+#define ROFI_MODE_RUN_H
 
 #include "mode.h"
 
@@ -45,4 +45,4 @@
 extern Mode run_mode;
 
 /**@}*/
-#endif // DIALOG_RUN_H
+#endif // ROFI_MODE_RUN_H
diff --git a/include/modes/script.h b/include/modes/script.h
index 47237734..8616eb28 100644
--- a/include/modes/script.h
+++ b/include/modes/script.h
@@ -25,8 +25,8 @@
  *
  */
 
-#ifndef ROFI_DIALOG_SCRIPT_H
-#define ROFI_DIALOG_SCRIPT_H
+#ifndef ROFI_MODE_SCRIPT_H
+#define ROFI_MODE_SCRIPT_H
 
 #include "mode.h"
 
@@ -55,4 +55,4 @@ Mode *script_mode_parse_setup(const char *str);
  */
 gboolean script_mode_is_valid(const char *token);
 /**@}*/
-#endif // ROFI_DIALOG_SCRIPT_H
+#endif // ROFI_MODE_SCRIPT_H
diff --git a/include/modes/ssh.h b/include/modes/ssh.h
index 6cb892a6..c41f036b 100644
--- a/include/modes/ssh.h
+++ b/include/modes/ssh.h
@@ -25,8 +25,8 @@
  *
  */
 
-#ifndef ROFI_DIALOG_SSH_H
-#define ROFI_DIALOG_SSH_H
+#ifndef ROFI_MODE_SSH_H
+#define ROFI_MODE_SSH_H
 #include "mode.h"
 /**
  * @defgroup SSHMode SSH
@@ -44,7 +44,7 @@
  * @{
  */
 
-/** #Mode object representing the ssh dialog. */
+/** #Mode object representing the ssh mode. */
 extern Mode ssh_mode;
 /**@}*/
-#endif // ROFI_DIALOG_SSH_H
+#endif // ROFI_MODE_SSH_H
diff --git a/include/modes/window.h b/include/modes/window.h
index 145628b3..58dff0df 100644
--- a/include/modes/window.h
+++ b/include/modes/window.h
@@ -25,8 +25,8 @@
  *
  */
 
-#ifndef ROFI_DIALOG_WINDOW_H
-#define ROFI_DIALOG_WINDOW_H
+#ifndef ROFI_MODE_WINDOW_H
+#define ROFI_MODE_WINDOW_H
 
 #include "mode.h"
 
@@ -44,4 +44,4 @@ extern Mode window_mode_cd;
 void window_client_handle_signal(xcb_window_t win, gboolean create);
 #endif // WINDOW_MODE
 /** @}*/
-#endif // ROFI_DIALOG_WINDOW_H
+#endif // ROFI_MODE_WINDOW_H