diff --git a/simulator/generated/canned-tunes/Honda-OBD1-comparing-against-global-defaults.md b/simulator/generated/canned-tunes/Honda-OBD1-comparing-against-global-defaults.md
index 724f66dc26..c63e3ded62 100644
--- a/simulator/generated/canned-tunes/Honda-OBD1-comparing-against-global-defaults.md
+++ b/simulator/generated/canned-tunes/Honda-OBD1-comparing-against-global-defaults.md
@@ -5,7 +5,7 @@
 ```
     // default 2.0
     engineConfiguration->displacement = 1.493;
-    // default "60/2"
+    // default "60-2"
     engineConfiguration->trigger.type = TT_TOOTHED_WHEEL;
     // default 0.0
     engineConfiguration->trigger.customTotalToothCount = 24;
diff --git a/simulator/generated/canned-tunes/MazdaMiataNB2-comparing-against-current-MazdaMiataNB2-default.md b/simulator/generated/canned-tunes/MazdaMiataNB2-comparing-against-current-MazdaMiataNB2-default.md
index 7e398979c9..cb6562effb 100644
--- a/simulator/generated/canned-tunes/MazdaMiataNB2-comparing-against-current-MazdaMiataNB2-default.md
+++ b/simulator/generated/canned-tunes/MazdaMiataNB2-comparing-against-current-MazdaMiataNB2-default.md
@@ -11,8 +11,6 @@
     engineConfiguration->fixedTiming = 10;
     // default 1.839
     engineConfiguration->displacement = 1.838997;
-    // default "Miata NB"
-    engineConfiguration->trigger.type = TT_TOOTHED_WHEEL_36_1;
     // default 0.0
     engineConfiguration->globalTriggerAngleOffset = 76;
     // default 98.0
diff --git a/simulator/generated/canned-tunes/MazdaMiataNB2-comparing-against-global-defaults.md b/simulator/generated/canned-tunes/MazdaMiataNB2-comparing-against-global-defaults.md
index c05effbee5..1de0c3224b 100644
--- a/simulator/generated/canned-tunes/MazdaMiataNB2-comparing-against-global-defaults.md
+++ b/simulator/generated/canned-tunes/MazdaMiataNB2-comparing-against-global-defaults.md
@@ -13,8 +13,6 @@
     engineConfiguration->fixedTiming = 10;
     // default 2.0
     engineConfiguration->displacement = 1.838997;
-    // default "60/2"
-    engineConfiguration->trigger.type = TT_TOOTHED_WHEEL_36_1;
     // default 0.0
     engineConfiguration->globalTriggerAngleOffset = 76;
     // default "Single Tooth"
diff --git a/simulator/generated/simulator_tune.msq b/simulator/generated/simulator_tune.msq
index 3f546663a6..bdd7a55c40 100644
--- a/simulator/generated/simulator_tune.msq
+++ b/simulator/generated/simulator_tune.msq
@@ -218,7 +218,7 @@
         <constant name="tps2_1AdcChannel">"Disabled"</constant>
         <constant digits="4" name="idle_derivativeFilterLoss" units="x">0.0</constant>
         <constant digits="0" name="trailingSparkAngle" units="angle">10.0</constant>
-        <constant name="trigger_type">"60/2"</constant>
+        <constant name="trigger_type">"60-2"</constant>
         <constant digits="0" name="trigger_customTotalToothCount" units="number">0.0</constant>
         <constant digits="0" name="trigger_customSkippedToothCount" units="number">0.0</constant>
         <constant digits="1" name="airByRpmTaper" units="%">0.0</constant>
@@ -4554,7 +4554,7 @@ end</constant>
          7000.0
 </constant>
     </page>
-    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI master.2024.03.19.f407-discovery.2404810828" version="5.0"/>
+    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI master.2024.03.19.f407-discovery.1179090729" version="5.0"/>
     <bibliography author="rusEFI 20240227" writeDate="date"/>
     <settings/>
     <userComments/>
diff --git a/simulator/generated/simulator_tune_BMW_M52.msq b/simulator/generated/simulator_tune_BMW_M52.msq
index 370673e8d4..51eb16c95d 100644
--- a/simulator/generated/simulator_tune_BMW_M52.msq
+++ b/simulator/generated/simulator_tune_BMW_M52.msq
@@ -218,7 +218,7 @@
         <constant name="tps2_1AdcChannel">"Disabled"</constant>
         <constant digits="4" name="idle_derivativeFilterLoss" units="x">0.0</constant>
         <constant digits="0" name="trailingSparkAngle" units="angle">10.0</constant>
-        <constant name="trigger_type">"60/2"</constant>
+        <constant name="trigger_type">"60-2"</constant>
         <constant digits="0" name="trigger_customTotalToothCount" units="number">0.0</constant>
         <constant digits="0" name="trigger_customSkippedToothCount" units="number">0.0</constant>
         <constant digits="1" name="airByRpmTaper" units="%">0.0</constant>
@@ -4554,7 +4554,7 @@ end</constant>
          7000.0
 </constant>
     </page>
-    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI master.2024.03.19.f407-discovery.2404810828" version="5.0"/>
+    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI master.2024.03.19.f407-discovery.1179090729" version="5.0"/>
     <bibliography author="rusEFI 20240227" writeDate="date"/>
     <settings/>
     <userComments/>
diff --git a/simulator/generated/simulator_tune_HARLEY.msq b/simulator/generated/simulator_tune_HARLEY.msq
index c94a01f7d4..f234126aeb 100644
--- a/simulator/generated/simulator_tune_HARLEY.msq
+++ b/simulator/generated/simulator_tune_HARLEY.msq
@@ -218,7 +218,7 @@
         <constant name="tps2_1AdcChannel">"Disabled"</constant>
         <constant digits="4" name="idle_derivativeFilterLoss" units="x">0.0</constant>
         <constant digits="0" name="trailingSparkAngle" units="angle">10.0</constant>
-        <constant name="trigger_type">"60/2"</constant>
+        <constant name="trigger_type">"60-2"</constant>
         <constant digits="0" name="trigger_customTotalToothCount" units="number">0.0</constant>
         <constant digits="0" name="trigger_customSkippedToothCount" units="number">0.0</constant>
         <constant digits="1" name="airByRpmTaper" units="%">0.0</constant>
@@ -4630,7 +4630,7 @@ end</constant>
          7000.0
 </constant>
     </page>
-    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI master.2024.03.19.f407-discovery.2404810828" version="5.0"/>
+    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI master.2024.03.19.f407-discovery.1179090729" version="5.0"/>
     <bibliography author="rusEFI 20240227" writeDate="date"/>
     <settings/>
     <userComments/>
diff --git a/simulator/generated/simulator_tune_HELLEN_154_HYUNDAI_COUPE_BK1.msq b/simulator/generated/simulator_tune_HELLEN_154_HYUNDAI_COUPE_BK1.msq
index 1a9cc26510..dc418737e2 100644
--- a/simulator/generated/simulator_tune_HELLEN_154_HYUNDAI_COUPE_BK1.msq
+++ b/simulator/generated/simulator_tune_HELLEN_154_HYUNDAI_COUPE_BK1.msq
@@ -218,7 +218,7 @@
         <constant name="tps2_1AdcChannel">"Disabled"</constant>
         <constant digits="4" name="idle_derivativeFilterLoss" units="x">0.0</constant>
         <constant digits="0" name="trailingSparkAngle" units="angle">10.0</constant>
-        <constant name="trigger_type">"60/2"</constant>
+        <constant name="trigger_type">"60-2"</constant>
         <constant digits="0" name="trigger_customTotalToothCount" units="number">0.0</constant>
         <constant digits="0" name="trigger_customSkippedToothCount" units="number">0.0</constant>
         <constant digits="1" name="airByRpmTaper" units="%">0.0</constant>
@@ -4603,7 +4603,7 @@ end</constant>
          7000.0
 </constant>
     </page>
-    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI master.2024.03.19.f407-discovery.2404810828" version="5.0"/>
+    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI master.2024.03.19.f407-discovery.1179090729" version="5.0"/>
     <bibliography author="rusEFI 20240227" writeDate="date"/>
     <settings/>
     <userComments/>
diff --git a/simulator/generated/simulator_tune_HELLEN_154_HYUNDAI_COUPE_BK2.msq b/simulator/generated/simulator_tune_HELLEN_154_HYUNDAI_COUPE_BK2.msq
index 78c14a6588..c88fdc13d7 100644
--- a/simulator/generated/simulator_tune_HELLEN_154_HYUNDAI_COUPE_BK2.msq
+++ b/simulator/generated/simulator_tune_HELLEN_154_HYUNDAI_COUPE_BK2.msq
@@ -218,7 +218,7 @@
         <constant name="tps2_1AdcChannel">"Disabled"</constant>
         <constant digits="4" name="idle_derivativeFilterLoss" units="x">0.0</constant>
         <constant digits="0" name="trailingSparkAngle" units="angle">10.0</constant>
-        <constant name="trigger_type">"60/2"</constant>
+        <constant name="trigger_type">"60-2"</constant>
         <constant digits="0" name="trigger_customTotalToothCount" units="number">0.0</constant>
         <constant digits="0" name="trigger_customSkippedToothCount" units="number">0.0</constant>
         <constant digits="1" name="airByRpmTaper" units="%">0.0</constant>
@@ -4603,7 +4603,7 @@ end</constant>
          7000.0
 </constant>
     </page>
-    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI master.2024.03.19.f407-discovery.2404810828" version="5.0"/>
+    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI master.2024.03.19.f407-discovery.1179090729" version="5.0"/>
     <bibliography author="rusEFI 20240227" writeDate="date"/>
     <settings/>
     <userComments/>
diff --git a/simulator/generated/simulator_tune_HONDA_K.msq b/simulator/generated/simulator_tune_HONDA_K.msq
index f49bb65e23..25c6bfae33 100644
--- a/simulator/generated/simulator_tune_HONDA_K.msq
+++ b/simulator/generated/simulator_tune_HONDA_K.msq
@@ -4556,7 +4556,7 @@ end</constant>
          7000.0
 </constant>
     </page>
-    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI master.2024.03.19.f407-discovery.2404810828" version="5.0"/>
+    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI master.2024.03.19.f407-discovery.1179090729" version="5.0"/>
     <bibliography author="rusEFI 20240227" writeDate="date"/>
     <settings/>
     <userComments/>
diff --git a/simulator/generated/simulator_tune_HONDA_OBD1.msq b/simulator/generated/simulator_tune_HONDA_OBD1.msq
index e496da2093..d9a7e5816d 100644
--- a/simulator/generated/simulator_tune_HONDA_OBD1.msq
+++ b/simulator/generated/simulator_tune_HONDA_OBD1.msq
@@ -4555,7 +4555,7 @@ end</constant>
          7000.0
 </constant>
     </page>
-    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI master.2024.03.19.f407-discovery.2404810828" version="5.0"/>
+    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI master.2024.03.19.f407-discovery.1179090729" version="5.0"/>
     <bibliography author="rusEFI 20240227" writeDate="date"/>
     <settings/>
     <userComments/>
diff --git a/simulator/generated/simulator_tune_HYUNDAI_PB.msq b/simulator/generated/simulator_tune_HYUNDAI_PB.msq
index 0ca0067949..7d751992d3 100644
--- a/simulator/generated/simulator_tune_HYUNDAI_PB.msq
+++ b/simulator/generated/simulator_tune_HYUNDAI_PB.msq
@@ -218,7 +218,7 @@
         <constant name="tps2_1AdcChannel">"Disabled"</constant>
         <constant digits="4" name="idle_derivativeFilterLoss" units="x">0.0</constant>
         <constant digits="0" name="trailingSparkAngle" units="angle">10.0</constant>
-        <constant name="trigger_type">"60/2"</constant>
+        <constant name="trigger_type">"60-2"</constant>
         <constant digits="0" name="trigger_customTotalToothCount" units="number">0.0</constant>
         <constant digits="0" name="trigger_customSkippedToothCount" units="number">0.0</constant>
         <constant digits="1" name="airByRpmTaper" units="%">0.0</constant>
@@ -4646,7 +4646,7 @@ end</constant>
          7000.0
 </constant>
     </page>
-    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI master.2024.03.19.f407-discovery.2404810828" version="5.0"/>
+    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI master.2024.03.19.f407-discovery.1179090729" version="5.0"/>
     <bibliography author="rusEFI 20240227" writeDate="date"/>
     <settings/>
     <userComments/>
diff --git a/simulator/generated/simulator_tune_MAVERICK_X3.msq b/simulator/generated/simulator_tune_MAVERICK_X3.msq
index 23d75b8d35..0d4acc83f5 100644
--- a/simulator/generated/simulator_tune_MAVERICK_X3.msq
+++ b/simulator/generated/simulator_tune_MAVERICK_X3.msq
@@ -218,7 +218,7 @@
         <constant name="tps2_1AdcChannel">"Disabled"</constant>
         <constant digits="4" name="idle_derivativeFilterLoss" units="x">0.0</constant>
         <constant digits="0" name="trailingSparkAngle" units="angle">10.0</constant>
-        <constant name="trigger_type">"36/2"</constant>
+        <constant name="trigger_type">"36-2"</constant>
         <constant digits="0" name="trigger_customTotalToothCount" units="number">0.0</constant>
         <constant digits="0" name="trigger_customSkippedToothCount" units="number">0.0</constant>
         <constant digits="1" name="airByRpmTaper" units="%">0.0</constant>
@@ -4553,7 +4553,7 @@ end</constant>
          7000.0
 </constant>
     </page>
-    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI master.2024.03.19.f407-discovery.2404810828" version="5.0"/>
+    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI master.2024.03.19.f407-discovery.1179090729" version="5.0"/>
     <bibliography author="rusEFI 20240227" writeDate="date"/>
     <settings/>
     <userComments/>
diff --git a/simulator/generated/simulator_tune_MAZDA_MIATA_NA6.msq b/simulator/generated/simulator_tune_MAZDA_MIATA_NA6.msq
index 6562d6e3c8..5496af0b2e 100644
--- a/simulator/generated/simulator_tune_MAZDA_MIATA_NA6.msq
+++ b/simulator/generated/simulator_tune_MAZDA_MIATA_NA6.msq
@@ -4556,7 +4556,7 @@ end</constant>
          7000.0
 </constant>
     </page>
-    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI master.2024.03.19.f407-discovery.2404810828" version="5.0"/>
+    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI master.2024.03.19.f407-discovery.1179090729" version="5.0"/>
     <bibliography author="rusEFI 20240227" writeDate="date"/>
     <settings/>
     <userComments/>
diff --git a/simulator/generated/simulator_tune_MAZDA_MIATA_NA94.msq b/simulator/generated/simulator_tune_MAZDA_MIATA_NA94.msq
index 8917b4606a..4bb1aa3829 100644
--- a/simulator/generated/simulator_tune_MAZDA_MIATA_NA94.msq
+++ b/simulator/generated/simulator_tune_MAZDA_MIATA_NA94.msq
@@ -4556,7 +4556,7 @@ end</constant>
          7000.0
 </constant>
     </page>
-    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI master.2024.03.19.f407-discovery.2404810828" version="5.0"/>
+    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI master.2024.03.19.f407-discovery.1179090729" version="5.0"/>
     <bibliography author="rusEFI 20240227" writeDate="date"/>
     <settings/>
     <userComments/>
diff --git a/simulator/generated/simulator_tune_MAZDA_MIATA_NA96.msq b/simulator/generated/simulator_tune_MAZDA_MIATA_NA96.msq
index 61027ecf40..2e6b10ae03 100644
--- a/simulator/generated/simulator_tune_MAZDA_MIATA_NA96.msq
+++ b/simulator/generated/simulator_tune_MAZDA_MIATA_NA96.msq
@@ -4556,7 +4556,7 @@ end</constant>
          7000.0
 </constant>
     </page>
-    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI master.2024.03.19.f407-discovery.2404810828" version="5.0"/>
+    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI master.2024.03.19.f407-discovery.1179090729" version="5.0"/>
     <bibliography author="rusEFI 20240227" writeDate="date"/>
     <settings/>
     <userComments/>
diff --git a/simulator/generated/simulator_tune_MAZDA_MIATA_NB1.msq b/simulator/generated/simulator_tune_MAZDA_MIATA_NB1.msq
index 20fb32ba37..031f06a441 100644
--- a/simulator/generated/simulator_tune_MAZDA_MIATA_NB1.msq
+++ b/simulator/generated/simulator_tune_MAZDA_MIATA_NB1.msq
@@ -4556,7 +4556,7 @@ end</constant>
          7000.0
 </constant>
     </page>
-    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI master.2024.03.19.f407-discovery.2404810828" version="5.0"/>
+    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI master.2024.03.19.f407-discovery.1179090729" version="5.0"/>
     <bibliography author="rusEFI 20240227" writeDate="date"/>
     <settings/>
     <userComments/>
diff --git a/simulator/generated/simulator_tune_MAZDA_MIATA_NB2.msq b/simulator/generated/simulator_tune_MAZDA_MIATA_NB2.msq
index ca26f429ea..96b94c53d1 100644
--- a/simulator/generated/simulator_tune_MAZDA_MIATA_NB2.msq
+++ b/simulator/generated/simulator_tune_MAZDA_MIATA_NB2.msq
@@ -4557,7 +4557,7 @@ end</constant>
          7000.0
 </constant>
     </page>
-    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI master.2024.03.19.f407-discovery.2404810828" version="5.0"/>
+    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI master.2024.03.19.f407-discovery.1179090729" version="5.0"/>
     <bibliography author="rusEFI 20240227" writeDate="date"/>
     <settings/>
     <userComments/>
diff --git a/simulator/generated/simulator_tune_MERCEDES_M111.msq b/simulator/generated/simulator_tune_MERCEDES_M111.msq
index 878c1a3fe1..656439af8a 100644
--- a/simulator/generated/simulator_tune_MERCEDES_M111.msq
+++ b/simulator/generated/simulator_tune_MERCEDES_M111.msq
@@ -218,7 +218,7 @@
         <constant name="tps2_1AdcChannel">"Disabled"</constant>
         <constant digits="4" name="idle_derivativeFilterLoss" units="x">0.0</constant>
         <constant digits="0" name="trailingSparkAngle" units="angle">10.0</constant>
-        <constant name="trigger_type">"60/2"</constant>
+        <constant name="trigger_type">"60-2"</constant>
         <constant digits="0" name="trigger_customTotalToothCount" units="number">0.0</constant>
         <constant digits="0" name="trigger_customSkippedToothCount" units="number">0.0</constant>
         <constant digits="1" name="airByRpmTaper" units="%">0.0</constant>
@@ -4556,7 +4556,7 @@ end</constant>
          7000.0
 </constant>
     </page>
-    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI master.2024.03.19.f407-discovery.2404810828" version="5.0"/>
+    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI master.2024.03.19.f407-discovery.1179090729" version="5.0"/>
     <bibliography author="rusEFI 20240227" writeDate="date"/>
     <settings/>
     <userComments/>
diff --git a/simulator/generated/simulator_tune_POLARIS_RZR.msq b/simulator/generated/simulator_tune_POLARIS_RZR.msq
index af5b60b7c9..a4c21040ad 100644
--- a/simulator/generated/simulator_tune_POLARIS_RZR.msq
+++ b/simulator/generated/simulator_tune_POLARIS_RZR.msq
@@ -218,7 +218,7 @@
         <constant name="tps2_1AdcChannel">"Disabled"</constant>
         <constant digits="4" name="idle_derivativeFilterLoss" units="x">0.0</constant>
         <constant digits="0" name="trailingSparkAngle" units="angle">10.0</constant>
-        <constant name="trigger_type">"36/2"</constant>
+        <constant name="trigger_type">"36-2"</constant>
         <constant digits="0" name="trigger_customTotalToothCount" units="number">0.0</constant>
         <constant digits="0" name="trigger_customSkippedToothCount" units="number">0.0</constant>
         <constant digits="1" name="airByRpmTaper" units="%">0.0</constant>
@@ -4553,7 +4553,7 @@ end</constant>
          7000.0
 </constant>
     </page>
-    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI master.2024.03.19.f407-discovery.2404810828" version="5.0"/>
+    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI master.2024.03.19.f407-discovery.1179090729" version="5.0"/>
     <bibliography author="rusEFI 20240227" writeDate="date"/>
     <settings/>
     <userComments/>