diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4c30aea..03e67e6 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -20,7 +20,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 # Source code
 set(HEADERS
-    about.h
+    about-dialog.h
     draw.h
     file.h
     ipfs.h
@@ -28,7 +28,7 @@ set(HEADERS
     middleware.h
     toolbar-button.h
     toc-model-cols.h
-    mainwindow.h
+    main-window.h
     md-parser.h
     menu.h
     ipfs-daemon.h
@@ -37,13 +37,13 @@ set(HEADERS
 )
 set(SOURCES 
   main.cc
-  about.cc
+  about-dialog.cc
   draw.cc
   file.cc
   ipfs.cc
   middleware.cc
   toolbar-button.cc
-  mainwindow.cc
+  main-window.cc
   md-parser.cc
   menu.cc
   ipfs-daemon.cc
diff --git a/src/about.cc b/src/about-dialog.cc
similarity index 98%
rename from src/about.cc
rename to src/about-dialog.cc
index 365a3da..d42a392 100644
--- a/src/about.cc
+++ b/src/about-dialog.cc
@@ -1,4 +1,4 @@
-#include "about.h"
+#include "about-dialog.h"
 #include "project_config.h"
 
 #include <glibmm/fileutils.h>
diff --git a/src/about.h b/src/about-dialog.h
similarity index 100%
rename from src/about.h
rename to src/about-dialog.h
diff --git a/src/mainwindow.cc b/src/main-window.cc
similarity index 99%
rename from src/mainwindow.cc
rename to src/main-window.cc
index ce7b56c..da7f140 100644
--- a/src/mainwindow.cc
+++ b/src/main-window.cc
@@ -1,4 +1,4 @@
-#include "mainwindow.h"
+#include "main-window.h"
 
 #include "menu.h"
 #include "project_config.h"
diff --git a/src/mainwindow.h b/src/main-window.h
similarity index 99%
rename from src/mainwindow.h
rename to src/main-window.h
index 7263497..9eaae10 100644
--- a/src/mainwindow.h
+++ b/src/main-window.h
@@ -1,7 +1,7 @@
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
-#include "about.h"
+#include "about-dialog.h"
 #include "draw.h"
 #include "menu.h"
 #include "middleware.h"
diff --git a/src/main.cc b/src/main.cc
index 7018cf5..03c8279 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -1,5 +1,5 @@
 #include "ipfs-daemon.h"
-#include "mainwindow.h"
+#include "main-window.h"
 #include "option-group.h"
 #include "project_config.h"
 
diff --git a/src/middleware.cc b/src/middleware.cc
index 1ed8ee0..24280cf 100644
--- a/src/middleware.cc
+++ b/src/middleware.cc
@@ -1,7 +1,7 @@
 #include "middleware.h"
 
 #include "file.h"
-#include "mainwindow.h"
+#include "main-window.h"
 #include "md-parser.h"
 #include <cmark-gfm.h>
 #include <glibmm.h>