diff --git a/Makefile.am b/Makefile.am
index 0407fcbc..c7c7769e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,11 +33,11 @@ rofi_SOURCES=\
     config/config.c\
 	source/helper.c\
 	source/x11-helper.c\
-    source/dialogs/dmenu-dialog.c\
-    source/dialogs/run-dialog.c\
-    source/dialogs/window-dialog.c\
-    source/dialogs/ssh-dialog.c\
-    source/dialogs/script-dialog.c\
+    source/dialogs/dmenu.c\
+    source/dialogs/run.c\
+    source/dialogs/window.c\
+    source/dialogs/ssh.c\
+    source/dialogs/script.c\
     include/rofi.h\
     include/i3-support.h\
     include/xrmoptions.h\
@@ -45,11 +45,11 @@ rofi_SOURCES=\
     include/textbox.h\
 	include/helper.h\
 	include/x11-helper.h\
-    include/dialogs/run-dialog.h\
-    include/dialogs/window-dialog.h\
-    include/dialogs/ssh-dialog.h\
-    include/dialogs/dmenu-dialog.h\
-    include/dialogs/script-dialog.h
+    include/dialogs/run.h\
+    include/dialogs/window.h\
+    include/dialogs/ssh.h\
+    include/dialogs/dmenu.h\
+    include/dialogs/script.h
 
 ##
 # Manpage
diff --git a/include/dialogs/dmenu-dialog.h b/include/dialogs/dmenu.h
similarity index 100%
rename from include/dialogs/dmenu-dialog.h
rename to include/dialogs/dmenu.h
diff --git a/include/dialogs/run-dialog.h b/include/dialogs/run.h
similarity index 100%
rename from include/dialogs/run-dialog.h
rename to include/dialogs/run.h
diff --git a/include/dialogs/script-dialog.h b/include/dialogs/script.h
similarity index 100%
rename from include/dialogs/script-dialog.h
rename to include/dialogs/script.h
diff --git a/include/dialogs/ssh-dialog.h b/include/dialogs/ssh.h
similarity index 100%
rename from include/dialogs/ssh-dialog.h
rename to include/dialogs/ssh.h
diff --git a/include/dialogs/window-dialog.h b/include/dialogs/window.h
similarity index 100%
rename from include/dialogs/window-dialog.h
rename to include/dialogs/window.h
diff --git a/source/dialogs/dmenu-dialog.c b/source/dialogs/dmenu.c
similarity index 99%
rename from source/dialogs/dmenu-dialog.c
rename to source/dialogs/dmenu.c
index b3841a8b..b79c56d4 100644
--- a/source/dialogs/dmenu-dialog.c
+++ b/source/dialogs/dmenu.c
@@ -33,7 +33,7 @@
 #include <string.h>
 #include <ctype.h>
 #include "rofi.h"
-#include "dialogs/dmenu-dialog.h"
+#include "dialogs/dmenu.h"
 #include "helper.h"
 
 
diff --git a/source/dialogs/run-dialog.c b/source/dialogs/run.c
similarity index 99%
rename from source/dialogs/run-dialog.c
rename to source/dialogs/run.c
index b4ea5ea1..946fe334 100644
--- a/source/dialogs/run-dialog.c
+++ b/source/dialogs/run.c
@@ -41,7 +41,7 @@
 #include "rofi.h"
 #include "helper.h"
 #include "history.h"
-#include "dialogs/run-dialog.h"
+#include "dialogs/run.h"
 
 #define RUN_CACHE_FILE    "rofi-2.runcache"
 
diff --git a/source/dialogs/script-dialog.c b/source/dialogs/script.c
similarity index 99%
rename from source/dialogs/script-dialog.c
rename to source/dialogs/script.c
index f381fc6c..946f7be6 100644
--- a/source/dialogs/script-dialog.c
+++ b/source/dialogs/script.c
@@ -35,7 +35,7 @@
 #include <ctype.h>
 #include <assert.h>
 #include "rofi.h"
-#include "dialogs/script-dialog.h"
+#include "dialogs/script.h"
 #include "helper.h"
 
 
diff --git a/source/dialogs/ssh-dialog.c b/source/dialogs/ssh.c
similarity index 99%
rename from source/dialogs/ssh-dialog.c
rename to source/dialogs/ssh.c
index 789944f5..49c167c4 100644
--- a/source/dialogs/ssh-dialog.c
+++ b/source/dialogs/ssh.c
@@ -42,7 +42,7 @@
 
 #include "rofi.h"
 #include "history.h"
-#include "dialogs/ssh-dialog.h"
+#include "dialogs/ssh.h"
 
 #define SSH_CACHE_FILE    "rofi-2.sshcache"
 
diff --git a/source/dialogs/window-dialog.c b/source/dialogs/window.c
similarity index 99%
rename from source/dialogs/window-dialog.c
rename to source/dialogs/window.c
index eef43359..deb4b54f 100644
--- a/source/dialogs/window-dialog.c
+++ b/source/dialogs/window.c
@@ -39,7 +39,7 @@
 #include "helper.h"
 #include "x11-helper.h"
 #include "i3-support.h"
-#include "dialogs/window-dialog.h"
+#include "dialogs/window.h"
 
 
 #define WINLIST        32
diff --git a/source/rofi.c b/source/rofi.c
index e2a2e0bb..c33a709c 100644
--- a/source/rofi.c
+++ b/source/rofi.c
@@ -50,11 +50,11 @@
 #include "x11-helper.h"
 #include "xrmoptions.h"
 // Switchers.
-#include "dialogs/run-dialog.h"
-#include "dialogs/ssh-dialog.h"
-#include "dialogs/dmenu-dialog.h"
-#include "dialogs/script-dialog.h"
-#include "dialogs/window-dialog.h"
+#include "dialogs/run.h"
+#include "dialogs/ssh.h"
+#include "dialogs/dmenu.h"
+#include "dialogs/script.h"
+#include "dialogs/window.h"
 
 #define LINE_MARGIN    3