diff --git a/Software/src/battery/KIA-E-GMP-BATTERY.cpp b/Software/src/battery/KIA-E-GMP-BATTERY.cpp
index 1679c459..e8f07f36 100644
--- a/Software/src/battery/KIA-E-GMP-BATTERY.cpp
+++ b/Software/src/battery/KIA-E-GMP-BATTERY.cpp
@@ -361,7 +361,7 @@ void receive_canfd_battery(CANFDMessage frame) {
   }
 }
 
-void receive_can_battery(CAN_frame_t frame) {}  // Not used on CAN-FD battery, just included to compile
+void receive_can_battery(CAN_frame frame) {}  // Not used on CAN-FD battery, just included to compile
 
 void send_can_battery() {
 
diff --git a/Software/src/battery/SANTA-FE-PHEV-BATTERY.cpp b/Software/src/battery/SANTA-FE-PHEV-BATTERY.cpp
index 059282df..4b4c53aa 100644
--- a/Software/src/battery/SANTA-FE-PHEV-BATTERY.cpp
+++ b/Software/src/battery/SANTA-FE-PHEV-BATTERY.cpp
@@ -388,7 +388,7 @@ void send_can_battery() {
   }
 }
 
-uint8_t CalculateCRC8(CAN_frame_t rx_frame) {
+uint8_t CalculateCRC8(CAN_frame rx_frame) {
   int crc = 0;
 
   for (uint8_t framepos = 0; framepos < 8; framepos++) {
diff --git a/Software/src/battery/SANTA-FE-PHEV-BATTERY.h b/Software/src/battery/SANTA-FE-PHEV-BATTERY.h
index 0a3f0e10..09be79e5 100644
--- a/Software/src/battery/SANTA-FE-PHEV-BATTERY.h
+++ b/Software/src/battery/SANTA-FE-PHEV-BATTERY.h
@@ -6,7 +6,7 @@
 #define BATTERY_SELECTED
 #define MAX_CELL_DEVIATION_MV 250
 
-uint8_t CalculateCRC8(CAN_frame_t rx_frame);
+uint8_t CalculateCRC8(CAN_frame rx_frame);
 void setup_battery(void);
 void transmit_can(CAN_frame* tx_frame, int interface);
 
diff --git a/Software/src/battery/VOLVO-SPA-BATTERY.cpp b/Software/src/battery/VOLVO-SPA-BATTERY.cpp
index ffe0c291..5d392906 100644
--- a/Software/src/battery/VOLVO-SPA-BATTERY.cpp
+++ b/Software/src/battery/VOLVO-SPA-BATTERY.cpp
@@ -144,7 +144,7 @@ void update_values_battery() {  //This function maps all the values fetched via
 #endif
 }
 
-void receive_can_battery(CAN_frame_t rx_frame) {
+void receive_can_battery(CAN_frame rx_frame) {
   datalayer.battery.status.CAN_battery_still_alive = CAN_STILL_ALIVE;
   switch (rx_frame.ID) {
     case 0x3A:
diff --git a/Software/src/charger/CHEVY-VOLT-CHARGER.cpp b/Software/src/charger/CHEVY-VOLT-CHARGER.cpp
index 49f3a683..75cfd021 100644
--- a/Software/src/charger/CHEVY-VOLT-CHARGER.cpp
+++ b/Software/src/charger/CHEVY-VOLT-CHARGER.cpp
@@ -56,7 +56,7 @@ static CAN_frame charger_set_targets = {
     .data = {0x40, 0x00, 0x00, 0x00}};  // data[0] is a static value, meaning unknown
 
 /* We are mostly sending out not receiving */
-void receive_can_charger(CAN_frame_t rx_frame) {
+void receive_can_charger(CAN_frame rx_frame) {
   uint16_t charger_stat_HVcur_temp = 0;
   uint16_t charger_stat_HVvol_temp = 0;
   uint16_t charger_stat_LVcur_temp = 0;