diff --git a/listener/CMakeLists.txt b/listener/CMakeLists.txt
index 4b8fee4..d57698a 100644
--- a/listener/CMakeLists.txt
+++ b/listener/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.10.0)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I/home/pi/CPP")
 project(listener VERSION 0.1.0 LANGUAGES C CXX)
 
-add_executable(listener main.cpp ClientSocketSender.cpp SocketConnectionReceiver.cpp SocketServer.cpp)
+add_executable(listener main.cpp clientsocketsender.cpp socketconnectionreceiver.cpp socketserver.cpp)
 
 add_subdirectory(/home/pi/CPP/common /home/pi/CPP/common/build) 
 target_link_libraries(listener PRIVATE common)
diff --git a/listener/ClientSocketSender.cpp b/listener/clientsocketsender.cpp
similarity index 98%
rename from listener/ClientSocketSender.cpp
rename to listener/clientsocketsender.cpp
index d760a3d..d90a303 100644
--- a/listener/ClientSocketSender.cpp
+++ b/listener/clientsocketsender.cpp
@@ -1,4 +1,4 @@
-#include <listener/ClientSocketSender.hpp>
+#include <listener/clientsocketsender.hpp>
 
 ClientSocketSender::ClientSocketSender(String ipAddress, int port)
 : mIPAddress(ipAddress), mPort(port)
diff --git a/listener/ClientSocketSender.hpp b/listener/clientsocketsender.hpp
similarity index 100%
rename from listener/ClientSocketSender.hpp
rename to listener/clientsocketsender.hpp
diff --git a/listener/main.cpp b/listener/main.cpp
index 67d4cb7..86ef5e8 100644
--- a/listener/main.cpp
+++ b/listener/main.cpp
@@ -12,8 +12,8 @@
 #include <common/block.hpp>
 #include <common/fileio.hpp>
 #include <common/utility.hpp>
-#include <listener/SocketServer.hpp>
-#include <listener/ClientSocketSender.hpp>
+#include <listener/socketserver.hpp>
+#include <listener/clientsocketsender.hpp>
 
 // https://www.man7.org/linux/man-pages/man2/accept.2.html
 
diff --git a/listener/SocketConnectionReceiver.cpp b/listener/socketconnectionreceiver.cpp
similarity index 99%
rename from listener/SocketConnectionReceiver.cpp
rename to listener/socketconnectionreceiver.cpp
index f87bfc7..4046b64 100644
--- a/listener/SocketConnectionReceiver.cpp
+++ b/listener/socketconnectionreceiver.cpp
@@ -1,4 +1,4 @@
-#include <listener/SocketConnectionReceiver.hpp>
+#include <listener/socketconnectionreceiver.hpp>
 #include <common/utility.hpp>
 #include <common/stringbuffer.hpp>
 
diff --git a/listener/SocketConnectionReceiver.hpp b/listener/socketconnectionreceiver.hpp
similarity index 100%
rename from listener/SocketConnectionReceiver.hpp
rename to listener/socketconnectionreceiver.hpp
diff --git a/listener/SocketServer.cpp b/listener/socketserver.cpp
similarity index 96%
rename from listener/SocketServer.cpp
rename to listener/socketserver.cpp
index bfc44df..635231a 100644
--- a/listener/SocketServer.cpp
+++ b/listener/socketserver.cpp
@@ -1,5 +1,5 @@
-#include <listener/SocketServer.hpp>
-#include <listener/SocketConnectionReceiver.hpp>
+#include <listener/socketserver.hpp>
+#include <listener/socketconnectionreceiver.hpp>
 
 /// @brief This will construct the socket listener.  You must then call listen() to listen for connections
 /// @param port 
diff --git a/listener/SocketServer.hpp b/listener/socketserver.hpp
similarity index 100%
rename from listener/SocketServer.hpp
rename to listener/socketserver.hpp