diff --git a/firmware/console/status_loop.cpp b/firmware/console/status_loop.cpp
index 8757329c73..bd44050db8 100644
--- a/firmware/console/status_loop.cpp
+++ b/firmware/console/status_loop.cpp
@@ -521,7 +521,7 @@ static THD_WORKING_AREA(tsThreadStack, UTILITY_THREAD_STACK_SIZE);
 
 #if EFI_TUNER_STUDIO
 
-extern Map3D1616 veMap;
+extern fuel_Map3D_t veMap;
 
 void updateTunerStudioState(TunerStudioOutputChannels *tsOutputChannels DECLARE_ENGINE_PARAMETER_S) {
 #if EFI_SHAFT_POSITION_INPUT || defined(__DOXYGEN__)
diff --git a/firmware/controllers/algo/advance_map.cpp b/firmware/controllers/algo/advance_map.cpp
index 4d0bfa631f..5361cd03c1 100644
--- a/firmware/controllers/algo/advance_map.cpp
+++ b/firmware/controllers/algo/advance_map.cpp
@@ -27,7 +27,7 @@
 
 EXTERN_ENGINE;
 
-static Map3D1616 advanceMap;
+static ign_Map3D_t advanceMap;
 
 float getBaseAdvance(int rpm, float engineLoad DECLARE_ENGINE_PARAMETER_S) {
 	if (cisnan(engineLoad)) {
diff --git a/firmware/controllers/algo/fuel_math.cpp b/firmware/controllers/algo/fuel_math.cpp
index 62fbeeb587..d622420cc8 100644
--- a/firmware/controllers/algo/fuel_math.cpp
+++ b/firmware/controllers/algo/fuel_math.cpp
@@ -44,10 +44,10 @@
 EXTERN_ENGINE
 ;
 
-static Map3D1616 fuelMap;
-static Map3D1616 fuelPhaseMap;
-extern Map3D1616 ve2Map;
-extern Map3D1616 afrMap;
+static fuel_Map3D_t fuelMap;
+static fuel_Map3D_t fuelPhaseMap;
+extern fuel_Map3D_t ve2Map;
+extern fuel_Map3D_t afrMap;
 
 /**
  * @return total duration of fuel injection per engine cycle, in milliseconds
diff --git a/firmware/controllers/core/table_helper.h b/firmware/controllers/core/table_helper.h
index 8633533f15..3dede6b887 100644
--- a/firmware/controllers/core/table_helper.h
+++ b/firmware/controllers/core/table_helper.h
@@ -100,7 +100,8 @@ void Map3D<RPM_BIN_SIZE, LOAD_BIN_SIZE>::setAll(float value) {
 	}
 }
 
-typedef Map3D<16, 16> Map3D1616;
+typedef Map3D<IGN_RPM_COUNT, IGN_LOAD_COUNT> ign_Map3D_t;
+typedef Map3D<FUEL_RPM_COUNT, FUEL_LOAD_COUNT> fuel_Map3D_t;
 
 void setTableBin(float array[], int size, float l, float r);
 void setTableBin2(float array[], int size, float l, float r, float precision);
diff --git a/firmware/controllers/math/speed_density.cpp b/firmware/controllers/math/speed_density.cpp
index 4f578523ed..e1759f306d 100644
--- a/firmware/controllers/math/speed_density.cpp
+++ b/firmware/controllers/math/speed_density.cpp
@@ -22,9 +22,9 @@
 #define rpmMin 500
 #define rpmMax 8000
 
-Map3D1616 veMap;
-Map3D1616 ve2Map;
-Map3D1616 afrMap;
+fuel_Map3D_t veMap;
+fuel_Map3D_t ve2Map;
+fuel_Map3D_t afrMap;
 
 #define tpMin 0
 #define tpMax 100
diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp
index 281da5d63b..ac16809ca1 100644
--- a/firmware/rusefi.cpp
+++ b/firmware/rusefi.cpp
@@ -276,5 +276,5 @@ int getRusEfiVersion(void) {
 		return 1; // this is here to make the compiler happy about the unused array
 	if (UNUSED_CCM_SIZE[0] == 0)
 		return 1; // this is here to make the compiler happy about the unused array
-	return 20150304;
+	return 20150306;
 }