diff --git a/Qt/CMakeLists.txt b/Qt/CMakeLists.txt
index 9072973..b90545b 100644
--- a/Qt/CMakeLists.txt
+++ b/Qt/CMakeLists.txt
@@ -38,8 +38,8 @@ set(PROJECT_SOURCES
         simulators/sim-test.cpp
         simulators/sim-test.ui
 
-        simulatorbase.h
-        simulatorbase.cpp
+        simulator_base.h
+        simulator_base.cpp
         helpers.h
         helpers.cpp
         IterableEnum.hpp
diff --git a/Qt/mainwindow.h b/Qt/mainwindow.h
index d105bd8..7d5c475 100644
--- a/Qt/mainwindow.h
+++ b/Qt/mainwindow.h
@@ -5,7 +5,7 @@
 #include <QMainWindow>
 #include "web_socket_wrapper.h"
 #include "networkerror.h"
-#include "simulatorbase.h"
+#include "simulator_base.h"
 
 namespace Ui {
 class MainWindow;
diff --git a/Qt/simulatorbase.cpp b/Qt/simulator_base.cpp
similarity index 99%
rename from Qt/simulatorbase.cpp
rename to Qt/simulator_base.cpp
index 98e88e0..412acaa 100644
--- a/Qt/simulatorbase.cpp
+++ b/Qt/simulator_base.cpp
@@ -1,4 +1,4 @@
-#include "simulatorbase.h"
+#include "simulator_base.h"
 
 SimulatorBase::SimulatorBase(Web_socket_wrapper* web_socket, QWidget* parent) :
       QMainWindow{parent},
diff --git a/Qt/simulatorbase.h b/Qt/simulator_base.h
similarity index 96%
rename from Qt/simulatorbase.h
rename to Qt/simulator_base.h
index db88bef..bebd3ba 100644
--- a/Qt/simulatorbase.h
+++ b/Qt/simulator_base.h
@@ -1,5 +1,5 @@
-#ifndef SIMULATORBASE_H
-#define SIMULATORBASE_H
+#ifndef SIMULATOR_BASE_H
+#define SIMULATOR_BASE_H
 
 #include <QMainWindow>
 #include <QWidget>
@@ -66,4 +66,4 @@ class SimulatorBase : public QMainWindow {
     std::vector<QWidget*>m_ui_lookup;
 };
 
-#endif // SIMULATORBASE_H
+#endif // SIMULATOR_BASE_H
diff --git a/Qt/simulators/sim-can_debugger.h b/Qt/simulators/sim-can_debugger.h
index 808061d..71c91e8 100644
--- a/Qt/simulators/sim-can_debugger.h
+++ b/Qt/simulators/sim-can_debugger.h
@@ -2,7 +2,7 @@
 #define SIM_CAN_DEBUGGER_H
 
 #include <QMainWindow>
-#include "simulatorbase.h"
+#include "simulator_base.h"
 
 namespace Ui {
 class Can_Debugger;
diff --git a/Qt/simulators/sim-test.h b/Qt/simulators/sim-test.h
index 4a79d9d..d3db76c 100644
--- a/Qt/simulators/sim-test.h
+++ b/Qt/simulators/sim-test.h
@@ -2,7 +2,7 @@
 #define SIM_TEST_H
 
 #include <QMainWindow>
-#include "simulatorbase.h"
+#include "simulator_base.h"
 #include "web_socket_wrapper.h"
 
 namespace Ui {