diff --git a/.github/workflows/compile-all-batteries.yml b/.github/workflows/compile-all-batteries.yml
index 80466e52e..09e852cab 100644
--- a/.github/workflows/compile-all-batteries.yml
+++ b/.github/workflows/compile-all-batteries.yml
@@ -70,6 +70,7 @@ jobs:
           - RENAULT_ZOE_GEN1_BATTERY
           - RENAULT_ZOE_GEN2_BATTERY
           - SANTA_FE_PHEV_BATTERY
+          - STELLANTIS_ECMP_BATTERY
           - TESLA_MODEL_3Y_BATTERY
           - TESLA_MODEL_SX_BATTERY
           - VOLVO_SPA_BATTERY
diff --git a/.github/workflows/compile-all-combinations-part2-batteries-N-to-Z.yml b/.github/workflows/compile-all-combinations-part2-batteries-N-to-Z.yml
index 8c77e2375..abec324ed 100644
--- a/.github/workflows/compile-all-combinations-part2-batteries-N-to-Z.yml
+++ b/.github/workflows/compile-all-combinations-part2-batteries-N-to-Z.yml
@@ -63,6 +63,7 @@ jobs:
           - RENAULT_ZOE_GEN1_BATTERY
           - RENAULT_ZOE_GEN2_BATTERY
           - SANTA_FE_PHEV_BATTERY
+          - STELLANTIS_ECMP_BATTERY
           - TESLA_MODEL_3Y_BATTERY
           - TESLA_MODEL_SX_BATTERY
           - VOLVO_SPA_BATTERY
diff --git a/Software/USER_SETTINGS.h b/Software/USER_SETTINGS.h
index 9f8d970e2..2496c2ceb 100644
--- a/Software/USER_SETTINGS.h
+++ b/Software/USER_SETTINGS.h
@@ -23,7 +23,6 @@
 //#define MEB_BATTERY
 //#define MG_5_BATTERY
 //#define NISSAN_LEAF_BATTERY
-//#define ECMP_BATTERY
 //#define PYLON_BATTERY
 //#define RJXZS_BMS
 //#define RANGE_ROVER_PHEV_BATTERY
@@ -32,6 +31,7 @@
 //#define RENAULT_ZOE_GEN1_BATTERY
 //#define RENAULT_ZOE_GEN2_BATTERY
 //#define SANTA_FE_PHEV_BATTERY
+//#define STELLANTIS_ECMP_BATTERY
 //#define TESLA_MODEL_3Y_BATTERY
 //#define TESLA_MODEL_SX_BATTERY
 //#define VOLVO_SPA_BATTERY
diff --git a/Software/src/battery/BATTERIES.h b/Software/src/battery/BATTERIES.h
index aec7d71f0..7be73f225 100644
--- a/Software/src/battery/BATTERIES.h
+++ b/Software/src/battery/BATTERIES.h
@@ -27,7 +27,7 @@
 #include "CHADEMO-SHUNTS.h"
 #endif
 
-#ifdef ECMP_BATTERY
+#ifdef STELLANTIS_ECMP_BATTERY
 #include "ECMP-BATTERY.h"
 #endif
 
diff --git a/Software/src/battery/ECMP-BATTERY.cpp b/Software/src/battery/ECMP-BATTERY.cpp
index f1ef2ea51..afcfd98b1 100644
--- a/Software/src/battery/ECMP-BATTERY.cpp
+++ b/Software/src/battery/ECMP-BATTERY.cpp
@@ -1,10 +1,21 @@
 #include "../include.h"
-#ifdef ECMP_BATTERY
+#ifdef STELLANTIS_ECMP_BATTERY
 #include <algorithm>  // For std::min and std::max
 #include "../datalayer/datalayer.h"
 #include "../devboard/utils/events.h"
 #include "ECMP-BATTERY.h"
 
+/* TODO:
+This integration is still ongoing. Here is what still needs to be done in order to use this battery type
+- Find SOC%
+- Find battery voltage
+- Find current value
+- Find/estimate charge/discharge limits
+- Find temperature
+- Figure out contactor closing
+   - Which CAN messages need to be sent towards the battery?
+*/
+
 /* Do not change code below unless you are sure what you are doing */
 static unsigned long previousMillis1000 = 0;  // will store last time a 1s CAN Message was sent
 
diff --git a/Software/src/battery/ECMP-BATTERY.h b/Software/src/battery/ECMP-BATTERY.h
index ef4232f9a..14955bd69 100644
--- a/Software/src/battery/ECMP-BATTERY.h
+++ b/Software/src/battery/ECMP-BATTERY.h
@@ -1,5 +1,5 @@
-#ifndef ECMP_BATTERY_H
-#define ECMP_BATTERY_H
+#ifndef STELLANTIS_ECMP_BATTERY_H
+#define STELLANTIS_ECMP_BATTERY_H
 #include <Arduino.h>
 #include "../include.h"