diff --git a/Software/src/charger/CHARGERS.h b/Software/src/charger/CHARGERS.h
index bbf54b35..2b5793f3 100644
--- a/Software/src/charger/CHARGERS.h
+++ b/Software/src/charger/CHARGERS.h
@@ -2,11 +2,11 @@
 #define CHARGERS_H
 
 #ifdef CHEVYVOLT_CHARGER
-#include "chevyvolt.h"
+#include "CHEVY-VOLT-CHARGER.h"
 #endif
 
 #ifdef NISSANLEAF_CHARGER
-#include "nissanleaf.h"
+#include "NISSAN-LEAF-CHARGER.h"
 #endif
 
 #endif
diff --git a/Software/src/charger/chevyvolt.cpp b/Software/src/charger/CHEVY-VOLT-CHARGER.cpp
similarity index 99%
rename from Software/src/charger/chevyvolt.cpp
rename to Software/src/charger/CHEVY-VOLT-CHARGER.cpp
index a44e59b2..817c606b 100644
--- a/Software/src/charger/chevyvolt.cpp
+++ b/Software/src/charger/CHEVY-VOLT-CHARGER.cpp
@@ -1,4 +1,4 @@
-#include "chevyvolt.h"
+#include "CHEVY-VOLT-CHARGER.h"
 #include "../lib/miwagner-ESP32-Arduino-CAN/CAN_config.h"
 #include "../lib/miwagner-ESP32-Arduino-CAN/ESP32CAN.h"
 
diff --git a/Software/src/charger/chevyvolt.h b/Software/src/charger/CHEVY-VOLT-CHARGER.h
similarity index 90%
rename from Software/src/charger/chevyvolt.h
rename to Software/src/charger/CHEVY-VOLT-CHARGER.h
index 522397e6..8f80797a 100644
--- a/Software/src/charger/chevyvolt.h
+++ b/Software/src/charger/CHEVY-VOLT-CHARGER.h
@@ -1,5 +1,5 @@
-#ifndef CHEVYVOLT_H
-#define CHEVYVOLT_H
+#ifndef CHEVYVOLT_CHARGER_H
+#define CHEVYVOLT_CHARGER_H
 #include <Arduino.h>
 #include "../../USER_SETTINGS.h"
 #include "../lib/miwagner-ESP32-Arduino-CAN/ESP32CAN.h"
diff --git a/Software/src/charger/nissanleaf.cpp b/Software/src/charger/NISSAN-LEAF-CHARGER.cpp
similarity index 99%
rename from Software/src/charger/nissanleaf.cpp
rename to Software/src/charger/NISSAN-LEAF-CHARGER.cpp
index 89998fd5..69a43978 100644
--- a/Software/src/charger/nissanleaf.cpp
+++ b/Software/src/charger/NISSAN-LEAF-CHARGER.cpp
@@ -1,4 +1,4 @@
-#include "nissanleaf.h"
+#include "NISSAN-LEAF-CHARGER.h"
 #include "../lib/miwagner-ESP32-Arduino-CAN/CAN_config.h"
 #include "../lib/miwagner-ESP32-Arduino-CAN/ESP32CAN.h"
 
diff --git a/Software/src/charger/nissanleaf.h b/Software/src/charger/NISSAN-LEAF-CHARGER.h
similarity index 81%
rename from Software/src/charger/nissanleaf.h
rename to Software/src/charger/NISSAN-LEAF-CHARGER.h
index beb76aab..b004e8bc 100644
--- a/Software/src/charger/nissanleaf.h
+++ b/Software/src/charger/NISSAN-LEAF-CHARGER.h
@@ -1,12 +1,11 @@
-#ifndef NISSANLEAF_H
-#define NISSANLEAF_H
+#ifndef NISSANLEAF_CHARGER_H
+#define NISSANLEAF_CHARGER_H
 #include <Arduino.h>
 #include "../../USER_SETTINGS.h"
 #include "../lib/miwagner-ESP32-Arduino-CAN/ESP32CAN.h"
 
 extern uint16_t battery_voltage;  //V+1,  0-500.0 (0-5000)
 
-void update_values_can_nissanleaf_charger();
 void send_can_nissanleaf_charger();
 void receive_can_nissanleaf_charger(CAN_frame_t rx_frame);
 uint8_t calculate_CRC_Nissan(CAN_frame_t* frame);