diff --git a/client/mainwindow.cpp b/client/mainwindow.cpp
index b378a55..a0ceb0f 100644
--- a/client/mainwindow.cpp
+++ b/client/mainwindow.cpp
@@ -1,10 +1,10 @@
 #include "mainwindow.h"
 #include "ui_mainwindow.h"
 
-#include "sim-can_debugger.h"
-#include "sim-cvs_i10.h"
-#include "sim-scope_mux_tester.h"
-#include "sim-test.h"
+#include "can_debugger.hpp"
+#include "cvs_i10.hpp"
+#include "scope_mux_tester.hpp"
+#include "test.hpp"
 
 MainWindow::MainWindow(QString host, uint16_t port, QWidget *parent)
     : QMainWindow(parent), ui(new Ui::MainWindow),
diff --git a/client/simulators/sim-can_debugger.cpp b/client/simulators/can_debugger.cpp
similarity index 83%
rename from client/simulators/sim-can_debugger.cpp
rename to client/simulators/can_debugger.cpp
index 0d61d1c..a8d4d12 100644
--- a/client/simulators/sim-can_debugger.cpp
+++ b/client/simulators/can_debugger.cpp
@@ -1,5 +1,5 @@
-#include "sim-can_debugger.h"
-#include "ui_sim-can_debugger.h"
+#include "can_debugger.hpp"
+#include "ui_can_debugger.h"
 
 Can_Debugger::Can_Debugger(Web_socket_wrapper *web_socket, QWidget *parent)
     : Simulator_base(web_socket, parent), ui(new Ui::Can_Debugger)
diff --git a/client/simulators/sim-can_debugger.h b/client/simulators/can_debugger.hpp
similarity index 100%
rename from client/simulators/sim-can_debugger.h
rename to client/simulators/can_debugger.hpp
diff --git a/client/simulators/sim-can_debugger.ui b/client/simulators/can_debugger.ui
similarity index 100%
rename from client/simulators/sim-can_debugger.ui
rename to client/simulators/can_debugger.ui
diff --git a/client/simulators/sim-test.cpp b/client/simulators/test.cpp
similarity index 94%
rename from client/simulators/sim-test.cpp
rename to client/simulators/test.cpp
index 8a194a5..f1818e0 100644
--- a/client/simulators/sim-test.cpp
+++ b/client/simulators/test.cpp
@@ -1,5 +1,5 @@
-#include "sim-test.h"
-#include "ui_sim-test.h"
+#include "test.hpp"
+#include "ui_test.h"
 
 Test_Sim::Test_Sim(Web_socket_wrapper *web_socket, QWidget *parent)
     : Simulator_base(web_socket, parent), ui(new Ui::Test_Sim)
diff --git a/client/simulators/sim-test.h b/client/simulators/test.hpp
similarity index 100%
rename from client/simulators/sim-test.h
rename to client/simulators/test.hpp
diff --git a/client/simulators/sim-test.ui b/client/simulators/test.ui
similarity index 100%
rename from client/simulators/sim-test.ui
rename to client/simulators/test.ui