diff --git a/client/client/lib/espnow/src/espnow.cpp b/client/client/lib/espnow/src/ESPNow.cpp
similarity index 98%
rename from client/client/lib/espnow/src/espnow.cpp
rename to client/client/lib/espnow/src/ESPNow.cpp
index 2d9aef44851371ab2844f92b60d7242e8fce824e..e52930604dace5db905876e9ffcdc12642e943bf 100644
--- a/client/client/lib/espnow/src/espnow.cpp
+++ b/client/client/lib/espnow/src/ESPNow.cpp
@@ -1,4 +1,4 @@
-#include "espnow.hpp"
+#include "ESPNow.hpp"
 
 uint8_t BROADCAST_MAC[] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
 esp_now_peer_info_t hostInfo;
diff --git a/client/client/lib/espnow/src/espnow.hpp b/client/client/lib/espnow/src/ESPNow.hpp
similarity index 93%
rename from client/client/lib/espnow/src/espnow.hpp
rename to client/client/lib/espnow/src/ESPNow.hpp
index 26e90b864fd3da10b091091d3bff1cd840eadb19..1230290fca05d93f3c98bbd7c3374f364f5868bb 100644
--- a/client/client/lib/espnow/src/espnow.hpp
+++ b/client/client/lib/espnow/src/ESPNow.hpp
@@ -2,12 +2,12 @@
 #define _ESPNOW
 
 #include "Message.hpp"
-#include "WiFi.h"
+#include "Time.hpp"
 #include "ram_caching.hpp"
-#include "time.hpp"
 #include <ClientDataPackage.hpp>
 #include <ESP32Time.h>
 #include <Preferences.h>
+#include <WiFi.h>
 #include <esp_now.h>
 
 typedef struct config {
diff --git a/client/client/lib/espnow/src/Message.hpp b/client/client/lib/espnow/src/Message.hpp
index 54099ac974b98f10a841966f5c676cc78cba007b..ee00f7fd7365a15c25a32d9ad81b575fb5edde3b 100644
--- a/client/client/lib/espnow/src/Message.hpp
+++ b/client/client/lib/espnow/src/Message.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
 #include "ClientDataPackage.hpp"
-#include "espnow.hpp"
-#include "time.hpp"
+#include "ESPNow.hpp"
+#include "Time.hpp"
 #include <Arduino.h>
 #include <ESP32Time.h>
 #include <esp_now.h>
diff --git a/client/client/lib/time/src/time.hpp b/client/client/lib/time/src/Time.hpp
similarity index 90%
rename from client/client/lib/time/src/time.hpp
rename to client/client/lib/time/src/Time.hpp
index 318bfda6148dcbd50040d2e8986ba49b93c9424f..93dfc964f0bef45fb86ccba203868ea995df4031 100644
--- a/client/client/lib/time/src/time.hpp
+++ b/client/client/lib/time/src/Time.hpp
@@ -6,3 +6,4 @@ namespace esptime {
 // internal linkage only
 static ESP32Time rtc; // global variable for the RTC (i don't think this is good practice)
 } // namespace esptime
+// namespace esptime
diff --git a/client/client/src/main.cpp b/client/client/src/main.cpp
index 22228f3c6fff5a974bb188e05098f4f4d2b970da..9c4ff798fc66a71927096f9186a34dfe962e2b91 100644
--- a/client/client/src/main.cpp
+++ b/client/client/src/main.cpp
@@ -1,4 +1,4 @@
-#include "espnow.hpp"
+#include "ESPNow.hpp"
 #include "ram_caching.hpp"
 #include <Arduino.h>
 #include <ArduinoJson.h>