diff --git a/firmware/config/engines/hyundai.cpp b/firmware/config/engines/hyundai.cpp
index 0e262da3ef..b63ad8ef41 100644
--- a/firmware/config/engines/hyundai.cpp
+++ b/firmware/config/engines/hyundai.cpp
@@ -35,6 +35,8 @@ static void set201xHyundai() {
 
 // set engine_type 104
 void setHyundaiPb() {
+	setGDIFueling();
+	// override injection phase
 	cannedPbTables();
     setInline4();
 	engineConfiguration->displacement = 1.6;
@@ -63,7 +65,6 @@ void setHyundaiPb() {
 	set201xHyundai();
 	// Injectors flow 1214 cc/min at 100 bar pressure
 	engineConfiguration->injector.flow = 1214;
-	setGDIFueling();
 	engineConfiguration->injectionMode = IM_SEQUENTIAL;
    	engineConfiguration->crankingInjectionMode = IM_SEQUENTIAL;
 
diff --git a/firmware/config/engines/hyundai_pb_canned.cpp b/firmware/config/engines/hyundai_pb_canned.cpp
index 7d1a8c6732..699455d362 100644
--- a/firmware/config/engines/hyundai_pb_canned.cpp
+++ b/firmware/config/engines/hyundai_pb_canned.cpp
@@ -2,11 +2,11 @@
 
 void cannedPbTables() {
 #if (IGN_LOAD_COUNT == DEFAULT_IGN_LOAD_COUNT) && (IGN_RPM_COUNT == DEFAULT_IGN_RPM_COUNT) && (FUEL_LOAD_COUNT == DEFAULT_FUEL_LOAD_COUNT) && (FUEL_RPM_COUNT == DEFAULT_FUEL_LOAD_COUNT)
-	cannedvvtTable1();
-	cannedvvtTable2();
+	pbcannedvvtTable1();
+	pbcannedvvtTable2();
 	pbcannedignitionTable();
 	pbcannedveTable();
-	cannedinjectionPhase();
+	pbcannedinjectionPhase();
 	pbcannedlambdaTable();
 #endif
 }
diff --git a/firmware/config/engines/hyundai_pb_canned_tables.cpp b/firmware/config/engines/hyundai_pb_canned_tables.cpp
index 114d61cfc6..3fa9b875f3 100644
--- a/firmware/config/engines/hyundai_pb_canned_tables.cpp
+++ b/firmware/config/engines/hyundai_pb_canned_tables.cpp
@@ -1,6 +1,6 @@
 #if (IGN_LOAD_COUNT == DEFAULT_IGN_LOAD_COUNT) && (IGN_RPM_COUNT == DEFAULT_IGN_RPM_COUNT) && (FUEL_LOAD_COUNT == DEFAULT_FUEL_LOAD_COUNT) && (FUEL_RPM_COUNT == DEFAULT_FUEL_LOAD_COUNT)
 
-static void cannedvvtTable1() {
+static void pbcannedvvtTable1() {
 	static const float hardCodedvvtTable1[8][8] = {
 {0.000,	0.000,	0.000,	0.000,	0.000,	0.000,	0.000,	0.000,	},
 {0.000,	0.000,	0.000,	0.000,	0.000,	0.000,	0.000,	0.000,	},
@@ -14,7 +14,7 @@ static void cannedvvtTable1() {
 	copyTable(config->vvtTable1, hardCodedvvtTable1);
 }
 
-static void cannedvvtTable2() {
+static void pbcannedvvtTable2() {
 	static const float hardCodedvvtTable2[8][8] = {
 {50.000,	50.000,	50.000,	50.000,	50.000,	40.000,	40.000,	40.000,	},
 {50.000,	50.000,	50.000,	50.000,	50.000,	40.000,	40.000,	40.000,	},
@@ -72,7 +72,7 @@ static void pbcannedveTable() {
 	copyTable(config->veTable, hardCodedveTable);
 }
 
-static void cannedinjectionPhase() {
+static void pbcannedinjectionPhase() {
 	static const float hardCodedinjectionPhase[16][16] = {
 {-220.000,	-220.000,	-220.000,	-220.000,	-220.000,	-220.000,	-220.000,	-220.000,	-250.000,	-250.000,	-250.000,	-240.000,	-240.000,	-240.000,	-240.000,	-240.000,	},
 {-220.000,	-220.000,	-220.000,	-220.000,	-220.000,	-220.000,	-220.000,	-220.000,	-250.000,	-250.000,	-250.000,	-240.000,	-240.000,	-240.000,	-240.000,	-240.000,	},
@@ -115,4 +115,5 @@ static void pbcannedlambdaTable() {
 };
 	copyTable(config->lambdaTable, hardCodedlambdaTable);
 }
+
 #endif