diff --git a/src/openrct2/ride/RideData.h b/src/openrct2/ride/RideData.h
index f82759026c..9e2b56e18d 100644
--- a/src/openrct2/ride/RideData.h
+++ b/src/openrct2/ride/RideData.h
@@ -468,7 +468,6 @@ struct RideTypeDescriptor
     RideLegacyBoosterSettings LegacyBoosterSettings{};
     RideNaming Naming{};
     RideNameConvention NameConvention{};
-    const char* EnumName{};
     uint8_t AvailableBreakdowns{};
     /** rct2: 0x0097D218 */
     RideHeights Heights{};
@@ -601,7 +600,6 @@ constexpr RideTypeDescriptor DummyRTD =
     .LegacyBoosterSettings = {},
     .Naming = { STR_UNKNOWN_RIDE, STR_RIDE_DESCRIPTION_UNKNOWN },
     .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station },
-    .EnumName = "(INVALID)",
     .AvailableBreakdowns = 0,
     .Heights = { 12, 64, 0, 0, },
     .MaxMass = 255,
diff --git a/src/openrct2/ride/rtd/coaster/AirPoweredVerticalCoaster.h b/src/openrct2/ride/rtd/coaster/AirPoweredVerticalCoaster.h
index b58156c4f3..32ab9e11d2 100644
--- a/src/openrct2/ride/rtd/coaster/AirPoweredVerticalCoaster.h
+++ b/src/openrct2/ride/rtd/coaster/AirPoweredVerticalCoaster.h
@@ -35,7 +35,6 @@ constexpr RideTypeDescriptor AirPoweredVerticalCoasterRTD =
     .LegacyBoosterSettings = { 40, 40 },
     .Naming = { STR_RIDE_NAME_AIR_POWERED_VERTICAL_COASTER, STR_RIDE_DESCRIPTION_AIR_POWERED_VERTICAL_COASTER },
     .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_AIR_POWERED_VERTICAL_COASTER",
     .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION),
     .Heights = { 255, 32, 4, 7, },
     .MaxMass = 255,
diff --git a/src/openrct2/ride/rtd/coaster/AlpineCoaster.h b/src/openrct2/ride/rtd/coaster/AlpineCoaster.h
index 60808acb0d..2682f74699 100644
--- a/src/openrct2/ride/rtd/coaster/AlpineCoaster.h
+++ b/src/openrct2/ride/rtd/coaster/AlpineCoaster.h
@@ -36,7 +36,6 @@ constexpr RideTypeDescriptor AlpineCoasterRTD =
     .TrackSpeedSettings = { 10, 10 },
     .Naming = { STR_RIDE_NAME_ALPINE_COASTER, STR_RIDE_DESCRIPTION_ALPINE_COASTER },
     .NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_ALPINE_ROLLER_COASTER",
     .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION),
     .Heights = {18, 24, 3, 7},
     .MaxMass = 4,
diff --git a/src/openrct2/ride/rtd/coaster/BobsleighCoaster.h b/src/openrct2/ride/rtd/coaster/BobsleighCoaster.h
index e0be886193..fd8b2c670a 100644
--- a/src/openrct2/ride/rtd/coaster/BobsleighCoaster.h
+++ b/src/openrct2/ride/rtd/coaster/BobsleighCoaster.h
@@ -33,7 +33,6 @@ constexpr RideTypeDescriptor BobsleighCoasterRTD =
     .DefaultMode = RideMode::ContinuousCircuit,
     .Naming = { STR_RIDE_NAME_BOBSLEIGH_COASTER, STR_RIDE_DESCRIPTION_BOBSLEIGH_COASTER },
     .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_BOBSLEIGH_COASTER",
     .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE),
     .Heights = { 19, 24, 5, 7, },
     .MaxMass = 25,
diff --git a/src/openrct2/ride/rtd/coaster/ClassicMiniRollerCoaster.h b/src/openrct2/ride/rtd/coaster/ClassicMiniRollerCoaster.h
index 65a288f231..9724307f17 100644
--- a/src/openrct2/ride/rtd/coaster/ClassicMiniRollerCoaster.h
+++ b/src/openrct2/ride/rtd/coaster/ClassicMiniRollerCoaster.h
@@ -35,7 +35,6 @@ constexpr RideTypeDescriptor ClassicMiniRollerCoasterRTD =
     .LegacyBoosterSettings = { 17, 16, 1 },
     .Naming = { STR_RIDE_NAME_CLASSIC_MINI_ROLLER_COASTER, STR_RIDE_DESCRIPTION_CLASSIC_MINI_COASTER },
     .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_CLASSIC_MINI_ROLLER_COASTER",
     .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE),
     .Heights = { 15, 24, 4, 7, },
     .MaxMass = 18,
diff --git a/src/openrct2/ride/rtd/coaster/ClassicStandUpRollerCoaster.h b/src/openrct2/ride/rtd/coaster/ClassicStandUpRollerCoaster.h
index ae0e34dc8e..6681a653ff 100644
--- a/src/openrct2/ride/rtd/coaster/ClassicStandUpRollerCoaster.h
+++ b/src/openrct2/ride/rtd/coaster/ClassicStandUpRollerCoaster.h
@@ -34,7 +34,6 @@ constexpr RideTypeDescriptor ClassicStandUpRollerCoasterRTD =
     .OperatingSettings = { 7, 27 },
     .Naming = { STR_RIDE_NAME_CLASSIC_STAND_UP_ROLLER_COASTER, STR_RIDE_DESCRIPTION_CLASSIC_STAND_UP_ROLLER_COASTER },
     .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_CLASSIC_STAND_UP_ROLLER_COASTER",
     .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE),
     .Heights = { 30, 24, 9, 11, },
     .MaxMass = 18,
diff --git a/src/openrct2/ride/rtd/coaster/ClassicWoodenRollerCoaster.h b/src/openrct2/ride/rtd/coaster/ClassicWoodenRollerCoaster.h
index b7565f38eb..15cbf79853 100644
--- a/src/openrct2/ride/rtd/coaster/ClassicWoodenRollerCoaster.h
+++ b/src/openrct2/ride/rtd/coaster/ClassicWoodenRollerCoaster.h
@@ -35,7 +35,6 @@ constexpr RideTypeDescriptor ClassicWoodenRollerCoasterRTD =
    .LegacyBoosterSettings = { 0, 68 },
    .Naming = { STR_RIDE_NAME_CLASSIC_WOODEN_ROLLER_COASTER, STR_RIDE_DESCRIPTION_CLASSIC_WOODEN_ROLLER_COASTER },
    .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station },
-   .EnumName = "RIDE_TYPE_CLASSIC_WOODEN_ROLLER_COASTER",
    .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE),
    .Heights = { 24, 24, 8, 11, },
    .MaxMass = 19,
diff --git a/src/openrct2/ride/rtd/coaster/ClassicWoodenTwisterRollerCoaster.h b/src/openrct2/ride/rtd/coaster/ClassicWoodenTwisterRollerCoaster.h
index beb8c97ef6..6e1101a056 100644
--- a/src/openrct2/ride/rtd/coaster/ClassicWoodenTwisterRollerCoaster.h
+++ b/src/openrct2/ride/rtd/coaster/ClassicWoodenTwisterRollerCoaster.h
@@ -35,7 +35,6 @@ constexpr RideTypeDescriptor ClassicWoodenTwisterRollerCoasterRTD =
    .LegacyBoosterSettings = { 0, 68 },
    .Naming = { STR_RIDE_NAME_CLASSIC_WOODEN_TWISTER_ROLLER_COASTER, STR_RIDE_DESCRIPTION_CLASSIC_WOODEN_TWISTER_ROLLER_COASTER },
    .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station },
-   .EnumName = "RIDE_TYPE_CLASSIC_WOODEN_TWISTER_ROLLER_COASTER",
    .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE),
    .Heights = { 24, 24, 8, 11, },
    .MaxMass = 19,
diff --git a/src/openrct2/ride/rtd/coaster/CompactInvertedCoaster.h b/src/openrct2/ride/rtd/coaster/CompactInvertedCoaster.h
index 62c945bab2..493a6f8b2f 100644
--- a/src/openrct2/ride/rtd/coaster/CompactInvertedCoaster.h
+++ b/src/openrct2/ride/rtd/coaster/CompactInvertedCoaster.h
@@ -34,7 +34,6 @@ constexpr RideTypeDescriptor CompactInvertedCoasterRTD =
     .OperatingSettings = { 7, 27 },
     .Naming = { STR_RIDE_NAME_COMPACT_INVERTED_COASTER, STR_RIDE_DESCRIPTION_COMPACT_INVERTED_COASTER },
     .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_COMPACT_INVERTED_COASTER",
     .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE),
     .Heights = { 27, 40, 29, 8, },
     .MaxMass = 18,
diff --git a/src/openrct2/ride/rtd/coaster/CorkscrewRollerCoaster.h b/src/openrct2/ride/rtd/coaster/CorkscrewRollerCoaster.h
index dfc385ca61..f6605a4b7e 100644
--- a/src/openrct2/ride/rtd/coaster/CorkscrewRollerCoaster.h
+++ b/src/openrct2/ride/rtd/coaster/CorkscrewRollerCoaster.h
@@ -36,7 +36,6 @@ constexpr RideTypeDescriptor CorkscrewRollerCoasterRTD =
     .LegacyBoosterSettings = { 25, 25 },
     .Naming = { STR_RIDE_NAME_CORKSCREW_ROLLER_COASTER, STR_RIDE_DESCRIPTION_CORKSCREW_ROLLER_COASTER },
     .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_CORKSCREW_ROLLER_COASTER",
     .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE),
     .Heights = { 28, 24, 8, 11, },
     .MaxMass = 18,
diff --git a/src/openrct2/ride/rtd/coaster/FlyingRollerCoaster.h b/src/openrct2/ride/rtd/coaster/FlyingRollerCoaster.h
index e1b61c3e99..c3222863b0 100644
--- a/src/openrct2/ride/rtd/coaster/FlyingRollerCoaster.h
+++ b/src/openrct2/ride/rtd/coaster/FlyingRollerCoaster.h
@@ -42,7 +42,6 @@ constexpr RideTypeDescriptor FlyingRollerCoasterRTD =
     .LegacyBoosterSettings = { 25, 25 },
     .Naming = { STR_RIDE_NAME_FLYING_ROLLER_COASTER, STR_RIDE_DESCRIPTION_FLYING_ROLLER_COASTER },
     .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_FLYING_ROLLER_COASTER",
     .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE),
     .Heights = { 30, 24, 8, 11, },
     .MaxMass = 35,
@@ -118,7 +117,6 @@ constexpr RideTypeDescriptor FlyingRollerCoasterAltRTD =
     .LegacyBoosterSettings = { 25, 25 },
     .Naming = { STR_RIDE_NAME_3A, STR_RIDE_DESCRIPTION_UNKNOWN },
     .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_FLYING_ROLLER_COASTER_ALT",
     .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE),
     .Heights = { 30, 24, 8, 11, },
     .MaxMass = 35,
diff --git a/src/openrct2/ride/rtd/coaster/GigaCoaster.h b/src/openrct2/ride/rtd/coaster/GigaCoaster.h
index fdb2ae56d1..520670b421 100644
--- a/src/openrct2/ride/rtd/coaster/GigaCoaster.h
+++ b/src/openrct2/ride/rtd/coaster/GigaCoaster.h
@@ -37,7 +37,6 @@ constexpr RideTypeDescriptor GigaCoasterRTD =
     .LegacyBoosterSettings = { 17, 68, 4 },
     .Naming = { STR_RIDE_NAME_GIGA_COASTER, STR_RIDE_DESCRIPTION_GIGA_COASTER },
     .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_GIGA_COASTER",
     .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE),
     .Heights = { 86, 24, 9, 11, },
     .MaxMass = 31,
diff --git a/src/openrct2/ride/rtd/coaster/HeartlineTwisterCoaster.h b/src/openrct2/ride/rtd/coaster/HeartlineTwisterCoaster.h
index 653299e25d..020ddefb49 100644
--- a/src/openrct2/ride/rtd/coaster/HeartlineTwisterCoaster.h
+++ b/src/openrct2/ride/rtd/coaster/HeartlineTwisterCoaster.h
@@ -36,7 +36,6 @@ constexpr RideTypeDescriptor HeartlineTwisterCoasterRTD =
     .LegacyBoosterSettings = { 25, 25 },
     .Naming = { STR_RIDE_NAME_HEARTLINE_TWISTER_COASTER, STR_RIDE_DESCRIPTION_HEARTLINE_TWISTER_COASTER },
     .NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_HEARTLINE_TWISTER_COASTER",
     .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION),
     .Heights = { 22, 24, 15, 9, },
     .MaxMass = 18,
diff --git a/src/openrct2/ride/rtd/coaster/HybridCoaster.h b/src/openrct2/ride/rtd/coaster/HybridCoaster.h
index 7953ba25cd..2b3cb147b1 100644
--- a/src/openrct2/ride/rtd/coaster/HybridCoaster.h
+++ b/src/openrct2/ride/rtd/coaster/HybridCoaster.h
@@ -35,7 +35,6 @@ constexpr RideTypeDescriptor HybridCoasterRTD =
     .LegacyBoosterSettings = { 15, 52 },
     .Naming = { STR_RIDE_NAME_HYBRID_COASTER, STR_RIDE_DESCRIPTION_HYBRID_COASTER },
     .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_HYBRID_COASTER",
     .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE),
     .Heights = { 43, 24, 13, 13},
     .MaxMass = 18,
diff --git a/src/openrct2/ride/rtd/coaster/HyperTwister.h b/src/openrct2/ride/rtd/coaster/HyperTwister.h
index 7a34b8c36b..78497c07c7 100644
--- a/src/openrct2/ride/rtd/coaster/HyperTwister.h
+++ b/src/openrct2/ride/rtd/coaster/HyperTwister.h
@@ -38,7 +38,6 @@ constexpr RideTypeDescriptor HyperTwisterRTD =
     .LegacyBoosterSettings = { 17, 68 },
     .Naming = { STR_RIDE_NAME_HYPER_TWISTER, STR_RIDE_DESCRIPTION_HYPER_TWISTER },
     .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station},
-    .EnumName = "RIDE_TYPE_HYPER_TWISTER",
     .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE),
     .Heights = { 61, 24, 8, 9, },
     .MaxMass = 31,
diff --git a/src/openrct2/ride/rtd/coaster/Hypercoaster.h b/src/openrct2/ride/rtd/coaster/Hypercoaster.h
index 6e900c5df1..255fe8a4b3 100644
--- a/src/openrct2/ride/rtd/coaster/Hypercoaster.h
+++ b/src/openrct2/ride/rtd/coaster/Hypercoaster.h
@@ -37,7 +37,6 @@ constexpr RideTypeDescriptor HypercoasterRTD =
     .LegacyBoosterSettings = { 25, 25 },
     .Naming = { STR_RIDE_NAME_HYPERCOASTER, STR_RIDE_DESCRIPTION_HYPERCOASTER },
     .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_HYPERCOASTER",
     .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE),
     .Heights = { 55, 24, 8, 11, },
     .MaxMass = 18,
diff --git a/src/openrct2/ride/rtd/coaster/InvertedHairpinCoaster.h b/src/openrct2/ride/rtd/coaster/InvertedHairpinCoaster.h
index 001953d5a6..6b800a7752 100644
--- a/src/openrct2/ride/rtd/coaster/InvertedHairpinCoaster.h
+++ b/src/openrct2/ride/rtd/coaster/InvertedHairpinCoaster.h
@@ -33,7 +33,6 @@ constexpr RideTypeDescriptor InvertedHairpinCoasterRTD =
     .DefaultMode = RideMode::ContinuousCircuit,
     .Naming = { STR_RIDE_NAME_INVERTED_HAIRPIN_COASTER, STR_RIDE_DESCRIPTION_INVERTED_HAIRPIN_COASTER },
     .NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_INVERTED_HAIRPIN_COASTER",
     .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE),
     .Heights = { 16, 24, 24, 7, },
     .MaxMass = 4,
diff --git a/src/openrct2/ride/rtd/coaster/InvertedImpulseCoaster.h b/src/openrct2/ride/rtd/coaster/InvertedImpulseCoaster.h
index 44bc1cc819..16aa3bbdb4 100644
--- a/src/openrct2/ride/rtd/coaster/InvertedImpulseCoaster.h
+++ b/src/openrct2/ride/rtd/coaster/InvertedImpulseCoaster.h
@@ -36,7 +36,6 @@ constexpr RideTypeDescriptor InvertedImpulseCoasterRTD =
     .LegacyBoosterSettings = { 25, 25 },
     .Naming = { STR_RIDE_NAME_INVERTED_IMPULSE_COASTER, STR_RIDE_DESCRIPTION_INVERTED_IMPULSE_COASTER },
     .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_INVERTED_IMPULSE_COASTER",
     .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION),
     .Heights = { 45, 40, 29, 8, },
     .MaxMass = 23,
diff --git a/src/openrct2/ride/rtd/coaster/InvertedRollerCoaster.h b/src/openrct2/ride/rtd/coaster/InvertedRollerCoaster.h
index f9dec13985..8905fc4930 100644
--- a/src/openrct2/ride/rtd/coaster/InvertedRollerCoaster.h
+++ b/src/openrct2/ride/rtd/coaster/InvertedRollerCoaster.h
@@ -36,7 +36,6 @@ constexpr RideTypeDescriptor InvertedRollerCoasterRTD =
     .LegacyBoosterSettings = { 0, 38 },
     .Naming = { STR_RIDE_NAME_INVERTED_ROLLER_COASTER, STR_RIDE_DESCRIPTION_INVERTED_ROLLER_COASTER },
     .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_INVERTED_ROLLER_COASTER",
     .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE),
     .Heights = { 42, 40, 29, 8, },
     .MaxMass = 27,
diff --git a/src/openrct2/ride/rtd/coaster/JuniorRollerCoaster.h b/src/openrct2/ride/rtd/coaster/JuniorRollerCoaster.h
index f658415a03..3b37d59a9a 100644
--- a/src/openrct2/ride/rtd/coaster/JuniorRollerCoaster.h
+++ b/src/openrct2/ride/rtd/coaster/JuniorRollerCoaster.h
@@ -36,7 +36,6 @@ constexpr RideTypeDescriptor JuniorRollerCoasterRTD =
     .LegacyBoosterSettings = { 17, 16, 1 },
     .Naming = { STR_RIDE_NAME_JUNIOR_ROLLER_COASTER, STR_RIDE_DESCRIPTION_JUNIOR_ROLLER_COASTER },
     .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_JUNIOR_ROLLER_COASTER",
     .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE),
     .Heights = { 12, 24, 4, 7, },
     .MaxMass = 18,
diff --git a/src/openrct2/ride/rtd/coaster/LIMLaunchedRollerCoaster.h b/src/openrct2/ride/rtd/coaster/LIMLaunchedRollerCoaster.h
index 43cb578e63..ced016c7c4 100644
--- a/src/openrct2/ride/rtd/coaster/LIMLaunchedRollerCoaster.h
+++ b/src/openrct2/ride/rtd/coaster/LIMLaunchedRollerCoaster.h
@@ -36,7 +36,6 @@ constexpr RideTypeDescriptor LIMLaunchedRollerCoasterRTD =
     .LegacyBoosterSettings = { 18, 52 },
     .Naming = { STR_RIDE_NAME_LIM_LAUNCHED_ROLLER_COASTER, STR_RIDE_DESCRIPTION_LIM_LAUNCHED_ROLLER_COASTER },
     .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_LIM_LAUNCHED_ROLLER_COASTER",
     .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE),
     .Heights = { 35, 24, 5, 7, },
     .MaxMass = 18,
diff --git a/src/openrct2/ride/rtd/coaster/LSMLaunchedRollerCoaster.h b/src/openrct2/ride/rtd/coaster/LSMLaunchedRollerCoaster.h
index 75c8103dbe..e84afaf332 100644
--- a/src/openrct2/ride/rtd/coaster/LSMLaunchedRollerCoaster.h
+++ b/src/openrct2/ride/rtd/coaster/LSMLaunchedRollerCoaster.h
@@ -37,7 +37,6 @@ constexpr RideTypeDescriptor LSMLaunchedRollerCoasterRTD =
     .LegacyBoosterSettings = { 17, 68, 2 },
     .Naming = { STR_RIDE_NAME_LSM_LAUNCHED_ROLLER_COASTER, STR_RIDE_DESCRIPTION_LSM_LAUNCHED_ROLLER_COASTER },
     .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_LSM_LAUNCHED_ROLLER_COASTER",
     .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION),
     .Heights = { 33, 24, 9, 11, },
     .MaxMass = 31,
diff --git a/src/openrct2/ride/rtd/coaster/LayDownRollerCoaster.h b/src/openrct2/ride/rtd/coaster/LayDownRollerCoaster.h
index 69ad588bcd..bfa128e60d 100644
--- a/src/openrct2/ride/rtd/coaster/LayDownRollerCoaster.h
+++ b/src/openrct2/ride/rtd/coaster/LayDownRollerCoaster.h
@@ -45,7 +45,6 @@ constexpr RideTypeDescriptor LayDownRollerCoasterRTD =
     .LegacyBoosterSettings = { 25, 25 },
     .Naming = { STR_RIDE_NAME_LAY_DOWN_ROLLER_COASTER, STR_RIDE_DESCRIPTION_LAY_DOWN_ROLLER_COASTER },
     .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_LAY_DOWN_ROLLER_COASTER",
     .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE),
     .Heights = { 26, 24, 8, 11, },
     .MaxMass = 25,
@@ -117,7 +116,6 @@ constexpr RideTypeDescriptor LayDownRollerCoasterAltRTD =
     .LegacyBoosterSettings = { 25, 25 },
     .Naming = { STR_RIDE_NAME_40, STR_RIDE_DESCRIPTION_UNKNOWN },
     .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_LAY_DOWN_ROLLER_COASTER_ALT",
     .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE),
     .Heights = { 26, 24, 8, 11, },
     .MaxMass = 25,
diff --git a/src/openrct2/ride/rtd/coaster/LoopingRollerCoaster.h b/src/openrct2/ride/rtd/coaster/LoopingRollerCoaster.h
index e31df2c416..f7d0ed27cb 100644
--- a/src/openrct2/ride/rtd/coaster/LoopingRollerCoaster.h
+++ b/src/openrct2/ride/rtd/coaster/LoopingRollerCoaster.h
@@ -36,7 +36,6 @@ constexpr RideTypeDescriptor LoopingRollerCoasterRTD =
     .LegacyBoosterSettings = { 18, 18 },
     .Naming = { STR_RIDE_NAME_LOOPING_ROLLER_COASTER, STR_RIDE_DESCRIPTION_LOOPING_ROLLER_COASTER },
     .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_LOOPING_ROLLER_COASTER",
     .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE),
     .Heights = { 35, 24, 5, 7, },
     .MaxMass = 18,
diff --git a/src/openrct2/ride/rtd/coaster/MineRide.h b/src/openrct2/ride/rtd/coaster/MineRide.h
index 8464c6d511..5418c4188b 100644
--- a/src/openrct2/ride/rtd/coaster/MineRide.h
+++ b/src/openrct2/ride/rtd/coaster/MineRide.h
@@ -33,7 +33,6 @@ constexpr RideTypeDescriptor MineRideRTD =
     .DefaultMode = RideMode::ContinuousCircuit,
     .Naming = { STR_RIDE_NAME_MINE_RIDE, STR_RIDE_DESCRIPTION_MINE_RIDE },
     .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_MINE_RIDE",
     .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION),
     .Heights = { 13, 24, 9, 11, },
     .MaxMass = 27,
diff --git a/src/openrct2/ride/rtd/coaster/MineTrainCoaster.h b/src/openrct2/ride/rtd/coaster/MineTrainCoaster.h
index 8bfda9bbec..eda3c1d5d3 100644
--- a/src/openrct2/ride/rtd/coaster/MineTrainCoaster.h
+++ b/src/openrct2/ride/rtd/coaster/MineTrainCoaster.h
@@ -34,7 +34,6 @@ constexpr RideTypeDescriptor MineTrainCoasterRTD =
     .DefaultMode = RideMode::ContinuousCircuit,
     .Naming = { STR_RIDE_NAME_MINE_TRAIN_COASTER, STR_RIDE_DESCRIPTION_MINE_TRAIN_COASTER },
     .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_MINE_TRAIN_COASTER",
     .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE),
     .Heights = { 21, 24, 4, 7, },
     .MaxMass = 15,
diff --git a/src/openrct2/ride/rtd/coaster/MiniRollerCoaster.h b/src/openrct2/ride/rtd/coaster/MiniRollerCoaster.h
index 0955641cd6..73606db057 100644
--- a/src/openrct2/ride/rtd/coaster/MiniRollerCoaster.h
+++ b/src/openrct2/ride/rtd/coaster/MiniRollerCoaster.h
@@ -35,7 +35,6 @@ constexpr RideTypeDescriptor MiniRollerCoasterRTD =
     .LegacyBoosterSettings = { 0, 68, 4 },
     .Naming = { STR_RIDE_NAME_MINI_ROLLER_COASTER, STR_RIDE_DESCRIPTION_MINI_ROLLER_COASTER },
     .NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_MINI_ROLLER_COASTER",
     .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE),
     .Heights = { 16, 24, 9, 11, },
     .MaxMass = 10,
diff --git a/src/openrct2/ride/rtd/coaster/MiniSuspendedCoaster.h b/src/openrct2/ride/rtd/coaster/MiniSuspendedCoaster.h
index 4db6112200..e69174d1fa 100644
--- a/src/openrct2/ride/rtd/coaster/MiniSuspendedCoaster.h
+++ b/src/openrct2/ride/rtd/coaster/MiniSuspendedCoaster.h
@@ -33,7 +33,6 @@ constexpr RideTypeDescriptor MiniSuspendedCoasterRTD =
     .DefaultMode = RideMode::ContinuousCircuit,
     .Naming = { STR_RIDE_NAME_MINI_SUSPENDED_COASTER, STR_RIDE_DESCRIPTION_MINI_SUSPENDED_COASTER },
     .NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_MINI_SUSPENDED_COASTER",
     .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE),
     .Heights = { 10, 24, 24, 8, },
     .MaxMass = 3,
diff --git a/src/openrct2/ride/rtd/coaster/MultiDimensionRollerCoaster.h b/src/openrct2/ride/rtd/coaster/MultiDimensionRollerCoaster.h
index 28967895ac..c3faf1c9a6 100644
--- a/src/openrct2/ride/rtd/coaster/MultiDimensionRollerCoaster.h
+++ b/src/openrct2/ride/rtd/coaster/MultiDimensionRollerCoaster.h
@@ -42,7 +42,6 @@ constexpr RideTypeDescriptor MultiDimensionRollerCoasterRTD =
     .LegacyBoosterSettings = { 25, 25 },
     .Naming = { STR_RIDE_NAME_MULTI_DIMENSION_ROLLER_COASTER, STR_RIDE_DESCRIPTION_MULTI_DIMENSION_ROLLER_COASTER },
     .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_MULTI_DIMENSION_ROLLER_COASTER",
     .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE),
     .Heights = { 40, 24, 8, 11, },
     .MaxMass = 78,
@@ -117,7 +116,6 @@ constexpr RideTypeDescriptor MultiDimensionRollerCoasterAltRTD =
     .LegacyBoosterSettings = { 25, 25 },
     .Naming = { STR_RIDE_NAME_38, STR_RIDE_DESCRIPTION_UNKNOWN },
     .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_MULTI_DIMENSION_ROLLER_COASTER_ALT",
     .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE),
     .Heights = { 40, 24, 8, 11, },
     .MaxMass = 78,
diff --git a/src/openrct2/ride/rtd/coaster/ReverseFreefallCoaster.h b/src/openrct2/ride/rtd/coaster/ReverseFreefallCoaster.h
index 7c9a858af4..1f662b5e3e 100644
--- a/src/openrct2/ride/rtd/coaster/ReverseFreefallCoaster.h
+++ b/src/openrct2/ride/rtd/coaster/ReverseFreefallCoaster.h
@@ -36,7 +36,6 @@ constexpr RideTypeDescriptor ReverseFreefallCoasterRTD =
     .LegacyBoosterSettings = { 40, 40 },
     .Naming = { STR_RIDE_NAME_REVERSE_FREEFALL_COASTER, STR_RIDE_DESCRIPTION_REVERSE_FREEFALL_COASTER },
     .NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_REVERSE_FREEFALL_COASTER",
     .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION),
     .Heights = { 255, 32, 4, 7, },
     .MaxMass = 255,
diff --git a/src/openrct2/ride/rtd/coaster/ReverserRollerCoaster.h b/src/openrct2/ride/rtd/coaster/ReverserRollerCoaster.h
index e171a308c3..3a0a12aa29 100644
--- a/src/openrct2/ride/rtd/coaster/ReverserRollerCoaster.h
+++ b/src/openrct2/ride/rtd/coaster/ReverserRollerCoaster.h
@@ -33,7 +33,6 @@ constexpr RideTypeDescriptor ReverserRollerCoasterRTD =
     .DefaultMode = RideMode::ContinuousCircuit,
     .Naming = { STR_RIDE_NAME_REVERSER_ROLLER_COASTER, STR_RIDE_DESCRIPTION_REVERSER_ROLLER_COASTER },
     .NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_REVERSER_ROLLER_COASTER",
     .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE),
     .Heights = { 18, 24, 8, 11, },
     .MaxMass = 15,
diff --git a/src/openrct2/ride/rtd/coaster/SideFrictionRollerCoaster.h b/src/openrct2/ride/rtd/coaster/SideFrictionRollerCoaster.h
index f3fe4f0f16..7e23552977 100644
--- a/src/openrct2/ride/rtd/coaster/SideFrictionRollerCoaster.h
+++ b/src/openrct2/ride/rtd/coaster/SideFrictionRollerCoaster.h
@@ -33,7 +33,6 @@ constexpr RideTypeDescriptor SideFrictionRollerCoasterRTD =
     .DefaultMode = RideMode::ContinuousCircuit,
     .Naming = { STR_RIDE_NAME_SIDE_FRICTION_ROLLER_COASTER, STR_RIDE_DESCRIPTION_SIDE_FRICTION_ROLLER_COASTER },
     .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_SIDE_FRICTION_ROLLER_COASTER",
     .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE),
     .Heights = { 18, 24, 4, 11, },
     .MaxMass = 15,
diff --git a/src/openrct2/ride/rtd/coaster/SingleRailRollerCoaster.h b/src/openrct2/ride/rtd/coaster/SingleRailRollerCoaster.h
index 5ee27b781c..735c561b0e 100644
--- a/src/openrct2/ride/rtd/coaster/SingleRailRollerCoaster.h
+++ b/src/openrct2/ride/rtd/coaster/SingleRailRollerCoaster.h
@@ -34,7 +34,6 @@ constexpr RideTypeDescriptor SingleRailRollerCoasterRTD =
     .LegacyBoosterSettings = { 15, 52 },
     .Naming = { STR_RIDE_NAME_SINGLE_RAIL_ROLLER_COASTER, STR_RIDE_DESCRIPTION_SINGLE_RAIL_ROLLER_COASTER },
     .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_SINGLE_RAIL_ROLLER_COASTER",
     .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE),
     .Heights = { 28, 24, 5, 7},
     .MaxMass = 18,
diff --git a/src/openrct2/ride/rtd/coaster/SpinningWildMouse.h b/src/openrct2/ride/rtd/coaster/SpinningWildMouse.h
index d92370ce92..d32207c972 100644
--- a/src/openrct2/ride/rtd/coaster/SpinningWildMouse.h
+++ b/src/openrct2/ride/rtd/coaster/SpinningWildMouse.h
@@ -32,7 +32,6 @@ constexpr RideTypeDescriptor SpinningWildMouseRTD =
     .DefaultMode = RideMode::ContinuousCircuit,
     .Naming = { STR_RIDE_NAME_SPINNING_WILD_MOUSE, STR_RIDE_DESCRIPTION_SPINNING_WILD_MOUSE },
     .NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_SPINNING_WILD_MOUSE",
     .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE),
     .Heights = { 16, 24, 4, 7, },
     .MaxMass = 4,
diff --git a/src/openrct2/ride/rtd/coaster/SpiralRollerCoaster.h b/src/openrct2/ride/rtd/coaster/SpiralRollerCoaster.h
index 963127fb04..89785d79e7 100644
--- a/src/openrct2/ride/rtd/coaster/SpiralRollerCoaster.h
+++ b/src/openrct2/ride/rtd/coaster/SpiralRollerCoaster.h
@@ -36,7 +36,6 @@ constexpr RideTypeDescriptor SpiralRollerCoasterRTD =
     .LegacyBoosterSettings = { 17, 17 },
     .Naming = { STR_RIDE_NAME_SPIRAL_ROLLER_COASTER, STR_RIDE_DESCRIPTION_SPIRAL_ROLLER_COASTER },
     .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_SPIRAL_ROLLER_COASTER",
     .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE),
     .Heights = { 19, 24, 9, 11, },
     .MaxMass = 31,
diff --git a/src/openrct2/ride/rtd/coaster/StandUpRollerCoaster.h b/src/openrct2/ride/rtd/coaster/StandUpRollerCoaster.h
index ba38784585..2d6c9555d6 100644
--- a/src/openrct2/ride/rtd/coaster/StandUpRollerCoaster.h
+++ b/src/openrct2/ride/rtd/coaster/StandUpRollerCoaster.h
@@ -34,7 +34,6 @@ constexpr RideTypeDescriptor StandUpRollerCoasterRTD =
     .OperatingSettings = { 7, 27 },
     .Naming = { STR_RIDE_NAME_STAND_UP_ROLLER_COASTER, STR_RIDE_DESCRIPTION_STAND_UP_ROLLER_COASTER },
     .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_STAND_UP_ROLLER_COASTER",
     .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE),
     .Heights = { 25, 24, 9, 11, },
     .MaxMass = 18,
diff --git a/src/openrct2/ride/rtd/coaster/SteelWildMouse.h b/src/openrct2/ride/rtd/coaster/SteelWildMouse.h
index 1bbc323db8..553bc49ceb 100644
--- a/src/openrct2/ride/rtd/coaster/SteelWildMouse.h
+++ b/src/openrct2/ride/rtd/coaster/SteelWildMouse.h
@@ -33,7 +33,6 @@ constexpr RideTypeDescriptor SteelWildMouseRTD =
     .DefaultMode = RideMode::ContinuousCircuit,
     .Naming = { STR_RIDE_NAME_WILD_MOUSE, STR_RIDE_DESCRIPTION_WILD_MOUSE },
     .NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_STEEL_WILD_MOUSE",
     .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE),
     .Heights = { 16, 24, 4, 7, },
     .MaxMass = 4,
diff --git a/src/openrct2/ride/rtd/coaster/Steeplechase.h b/src/openrct2/ride/rtd/coaster/Steeplechase.h
index 57262e10cb..f57690723b 100644
--- a/src/openrct2/ride/rtd/coaster/Steeplechase.h
+++ b/src/openrct2/ride/rtd/coaster/Steeplechase.h
@@ -32,7 +32,6 @@ constexpr RideTypeDescriptor SteeplechaseRTD =
     .DefaultMode = RideMode::ContinuousCircuit,
     .Naming = { STR_RIDE_NAME_STEEPLECHASE, STR_RIDE_DESCRIPTION_STEEPLECHASE },
     .NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_STEEPLECHASE",
     .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE),
     .Heights = { 14, 24, 7, 7, },
     .MaxMass = 4,
diff --git a/src/openrct2/ride/rtd/coaster/SuspendedSwingingCoaster.h b/src/openrct2/ride/rtd/coaster/SuspendedSwingingCoaster.h
index c8fb3f555f..53ba3f6834 100644
--- a/src/openrct2/ride/rtd/coaster/SuspendedSwingingCoaster.h
+++ b/src/openrct2/ride/rtd/coaster/SuspendedSwingingCoaster.h
@@ -32,7 +32,6 @@ constexpr RideTypeDescriptor SuspendedSwingingCoasterRTD =
     .DefaultMode = RideMode::ContinuousCircuit,
     .Naming = { STR_RIDE_NAME_SUSPENDED_SWINGING_COASTER, STR_RIDE_DESCRIPTION_SUSPENDED_SWINGING_COASTER },
     .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_SUSPENDED_SWINGING_COASTER",
     .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE),
     .Heights = { 24, 40, 29, 8, },
     .MaxMass = 26,
diff --git a/src/openrct2/ride/rtd/coaster/TwisterRollerCoaster.h b/src/openrct2/ride/rtd/coaster/TwisterRollerCoaster.h
index e69594d296..841f8f6249 100644
--- a/src/openrct2/ride/rtd/coaster/TwisterRollerCoaster.h
+++ b/src/openrct2/ride/rtd/coaster/TwisterRollerCoaster.h
@@ -37,7 +37,6 @@ constexpr RideTypeDescriptor TwisterRollerCoasterRTD =
     .LegacyBoosterSettings = { 17, 68 },
     .Naming = { STR_RIDE_NAME_TWISTER_ROLLER_COASTER, STR_RIDE_DESCRIPTION_TWISTER_ROLLER_COASTER },
     .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_TWISTER_ROLLER_COASTER",
     .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE),
     .Heights = { 40, 24, 8, 9, },
     .MaxMass = 31,
diff --git a/src/openrct2/ride/rtd/coaster/VerticalDropCoaster.h b/src/openrct2/ride/rtd/coaster/VerticalDropCoaster.h
index a24af87074..1b159dceab 100644
--- a/src/openrct2/ride/rtd/coaster/VerticalDropCoaster.h
+++ b/src/openrct2/ride/rtd/coaster/VerticalDropCoaster.h
@@ -36,7 +36,6 @@ constexpr RideTypeDescriptor VerticalDropCoasterRTD =
     .LegacyBoosterSettings = { 17, 68 },
     .Naming = { STR_RIDE_NAME_VERTICAL_DROP_ROLLER_COASTER, STR_RIDE_DESCRIPTION_VERTICAL_DROP_ROLLER_COASTER },
     .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_VERTICAL_DROP_ROLLER_COASTER",
     .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE),
     .Heights = { 55, 24, 8, 11, },
     .MaxMass = 25,
diff --git a/src/openrct2/ride/rtd/coaster/VirginiaReel.h b/src/openrct2/ride/rtd/coaster/VirginiaReel.h
index e98045dd52..0b536b1d99 100644
--- a/src/openrct2/ride/rtd/coaster/VirginiaReel.h
+++ b/src/openrct2/ride/rtd/coaster/VirginiaReel.h
@@ -32,7 +32,6 @@ constexpr RideTypeDescriptor VirginiaReelRTD =
     .DefaultMode = RideMode::ContinuousCircuit,
     .Naming = { STR_RIDE_NAME_VIRGINIA_REEL, STR_RIDE_DESCRIPTION_VIRGINIA_REEL },
     .NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_VIRGINIA_REEL",
     .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE),
     .Heights = { 14, 24, 6, 7, },
     .MaxMass = 15,
diff --git a/src/openrct2/ride/rtd/coaster/WaterCoaster.h b/src/openrct2/ride/rtd/coaster/WaterCoaster.h
index 639aeb2917..7d7745523f 100644
--- a/src/openrct2/ride/rtd/coaster/WaterCoaster.h
+++ b/src/openrct2/ride/rtd/coaster/WaterCoaster.h
@@ -49,7 +49,6 @@ constexpr RideTypeDescriptor WaterCoasterRTD =
     .LegacyBoosterSettings = { 17, 16, 1 },
     .Naming = { STR_RIDE_NAME_WATER_COASTER, STR_RIDE_DESCRIPTION_WATER_COASTER },
     .NameConvention = { RideComponentType::Boat, RideComponentType::Track, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_WATER_COASTER",
     .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE),
     .Heights = { 18, 24, 4, 7, },
     .MaxMass = 13,
diff --git a/src/openrct2/ride/rtd/coaster/WoodenRollerCoaster.h b/src/openrct2/ride/rtd/coaster/WoodenRollerCoaster.h
index 5cf58d8ffe..b1947d6fe3 100644
--- a/src/openrct2/ride/rtd/coaster/WoodenRollerCoaster.h
+++ b/src/openrct2/ride/rtd/coaster/WoodenRollerCoaster.h
@@ -35,7 +35,6 @@ constexpr RideTypeDescriptor WoodenRollerCoasterRTD =
     .LegacyBoosterSettings = { 0, 68 },
     .Naming = { STR_RIDE_NAME_WOODEN_ROLLER_COASTER, STR_RIDE_DESCRIPTION_WOODEN_ROLLER_COASTER },
     .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_WOODEN_ROLLER_COASTER",
     .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE),
     .Heights = { 41, 24, 8, 11, },
     .MaxMass = 19,
diff --git a/src/openrct2/ride/rtd/coaster/WoodenWildMouse.h b/src/openrct2/ride/rtd/coaster/WoodenWildMouse.h
index 54aaadbb7a..5ca73a52cf 100644
--- a/src/openrct2/ride/rtd/coaster/WoodenWildMouse.h
+++ b/src/openrct2/ride/rtd/coaster/WoodenWildMouse.h
@@ -33,7 +33,6 @@ constexpr RideTypeDescriptor WoodenWildMouseRTD =
     .DefaultMode = RideMode::ContinuousCircuit,
     .Naming = { STR_RIDE_NAME_WOODEN_WILD_MOUSE, STR_RIDE_DESCRIPTION_WOODEN_WILD_MOUSE },
     .NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_WOODEN_WILD_MOUSE",
     .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE),
     .Heights = { 14, 24, 4, 7, },
     .MaxMass = 4,
diff --git a/src/openrct2/ride/rtd/gentle/CarRide.h b/src/openrct2/ride/rtd/gentle/CarRide.h
index 2ca48f56a0..eaf8841c62 100644
--- a/src/openrct2/ride/rtd/gentle/CarRide.h
+++ b/src/openrct2/ride/rtd/gentle/CarRide.h
@@ -37,7 +37,6 @@ constexpr RideTypeDescriptor CarRideRTD =
     .DefaultMode = RideMode::ContinuousCircuit,
     .Naming = { STR_RIDE_NAME_CAR_RIDE, STR_RIDE_DESCRIPTION_CAR_RIDE },
     .NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_CAR_RIDE",
     .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION),
     .Heights = { 6, 24, 4, 7, },
     .MaxMass = 2,
diff --git a/src/openrct2/ride/rtd/gentle/Circus.h b/src/openrct2/ride/rtd/gentle/Circus.h
index ad5ab81412..bec6193f99 100644
--- a/src/openrct2/ride/rtd/gentle/Circus.h
+++ b/src/openrct2/ride/rtd/gentle/Circus.h
@@ -34,7 +34,6 @@ constexpr RideTypeDescriptor CircusRTD =
     .DefaultMode = RideMode::Circus,
     .Naming = { STR_RIDE_NAME_CIRCUS, STR_RIDE_DESCRIPTION_CIRCUS },
     .NameConvention = { RideComponentType::Building, RideComponentType::Structure, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_CIRCUS",
     .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT),
     .Heights = { 12, 128, 3, 2, },
     .MaxMass = 255,
diff --git a/src/openrct2/ride/rtd/gentle/CrookedHouse.h b/src/openrct2/ride/rtd/gentle/CrookedHouse.h
index b2a38d768c..1d30eae8f2 100644
--- a/src/openrct2/ride/rtd/gentle/CrookedHouse.h
+++ b/src/openrct2/ride/rtd/gentle/CrookedHouse.h
@@ -34,7 +34,6 @@ constexpr RideTypeDescriptor CrookedHouseRTD =
     .DefaultMode = RideMode::CrookedHouse,
     .Naming = { STR_RIDE_NAME_CROOKED_HOUSE, STR_RIDE_DESCRIPTION_CROOKED_HOUSE },
     .NameConvention = { RideComponentType::Building, RideComponentType::Structure, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_CROOKED_HOUSE",
     .AvailableBreakdowns = 0,
     .Heights = { 16, 96, 3, 2, },
     .MaxMass = 255,
diff --git a/src/openrct2/ride/rtd/gentle/Dodgems.h b/src/openrct2/ride/rtd/gentle/Dodgems.h
index 44067abeea..3b48d42e76 100644
--- a/src/openrct2/ride/rtd/gentle/Dodgems.h
+++ b/src/openrct2/ride/rtd/gentle/Dodgems.h
@@ -36,7 +36,6 @@ constexpr RideTypeDescriptor DodgemsRTD =
     .OperatingSettings = { 20, 180 },
     .Naming = { STR_RIDE_NAME_DODGEMS, STR_RIDE_DESCRIPTION_DODGEMS },
     .NameConvention = { RideComponentType::Car, RideComponentType::Building, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_DODGEMS",
     .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT),
     .Heights = { 9, 48, 2, 2, },
     .MaxMass = 255,
diff --git a/src/openrct2/ride/rtd/gentle/FerrisWheel.h b/src/openrct2/ride/rtd/gentle/FerrisWheel.h
index fd7070bfa8..afae1776c3 100644
--- a/src/openrct2/ride/rtd/gentle/FerrisWheel.h
+++ b/src/openrct2/ride/rtd/gentle/FerrisWheel.h
@@ -35,7 +35,6 @@ constexpr RideTypeDescriptor FerrisWheelRTD =
     .OperatingSettings = { 1, 3 },
     .Naming = { STR_RIDE_NAME_FERRIS_WHEEL, STR_RIDE_DESCRIPTION_FERRIS_WHEEL },
     .NameConvention = { RideComponentType::Wheel, RideComponentType::Structure, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_FERRIS_WHEEL",
     .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT),
     .Heights = { 16, 176, 3, 2, },
     .MaxMass = 255,
diff --git a/src/openrct2/ride/rtd/gentle/FlyingSaucers.h b/src/openrct2/ride/rtd/gentle/FlyingSaucers.h
index fc6ca4c05c..15d37f137d 100644
--- a/src/openrct2/ride/rtd/gentle/FlyingSaucers.h
+++ b/src/openrct2/ride/rtd/gentle/FlyingSaucers.h
@@ -35,7 +35,6 @@ constexpr RideTypeDescriptor FlyingSaucersRTD =
     .OperatingSettings = { 20, 180 },
     .Naming = { STR_RIDE_NAME_FLYING_SAUCERS, STR_RIDE_DESCRIPTION_FLYING_SAUCERS },
     .NameConvention = { RideComponentType::Car, RideComponentType::Building, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_FLYING_SAUCERS",
     .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT),
     .Heights = { 9, 48, 2, 2, },
     .MaxMass = 255,
diff --git a/src/openrct2/ride/rtd/gentle/GhostTrain.h b/src/openrct2/ride/rtd/gentle/GhostTrain.h
index 8ec480ea23..f9c00ea842 100644
--- a/src/openrct2/ride/rtd/gentle/GhostTrain.h
+++ b/src/openrct2/ride/rtd/gentle/GhostTrain.h
@@ -38,7 +38,6 @@ constexpr RideTypeDescriptor GhostTrainRTD =
     .DefaultMode = RideMode::ContinuousCircuit,
     .Naming = { STR_RIDE_NAME_GHOST_TRAIN, STR_RIDE_DESCRIPTION_GHOST_TRAIN },
     .NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_GHOST_TRAIN",
     .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION),
     .Heights = { 8, 24, 6, 7, },
     .MaxMass = 2,
diff --git a/src/openrct2/ride/rtd/gentle/HauntedHouse.h b/src/openrct2/ride/rtd/gentle/HauntedHouse.h
index 9ad736cfb2..33f64c420d 100644
--- a/src/openrct2/ride/rtd/gentle/HauntedHouse.h
+++ b/src/openrct2/ride/rtd/gentle/HauntedHouse.h
@@ -34,7 +34,6 @@ constexpr RideTypeDescriptor HauntedHouseRTD =
     .DefaultMode = RideMode::HauntedHouse,
     .Naming = { STR_RIDE_NAME_HAUNTED_HOUSE, STR_RIDE_DESCRIPTION_HAUNTED_HOUSE },
     .NameConvention = { RideComponentType::Building, RideComponentType::Structure, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_HAUNTED_HOUSE",
     .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT),
     .Heights = { 16, 160, 3, 2, },
     .MaxMass = 255,
diff --git a/src/openrct2/ride/rtd/gentle/Maze.h b/src/openrct2/ride/rtd/gentle/Maze.h
index ff9891c763..e3dc2616b4 100644
--- a/src/openrct2/ride/rtd/gentle/Maze.h
+++ b/src/openrct2/ride/rtd/gentle/Maze.h
@@ -35,7 +35,6 @@ constexpr RideTypeDescriptor MazeRTD =
     .OperatingSettings = { 1, 64 },
     .Naming = { STR_RIDE_NAME_MAZE, STR_RIDE_DESCRIPTION_MAZE },
     .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_MAZE",
     .AvailableBreakdowns = 0,
     .Heights = { 6, 24, 0, 1, },
     .MaxMass = 18,
diff --git a/src/openrct2/ride/rtd/gentle/MerryGoRound.h b/src/openrct2/ride/rtd/gentle/MerryGoRound.h
index 44ac6657f2..2525ccf736 100644
--- a/src/openrct2/ride/rtd/gentle/MerryGoRound.h
+++ b/src/openrct2/ride/rtd/gentle/MerryGoRound.h
@@ -35,7 +35,6 @@ constexpr RideTypeDescriptor MerryGoRoundRTD =
     .OperatingSettings = { 4, 25 },
     .Naming = { STR_RIDE_NAME_MERRY_GO_ROUND, STR_RIDE_DESCRIPTION_MERRY_GO_ROUND },
     .NameConvention = { RideComponentType::Car, RideComponentType::Structure, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_MERRY_GO_ROUND",
     .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_CONTROL_FAILURE),
     .Heights = { 12, 64, 3, 2, },
     .MaxMass = 255,
diff --git a/src/openrct2/ride/rtd/gentle/MiniGolf.h b/src/openrct2/ride/rtd/gentle/MiniGolf.h
index ac1766ee68..f06e988df1 100644
--- a/src/openrct2/ride/rtd/gentle/MiniGolf.h
+++ b/src/openrct2/ride/rtd/gentle/MiniGolf.h
@@ -33,7 +33,6 @@ constexpr RideTypeDescriptor MiniGolfRTD =
     .DefaultMode = RideMode::ContinuousCircuit,
     .Naming = { STR_RIDE_NAME_MINI_GOLF, STR_RIDE_DESCRIPTION_MINI_GOLF },
     .NameConvention = { RideComponentType::Player, RideComponentType::Course, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_MINI_GOLF",
     .AvailableBreakdowns = 0,
     .Heights = { 7, 32, 2, 2, },
     .MaxMass = 255,
diff --git a/src/openrct2/ride/rtd/gentle/MiniHelicopters.h b/src/openrct2/ride/rtd/gentle/MiniHelicopters.h
index d58025d9ca..221757b64f 100644
--- a/src/openrct2/ride/rtd/gentle/MiniHelicopters.h
+++ b/src/openrct2/ride/rtd/gentle/MiniHelicopters.h
@@ -37,7 +37,6 @@ constexpr RideTypeDescriptor MiniHelicoptersRTD =
     .DefaultMode = RideMode::ContinuousCircuit,
     .Naming = { STR_RIDE_NAME_MINI_HELICOPTERS, STR_RIDE_DESCRIPTION_MINI_HELICOPTERS },
     .NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_MINI_HELICOPTERS",
     .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION),
     .Heights = { 7, 24, 4, 7, },
     .MaxMass = 2,
diff --git a/src/openrct2/ride/rtd/gentle/MonorailCycles.h b/src/openrct2/ride/rtd/gentle/MonorailCycles.h
index 73bd5cdb19..60e36a770c 100644
--- a/src/openrct2/ride/rtd/gentle/MonorailCycles.h
+++ b/src/openrct2/ride/rtd/gentle/MonorailCycles.h
@@ -36,7 +36,6 @@ constexpr RideTypeDescriptor MonorailCyclesRTD =
     .DefaultMode = RideMode::ContinuousCircuit,
     .Naming = { STR_RIDE_NAME_MONORAIL_CYCLES, STR_RIDE_DESCRIPTION_MONORAIL_CYCLES },
     .NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_MONORAIL_CYCLES",
     .AvailableBreakdowns = (1 << BREAKDOWN_VEHICLE_MALFUNCTION),
     .Heights = { 5, 24, 8, 7, },
     .MaxMass = 2,
diff --git a/src/openrct2/ride/rtd/gentle/MonsterTrucks.h b/src/openrct2/ride/rtd/gentle/MonsterTrucks.h
index d3a5e432fa..8c8f203b38 100644
--- a/src/openrct2/ride/rtd/gentle/MonsterTrucks.h
+++ b/src/openrct2/ride/rtd/gentle/MonsterTrucks.h
@@ -37,7 +37,6 @@ constexpr RideTypeDescriptor MonsterTrucksRTD =
     .DefaultMode = RideMode::ContinuousCircuit,
     .Naming = { STR_RIDE_NAME_MONSTER_TRUCKS, STR_RIDE_DESCRIPTION_MONSTER_TRUCKS },
     .NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_MONSTER_TRUCKS",
     .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION),
     .Heights = { 18, 24, 4, 7, },
     .MaxMass = 2,
diff --git a/src/openrct2/ride/rtd/gentle/ObservationTower.h b/src/openrct2/ride/rtd/gentle/ObservationTower.h
index baa711be27..1e5169f263 100644
--- a/src/openrct2/ride/rtd/gentle/ObservationTower.h
+++ b/src/openrct2/ride/rtd/gentle/ObservationTower.h
@@ -34,7 +34,6 @@ constexpr RideTypeDescriptor ObservationTowerRTD =
     .DefaultMode = RideMode::RotatingLift,
     .Naming = { STR_RIDE_NAME_OBSERVATION_TOWER, STR_RIDE_DESCRIPTION_OBSERVATION_TOWER },
     .NameConvention = { RideComponentType::Cabin, RideComponentType::Track, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_OBSERVATION_TOWER",
     .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION),
     .Heights = { 255, 32, 3, 2, },
     .MaxMass = 15,
diff --git a/src/openrct2/ride/rtd/gentle/SpaceRings.h b/src/openrct2/ride/rtd/gentle/SpaceRings.h
index 793a9e0c8c..59b5b0504b 100644
--- a/src/openrct2/ride/rtd/gentle/SpaceRings.h
+++ b/src/openrct2/ride/rtd/gentle/SpaceRings.h
@@ -33,7 +33,6 @@ constexpr RideTypeDescriptor SpaceRingsRTD =
     .DefaultMode = RideMode::SpaceRings,
     .Naming = { STR_RIDE_NAME_SPACE_RINGS, STR_RIDE_DESCRIPTION_SPACE_RINGS },
     .NameConvention = { RideComponentType::Ring, RideComponentType::Structure, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_SPACE_RINGS",
     .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT),
     .Heights = { 16, 48, 3, 2, },
     .MaxMass = 255,
diff --git a/src/openrct2/ride/rtd/gentle/SpiralSlide.h b/src/openrct2/ride/rtd/gentle/SpiralSlide.h
index 2e33bd06d3..be22034f39 100644
--- a/src/openrct2/ride/rtd/gentle/SpiralSlide.h
+++ b/src/openrct2/ride/rtd/gentle/SpiralSlide.h
@@ -35,7 +35,6 @@ constexpr RideTypeDescriptor SpiralSlideRTD =
     .OperatingSettings = { 1, 5 },
     .Naming = { STR_RIDE_NAME_SPIRAL_SLIDE, STR_RIDE_DESCRIPTION_SPIRAL_SLIDE },
     .NameConvention = { RideComponentType::Train, RideComponentType::Building, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_SPIRAL_SLIDE",
     .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT),
     .Heights = { 15, 128, 0, 2, },
     .MaxMass = 255,
diff --git a/src/openrct2/ride/rtd/shops/CashMachine.h b/src/openrct2/ride/rtd/shops/CashMachine.h
index 3ed5d112c4..8865bbf4a8 100644
--- a/src/openrct2/ride/rtd/shops/CashMachine.h
+++ b/src/openrct2/ride/rtd/shops/CashMachine.h
@@ -31,7 +31,6 @@ constexpr RideTypeDescriptor CashMachineRTD =
     .DefaultMode = RideMode::ShopStall,
     .Naming = { STR_RIDE_NAME_CASH_MACHINE, STR_RIDE_DESCRIPTION_CASH_MACHINE },
     .NameConvention = { RideComponentType::Car, RideComponentType::Building, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_CASH_MACHINE",
     .AvailableBreakdowns = 0,
     .Heights = { 12, DefaultCashMachineHeight, 0, 0, },
     .MaxMass = 255,
diff --git a/src/openrct2/ride/rtd/shops/DrinkStall.h b/src/openrct2/ride/rtd/shops/DrinkStall.h
index 4a65a7363c..562933a666 100644
--- a/src/openrct2/ride/rtd/shops/DrinkStall.h
+++ b/src/openrct2/ride/rtd/shops/DrinkStall.h
@@ -32,7 +32,6 @@ constexpr RideTypeDescriptor DrinkStallRTD =
     .DefaultMode = RideMode::ShopStall,
     .Naming = { STR_RIDE_NAME_DRINK_STALL, STR_RIDE_DESCRIPTION_DRINK_STALL },
     .NameConvention = { RideComponentType::Car, RideComponentType::Building, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_DRINK_STALL",
     .AvailableBreakdowns = 0,
     .Heights = { 12, DefaultDrinksStallHeight, 0, 0, },
     .MaxMass = 255,
diff --git a/src/openrct2/ride/rtd/shops/FirstAid.h b/src/openrct2/ride/rtd/shops/FirstAid.h
index ca60bbf063..553f3f4fd0 100644
--- a/src/openrct2/ride/rtd/shops/FirstAid.h
+++ b/src/openrct2/ride/rtd/shops/FirstAid.h
@@ -33,7 +33,6 @@ constexpr RideTypeDescriptor FirstAidRTD =
     .OperatingSettings = { 8, 8 },
     .Naming = { STR_RIDE_NAME_FIRST_AID, STR_RIDE_DESCRIPTION_FIRST_AID },
     .NameConvention = { RideComponentType::Car, RideComponentType::Building, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_FIRST_AID",
     .AvailableBreakdowns = 0,
     .Heights = { 12, DefaultFirstAidHeight, 0, 0, },
     .MaxMass = 255,
diff --git a/src/openrct2/ride/rtd/shops/FoodStall.h b/src/openrct2/ride/rtd/shops/FoodStall.h
index 8c545c60ee..62d63a91b1 100644
--- a/src/openrct2/ride/rtd/shops/FoodStall.h
+++ b/src/openrct2/ride/rtd/shops/FoodStall.h
@@ -32,7 +32,6 @@ constexpr RideTypeDescriptor FoodStallRTD =
     .DefaultMode = RideMode::ShopStall,
     .Naming = { STR_RIDE_NAME_FOOD_STALL, STR_RIDE_DESCRIPTION_FOOD_STALL },
     .NameConvention = { RideComponentType::Car, RideComponentType::Building, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_FOOD_STALL",
     .AvailableBreakdowns = 0,
     .Heights = { 12, DefaultFoodStallHeight, 0, 0, },
     .MaxMass = 255,
diff --git a/src/openrct2/ride/rtd/shops/InformationKiosk.h b/src/openrct2/ride/rtd/shops/InformationKiosk.h
index 89b509173c..cb9ec5b63d 100644
--- a/src/openrct2/ride/rtd/shops/InformationKiosk.h
+++ b/src/openrct2/ride/rtd/shops/InformationKiosk.h
@@ -32,7 +32,6 @@ constexpr RideTypeDescriptor InformationKioskRTD =
     .DefaultMode = RideMode::ShopStall,
     .Naming = { STR_RIDE_NAME_INFORMATION_KIOSK, STR_RIDE_DESCRIPTION_INFORMATION_KIOSK },
     .NameConvention = { RideComponentType::Car, RideComponentType::Building, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_INFORMATION_KIOSK",
     .AvailableBreakdowns = 0,
     .Heights = { 12, DefaultInformationKioskHeight, 0, 0, },
     .MaxMass = 255,
diff --git a/src/openrct2/ride/rtd/shops/Shop.h b/src/openrct2/ride/rtd/shops/Shop.h
index 239a3bab27..a4ab313758 100644
--- a/src/openrct2/ride/rtd/shops/Shop.h
+++ b/src/openrct2/ride/rtd/shops/Shop.h
@@ -32,7 +32,6 @@ constexpr RideTypeDescriptor ShopRTD =
     .DefaultMode = RideMode::ShopStall,
     .Naming = { STR_RIDE_NAME_SHOP, STR_RIDE_DESCRIPTION_SHOP },
     .NameConvention = { RideComponentType::Car, RideComponentType::Building, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_SHOP",
     .AvailableBreakdowns = 0,
     .Heights = { 12, DefaultShopHeight, 0, 0, },
     .MaxMass = 255,
diff --git a/src/openrct2/ride/rtd/shops/Toilets.h b/src/openrct2/ride/rtd/shops/Toilets.h
index adff80f683..5e60e15896 100644
--- a/src/openrct2/ride/rtd/shops/Toilets.h
+++ b/src/openrct2/ride/rtd/shops/Toilets.h
@@ -33,7 +33,6 @@ constexpr RideTypeDescriptor ToiletsRTD =
     .OperatingSettings = { 4, 4 },
     .Naming = { STR_RIDE_NAME_TOILETS, STR_RIDE_DESCRIPTION_TOILETS },
     .NameConvention = { RideComponentType::Car, RideComponentType::Building, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_TOILETS",
     .AvailableBreakdowns = 0,
     .Heights = { 12, DefaultToiletHeight, 0, 0, },
     .MaxMass = 255,
diff --git a/src/openrct2/ride/rtd/thrill/3DCinema.h b/src/openrct2/ride/rtd/thrill/3DCinema.h
index 3fe96de6ff..d9234a99ea 100644
--- a/src/openrct2/ride/rtd/thrill/3DCinema.h
+++ b/src/openrct2/ride/rtd/thrill/3DCinema.h
@@ -34,7 +34,6 @@ constexpr RideTypeDescriptor CinemaRTD =
     .DefaultMode = RideMode::MouseTails3DFilm,
     .Naming = { STR_RIDE_NAME_3D_CINEMA, STR_RIDE_DESCRIPTION_3D_CINEMA },
     .NameConvention = { RideComponentType::Building, RideComponentType::Structure, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_3D_CINEMA",
     .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT),
     .Heights = { 12, 128, 3, 2, },
     .MaxMass = 255,
diff --git a/src/openrct2/ride/rtd/thrill/Enterprise.h b/src/openrct2/ride/rtd/thrill/Enterprise.h
index 9a794dd58e..58ea36848f 100644
--- a/src/openrct2/ride/rtd/thrill/Enterprise.h
+++ b/src/openrct2/ride/rtd/thrill/Enterprise.h
@@ -34,7 +34,6 @@ constexpr RideTypeDescriptor EnterpriseRTD =
     .OperatingSettings = { 10, 20 },
     .Naming = { STR_RIDE_NAME_ENTERPRISE, STR_RIDE_DESCRIPTION_ENTERPRISE },
     .NameConvention = { RideComponentType::Wheel, RideComponentType::Structure, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_ENTERPRISE",
     .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT),
     .Heights = { 16, 160, 3, 2, },
     .MaxMass = 255,
diff --git a/src/openrct2/ride/rtd/thrill/GoKarts.h b/src/openrct2/ride/rtd/thrill/GoKarts.h
index 411fbd751e..1b9dd6b837 100644
--- a/src/openrct2/ride/rtd/thrill/GoKarts.h
+++ b/src/openrct2/ride/rtd/thrill/GoKarts.h
@@ -35,7 +35,6 @@ constexpr RideTypeDescriptor GoKartsRTD =
     .OperatingSettings = { 1, 10 },
     .Naming = { STR_RIDE_NAME_GO_KARTS, STR_RIDE_DESCRIPTION_GO_KARTS },
     .NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_GO_KARTS",
     .AvailableBreakdowns = (1 << BREAKDOWN_VEHICLE_MALFUNCTION),
     .Heights = { 7, 24, 2, 1, },
     .MaxMass = 255,
diff --git a/src/openrct2/ride/rtd/thrill/LaunchedFreefall.h b/src/openrct2/ride/rtd/thrill/LaunchedFreefall.h
index 8619ecc566..0a80e45a99 100644
--- a/src/openrct2/ride/rtd/thrill/LaunchedFreefall.h
+++ b/src/openrct2/ride/rtd/thrill/LaunchedFreefall.h
@@ -34,7 +34,6 @@ constexpr RideTypeDescriptor LaunchedFreefallRTD =
     .OperatingSettings = { 10, 40 },
     .Naming = { STR_RIDE_NAME_LAUNCHED_FREEFALL, STR_RIDE_DESCRIPTION_LAUNCHED_FREEFALL },
     .NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_LAUNCHED_FREEFALL",
     .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION),
     .Heights = { 255, 32, 3, 2, },
     .MaxMass = 15,
diff --git a/src/openrct2/ride/rtd/thrill/MagicCarpet.h b/src/openrct2/ride/rtd/thrill/MagicCarpet.h
index 6830542abe..40cede2fdb 100644
--- a/src/openrct2/ride/rtd/thrill/MagicCarpet.h
+++ b/src/openrct2/ride/rtd/thrill/MagicCarpet.h
@@ -35,7 +35,6 @@ constexpr RideTypeDescriptor MagicCarpetRTD =
     .OperatingSettings = { 7, 15 },
     .Naming = { STR_RIDE_NAME_MAGIC_CARPET, STR_RIDE_DESCRIPTION_MAGIC_CARPET },
     .NameConvention = { RideComponentType::Car, RideComponentType::Structure, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_MAGIC_CARPET",
     .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT),
     .Heights = { 15, 176, 7, 11, },
     .MaxMass = 255,
diff --git a/src/openrct2/ride/rtd/thrill/MotionSimulator.h b/src/openrct2/ride/rtd/thrill/MotionSimulator.h
index b1d1bf0d89..f600dc221e 100644
--- a/src/openrct2/ride/rtd/thrill/MotionSimulator.h
+++ b/src/openrct2/ride/rtd/thrill/MotionSimulator.h
@@ -33,7 +33,6 @@ constexpr RideTypeDescriptor MotionSimulatorRTD =
     .DefaultMode = RideMode::FilmAvengingAviators,
     .Naming = { STR_RIDE_NAME_MOTION_SIMULATOR, STR_RIDE_DESCRIPTION_MOTION_SIMULATOR },
     .NameConvention = { RideComponentType::Car, RideComponentType::Structure, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_MOTION_SIMULATOR",
     .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT),
     .Heights = { 12, 64, 3, 2, },
     .MaxMass = 255,
diff --git a/src/openrct2/ride/rtd/thrill/RotoDrop.h b/src/openrct2/ride/rtd/thrill/RotoDrop.h
index f60e4bf93e..a6271bf6a1 100644
--- a/src/openrct2/ride/rtd/thrill/RotoDrop.h
+++ b/src/openrct2/ride/rtd/thrill/RotoDrop.h
@@ -34,7 +34,6 @@ constexpr RideTypeDescriptor RotoDropRTD =
     .DefaultMode = RideMode::FreefallDrop,
     .Naming = { STR_RIDE_NAME_ROTO_DROP, STR_RIDE_DESCRIPTION_ROTO_DROP },
     .NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_ROTO_DROP",
     .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION),
     .Heights = { 255, 32, 3, 2, },
     .MaxMass = 15,
diff --git a/src/openrct2/ride/rtd/thrill/SwingingInverterShip.h b/src/openrct2/ride/rtd/thrill/SwingingInverterShip.h
index 66af0b1981..6b2275719f 100644
--- a/src/openrct2/ride/rtd/thrill/SwingingInverterShip.h
+++ b/src/openrct2/ride/rtd/thrill/SwingingInverterShip.h
@@ -35,7 +35,6 @@ constexpr RideTypeDescriptor SwingingInverterShipRTD =
     .OperatingSettings = { 7, 15 },
     .Naming = { STR_RIDE_NAME_SWINGING_INVERTER_SHIP, STR_RIDE_DESCRIPTION_SWINGING_INVERTER_SHIP },
     .NameConvention = { RideComponentType::Ship, RideComponentType::Structure, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_SWINGING_INVERTER_SHIP",
     .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT),
     .Heights = { 15, 176, 7, 11, },
     .MaxMass = 255,
diff --git a/src/openrct2/ride/rtd/thrill/SwingingShip.h b/src/openrct2/ride/rtd/thrill/SwingingShip.h
index 9e6a8d3a65..30dca2caa5 100644
--- a/src/openrct2/ride/rtd/thrill/SwingingShip.h
+++ b/src/openrct2/ride/rtd/thrill/SwingingShip.h
@@ -36,7 +36,6 @@ constexpr RideTypeDescriptor SwingingShipRTD =
     .OperatingSettings = { 7, 25 },
     .Naming = { STR_RIDE_NAME_SWINGING_SHIP, STR_RIDE_DESCRIPTION_SWINGING_SHIP },
     .NameConvention = { RideComponentType::Ship, RideComponentType::Structure, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_SWINGING_SHIP",
     .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT),
     .Heights = { 12, 112, 7, 11, },
     .MaxMass = 255,
diff --git a/src/openrct2/ride/rtd/thrill/TopSpin.h b/src/openrct2/ride/rtd/thrill/TopSpin.h
index f46cdbfe4a..41c5d022eb 100644
--- a/src/openrct2/ride/rtd/thrill/TopSpin.h
+++ b/src/openrct2/ride/rtd/thrill/TopSpin.h
@@ -34,7 +34,6 @@ constexpr RideTypeDescriptor TopSpinRTD =
     .DefaultMode = RideMode::Beginners,
     .Naming = { STR_RIDE_NAME_TOP_SPIN, STR_RIDE_DESCRIPTION_TOP_SPIN },
     .NameConvention = { RideComponentType::Car, RideComponentType::Structure, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_TOP_SPIN",
     .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT),
     .Heights = { 16, 112, 3, 2, },
     .MaxMass = 255,
diff --git a/src/openrct2/ride/rtd/thrill/Twist.h b/src/openrct2/ride/rtd/thrill/Twist.h
index 5ab908ae3d..958d1177ec 100644
--- a/src/openrct2/ride/rtd/thrill/Twist.h
+++ b/src/openrct2/ride/rtd/thrill/Twist.h
@@ -33,7 +33,6 @@ constexpr RideTypeDescriptor TwistRTD =
     .OperatingSettings = { 3, 6, 3 },
     .Naming = { STR_RIDE_NAME_TWIST, STR_RIDE_DESCRIPTION_TWIST },
     .NameConvention = { RideComponentType::Structure, RideComponentType::Structure, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_TWIST",
     .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT),
     .Heights = { 12, 64, 3, 2, },
     .MaxMass = 255,
diff --git a/src/openrct2/ride/rtd/transport/Chairlift.h b/src/openrct2/ride/rtd/transport/Chairlift.h
index 937e60eec4..d2d4f96ff4 100644
--- a/src/openrct2/ride/rtd/transport/Chairlift.h
+++ b/src/openrct2/ride/rtd/transport/Chairlift.h
@@ -37,7 +37,6 @@ constexpr RideTypeDescriptor ChairliftRTD =
     .OperatingSettings = { 1, 4 },
     .Naming = { STR_RIDE_NAME_CHAIRLIFT, STR_RIDE_DESCRIPTION_CHAIRLIFT },
     .NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_CHAIRLIFT",
     .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT),
     .Heights = { 40, 32, 28, 2, },
     .MaxMass = 18,
diff --git a/src/openrct2/ride/rtd/transport/Lift.h b/src/openrct2/ride/rtd/transport/Lift.h
index cef2d8980f..5e0c763ee3 100644
--- a/src/openrct2/ride/rtd/transport/Lift.h
+++ b/src/openrct2/ride/rtd/transport/Lift.h
@@ -33,7 +33,6 @@ constexpr RideTypeDescriptor LiftRTD =
     .DefaultMode = RideMode::Shuttle,
     .Naming = { STR_RIDE_NAME_LIFT, STR_RIDE_DESCRIPTION_LIFT },
     .NameConvention = { RideComponentType::Cabin, RideComponentType::Track, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_LIFT",
     .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_DOORS_STUCK_CLOSED) | (1 << BREAKDOWN_DOORS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION),
     .Heights = { 255, 32, 3, 2, },
     .MaxMass = 15,
diff --git a/src/openrct2/ride/rtd/transport/MiniatureRailway.h b/src/openrct2/ride/rtd/transport/MiniatureRailway.h
index b6201d9fb8..b254ec344c 100644
--- a/src/openrct2/ride/rtd/transport/MiniatureRailway.h
+++ b/src/openrct2/ride/rtd/transport/MiniatureRailway.h
@@ -37,7 +37,6 @@ constexpr RideTypeDescriptor MiniatureRailwayRTD =
     .DefaultMode = RideMode::ContinuousCircuit,
     .Naming = { STR_RIDE_NAME_MINIATURE_RAILWAY, STR_RIDE_DESCRIPTION_MINIATURE_RAILWAY },
     .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_MINIATURE_RAILWAY",
     .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION),
     .Heights = { 7, 32, 5, 9, },
     .MaxMass = 39,
diff --git a/src/openrct2/ride/rtd/transport/Monorail.h b/src/openrct2/ride/rtd/transport/Monorail.h
index a27ce1ebcd..5933298fed 100644
--- a/src/openrct2/ride/rtd/transport/Monorail.h
+++ b/src/openrct2/ride/rtd/transport/Monorail.h
@@ -37,7 +37,6 @@ constexpr RideTypeDescriptor MonorailRTD =
     .DefaultMode = RideMode::ContinuousCircuit,
     .Naming = { STR_RIDE_NAME_MONORAIL, STR_RIDE_DESCRIPTION_MONORAIL },
     .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_MONORAIL",
     .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_DOORS_STUCK_CLOSED) | (1 << BREAKDOWN_DOORS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION),
     .Heights = { 8, 32, 8, 9, },
     .MaxMass = 78,
diff --git a/src/openrct2/ride/rtd/transport/SuspendedMonorail.h b/src/openrct2/ride/rtd/transport/SuspendedMonorail.h
index e94ca6b30c..b0fd090aee 100644
--- a/src/openrct2/ride/rtd/transport/SuspendedMonorail.h
+++ b/src/openrct2/ride/rtd/transport/SuspendedMonorail.h
@@ -37,7 +37,6 @@ constexpr RideTypeDescriptor SuspendedMonorailRTD =
     .DefaultMode = RideMode::ContinuousCircuit,
     .Naming = { STR_RIDE_NAME_SUSPENDED_MONORAIL, STR_RIDE_DESCRIPTION_SUSPENDED_MONORAIL },
     .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_SUSPENDED_MONORAIL",
     .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_DOORS_STUCK_CLOSED) | (1 << BREAKDOWN_DOORS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION),
     .Heights = { 12, 40, 32, 8, },
     .MaxMass = 78,
diff --git a/src/openrct2/ride/rtd/water/BoatHire.h b/src/openrct2/ride/rtd/water/BoatHire.h
index 3d9ab1844c..cafff1d78f 100644
--- a/src/openrct2/ride/rtd/water/BoatHire.h
+++ b/src/openrct2/ride/rtd/water/BoatHire.h
@@ -33,7 +33,6 @@ constexpr RideTypeDescriptor BoatHireRTD =
     .DefaultMode = RideMode::BoatHire,
     .Naming = { STR_RIDE_NAME_BOAT_HIRE, STR_RIDE_DESCRIPTION_BOAT_HIRE },
     .NameConvention = { RideComponentType::Boat, RideComponentType::DockingPlatform, RideComponentType::DockingPlatform },
-    .EnumName = "RIDE_TYPE_BOAT_HIRE",
     .AvailableBreakdowns = (1 << BREAKDOWN_VEHICLE_MALFUNCTION),
     .Heights = { 255, 16, 0, 3, },
     .MaxMass = 255,
diff --git a/src/openrct2/ride/rtd/water/DinghySlide.h b/src/openrct2/ride/rtd/water/DinghySlide.h
index fbd0f8eea9..a1314111b4 100644
--- a/src/openrct2/ride/rtd/water/DinghySlide.h
+++ b/src/openrct2/ride/rtd/water/DinghySlide.h
@@ -50,7 +50,6 @@ constexpr RideTypeDescriptor DinghySlideRTD =
     .DefaultMode = RideMode::ContinuousCircuit,
     .Naming = { STR_RIDE_NAME_DINGHY_SLIDE, STR_RIDE_DESCRIPTION_DINGHY_SLIDE },
     .NameConvention = { RideComponentType::Boat, RideComponentType::Track, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_DINGHY_SLIDE",
     .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT),
     .Heights = { 15, 24, 5, 7, },
     .MaxMass = 5,
diff --git a/src/openrct2/ride/rtd/water/LogFlume.h b/src/openrct2/ride/rtd/water/LogFlume.h
index 7909fb109d..f4bae6ee9d 100644
--- a/src/openrct2/ride/rtd/water/LogFlume.h
+++ b/src/openrct2/ride/rtd/water/LogFlume.h
@@ -36,7 +36,6 @@ constexpr RideTypeDescriptor LogFlumeRTD =
     .DefaultMode = RideMode::ContinuousCircuit,
     .Naming = { STR_RIDE_NAME_LOG_FLUME, STR_RIDE_DESCRIPTION_LOG_FLUME },
     .NameConvention = { RideComponentType::Boat, RideComponentType::Track, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_LOG_FLUME",
     .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_CONTROL_FAILURE),
     .Heights = { 10, 24, 7, 9, },
     .MaxMass = 255,
diff --git a/src/openrct2/ride/rtd/water/RiverRafts.h b/src/openrct2/ride/rtd/water/RiverRafts.h
index 6ed052bd83..ae7febaa55 100644
--- a/src/openrct2/ride/rtd/water/RiverRafts.h
+++ b/src/openrct2/ride/rtd/water/RiverRafts.h
@@ -36,7 +36,6 @@ constexpr RideTypeDescriptor RiverRaftsRTD =
     .DefaultMode = RideMode::ContinuousCircuit,
     .Naming = { STR_RIDE_NAME_RIVER_RAFTS, STR_RIDE_DESCRIPTION_RIVER_RAFTS },
     .NameConvention = { RideComponentType::Boat, RideComponentType::Track, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_RIVER_RAFTS",
     .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT),
     .Heights = { 12, 24, 7, 11, },
     .MaxMass = 255,
diff --git a/src/openrct2/ride/rtd/water/RiverRapids.h b/src/openrct2/ride/rtd/water/RiverRapids.h
index 8ab7b5c81a..81bd264283 100644
--- a/src/openrct2/ride/rtd/water/RiverRapids.h
+++ b/src/openrct2/ride/rtd/water/RiverRapids.h
@@ -37,7 +37,6 @@ constexpr RideTypeDescriptor RiverRapidsRTD =
     .DefaultMode = RideMode::ContinuousCircuit,
     .Naming = { STR_RIDE_NAME_RIVER_RAPIDS, STR_RIDE_DESCRIPTION_RIVER_RAPIDS },
     .NameConvention = { RideComponentType::Boat, RideComponentType::Track, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_RIVER_RAPIDS",
     .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_CONTROL_FAILURE),
     .Heights = { 9, 32, 14, 15, },
     .MaxMass = 255,
diff --git a/src/openrct2/ride/rtd/water/SplashBoats.h b/src/openrct2/ride/rtd/water/SplashBoats.h
index bef454e92f..a44c58c82c 100644
--- a/src/openrct2/ride/rtd/water/SplashBoats.h
+++ b/src/openrct2/ride/rtd/water/SplashBoats.h
@@ -37,7 +37,6 @@ constexpr RideTypeDescriptor SplashBoatsRTD =
     .DefaultMode = RideMode::ContinuousCircuit,
     .Naming = { STR_RIDE_NAME_SPLASH_BOATS, STR_RIDE_DESCRIPTION_SPLASH_BOATS },
     .NameConvention = { RideComponentType::Boat, RideComponentType::Track, RideComponentType::Station },
-    .EnumName = "RIDE_TYPE_SPLASH_BOATS",
     .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_CONTROL_FAILURE),
     .Heights = { 16, 24, 7, 11, },
     .MaxMass = 255,
diff --git a/src/openrct2/ride/rtd/water/SubmarineRide.h b/src/openrct2/ride/rtd/water/SubmarineRide.h
index 1fe2f9dd6e..81f115837b 100644
--- a/src/openrct2/ride/rtd/water/SubmarineRide.h
+++ b/src/openrct2/ride/rtd/water/SubmarineRide.h
@@ -36,7 +36,6 @@ constexpr RideTypeDescriptor SubmarineRideRTD =
     .DefaultMode = RideMode::ContinuousCircuit,
     .Naming = { STR_RIDE_NAME_SUBMARINE_RIDE, STR_RIDE_DESCRIPTION_SUBMARINE_RIDE },
     .NameConvention = { RideComponentType::Boat, RideComponentType::Track, RideComponentType::DockingPlatform },
-    .EnumName = "RIDE_TYPE_SUBMARINE_RIDE",
     .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION),
     .Heights = { 255, 16, 0, 3, },
     .MaxMass = 255,
diff --git a/test/tests/RideRatings.cpp b/test/tests/RideRatings.cpp
index c37fa03421..2348896267 100644
--- a/test/tests/RideRatings.cpp
+++ b/test/tests/RideRatings.cpp
@@ -47,9 +47,10 @@ protected:
     std::string FormatRatings(const Ride& ride)
     {
         RatingTuple ratings = ride.ratings;
+        auto name = std::string(ride.GetRideTypeDescriptor().Name);
         std::string line = String::StdFormat(
-            "%s: (%d, %d, %d)", ride.GetRideTypeDescriptor().EnumName, static_cast<int>(ratings.excitement),
-            static_cast<int>(ratings.intensity), static_cast<int>(ratings.nausea));
+            "%s: (%d, %d, %d)", name.c_str(), static_cast<int>(ratings.excitement), static_cast<int>(ratings.intensity),
+            static_cast<int>(ratings.nausea));
         return line;
     }
 
diff --git a/test/tests/testdata/ratings/BigMapTest.sv6.txt b/test/tests/testdata/ratings/BigMapTest.sv6.txt
index 7febcdaf81..f3f684f653 100644
--- a/test/tests/testdata/ratings/BigMapTest.sv6.txt
+++ b/test/tests/testdata/ratings/BigMapTest.sv6.txt
@@ -1,100 +1,100 @@
-RIDE_TYPE_MINIATURE_RAILWAY: (150, 15, 1)
-RIDE_TYPE_MONORAIL: (299, 14, 6)
-RIDE_TYPE_SUSPENDED_MONORAIL: (141, 19, 5)
-RIDE_TYPE_CHAIRLIFT: (98, 23, 25)
-RIDE_TYPE_LIFT: (579, 35, 102)
-RIDE_TYPE_MONORAIL_CYCLES: (212, 28, 1)
-RIDE_TYPE_CROOKED_HOUSE: (215, 62, 34)
-RIDE_TYPE_HAUNTED_HOUSE: (341, 153, 10)
-RIDE_TYPE_FERRIS_WHEEL: (88, 50, 55)
-RIDE_TYPE_MAZE: (166, 122, 0)
-RIDE_TYPE_MERRY_GO_ROUND: (167, 60, 75)
-RIDE_TYPE_MINI_GOLF: (295, 90, 0)
-RIDE_TYPE_OBSERVATION_TOWER: (302, 0, 74)
-RIDE_TYPE_CAR_RIDE: (39, 29, 1)
-RIDE_TYPE_MONSTER_TRUCKS: (376, 69, 6)
-RIDE_TYPE_MINI_HELICOPTERS: (322, 48, 2)
-RIDE_TYPE_SPIRAL_SLIDE: (150, 140, 90)
-RIDE_TYPE_DODGEMS: (270, 80, 35)
-RIDE_TYPE_SPACE_RINGS: (150, 210, 650)
-RIDE_TYPE_CIRCUS: (210, 30, 0)
-RIDE_TYPE_GHOST_TRAIN: (282, 42, 19)
-RIDE_TYPE_FLYING_SAUCERS: (380, 85, 39)
-RIDE_TYPE_VIRGINIA_REEL: (512, 487, 542)
-RIDE_TYPE_REVERSER_ROLLER_COASTER: (506, 525, 388)
-RIDE_TYPE_WOODEN_ROLLER_COASTER: (626, 683, 382)
-RIDE_TYPE_STEEL_WILD_MOUSE: (709, 784, 475)
-RIDE_TYPE_SPINNING_WILD_MOUSE: (618, 667, 523)
-RIDE_TYPE_INVERTED_HAIRPIN_COASTER: (656, 769, 460)
-RIDE_TYPE_JUNIOR_ROLLER_COASTER: (475, 550, 366)
-RIDE_TYPE_CLASSIC_MINI_ROLLER_COASTER: (279, 1158, 917)
-RIDE_TYPE_MINI_ROLLER_COASTER: (495, 572, 383)
-RIDE_TYPE_SPIRAL_ROLLER_COASTER: (591, 370, 192)
-RIDE_TYPE_MINE_TRAIN_COASTER: (642, 708, 468)
-RIDE_TYPE_LOOPING_ROLLER_COASTER: (606, 564, 264)
-RIDE_TYPE_STAND_UP_ROLLER_COASTER: (536, 943, 644)
-RIDE_TYPE_CORKSCREW_ROLLER_COASTER: (613, 830, 365)
-RIDE_TYPE_LIM_LAUNCHED_ROLLER_COASTER: (632, 937, 529)
-RIDE_TYPE_TWISTER_ROLLER_COASTER: (784, 645, 372)
-RIDE_TYPE_HYPER_TWISTER: (737, 620, 344)
-RIDE_TYPE_GIGA_COASTER: (851, 545, 305)
-RIDE_TYPE_INVERTED_ROLLER_COASTER: (703, 906, 716)
-RIDE_TYPE_INVERTED_IMPULSE_COASTER: (648, 713, 567)
-RIDE_TYPE_MINI_SUSPENDED_COASTER: (533, 711, 480)
-RIDE_TYPE_STEEPLECHASE: (573, 541, 390)
-RIDE_TYPE_BOBSLEIGH_COASTER: (619, 657, 466)
-RIDE_TYPE_MINE_RIDE: (564, 454, 376)
-RIDE_TYPE_HEARTLINE_TWISTER_COASTER: (523, 837, 545)
-RIDE_TYPE_LAY_DOWN_ROLLER_COASTER: (696, 664, 538)
-RIDE_TYPE_FLYING_ROLLER_COASTER: (744, 690, 668)
-RIDE_TYPE_MULTI_DIMENSION_ROLLER_COASTER: (674, 833, 762)
-RIDE_TYPE_REVERSE_FREEFALL_COASTER: (472, 744, 532)
-RIDE_TYPE_AIR_POWERED_VERTICAL_COASTER: (852, 892, 698)
-RIDE_TYPE_WATER_COASTER: (-1, 0, 0)
-RIDE_TYPE_TWIST: (173, 157, 250)
-RIDE_TYPE_MAGIC_CARPET: (335, 340, 440)
-RIDE_TYPE_LAUNCHED_FREEFALL: (368, 941, 563)
-RIDE_TYPE_SWINGING_SHIP: (205, 245, 251)
-RIDE_TYPE_GO_KARTS: (-1, 0, 0)
-RIDE_TYPE_SWINGING_INVERTER_SHIP: (350, 468, 472)
-RIDE_TYPE_MOTION_SIMULATOR: (290, 350, 300)
-RIDE_TYPE_3D_CINEMA: (350, 240, 140)
-RIDE_TYPE_TOP_SPIN: (200, 480, 574)
-RIDE_TYPE_ROTO_DROP: (270, 1444, 1444)
-RIDE_TYPE_ENTERPRISE: (374, 647, 764)
-RIDE_TYPE_DINGHY_SLIDE: (484, 589, 354)
-RIDE_TYPE_LOG_FLUME: (459, 236, 117)
-RIDE_TYPE_RIVER_RAPIDS: (581, 169, 108)
-RIDE_TYPE_SPLASH_BOATS: (422, 203, 102)
-RIDE_TYPE_SUBMARINE_RIDE: (246, 180, 140)
-RIDE_TYPE_BOAT_HIRE: (202, 80, 90)
-RIDE_TYPE_RIVER_RAFTS: (243, 45, 43)
-RIDE_TYPE_INFORMATION_KIOSK: (-1, 0, 0)
-RIDE_TYPE_FOOD_STALL: (-1, 0, 0)
-RIDE_TYPE_FOOD_STALL: (-1, 0, 0)
-RIDE_TYPE_SHOP: (-1, 0, 0)
-RIDE_TYPE_FIRST_AID: (-1, 0, 0)
-RIDE_TYPE_DRINK_STALL: (-1, 0, 0)
-RIDE_TYPE_FIRST_AID: (-1, 0, 0)
-RIDE_TYPE_SHOP: (-1, 0, 0)
-RIDE_TYPE_FOOD_STALL: (-1, 0, 0)
-RIDE_TYPE_INFORMATION_KIOSK: (-1, 0, 0)
-RIDE_TYPE_FOOD_STALL: (-1, 0, 0)
-RIDE_TYPE_TOILETS: (-1, 0, 0)
-RIDE_TYPE_TOILETS: (-1, 0, 0)
-RIDE_TYPE_TOILETS: (-1, 0, 0)
-RIDE_TYPE_TOILETS: (-1, 0, 0)
-RIDE_TYPE_CASH_MACHINE: (-1, 0, 0)
-RIDE_TYPE_FOOD_STALL: (-1, 0, 0)
-RIDE_TYPE_FOOD_STALL: (-1, 0, 0)
-RIDE_TYPE_DRINK_STALL: (-1, 0, 0)
-RIDE_TYPE_FOOD_STALL: (-1, 0, 0)
-RIDE_TYPE_SHOP: (-1, 0, 0)
-RIDE_TYPE_TOILETS: (-1, 0, 0)
-RIDE_TYPE_FIRST_AID: (-1, 0, 0)
-RIDE_TYPE_FIRST_AID: (-1, 0, 0)
-RIDE_TYPE_FIRST_AID: (-1, 0, 0)
-RIDE_TYPE_FOOD_STALL: (-1, 0, 0)
-RIDE_TYPE_DRINK_STALL: (-1, 0, 0)
-RIDE_TYPE_INFORMATION_KIOSK: (-1, 0, 0)
-RIDE_TYPE_TOILETS: (-1, 0, 0)
+miniature_railway: (150, 15, 1)
+monorail: (299, 14, 6)
+suspended_monorail: (141, 19, 5)
+chairlift: (98, 23, 25)
+lift: (579, 35, 102)
+monorail_cycles: (212, 28, 1)
+crooked_house: (215, 62, 34)
+haunted_house: (341, 153, 10)
+ferris_wheel: (88, 50, 55)
+maze: (166, 122, 0)
+merry_go_round: (167, 60, 75)
+mini_golf: (295, 90, 0)
+observation_tower: (302, 0, 74)
+car_ride: (39, 29, 1)
+monster_trucks: (376, 69, 6)
+mini_helicopters: (322, 48, 2)
+spiral_slide: (150, 140, 90)
+dodgems: (270, 80, 35)
+space_rings: (150, 210, 650)
+circus: (210, 30, 0)
+ghost_train: (282, 42, 19)
+flying_saucers: (380, 85, 39)
+virginia_reel: (512, 487, 542)
+reverser_rc: (506, 525, 388)
+wooden_rc: (626, 683, 382)
+steel_wild_mouse: (709, 784, 475)
+spinning_wild_mouse: (618, 667, 523)
+inverted_hairpin_rc: (656, 769, 460)
+junior_rc: (475, 550, 366)
+classic_mini_rc: (279, 1158, 917)
+mini_rc: (495, 572, 383)
+spiral_rc: (591, 370, 192)
+mine_train_rc: (642, 708, 468)
+looping_rc: (606, 564, 264)
+stand_up_rc: (536, 943, 644)
+corkscrew_rc: (613, 830, 365)
+lim_launched_rc: (632, 937, 529)
+twister_rc: (784, 645, 372)
+hyper_twister: (737, 620, 344)
+giga_rc: (851, 545, 305)
+inverted_rc: (703, 906, 716)
+inverted_impulse_rc: (648, 713, 567)
+mini_suspended_rc: (533, 711, 480)
+steeplechase: (573, 541, 390)
+bobsleigh_rc: (619, 657, 466)
+mine_ride: (564, 454, 376)
+heartline_twister_rc: (523, 837, 545)
+lay_down_rc: (696, 664, 538)
+flying_rc: (744, 690, 668)
+multi_dimension_rc: (674, 833, 762)
+reverse_freefall_rc: (472, 744, 532)
+air_powered_vertical_rc: (852, 892, 698)
+water_coaster: (-1, 0, 0)
+twist: (173, 157, 250)
+magic_carpet: (335, 340, 440)
+launched_freefall: (368, 941, 563)
+swinging_ship: (205, 245, 251)
+go_karts: (-1, 0, 0)
+swinging_inverter_ship: (350, 468, 472)
+motion_simulator: (290, 350, 300)
+3d_cinema: (350, 240, 140)
+top_spin: (200, 480, 574)
+roto_drop: (270, 1444, 1444)
+enterprise: (374, 647, 764)
+dinghy_slide: (484, 589, 354)
+log_flume: (459, 236, 117)
+river_rapids: (581, 169, 108)
+splash_boats: (422, 203, 102)
+submarine_ride: (246, 180, 140)
+boat_hire: (202, 80, 90)
+river_rafts: (243, 45, 43)
+information_kiosk: (-1, 0, 0)
+food_stall: (-1, 0, 0)
+food_stall: (-1, 0, 0)
+shop: (-1, 0, 0)
+first_aid: (-1, 0, 0)
+drink_stall: (-1, 0, 0)
+first_aid: (-1, 0, 0)
+shop: (-1, 0, 0)
+food_stall: (-1, 0, 0)
+information_kiosk: (-1, 0, 0)
+food_stall: (-1, 0, 0)
+toilets: (-1, 0, 0)
+toilets: (-1, 0, 0)
+toilets: (-1, 0, 0)
+toilets: (-1, 0, 0)
+cash_machine: (-1, 0, 0)
+food_stall: (-1, 0, 0)
+food_stall: (-1, 0, 0)
+drink_stall: (-1, 0, 0)
+food_stall: (-1, 0, 0)
+shop: (-1, 0, 0)
+toilets: (-1, 0, 0)
+first_aid: (-1, 0, 0)
+first_aid: (-1, 0, 0)
+first_aid: (-1, 0, 0)
+food_stall: (-1, 0, 0)
+drink_stall: (-1, 0, 0)
+information_kiosk: (-1, 0, 0)
+toilets: (-1, 0, 0)
diff --git a/test/tests/testdata/ratings/EverythingPark.park.txt b/test/tests/testdata/ratings/EverythingPark.park.txt
index 812c92259e..4a670df88f 100644
--- a/test/tests/testdata/ratings/EverythingPark.park.txt
+++ b/test/tests/testdata/ratings/EverythingPark.park.txt
@@ -1,529 +1,529 @@
-RIDE_TYPE_MERRY_GO_ROUND: (105, 60, 75)
-RIDE_TYPE_LOOPING_ROLLER_COASTER: (646, 612, 271)
-RIDE_TYPE_FOOD_STALL: (-1, 702, 346)
-RIDE_TYPE_DRINK_STALL: (-1, 886, 620)
-RIDE_TYPE_TOILETS: (-1, 245, 251)
-RIDE_TYPE_INFORMATION_KIOSK: (-1, 157, 250)
-RIDE_TYPE_SHOP: (-1, 0, 0)
-RIDE_TYPE_CASH_MACHINE: (-1, 0, 0)
-RIDE_TYPE_TWIST: (173, 157, 250)
-RIDE_TYPE_TWIST: (173, 157, 250)
-RIDE_TYPE_TWIST: (173, 157, 250)
-RIDE_TYPE_TWIST: (173, 157, 250)
-RIDE_TYPE_TWIST: (173, 157, 250)
-RIDE_TYPE_TWIST: (173, 157, 250)
-RIDE_TYPE_TWIST: (173, 157, 250)
-RIDE_TYPE_TWIST: (173, 157, 250)
-RIDE_TYPE_TWIST: (173, 157, 250)
-RIDE_TYPE_TWIST: (173, 157, 250)
-RIDE_TYPE_TWIST: (173, 157, 250)
-RIDE_TYPE_JUNIOR_ROLLER_COASTER: (479, 583, 384)
-RIDE_TYPE_SINGLE_RAIL_ROLLER_COASTER: (746, 768, 369)
-RIDE_TYPE_MAZE: (155, 90, 0)
-RIDE_TYPE_SWINGING_SHIP: (207, 245, 251)
-RIDE_TYPE_BOAT_HIRE: (213, 80, 90)
-RIDE_TYPE_ENTERPRISE: (372, 647, 764)
-RIDE_TYPE_TOP_SPIN: (200, 480, 574)
-RIDE_TYPE_HAUNTED_HOUSE: (341, 153, 10)
-RIDE_TYPE_FOOD_STALL: (-1, 678, 684)
-RIDE_TYPE_FOOD_STALL: (-1, 248, 131)
-RIDE_TYPE_FOOD_STALL: (-1, 113, 67)
-RIDE_TYPE_FOOD_STALL: (-1, 947, 763)
-RIDE_TYPE_FOOD_STALL: (-1, 968, 559)
-RIDE_TYPE_FOOD_STALL: (-1, 242, 118)
-RIDE_TYPE_FOOD_STALL: (-1, 60, 75)
-RIDE_TYPE_FOOD_STALL: (-1, 0, 0)
-RIDE_TYPE_FOOD_STALL: (-1, 0, 0)
-RIDE_TYPE_FOOD_STALL: (-1, 0, 0)
-RIDE_TYPE_FOOD_STALL: (-1, 0, 0)
-RIDE_TYPE_FOOD_STALL: (-1, 0, 0)
-RIDE_TYPE_FOOD_STALL: (-1, 0, 0)
-RIDE_TYPE_FOOD_STALL: (-1, 0, 0)
-RIDE_TYPE_FOOD_STALL: (-1, 0, 0)
-RIDE_TYPE_FOOD_STALL: (-1, 0, 0)
-RIDE_TYPE_FOOD_STALL: (-1, 0, 0)
-RIDE_TYPE_FOOD_STALL: (-1, 0, 0)
-RIDE_TYPE_FOOD_STALL: (-1, 157, 250)
-RIDE_TYPE_FOOD_STALL: (-1, 80, 35)
-RIDE_TYPE_FOOD_STALL: (-1, 647, 764)
-RIDE_TYPE_FOOD_STALL: (-1, 0, 0)
-RIDE_TYPE_FOOD_STALL: (-1, 0, 0)
-RIDE_TYPE_FOOD_STALL: (-1, 0, 0)
-RIDE_TYPE_FOOD_STALL: (-1, 0, 0)
-RIDE_TYPE_FOOD_STALL: (-1, 0, 0)
-RIDE_TYPE_FOOD_STALL: (-1, 0, 0)
-RIDE_TYPE_DRINK_STALL: (-1, 0, 0)
-RIDE_TYPE_DRINK_STALL: (-1, 50, 55)
-RIDE_TYPE_DRINK_STALL: (-1, 0, 0)
-RIDE_TYPE_DRINK_STALL: (-1, 0, 0)
-RIDE_TYPE_DRINK_STALL: (-1, 0, 0)
-RIDE_TYPE_DRINK_STALL: (-1, 0, 0)
-RIDE_TYPE_DRINK_STALL: (-1, 0, 0)
-RIDE_TYPE_DRINK_STALL: (-1, 0, 0)
-RIDE_TYPE_DRINK_STALL: (-1, 0, 0)
-RIDE_TYPE_DRINK_STALL: (-1, 0, 0)
-RIDE_TYPE_SHOP: (-1, 0, 0)
-RIDE_TYPE_SHOP: (-1, 254, 41)
-RIDE_TYPE_SHOP: (-1, 0, 0)
-RIDE_TYPE_SHOP: (-1, 0, 0)
-RIDE_TYPE_SHOP: (-1, 0, 0)
-RIDE_TYPE_SHOP: (-1, 0, 0)
-RIDE_TYPE_SHOP: (-1, 0, 0)
-RIDE_TYPE_INFORMATION_KIOSK: (-1, 30, 0)
-RIDE_TYPE_FIRST_AID: (-1, 62, 34)
-RIDE_TYPE_CASH_MACHINE: (-1, 350, 300)
-RIDE_TYPE_TOILETS: (-1, 157, 250)
-RIDE_TYPE_TOILETS: (-1, 153, 10)
-RIDE_TYPE_TOILETS: (-1, 850, 809)
-RIDE_TYPE_CORKSCREW_ROLLER_COASTER: (622, 763, 369)
-RIDE_TYPE_HEARTLINE_TWISTER_COASTER: (546, 918, 606)
-RIDE_TYPE_MERRY_GO_ROUND: (119, 61, 75)
-RIDE_TYPE_DODGEMS: (270, 80, 35)
-RIDE_TYPE_DODGEMS: (271, 80, 35)
-RIDE_TYPE_DODGEMS: (273, 80, 35)
-RIDE_TYPE_TOP_SPIN: (206, 480, 574)
-RIDE_TYPE_TOP_SPIN: (206, 480, 574)
-RIDE_TYPE_MOTION_SIMULATOR: (290, 350, 300)
-RIDE_TYPE_MOTION_SIMULATOR: (290, 350, 300)
-RIDE_TYPE_3D_CINEMA: (350, 240, 140)
-RIDE_TYPE_FERRIS_WHEEL: (85, 50, 55)
-RIDE_TYPE_FERRIS_WHEEL: (85, 50, 55)
-RIDE_TYPE_FERRIS_WHEEL: (85, 50, 55)
-RIDE_TYPE_FERRIS_WHEEL: (85, 50, 55)
-RIDE_TYPE_FERRIS_WHEEL: (85, 50, 55)
-RIDE_TYPE_FERRIS_WHEEL: (85, 50, 55)
-RIDE_TYPE_FERRIS_WHEEL: (85, 50, 55)
-RIDE_TYPE_FERRIS_WHEEL: (85, 50, 55)
-RIDE_TYPE_FERRIS_WHEEL: (85, 50, 55)
-RIDE_TYPE_FERRIS_WHEEL: (85, 50, 55)
-RIDE_TYPE_FERRIS_WHEEL: (85, 50, 55)
-RIDE_TYPE_FERRIS_WHEEL: (85, 50, 55)
-RIDE_TYPE_FERRIS_WHEEL: (85, 50, 55)
-RIDE_TYPE_FERRIS_WHEEL: (85, 50, 55)
-RIDE_TYPE_FERRIS_WHEEL: (85, 50, 55)
-RIDE_TYPE_FERRIS_WHEEL: (85, 50, 55)
-RIDE_TYPE_FERRIS_WHEEL: (85, 50, 55)
-RIDE_TYPE_FERRIS_WHEEL: (85, 50, 55)
-RIDE_TYPE_FERRIS_WHEEL: (85, 50, 55)
-RIDE_TYPE_FERRIS_WHEEL: (85, 50, 55)
-RIDE_TYPE_FERRIS_WHEEL: (85, 50, 55)
-RIDE_TYPE_FERRIS_WHEEL: (85, 50, 55)
-RIDE_TYPE_FERRIS_WHEEL: (85, 50, 55)
-RIDE_TYPE_FERRIS_WHEEL: (85, 50, 55)
-RIDE_TYPE_FERRIS_WHEEL: (85, 50, 55)
-RIDE_TYPE_FERRIS_WHEEL: (85, 50, 55)
-RIDE_TYPE_FERRIS_WHEEL: (85, 50, 55)
-RIDE_TYPE_FERRIS_WHEEL: (85, 50, 55)
-RIDE_TYPE_FERRIS_WHEEL: (85, 50, 55)
-RIDE_TYPE_FERRIS_WHEEL: (85, 50, 55)
-RIDE_TYPE_FERRIS_WHEEL: (85, 50, 55)
-RIDE_TYPE_FERRIS_WHEEL: (85, 50, 55)
-RIDE_TYPE_FERRIS_WHEEL: (85, 50, 55)
-RIDE_TYPE_FERRIS_WHEEL: (85, 50, 55)
-RIDE_TYPE_FERRIS_WHEEL: (85, 50, 55)
-RIDE_TYPE_FERRIS_WHEEL: (85, 50, 55)
-RIDE_TYPE_FERRIS_WHEEL: (85, 50, 55)
-RIDE_TYPE_FERRIS_WHEEL: (85, 50, 55)
-RIDE_TYPE_FERRIS_WHEEL: (85, 50, 55)
-RIDE_TYPE_FERRIS_WHEEL: (85, 50, 55)
-RIDE_TYPE_FERRIS_WHEEL: (85, 50, 55)
-RIDE_TYPE_FERRIS_WHEEL: (85, 50, 55)
-RIDE_TYPE_FERRIS_WHEEL: (85, 50, 55)
-RIDE_TYPE_FERRIS_WHEEL: (85, 50, 55)
-RIDE_TYPE_FERRIS_WHEEL: (85, 50, 55)
-RIDE_TYPE_FERRIS_WHEEL: (85, 50, 55)
-RIDE_TYPE_FERRIS_WHEEL: (85, 50, 55)
-RIDE_TYPE_FERRIS_WHEEL: (85, 50, 55)
-RIDE_TYPE_FERRIS_WHEEL: (85, 50, 55)
-RIDE_TYPE_FERRIS_WHEEL: (85, 50, 55)
-RIDE_TYPE_FERRIS_WHEEL: (85, 50, 55)
-RIDE_TYPE_FERRIS_WHEEL: (85, 50, 55)
-RIDE_TYPE_FERRIS_WHEEL: (85, 50, 55)
-RIDE_TYPE_FERRIS_WHEEL: (85, 50, 55)
-RIDE_TYPE_FERRIS_WHEEL: (85, 50, 55)
-RIDE_TYPE_FERRIS_WHEEL: (85, 50, 55)
-RIDE_TYPE_WOODEN_WILD_MOUSE: (727, 873, 495)
-RIDE_TYPE_FOOD_STALL: (-1, 0, 0)
-RIDE_TYPE_FOOD_STALL: (-1, 0, 0)
-RIDE_TYPE_CASH_MACHINE: (-1, 0, 0)
-RIDE_TYPE_DRINK_STALL: (-1, 0, 0)
-RIDE_TYPE_SHOP: (-1, 0, 0)
-RIDE_TYPE_TOILETS: (-1, 0, 0)
-RIDE_TYPE_CROOKED_HOUSE: (215, 62, 34)
-RIDE_TYPE_CROOKED_HOUSE: (215, 62, 34)
-RIDE_TYPE_CROOKED_HOUSE: (340, 62, 34)
-RIDE_TYPE_CROOKED_HOUSE: (215, 62, 34)
-RIDE_TYPE_MAGIC_CARPET: (335, 340, 440)
-RIDE_TYPE_TWISTER_ROLLER_COASTER: (672, 939, 477)
-RIDE_TYPE_CLASSIC_WOODEN_ROLLER_COASTER: (634, 747, 408)
-RIDE_TYPE_WOODEN_ROLLER_COASTER: (680, 706, 387)
-RIDE_TYPE_ENTERPRISE: (382, 647, 764)
-RIDE_TYPE_GIGA_COASTER: (1030, 898, 444)
-RIDE_TYPE_SUBMARINE_RIDE: (256, 180, 140)
-RIDE_TYPE_OBSERVATION_TOWER: (428, 0, 117)
-RIDE_TYPE_SWINGING_INVERTER_SHIP: (351, 468, 472)
-RIDE_TYPE_SWINGING_INVERTER_SHIP: (352, 468, 472)
-RIDE_TYPE_HAUNTED_HOUSE: (341, 153, 10)
-RIDE_TYPE_SPACE_RINGS: (161, 210, 650)
-RIDE_TYPE_MINI_GOLF: (342, 90, 0)
-RIDE_TYPE_CASH_MACHINE: (-1, 0, 0)
-RIDE_TYPE_TOILETS: (-1, 0, 0)
-RIDE_TYPE_FIRST_AID: (-1, 0, 0)
-RIDE_TYPE_DRINK_STALL: (-1, 0, 0)
-RIDE_TYPE_FOOD_STALL: (-1, 0, 0)
-RIDE_TYPE_INFORMATION_KIOSK: (-1, 0, 0)
-RIDE_TYPE_SHOP: (-1, 0, 0)
-RIDE_TYPE_TOILETS: (-1, 0, 0)
-RIDE_TYPE_CASH_MACHINE: (-1, 0, 0)
-RIDE_TYPE_FIRST_AID: (-1, 0, 0)
-RIDE_TYPE_INFORMATION_KIOSK: (-1, 0, 0)
-RIDE_TYPE_DRINK_STALL: (-1, 0, 0)
-RIDE_TYPE_FOOD_STALL: (-1, 0, 0)
-RIDE_TYPE_ROTO_DROP: (507, 1078, 1078)
-RIDE_TYPE_TOP_SPIN: (202, 480, 574)
-RIDE_TYPE_TOP_SPIN: (204, 480, 574)
-RIDE_TYPE_LAUNCHED_FREEFALL: (380, 982, 577)
-RIDE_TYPE_CORKSCREW_ROLLER_COASTER: (417, 456, 182)
-RIDE_TYPE_GO_KARTS: (518, 262, 49)
-RIDE_TYPE_MULTI_DIMENSION_ROLLER_COASTER: (687, 822, 833)
-RIDE_TYPE_HYBRID_COASTER: (799, 786, 363)
-RIDE_TYPE_SINGLE_RAIL_ROLLER_COASTER: (734, 613, 283)
-RIDE_TYPE_MINIATURE_RAILWAY: (165, 12, 1)
-RIDE_TYPE_MONORAIL: (138, 9, 1)
-RIDE_TYPE_MONORAIL: (136, 7, 1)
-RIDE_TYPE_MONORAIL: (137, 8, 2)
-RIDE_TYPE_SUSPENDED_MONORAIL: (146, 21, 5)
-RIDE_TYPE_CHAIRLIFT: (234, 71, 52)
-RIDE_TYPE_MONORAIL_CYCLES: (95, 14, 0)
-RIDE_TYPE_LIFT: (181, 35, 46)
-RIDE_TYPE_SPIRAL_SLIDE: (151, 140, 90)
-RIDE_TYPE_SPIRAL_SLIDE: (153, 140, 90)
-RIDE_TYPE_SPIRAL_SLIDE: (153, 140, 90)
-RIDE_TYPE_SPIRAL_SLIDE: (153, 140, 90)
-RIDE_TYPE_SPIRAL_SLIDE: (153, 140, 90)
-RIDE_TYPE_SPIRAL_SLIDE: (151, 140, 90)
-RIDE_TYPE_FOOD_STALL: (-1, 0, 0)
-RIDE_TYPE_DRINK_STALL: (-1, 0, 0)
-RIDE_TYPE_TOILETS: (-1, 0, 0)
-RIDE_TYPE_CASH_MACHINE: (-1, 0, 0)
-RIDE_TYPE_FIRST_AID: (-1, 0, 0)
-RIDE_TYPE_INFORMATION_KIOSK: (-1, 0, 0)
-RIDE_TYPE_SHOP: (-1, 0, 0)
-RIDE_TYPE_MERRY_GO_ROUND: (106, 60, 75)
-RIDE_TYPE_CIRCUS: (210, 30, 0)
-RIDE_TYPE_INVERTED_ROLLER_COASTER: (602, 799, 635)
-RIDE_TYPE_DRINK_STALL: (-1, 0, 0)
-RIDE_TYPE_FOOD_STALL: (-1, 0, 0)
-RIDE_TYPE_TOILETS: (-1, 0, 0)
-RIDE_TYPE_CASH_MACHINE: (-1, 0, 0)
-RIDE_TYPE_INFORMATION_KIOSK: (-1, 0, 0)
-RIDE_TYPE_FIRST_AID: (-1, 0, 0)
-RIDE_TYPE_SHOP: (-1, 0, 0)
-RIDE_TYPE_SHOP: (-1, 0, 0)
-RIDE_TYPE_SHOP: (-1, 0, 0)
-RIDE_TYPE_SHOP: (-1, 0, 0)
-RIDE_TYPE_BOBSLEIGH_COASTER: (590, 650, 487)
-RIDE_TYPE_FOOD_STALL: (-1, 0, 0)
-RIDE_TYPE_DRINK_STALL: (-1, 0, 0)
-RIDE_TYPE_TOILETS: (-1, 0, 0)
-RIDE_TYPE_INFORMATION_KIOSK: (-1, 0, 0)
-RIDE_TYPE_CASH_MACHINE: (-1, 0, 0)
-RIDE_TYPE_FIRST_AID: (-1, 0, 0)
-RIDE_TYPE_SHOP: (-1, 0, 0)
-RIDE_TYPE_CAR_RIDE: (377, 58, 4)
-RIDE_TYPE_SPACE_RINGS: (275, 333, 751)
-RIDE_TYPE_SPACE_RINGS: (165, 210, 650)
-RIDE_TYPE_MINI_SUSPENDED_COASTER: (509, 635, 448)
-RIDE_TYPE_HYPER_TWISTER: (849, 761, 379)
-RIDE_TYPE_VERTICAL_DROP_ROLLER_COASTER: (785, 826, 375)
-RIDE_TYPE_REVERSE_FREEFALL_COASTER: (164, 241, 184)
-RIDE_TYPE_MINI_ROLLER_COASTER: (549, 760, 497)
-RIDE_TYPE_MONSTER_TRUCKS: (411, 69, 6)
-RIDE_TYPE_WOODEN_ROLLER_COASTER: (648, 885, 503)
-RIDE_TYPE_VIRGINIA_REEL: (655, 684, 674)
-RIDE_TYPE_FOOD_STALL: (-1, 0, 0)
-RIDE_TYPE_TOILETS: (-1, 0, 0)
-RIDE_TYPE_DRINK_STALL: (-1, 0, 0)
-RIDE_TYPE_INFORMATION_KIOSK: (-1, 0, 0)
-RIDE_TYPE_CASH_MACHINE: (-1, 0, 0)
-RIDE_TYPE_SHOP: (-1, 0, 0)
-RIDE_TYPE_FIRST_AID: (-1, 0, 0)
-RIDE_TYPE_LOG_FLUME: (529, 293, 141)
-RIDE_TYPE_SPLASH_BOATS: (795, 503, 229)
-RIDE_TYPE_MERRY_GO_ROUND: (106, 60, 75)
-RIDE_TYPE_DINGHY_SLIDE: (550, 647, 410)
-RIDE_TYPE_RIVER_RAPIDS: (362, 144, 83)
-RIDE_TYPE_RIVER_RAFTS: (217, 45, 43)
-RIDE_TYPE_CASH_MACHINE: (-1, 0, 0)
-RIDE_TYPE_CASH_MACHINE: (-1, 0, 0)
-RIDE_TYPE_CASH_MACHINE: (-1, 0, 0)
-RIDE_TYPE_CASH_MACHINE: (-1, 0, 0)
-RIDE_TYPE_SHOP: (-1, 0, 0)
-RIDE_TYPE_DRINK_STALL: (-1, 0, 0)
-RIDE_TYPE_FOOD_STALL: (-1, 0, 0)
-RIDE_TYPE_FOOD_STALL: (-1, 0, 0)
-RIDE_TYPE_FOOD_STALL: (-1, 0, 0)
-RIDE_TYPE_TOILETS: (-1, 0, 0)
-RIDE_TYPE_CASH_MACHINE: (-1, 0, 0)
-RIDE_TYPE_CASH_MACHINE: (-1, 0, 0)
-RIDE_TYPE_FIRST_AID: (-1, 0, 0)
-RIDE_TYPE_CASH_MACHINE: (-1, 0, 0)
-RIDE_TYPE_CASH_MACHINE: (-1, 0, 0)
-RIDE_TYPE_CASH_MACHINE: (-1, 0, 0)
-RIDE_TYPE_CASH_MACHINE: (-1, 0, 0)
-RIDE_TYPE_CASH_MACHINE: (-1, 0, 0)
-RIDE_TYPE_CASH_MACHINE: (-1, 0, 0)
-RIDE_TYPE_CASH_MACHINE: (-1, 0, 0)
-RIDE_TYPE_CASH_MACHINE: (-1, 0, 0)
-RIDE_TYPE_CASH_MACHINE: (-1, 0, 0)
-RIDE_TYPE_CASH_MACHINE: (-1, 0, 0)
-RIDE_TYPE_CASH_MACHINE: (-1, 0, 0)
-RIDE_TYPE_CASH_MACHINE: (-1, 0, 0)
-RIDE_TYPE_CASH_MACHINE: (-1, 0, 0)
-RIDE_TYPE_CASH_MACHINE: (-1, 0, 0)
-RIDE_TYPE_CASH_MACHINE: (-1, 0, 0)
-RIDE_TYPE_CASH_MACHINE: (-1, 0, 0)
-RIDE_TYPE_CASH_MACHINE: (-1, 0, 0)
-RIDE_TYPE_CASH_MACHINE: (-1, 0, 0)
-RIDE_TYPE_CASH_MACHINE: (-1, 0, 0)
-RIDE_TYPE_CASH_MACHINE: (-1, 0, 0)
-RIDE_TYPE_CASH_MACHINE: (-1, 0, 0)
-RIDE_TYPE_CASH_MACHINE: (-1, 0, 0)
-RIDE_TYPE_CASH_MACHINE: (-1, 0, 0)
-RIDE_TYPE_CASH_MACHINE: (-1, 0, 0)
-RIDE_TYPE_CASH_MACHINE: (-1, 0, 0)
-RIDE_TYPE_CASH_MACHINE: (-1, 0, 0)
-RIDE_TYPE_CASH_MACHINE: (-1, 0, 0)
-RIDE_TYPE_CASH_MACHINE: (-1, 0, 0)
-RIDE_TYPE_CAR_RIDE: (29, 29, 1)
-RIDE_TYPE_CAR_RIDE: (29, 29, 1)
-RIDE_TYPE_CAR_RIDE: (29, 29, 1)
-RIDE_TYPE_CAR_RIDE: (29, 29, 1)
-RIDE_TYPE_CAR_RIDE: (29, 29, 1)
-RIDE_TYPE_CAR_RIDE: (29, 29, 1)
-RIDE_TYPE_CAR_RIDE: (29, 29, 1)
-RIDE_TYPE_CAR_RIDE: (29, 29, 1)
-RIDE_TYPE_CAR_RIDE: (28, 29, 1)
-RIDE_TYPE_CAR_RIDE: (29, 29, 1)
-RIDE_TYPE_CAR_RIDE: (29, 29, 1)
-RIDE_TYPE_CAR_RIDE: (29, 29, 1)
-RIDE_TYPE_GO_KARTS: (397, 253, 42)
-RIDE_TYPE_GO_KARTS: (400, 253, 42)
-RIDE_TYPE_GO_KARTS: (397, 253, 42)
-RIDE_TYPE_GO_KARTS: (397, 253, 42)
-RIDE_TYPE_FLYING_SAUCERS: (393, 85, 39)
-RIDE_TYPE_FLYING_SAUCERS: (394, 85, 39)
-RIDE_TYPE_FLYING_SAUCERS: (394, 85, 39)
-RIDE_TYPE_FLYING_SAUCERS: (624, 111, 42)
-RIDE_TYPE_FLYING_SAUCERS: (394, 85, 39)
-RIDE_TYPE_MINI_HELICOPTERS: (302, 48, 1)
-RIDE_TYPE_BOAT_HIRE: (259, 89, 100)
-RIDE_TYPE_BOAT_HIRE: (208, 80, 90)
-RIDE_TYPE_BOAT_HIRE: (208, 80, 90)
-RIDE_TYPE_BOAT_HIRE: (329, 126, 118)
-RIDE_TYPE_BOAT_HIRE: (329, 126, 118)
-RIDE_TYPE_BOAT_HIRE: (214, 80, 91)
-RIDE_TYPE_BOAT_HIRE: (256, 89, 100)
-RIDE_TYPE_BOAT_HIRE: (216, 81, 90)
-RIDE_TYPE_BOAT_HIRE: (208, 80, 90)
-RIDE_TYPE_BOAT_HIRE: (208, 80, 90)
-RIDE_TYPE_BOAT_HIRE: (223, 81, 90)
-RIDE_TYPE_WOODEN_WILD_MOUSE: (63, 77, 43)
-RIDE_TYPE_WOODEN_WILD_MOUSE: (63, 78, 43)
-RIDE_TYPE_STEEL_WILD_MOUSE: (123, 145, 86)
-RIDE_TYPE_STEEL_WILD_MOUSE: (125, 145, 86)
-RIDE_TYPE_REVERSER_ROLLER_COASTER: (482, 439, 340)
-RIDE_TYPE_REVERSER_ROLLER_COASTER: (482, 440, 340)
-RIDE_TYPE_WOODEN_ROLLER_COASTER: (12, 11, 7)
-RIDE_TYPE_WOODEN_ROLLER_COASTER: (12, 11, 7)
-RIDE_TYPE_WOODEN_ROLLER_COASTER: (12, 10, 7)
-RIDE_TYPE_WOODEN_ROLLER_COASTER: (12, 11, 7)
-RIDE_TYPE_WOODEN_ROLLER_COASTER: (12, 11, 7)
-RIDE_TYPE_WOODEN_ROLLER_COASTER: (12, 11, 7)
-RIDE_TYPE_CLASSIC_WOODEN_ROLLER_COASTER: (10, 385, 8)
-RIDE_TYPE_LAY_DOWN_ROLLER_COASTER: (166, 1630, 1072)
-RIDE_TYPE_LAY_DOWN_ROLLER_COASTER: (169, 1612, 1064)
-RIDE_TYPE_MINI_ROLLER_COASTER: (39, 37, 28)
-RIDE_TYPE_MINI_ROLLER_COASTER: (39, 37, 28)
-RIDE_TYPE_MINI_ROLLER_COASTER: (38, 37, 28)
-RIDE_TYPE_MINI_ROLLER_COASTER: (38, 37, 28)
-RIDE_TYPE_MINI_ROLLER_COASTER: (39, 37, 28)
-RIDE_TYPE_MINI_ROLLER_COASTER: (38, 37, 28)
-RIDE_TYPE_MINI_ROLLER_COASTER: (38, 37, 28)
-RIDE_TYPE_STEEPLECHASE: (20, 18, 13)
-RIDE_TYPE_STEEPLECHASE: (20, 18, 13)
-RIDE_TYPE_STEEPLECHASE: (20, 18, 13)
-RIDE_TYPE_STEEPLECHASE: (20, 18, 13)
-RIDE_TYPE_STEEPLECHASE: (20, 18, 13)
-RIDE_TYPE_STEEPLECHASE: (20, 18, 13)
-RIDE_TYPE_MINI_SUSPENDED_COASTER: (21, 21, 19)
-RIDE_TYPE_MINI_SUSPENDED_COASTER: (21, 21, 19)
-RIDE_TYPE_MINI_SUSPENDED_COASTER: (21, 21, 19)
-RIDE_TYPE_MINI_SUSPENDED_COASTER: (21, 21, 19)
-RIDE_TYPE_MINI_SUSPENDED_COASTER: (21, 21, 19)
-RIDE_TYPE_MINI_SUSPENDED_COASTER: (22, 25, 21)
-RIDE_TYPE_CORKSCREW_ROLLER_COASTER: (415, 432, 161)
-RIDE_TYPE_CORKSCREW_ROLLER_COASTER: (415, 431, 160)
-RIDE_TYPE_CORKSCREW_ROLLER_COASTER: (415, 431, 160)
-RIDE_TYPE_CORKSCREW_ROLLER_COASTER: (415, 432, 161)
-RIDE_TYPE_CORKSCREW_ROLLER_COASTER: (415, 432, 161)
-RIDE_TYPE_CORKSCREW_ROLLER_COASTER: (415, 432, 161)
-RIDE_TYPE_SPINNING_WILD_MOUSE: (599, 716, 549)
-RIDE_TYPE_TWISTER_ROLLER_COASTER: (575, 790, 439)
-RIDE_TYPE_TWISTER_ROLLER_COASTER: (539, 623, 272)
-RIDE_TYPE_TWISTER_ROLLER_COASTER: (532, 562, 254)
-RIDE_TYPE_TWISTER_ROLLER_COASTER: (537, 640, 279)
-RIDE_TYPE_INVERTED_HAIRPIN_COASTER: (671, 828, 481)
-RIDE_TYPE_SUSPENDED_SWINGING_COASTER: (24, 22, 25)
-RIDE_TYPE_SUSPENDED_SWINGING_COASTER: (24, 22, 25)
-RIDE_TYPE_SUSPENDED_SWINGING_COASTER: (24, 22, 25)
-RIDE_TYPE_SUSPENDED_SWINGING_COASTER: (24, 22, 25)
-RIDE_TYPE_SUSPENDED_SWINGING_COASTER: (26, 22, 26)
-RIDE_TYPE_SUSPENDED_SWINGING_COASTER: (24, 22, 25)
-RIDE_TYPE_SUSPENDED_SWINGING_COASTER: (24, 22, 25)
-RIDE_TYPE_SUSPENDED_SWINGING_COASTER: (24, 22, 25)
-RIDE_TYPE_JUNIOR_ROLLER_COASTER: (343, 512, 329)
-RIDE_TYPE_JUNIOR_ROLLER_COASTER: (344, 512, 329)
-RIDE_TYPE_JUNIOR_ROLLER_COASTER: (380, 533, 330)
-RIDE_TYPE_JUNIOR_ROLLER_COASTER: (343, 512, 329)
-RIDE_TYPE_COMPACT_INVERTED_COASTER: (46, 44, 45)
-RIDE_TYPE_COMPACT_INVERTED_COASTER: (47, 48, 48)
-RIDE_TYPE_COMPACT_INVERTED_COASTER: (48, 49, 48)
-RIDE_TYPE_COMPACT_INVERTED_COASTER: (47, 49, 48)
-RIDE_TYPE_COMPACT_INVERTED_COASTER: (53, 58, 53)
-RIDE_TYPE_FOOD_STALL: (-1, 0, 0)
-RIDE_TYPE_FOOD_STALL: (-1, 0, 0)
-RIDE_TYPE_FOOD_STALL: (-1, 0, 0)
-RIDE_TYPE_TOILETS: (-1, 0, 0)
-RIDE_TYPE_CASH_MACHINE: (-1, 0, 0)
-RIDE_TYPE_INFORMATION_KIOSK: (-1, 0, 0)
-RIDE_TYPE_CASH_MACHINE: (-1, 0, 0)
-RIDE_TYPE_DRINK_STALL: (-1, 0, 0)
-RIDE_TYPE_FOOD_STALL: (-1, 0, 0)
-RIDE_TYPE_INFORMATION_KIOSK: (-1, 0, 0)
-RIDE_TYPE_TOILETS: (-1, 0, 0)
-RIDE_TYPE_SHOP: (-1, 0, 0)
-RIDE_TYPE_AIR_POWERED_VERTICAL_COASTER: (58, 1412, 1165)
-RIDE_TYPE_AIR_POWERED_VERTICAL_COASTER: (785, 863, 666)
-RIDE_TYPE_AIR_POWERED_VERTICAL_COASTER: (58, 1412, 1165)
-RIDE_TYPE_BOBSLEIGH_COASTER: (44, 47, 36)
-RIDE_TYPE_BOBSLEIGH_COASTER: (44, 47, 36)
-RIDE_TYPE_BOBSLEIGH_COASTER: (44, 47, 36)
-RIDE_TYPE_BOBSLEIGH_COASTER: (43, 47, 36)
-RIDE_TYPE_SPIRAL_ROLLER_COASTER: (24, 6, 4)
-RIDE_TYPE_SPIRAL_ROLLER_COASTER: (24, 6, 4)
-RIDE_TYPE_SPIRAL_ROLLER_COASTER: (24, 6, 4)
-RIDE_TYPE_STAND_UP_ROLLER_COASTER: (77, 97, 86)
-RIDE_TYPE_STAND_UP_ROLLER_COASTER: (77, 97, 86)
-RIDE_TYPE_STAND_UP_ROLLER_COASTER: (77, 97, 86)
-RIDE_TYPE_WATER_COASTER: (44, 44, 33)
-RIDE_TYPE_WATER_COASTER: (44, 44, 32)
-RIDE_TYPE_WATER_COASTER: (44, 44, 32)
-RIDE_TYPE_WATER_COASTER: (44, 44, 32)
-RIDE_TYPE_VERTICAL_DROP_ROLLER_COASTER: (388, 1108, 462)
-RIDE_TYPE_CLASSIC_MINI_ROLLER_COASTER: (174, 265, 166)
-RIDE_TYPE_CLASSIC_MINI_ROLLER_COASTER: (175, 263, 165)
-RIDE_TYPE_CLASSIC_MINI_ROLLER_COASTER: (177, 260, 166)
-RIDE_TYPE_GIGA_COASTER: (460, 1219, 505)
-RIDE_TYPE_MAZE: (139, 52, 0)
-RIDE_TYPE_SUBMARINE_RIDE: (247, 180, 140)
-RIDE_TYPE_SUBMARINE_RIDE: (247, 180, 140)
-RIDE_TYPE_LIM_LAUNCHED_ROLLER_COASTER: (53, 61, 40)
-RIDE_TYPE_LIM_LAUNCHED_ROLLER_COASTER: (53, 61, 40)
-RIDE_TYPE_LIM_LAUNCHED_ROLLER_COASTER: (53, 61, 40)
-RIDE_TYPE_FLYING_ROLLER_COASTER: (31, 282, 473)
-RIDE_TYPE_FLYING_ROLLER_COASTER: (31, 282, 473)
-RIDE_TYPE_FLYING_ROLLER_COASTER: (31, 282, 473)
-RIDE_TYPE_HYPER_TWISTER: (29, 7, 4)
-RIDE_TYPE_HYPER_TWISTER: (28, 7, 4)
-RIDE_TYPE_HYPERCOASTER: (24, 8, 3)
-RIDE_TYPE_HYPERCOASTER: (24, 8, 3)
-RIDE_TYPE_HEARTLINE_TWISTER_COASTER: (423, 565, 393)
-RIDE_TYPE_HEARTLINE_TWISTER_COASTER: (423, 568, 395)
-RIDE_TYPE_REVERSE_FREEFALL_COASTER: (594, 811, 568)
-RIDE_TYPE_REVERSE_FREEFALL_COASTER: (594, 811, 568)
-RIDE_TYPE_FOOD_STALL: (-1, 0, 0)
-RIDE_TYPE_FOOD_STALL: (-1, 0, 0)
-RIDE_TYPE_FOOD_STALL: (-1, 0, 0)
-RIDE_TYPE_DRINK_STALL: (-1, 0, 0)
-RIDE_TYPE_DRINK_STALL: (-1, 0, 0)
-RIDE_TYPE_DRINK_STALL: (-1, 0, 0)
-RIDE_TYPE_INFORMATION_KIOSK: (-1, 0, 0)
-RIDE_TYPE_TOILETS: (-1, 0, 0)
-RIDE_TYPE_CASH_MACHINE: (-1, 0, 0)
-RIDE_TYPE_FIRST_AID: (-1, 0, 0)
-RIDE_TYPE_SHOP: (-1, 0, 0)
-RIDE_TYPE_SHOP: (-1, 0, 0)
-RIDE_TYPE_SIDE_FRICTION_ROLLER_COASTER: (486, 681, 370)
-RIDE_TYPE_LOOPING_ROLLER_COASTER: (22, 8, 3)
-RIDE_TYPE_LOOPING_ROLLER_COASTER: (22, 8, 3)
-RIDE_TYPE_LOOPING_ROLLER_COASTER: (485, 628, 252)
-RIDE_TYPE_INVERTED_IMPULSE_COASTER: (715, 826, 555)
-RIDE_TYPE_INVERTED_IMPULSE_COASTER: (706, 814, 555)
-RIDE_TYPE_MINE_TRAIN_COASTER: (601, 752, 454)
-RIDE_TYPE_MINE_RIDE: (523, 451, 352)
-RIDE_TYPE_ALPINE_ROLLER_COASTER: (170, 141, 65)
-RIDE_TYPE_OBSERVATION_TOWER: (354, 0, 97)
-RIDE_TYPE_OBSERVATION_TOWER: (313, 0, 74)
-RIDE_TYPE_GHOST_TRAIN: (132, 24, 8)
-RIDE_TYPE_GHOST_TRAIN: (132, 24, 8)
-RIDE_TYPE_LOG_FLUME: (446, 265, 125)
-RIDE_TYPE_RIVER_RAFTS: (225, 45, 43)
-RIDE_TYPE_RIVER_RAPIDS: (354, 181, 114)
-RIDE_TYPE_MAZE: (150, 90, 0)
-RIDE_TYPE_MAZE: (150, 90, 0)
-RIDE_TYPE_MAZE: (150, 90, 0)
-RIDE_TYPE_MAZE: (150, 90, 0)
-RIDE_TYPE_CORKSCREW_ROLLER_COASTER: (482, 510, 220)
-RIDE_TYPE_LIM_LAUNCHED_ROLLER_COASTER: (528, 730, 443)
-RIDE_TYPE_LIM_LAUNCHED_ROLLER_COASTER: (532, 727, 436)
-RIDE_TYPE_LIM_LAUNCHED_ROLLER_COASTER: (530, 812, 472)
-RIDE_TYPE_MINIATURE_RAILWAY: (154, 12, 1)
-RIDE_TYPE_MINIATURE_RAILWAY: (154, 12, 1)
-RIDE_TYPE_MINIATURE_RAILWAY: (149, 12, 1)
-RIDE_TYPE_MINIATURE_RAILWAY: (151, 12, 1)
-RIDE_TYPE_MINIATURE_RAILWAY: (157, 12, 1)
-RIDE_TYPE_MINIATURE_RAILWAY: (154, 12, 1)
-RIDE_TYPE_MINIATURE_RAILWAY: (150, 12, 1)
-RIDE_TYPE_MINIATURE_RAILWAY: (149, 12, 1)
-RIDE_TYPE_SUSPENDED_MONORAIL: (137, 19, 5)
-RIDE_TYPE_SUSPENDED_MONORAIL: (137, 19, 5)
-RIDE_TYPE_LIFT: (176, 35, 51)
-RIDE_TYPE_LIFT: (208, 35, 51)
-RIDE_TYPE_CHAIRLIFT: (99, 35, 26)
-RIDE_TYPE_TWISTER_ROLLER_COASTER: (701, 623, 407)
-RIDE_TYPE_MOTION_SIMULATOR: (290, 350, 300)
-RIDE_TYPE_MOTION_SIMULATOR: (325, 410, 330)
-RIDE_TYPE_3D_CINEMA: (350, 240, 140)
-RIDE_TYPE_3D_CINEMA: (400, 265, 155)
-RIDE_TYPE_3D_CINEMA: (420, 260, 148)
-RIDE_TYPE_TOP_SPIN: (200, 480, 574)
-RIDE_TYPE_TOP_SPIN: (300, 575, 664)
-RIDE_TYPE_TOP_SPIN: (320, 680, 794)
-RIDE_TYPE_LAUNCHED_FREEFALL: (339, 713, 487)
-RIDE_TYPE_LAUNCHED_FREEFALL: (550, 729, 759)
-RIDE_TYPE_FERRIS_WHEEL: (85, 50, 55)
-RIDE_TYPE_FERRIS_WHEEL: (85, 50, 55)
-RIDE_TYPE_SPIRAL_ROLLER_COASTER: (581, 467, 249)
-RIDE_TYPE_SPIRAL_SLIDE: (190, 160, 115)
-RIDE_TYPE_SPIRAL_SLIDE: (150, 140, 90)
-RIDE_TYPE_GIGA_COASTER: (637, 447, 239)
-RIDE_TYPE_ROTO_DROP: (306, 350, 350)
-RIDE_TYPE_CLASSIC_MINI_ROLLER_COASTER: (50, 42, 30)
-RIDE_TYPE_GIGA_COASTER: (171, 1624, 980)
-RIDE_TYPE_CHAIRLIFT: (0, 11, 25)
-RIDE_TYPE_COMPACT_INVERTED_COASTER: (-1, 1042, 811)
-RIDE_TYPE_MERRY_GO_ROUND: (185, 140, 155)
-RIDE_TYPE_LIM_LAUNCHED_ROLLER_COASTER: (-1, 0, 0)
-RIDE_TYPE_SHOP: (-1, 0, 0)
-RIDE_TYPE_GO_KARTS: (422, 255, 42)
-RIDE_TYPE_TOILETS: (-1, 0, 0)
-RIDE_TYPE_CASH_MACHINE: (-1, 0, 0)
-RIDE_TYPE_DRINK_STALL: (-1, 0, 0)
-RIDE_TYPE_FOOD_STALL: (-1, 0, 0)
-RIDE_TYPE_BOAT_HIRE: (201, 80, 90)
-RIDE_TYPE_INVERTED_HAIRPIN_COASTER: (703, 936, 520)
-RIDE_TYPE_HAUNTED_HOUSE: (-1, 0, 0)
-RIDE_TYPE_WOODEN_WILD_MOUSE: (5, 5, 3)
-RIDE_TYPE_CAR_RIDE: (329, 59, 10)
-RIDE_TYPE_MINIATURE_RAILWAY: (154, 12, 1)
\ No newline at end of file
+merry_go_round: (105, 60, 75)
+looping_rc: (646, 612, 271)
+food_stall: (-1, 702, 346)
+drink_stall: (-1, 886, 620)
+toilets: (-1, 245, 251)
+information_kiosk: (-1, 157, 250)
+shop: (-1, 0, 0)
+cash_machine: (-1, 0, 0)
+twist: (173, 157, 250)
+twist: (173, 157, 250)
+twist: (173, 157, 250)
+twist: (173, 157, 250)
+twist: (173, 157, 250)
+twist: (173, 157, 250)
+twist: (173, 157, 250)
+twist: (173, 157, 250)
+twist: (173, 157, 250)
+twist: (173, 157, 250)
+twist: (173, 157, 250)
+junior_rc: (479, 583, 384)
+single_rail_rc: (746, 768, 369)
+maze: (155, 90, 0)
+swinging_ship: (207, 245, 251)
+boat_hire: (213, 80, 90)
+enterprise: (372, 647, 764)
+top_spin: (200, 480, 574)
+haunted_house: (341, 153, 10)
+food_stall: (-1, 678, 684)
+food_stall: (-1, 248, 131)
+food_stall: (-1, 113, 67)
+food_stall: (-1, 947, 763)
+food_stall: (-1, 968, 559)
+food_stall: (-1, 242, 118)
+food_stall: (-1, 60, 75)
+food_stall: (-1, 0, 0)
+food_stall: (-1, 0, 0)
+food_stall: (-1, 0, 0)
+food_stall: (-1, 0, 0)
+food_stall: (-1, 0, 0)
+food_stall: (-1, 0, 0)
+food_stall: (-1, 0, 0)
+food_stall: (-1, 0, 0)
+food_stall: (-1, 0, 0)
+food_stall: (-1, 0, 0)
+food_stall: (-1, 0, 0)
+food_stall: (-1, 157, 250)
+food_stall: (-1, 80, 35)
+food_stall: (-1, 647, 764)
+food_stall: (-1, 0, 0)
+food_stall: (-1, 0, 0)
+food_stall: (-1, 0, 0)
+food_stall: (-1, 0, 0)
+food_stall: (-1, 0, 0)
+food_stall: (-1, 0, 0)
+drink_stall: (-1, 0, 0)
+drink_stall: (-1, 50, 55)
+drink_stall: (-1, 0, 0)
+drink_stall: (-1, 0, 0)
+drink_stall: (-1, 0, 0)
+drink_stall: (-1, 0, 0)
+drink_stall: (-1, 0, 0)
+drink_stall: (-1, 0, 0)
+drink_stall: (-1, 0, 0)
+drink_stall: (-1, 0, 0)
+shop: (-1, 0, 0)
+shop: (-1, 254, 41)
+shop: (-1, 0, 0)
+shop: (-1, 0, 0)
+shop: (-1, 0, 0)
+shop: (-1, 0, 0)
+shop: (-1, 0, 0)
+information_kiosk: (-1, 30, 0)
+first_aid: (-1, 62, 34)
+cash_machine: (-1, 350, 300)
+toilets: (-1, 157, 250)
+toilets: (-1, 153, 10)
+toilets: (-1, 850, 809)
+corkscrew_rc: (622, 763, 369)
+heartline_twister_rc: (546, 918, 606)
+merry_go_round: (119, 61, 75)
+dodgems: (270, 80, 35)
+dodgems: (271, 80, 35)
+dodgems: (273, 80, 35)
+top_spin: (206, 480, 574)
+top_spin: (206, 480, 574)
+motion_simulator: (290, 350, 300)
+motion_simulator: (290, 350, 300)
+3d_cinema: (350, 240, 140)
+ferris_wheel: (85, 50, 55)
+ferris_wheel: (85, 50, 55)
+ferris_wheel: (85, 50, 55)
+ferris_wheel: (85, 50, 55)
+ferris_wheel: (85, 50, 55)
+ferris_wheel: (85, 50, 55)
+ferris_wheel: (85, 50, 55)
+ferris_wheel: (85, 50, 55)
+ferris_wheel: (85, 50, 55)
+ferris_wheel: (85, 50, 55)
+ferris_wheel: (85, 50, 55)
+ferris_wheel: (85, 50, 55)
+ferris_wheel: (85, 50, 55)
+ferris_wheel: (85, 50, 55)
+ferris_wheel: (85, 50, 55)
+ferris_wheel: (85, 50, 55)
+ferris_wheel: (85, 50, 55)
+ferris_wheel: (85, 50, 55)
+ferris_wheel: (85, 50, 55)
+ferris_wheel: (85, 50, 55)
+ferris_wheel: (85, 50, 55)
+ferris_wheel: (85, 50, 55)
+ferris_wheel: (85, 50, 55)
+ferris_wheel: (85, 50, 55)
+ferris_wheel: (85, 50, 55)
+ferris_wheel: (85, 50, 55)
+ferris_wheel: (85, 50, 55)
+ferris_wheel: (85, 50, 55)
+ferris_wheel: (85, 50, 55)
+ferris_wheel: (85, 50, 55)
+ferris_wheel: (85, 50, 55)
+ferris_wheel: (85, 50, 55)
+ferris_wheel: (85, 50, 55)
+ferris_wheel: (85, 50, 55)
+ferris_wheel: (85, 50, 55)
+ferris_wheel: (85, 50, 55)
+ferris_wheel: (85, 50, 55)
+ferris_wheel: (85, 50, 55)
+ferris_wheel: (85, 50, 55)
+ferris_wheel: (85, 50, 55)
+ferris_wheel: (85, 50, 55)
+ferris_wheel: (85, 50, 55)
+ferris_wheel: (85, 50, 55)
+ferris_wheel: (85, 50, 55)
+ferris_wheel: (85, 50, 55)
+ferris_wheel: (85, 50, 55)
+ferris_wheel: (85, 50, 55)
+ferris_wheel: (85, 50, 55)
+ferris_wheel: (85, 50, 55)
+ferris_wheel: (85, 50, 55)
+ferris_wheel: (85, 50, 55)
+ferris_wheel: (85, 50, 55)
+ferris_wheel: (85, 50, 55)
+ferris_wheel: (85, 50, 55)
+ferris_wheel: (85, 50, 55)
+ferris_wheel: (85, 50, 55)
+wooden_wild_mouse: (727, 873, 495)
+food_stall: (-1, 0, 0)
+food_stall: (-1, 0, 0)
+cash_machine: (-1, 0, 0)
+drink_stall: (-1, 0, 0)
+shop: (-1, 0, 0)
+toilets: (-1, 0, 0)
+crooked_house: (215, 62, 34)
+crooked_house: (215, 62, 34)
+crooked_house: (340, 62, 34)
+crooked_house: (215, 62, 34)
+magic_carpet: (335, 340, 440)
+twister_rc: (672, 939, 477)
+classic_wooden_rc: (634, 747, 408)
+wooden_rc: (680, 706, 387)
+enterprise: (382, 647, 764)
+giga_rc: (1030, 898, 444)
+submarine_ride: (256, 180, 140)
+observation_tower: (428, 0, 117)
+swinging_inverter_ship: (351, 468, 472)
+swinging_inverter_ship: (352, 468, 472)
+haunted_house: (341, 153, 10)
+space_rings: (161, 210, 650)
+mini_golf: (342, 90, 0)
+cash_machine: (-1, 0, 0)
+toilets: (-1, 0, 0)
+first_aid: (-1, 0, 0)
+drink_stall: (-1, 0, 0)
+food_stall: (-1, 0, 0)
+information_kiosk: (-1, 0, 0)
+shop: (-1, 0, 0)
+toilets: (-1, 0, 0)
+cash_machine: (-1, 0, 0)
+first_aid: (-1, 0, 0)
+information_kiosk: (-1, 0, 0)
+drink_stall: (-1, 0, 0)
+food_stall: (-1, 0, 0)
+roto_drop: (507, 1078, 1078)
+top_spin: (202, 480, 574)
+top_spin: (204, 480, 574)
+launched_freefall: (380, 982, 577)
+corkscrew_rc: (417, 456, 182)
+go_karts: (518, 262, 49)
+multi_dimension_rc: (687, 822, 833)
+hybrid_rc: (799, 786, 363)
+single_rail_rc: (734, 613, 283)
+miniature_railway: (165, 12, 1)
+monorail: (138, 9, 1)
+monorail: (136, 7, 1)
+monorail: (137, 8, 2)
+suspended_monorail: (146, 21, 5)
+chairlift: (234, 71, 52)
+monorail_cycles: (95, 14, 0)
+lift: (181, 35, 46)
+spiral_slide: (151, 140, 90)
+spiral_slide: (153, 140, 90)
+spiral_slide: (153, 140, 90)
+spiral_slide: (153, 140, 90)
+spiral_slide: (153, 140, 90)
+spiral_slide: (151, 140, 90)
+food_stall: (-1, 0, 0)
+drink_stall: (-1, 0, 0)
+toilets: (-1, 0, 0)
+cash_machine: (-1, 0, 0)
+first_aid: (-1, 0, 0)
+information_kiosk: (-1, 0, 0)
+shop: (-1, 0, 0)
+merry_go_round: (106, 60, 75)
+circus: (210, 30, 0)
+inverted_rc: (602, 799, 635)
+drink_stall: (-1, 0, 0)
+food_stall: (-1, 0, 0)
+toilets: (-1, 0, 0)
+cash_machine: (-1, 0, 0)
+information_kiosk: (-1, 0, 0)
+first_aid: (-1, 0, 0)
+shop: (-1, 0, 0)
+shop: (-1, 0, 0)
+shop: (-1, 0, 0)
+shop: (-1, 0, 0)
+bobsleigh_rc: (590, 650, 487)
+food_stall: (-1, 0, 0)
+drink_stall: (-1, 0, 0)
+toilets: (-1, 0, 0)
+information_kiosk: (-1, 0, 0)
+cash_machine: (-1, 0, 0)
+first_aid: (-1, 0, 0)
+shop: (-1, 0, 0)
+car_ride: (377, 58, 4)
+space_rings: (275, 333, 751)
+space_rings: (165, 210, 650)
+mini_suspended_rc: (509, 635, 448)
+hyper_twister: (849, 761, 379)
+vertical_drop_rc: (785, 826, 375)
+reverse_freefall_rc: (164, 241, 184)
+mini_rc: (549, 760, 497)
+monster_trucks: (411, 69, 6)
+wooden_rc: (648, 885, 503)
+virginia_reel: (655, 684, 674)
+food_stall: (-1, 0, 0)
+toilets: (-1, 0, 0)
+drink_stall: (-1, 0, 0)
+information_kiosk: (-1, 0, 0)
+cash_machine: (-1, 0, 0)
+shop: (-1, 0, 0)
+first_aid: (-1, 0, 0)
+log_flume: (529, 293, 141)
+splash_boats: (795, 503, 229)
+merry_go_round: (106, 60, 75)
+dinghy_slide: (550, 647, 410)
+river_rapids: (362, 144, 83)
+river_rafts: (217, 45, 43)
+cash_machine: (-1, 0, 0)
+cash_machine: (-1, 0, 0)
+cash_machine: (-1, 0, 0)
+cash_machine: (-1, 0, 0)
+shop: (-1, 0, 0)
+drink_stall: (-1, 0, 0)
+food_stall: (-1, 0, 0)
+food_stall: (-1, 0, 0)
+food_stall: (-1, 0, 0)
+toilets: (-1, 0, 0)
+cash_machine: (-1, 0, 0)
+cash_machine: (-1, 0, 0)
+first_aid: (-1, 0, 0)
+cash_machine: (-1, 0, 0)
+cash_machine: (-1, 0, 0)
+cash_machine: (-1, 0, 0)
+cash_machine: (-1, 0, 0)
+cash_machine: (-1, 0, 0)
+cash_machine: (-1, 0, 0)
+cash_machine: (-1, 0, 0)
+cash_machine: (-1, 0, 0)
+cash_machine: (-1, 0, 0)
+cash_machine: (-1, 0, 0)
+cash_machine: (-1, 0, 0)
+cash_machine: (-1, 0, 0)
+cash_machine: (-1, 0, 0)
+cash_machine: (-1, 0, 0)
+cash_machine: (-1, 0, 0)
+cash_machine: (-1, 0, 0)
+cash_machine: (-1, 0, 0)
+cash_machine: (-1, 0, 0)
+cash_machine: (-1, 0, 0)
+cash_machine: (-1, 0, 0)
+cash_machine: (-1, 0, 0)
+cash_machine: (-1, 0, 0)
+cash_machine: (-1, 0, 0)
+cash_machine: (-1, 0, 0)
+cash_machine: (-1, 0, 0)
+cash_machine: (-1, 0, 0)
+cash_machine: (-1, 0, 0)
+cash_machine: (-1, 0, 0)
+car_ride: (29, 29, 1)
+car_ride: (29, 29, 1)
+car_ride: (29, 29, 1)
+car_ride: (29, 29, 1)
+car_ride: (29, 29, 1)
+car_ride: (29, 29, 1)
+car_ride: (29, 29, 1)
+car_ride: (29, 29, 1)
+car_ride: (28, 29, 1)
+car_ride: (29, 29, 1)
+car_ride: (29, 29, 1)
+car_ride: (29, 29, 1)
+go_karts: (397, 253, 42)
+go_karts: (400, 253, 42)
+go_karts: (397, 253, 42)
+go_karts: (397, 253, 42)
+flying_saucers: (393, 85, 39)
+flying_saucers: (394, 85, 39)
+flying_saucers: (394, 85, 39)
+flying_saucers: (624, 111, 42)
+flying_saucers: (394, 85, 39)
+mini_helicopters: (302, 48, 1)
+boat_hire: (259, 89, 100)
+boat_hire: (208, 80, 90)
+boat_hire: (208, 80, 90)
+boat_hire: (329, 126, 118)
+boat_hire: (329, 126, 118)
+boat_hire: (214, 80, 91)
+boat_hire: (256, 89, 100)
+boat_hire: (216, 81, 90)
+boat_hire: (208, 80, 90)
+boat_hire: (208, 80, 90)
+boat_hire: (223, 81, 90)
+wooden_wild_mouse: (63, 77, 43)
+wooden_wild_mouse: (63, 78, 43)
+steel_wild_mouse: (123, 145, 86)
+steel_wild_mouse: (125, 145, 86)
+reverser_rc: (482, 439, 340)
+reverser_rc: (482, 440, 340)
+wooden_rc: (12, 11, 7)
+wooden_rc: (12, 11, 7)
+wooden_rc: (12, 10, 7)
+wooden_rc: (12, 11, 7)
+wooden_rc: (12, 11, 7)
+wooden_rc: (12, 11, 7)
+classic_wooden_rc: (10, 385, 8)
+lay_down_rc: (166, 1630, 1072)
+lay_down_rc: (169, 1612, 1064)
+mini_rc: (39, 37, 28)
+mini_rc: (39, 37, 28)
+mini_rc: (38, 37, 28)
+mini_rc: (38, 37, 28)
+mini_rc: (39, 37, 28)
+mini_rc: (38, 37, 28)
+mini_rc: (38, 37, 28)
+steeplechase: (20, 18, 13)
+steeplechase: (20, 18, 13)
+steeplechase: (20, 18, 13)
+steeplechase: (20, 18, 13)
+steeplechase: (20, 18, 13)
+steeplechase: (20, 18, 13)
+mini_suspended_rc: (21, 21, 19)
+mini_suspended_rc: (21, 21, 19)
+mini_suspended_rc: (21, 21, 19)
+mini_suspended_rc: (21, 21, 19)
+mini_suspended_rc: (21, 21, 19)
+mini_suspended_rc: (22, 25, 21)
+corkscrew_rc: (415, 432, 161)
+corkscrew_rc: (415, 431, 160)
+corkscrew_rc: (415, 431, 160)
+corkscrew_rc: (415, 432, 161)
+corkscrew_rc: (415, 432, 161)
+corkscrew_rc: (415, 432, 161)
+spinning_wild_mouse: (599, 716, 549)
+twister_rc: (575, 790, 439)
+twister_rc: (539, 623, 272)
+twister_rc: (532, 562, 254)
+twister_rc: (537, 640, 279)
+inverted_hairpin_rc: (671, 828, 481)
+suspended_swinging_rc: (24, 22, 25)
+suspended_swinging_rc: (24, 22, 25)
+suspended_swinging_rc: (24, 22, 25)
+suspended_swinging_rc: (24, 22, 25)
+suspended_swinging_rc: (26, 22, 26)
+suspended_swinging_rc: (24, 22, 25)
+suspended_swinging_rc: (24, 22, 25)
+suspended_swinging_rc: (24, 22, 25)
+junior_rc: (343, 512, 329)
+junior_rc: (344, 512, 329)
+junior_rc: (380, 533, 330)
+junior_rc: (343, 512, 329)
+compact_inverted_rc: (46, 44, 45)
+compact_inverted_rc: (47, 48, 48)
+compact_inverted_rc: (48, 49, 48)
+compact_inverted_rc: (47, 49, 48)
+compact_inverted_rc: (53, 58, 53)
+food_stall: (-1, 0, 0)
+food_stall: (-1, 0, 0)
+food_stall: (-1, 0, 0)
+toilets: (-1, 0, 0)
+cash_machine: (-1, 0, 0)
+information_kiosk: (-1, 0, 0)
+cash_machine: (-1, 0, 0)
+drink_stall: (-1, 0, 0)
+food_stall: (-1, 0, 0)
+information_kiosk: (-1, 0, 0)
+toilets: (-1, 0, 0)
+shop: (-1, 0, 0)
+air_powered_vertical_rc: (58, 1412, 1165)
+air_powered_vertical_rc: (785, 863, 666)
+air_powered_vertical_rc: (58, 1412, 1165)
+bobsleigh_rc: (44, 47, 36)
+bobsleigh_rc: (44, 47, 36)
+bobsleigh_rc: (44, 47, 36)
+bobsleigh_rc: (43, 47, 36)
+spiral_rc: (24, 6, 4)
+spiral_rc: (24, 6, 4)
+spiral_rc: (24, 6, 4)
+stand_up_rc: (77, 97, 86)
+stand_up_rc: (77, 97, 86)
+stand_up_rc: (77, 97, 86)
+water_coaster: (44, 44, 33)
+water_coaster: (44, 44, 32)
+water_coaster: (44, 44, 32)
+water_coaster: (44, 44, 32)
+vertical_drop_rc: (388, 1108, 462)
+classic_mini_rc: (174, 265, 166)
+classic_mini_rc: (175, 263, 165)
+classic_mini_rc: (177, 260, 166)
+giga_rc: (460, 1219, 505)
+maze: (139, 52, 0)
+submarine_ride: (247, 180, 140)
+submarine_ride: (247, 180, 140)
+lim_launched_rc: (53, 61, 40)
+lim_launched_rc: (53, 61, 40)
+lim_launched_rc: (53, 61, 40)
+flying_rc: (31, 282, 473)
+flying_rc: (31, 282, 473)
+flying_rc: (31, 282, 473)
+hyper_twister: (29, 7, 4)
+hyper_twister: (28, 7, 4)
+hypercoaster: (24, 8, 3)
+hypercoaster: (24, 8, 3)
+heartline_twister_rc: (423, 565, 393)
+heartline_twister_rc: (423, 568, 395)
+reverse_freefall_rc: (594, 811, 568)
+reverse_freefall_rc: (594, 811, 568)
+food_stall: (-1, 0, 0)
+food_stall: (-1, 0, 0)
+food_stall: (-1, 0, 0)
+drink_stall: (-1, 0, 0)
+drink_stall: (-1, 0, 0)
+drink_stall: (-1, 0, 0)
+information_kiosk: (-1, 0, 0)
+toilets: (-1, 0, 0)
+cash_machine: (-1, 0, 0)
+first_aid: (-1, 0, 0)
+shop: (-1, 0, 0)
+shop: (-1, 0, 0)
+side_friction_rc: (486, 681, 370)
+looping_rc: (22, 8, 3)
+looping_rc: (22, 8, 3)
+looping_rc: (485, 628, 252)
+inverted_impulse_rc: (715, 826, 555)
+inverted_impulse_rc: (706, 814, 555)
+mine_train_rc: (601, 752, 454)
+mine_ride: (523, 451, 352)
+alpine_rc: (170, 141, 65)
+observation_tower: (354, 0, 97)
+observation_tower: (313, 0, 74)
+ghost_train: (132, 24, 8)
+ghost_train: (132, 24, 8)
+log_flume: (446, 265, 125)
+river_rafts: (225, 45, 43)
+river_rapids: (354, 181, 114)
+maze: (150, 90, 0)
+maze: (150, 90, 0)
+maze: (150, 90, 0)
+maze: (150, 90, 0)
+corkscrew_rc: (482, 510, 220)
+lim_launched_rc: (528, 730, 443)
+lim_launched_rc: (532, 727, 436)
+lim_launched_rc: (530, 812, 472)
+miniature_railway: (154, 12, 1)
+miniature_railway: (154, 12, 1)
+miniature_railway: (149, 12, 1)
+miniature_railway: (151, 12, 1)
+miniature_railway: (157, 12, 1)
+miniature_railway: (154, 12, 1)
+miniature_railway: (150, 12, 1)
+miniature_railway: (149, 12, 1)
+suspended_monorail: (137, 19, 5)
+suspended_monorail: (137, 19, 5)
+lift: (176, 35, 51)
+lift: (208, 35, 51)
+chairlift: (99, 35, 26)
+twister_rc: (701, 623, 407)
+motion_simulator: (290, 350, 300)
+motion_simulator: (325, 410, 330)
+3d_cinema: (350, 240, 140)
+3d_cinema: (400, 265, 155)
+3d_cinema: (420, 260, 148)
+top_spin: (200, 480, 574)
+top_spin: (300, 575, 664)
+top_spin: (320, 680, 794)
+launched_freefall: (339, 713, 487)
+launched_freefall: (550, 729, 759)
+ferris_wheel: (85, 50, 55)
+ferris_wheel: (85, 50, 55)
+spiral_rc: (581, 467, 249)
+spiral_slide: (190, 160, 115)
+spiral_slide: (150, 140, 90)
+giga_rc: (637, 447, 239)
+roto_drop: (306, 350, 350)
+classic_mini_rc: (50, 42, 30)
+giga_rc: (171, 1624, 980)
+chairlift: (0, 11, 25)
+compact_inverted_rc: (-1, 1042, 811)
+merry_go_round: (185, 140, 155)
+lim_launched_rc: (-1, 0, 0)
+shop: (-1, 0, 0)
+go_karts: (422, 255, 42)
+toilets: (-1, 0, 0)
+cash_machine: (-1, 0, 0)
+drink_stall: (-1, 0, 0)
+food_stall: (-1, 0, 0)
+boat_hire: (201, 80, 90)
+inverted_hairpin_rc: (703, 936, 520)
+haunted_house: (-1, 0, 0)
+wooden_wild_mouse: (5, 5, 3)
+car_ride: (329, 59, 10)
+miniature_railway: (154, 12, 1)
diff --git a/test/tests/testdata/ratings/bpb.sv6.txt b/test/tests/testdata/ratings/bpb.sv6.txt
index c3d1da1555..9910aa43f5 100644
--- a/test/tests/testdata/ratings/bpb.sv6.txt
+++ b/test/tests/testdata/ratings/bpb.sv6.txt
@@ -1,134 +1,134 @@
-RIDE_TYPE_HYPERCOASTER: (840, 766, 346)
-RIDE_TYPE_WOODEN_ROLLER_COASTER: (643, 1011, 626)
-RIDE_TYPE_WOODEN_ROLLER_COASTER: (700, 734, 428)
-RIDE_TYPE_MINIATURE_RAILWAY: (465, 37, 27)
-RIDE_TYPE_LOG_FLUME: (522, 199, 107)
-RIDE_TYPE_BOBSLEIGH_COASTER: (555, 548, 440)
-RIDE_TYPE_CORKSCREW_ROLLER_COASTER: (501, 533, 204)
-RIDE_TYPE_CAR_RIDE: (410, 58, 3)
-RIDE_TYPE_WOODEN_WILD_MOUSE: (323, 381, 220)
-RIDE_TYPE_LOG_FLUME: (208, 69, 52)
-RIDE_TYPE_3D_CINEMA: (350, 240, 140)
-RIDE_TYPE_HAUNTED_HOUSE: (341, 153, 10)
-RIDE_TYPE_MONORAIL: (434, 25, 5)
-RIDE_TYPE_MINI_GOLF: (306, 90, 0)
-RIDE_TYPE_WOODEN_ROLLER_COASTER: (634, 648, 377)
-RIDE_TYPE_WOODEN_ROLLER_COASTER: (71, 68, 41)
-RIDE_TYPE_STEEPLECHASE: (609, 509, 351)
-RIDE_TYPE_STEEPLECHASE: (587, 492, 338)
-RIDE_TYPE_CLASSIC_MINI_ROLLER_COASTER: (244, 245, 170)
-RIDE_TYPE_SHOP: (-1, 0, 0)
-RIDE_TYPE_INFORMATION_KIOSK: (-1, 0, 0)
-RIDE_TYPE_FOOD_STALL: (-1, 0, 0)
-RIDE_TYPE_LOG_FLUME: (133, 37, 19)
-RIDE_TYPE_CAR_RIDE: (38, 29, 1)
-RIDE_TYPE_FOOD_STALL: (-1, 0, 0)
-RIDE_TYPE_CROOKED_HOUSE: (215, 62, 34)
-RIDE_TYPE_MINE_TRAIN_COASTER: (35, 32, 22)
-RIDE_TYPE_TOILETS: (-1, 0, 0)
-RIDE_TYPE_DRINK_STALL: (-1, 0, 0)
-RIDE_TYPE_FOOD_STALL: (-1, 0, 0)
-RIDE_TYPE_FOOD_STALL: (-1, 0, 0)
-RIDE_TYPE_GHOST_TRAIN: (389, 43, 22)
-RIDE_TYPE_SHOP: (-1, 0, 0)
-RIDE_TYPE_CAR_RIDE: (40, 29, 2)
-RIDE_TYPE_SPIRAL_SLIDE: (178, 140, 90)
-RIDE_TYPE_TWIST: (193, 157, 250)
-RIDE_TYPE_MERRY_GO_ROUND: (125, 60, 75)
-RIDE_TYPE_MERRY_GO_ROUND: (106, 60, 75)
-RIDE_TYPE_DODGEMS: (275, 80, 35)
-RIDE_TYPE_TWIST: (173, 157, 250)
-RIDE_TYPE_LAUNCHED_FREEFALL: (379, 879, 543)
-RIDE_TYPE_BOAT_HIRE: (269, 89, 100)
-RIDE_TYPE_MOTION_SIMULATOR: (290, 350, 300)
-RIDE_TYPE_DRINK_STALL: (-1, 0, 0)
-RIDE_TYPE_CHAIRLIFT: (287, 55, 51)
-RIDE_TYPE_GO_KARTS: (509, 288, 45)
-RIDE_TYPE_INFORMATION_KIOSK: (-1, 0, 0)
-RIDE_TYPE_FOOD_STALL: (-1, 0, 0)
-RIDE_TYPE_SHOP: (-1, 0, 0)
-RIDE_TYPE_MAZE: (191, 104, 0)
-RIDE_TYPE_TWIST: (180, 157, 250)
-RIDE_TYPE_DRINK_STALL: (-1, 0, 0)
-RIDE_TYPE_DRINK_STALL: (-1, 0, 0)
-RIDE_TYPE_SHOP: (-1, 0, 0)
-RIDE_TYPE_TOILETS: (-1, 0, 0)
-RIDE_TYPE_TOILETS: (-1, 0, 0)
-RIDE_TYPE_TOILETS: (-1, 0, 0)
-RIDE_TYPE_TOILETS: (-1, 0, 0)
-RIDE_TYPE_FOOD_STALL: (-1, 0, 0)
-RIDE_TYPE_LOG_FLUME: (586, 268, 172)
-RIDE_TYPE_INFORMATION_KIOSK: (-1, 0, 0)
-RIDE_TYPE_WOODEN_ROLLER_COASTER: (124, 150, 87)
-RIDE_TYPE_FOOD_STALL: (-1, 30, 0)
-RIDE_TYPE_CROOKED_HOUSE: (215, 62, 34)
-RIDE_TYPE_SHOP: (-1, 0, 0)
-RIDE_TYPE_SHOP: (-1, 0, 0)
-RIDE_TYPE_FOOD_STALL: (-1, 0, 0)
-RIDE_TYPE_FOOD_STALL: (-1, 0, 0)
-RIDE_TYPE_SHOP: (-1, 0, 0)
-RIDE_TYPE_FOOD_STALL: (-1, 0, 0)
-RIDE_TYPE_DRINK_STALL: (-1, 0, 0)
-RIDE_TYPE_SHOP: (-1, 0, 0)
-RIDE_TYPE_FOOD_STALL: (-1, 0, 0)
-RIDE_TYPE_FOOD_STALL: (-1, 0, 0)
-RIDE_TYPE_INFORMATION_KIOSK: (-1, 0, 0)
-RIDE_TYPE_INFORMATION_KIOSK: (-1, 0, 0)
-RIDE_TYPE_FOOD_STALL: (-1, 0, 0)
-RIDE_TYPE_FOOD_STALL: (-1, 0, 0)
-RIDE_TYPE_FOOD_STALL: (-1, 0, 0)
-RIDE_TYPE_DRINK_STALL: (-1, 0, 0)
-RIDE_TYPE_DODGEMS: (270, 80, 35)
-RIDE_TYPE_DODGEMS: (274, 80, 35)
-RIDE_TYPE_FOOD_STALL: (-1, 0, 0)
-RIDE_TYPE_FOOD_STALL: (-1, 0, 0)
-RIDE_TYPE_SHOP: (-1, 0, 0)
-RIDE_TYPE_SHOP: (-1, 0, 0)
-RIDE_TYPE_FIRST_AID: (-1, 0, 0)
-RIDE_TYPE_CASH_MACHINE: (-1, 0, 0)
-RIDE_TYPE_MULTI_DIMENSION_ROLLER_COASTER: (694, 833, 772)
-RIDE_TYPE_SIDE_FRICTION_ROLLER_COASTER: (486, 586, 338)
-RIDE_TYPE_REVERSER_ROLLER_COASTER: (548, 525, 387)
-RIDE_TYPE_INVERTED_HAIRPIN_COASTER: (670, 770, 470)
-RIDE_TYPE_VIRGINIA_REEL: (531, 542, 588)
-RIDE_TYPE_STEEL_WILD_MOUSE: (631, 768, 473)
-RIDE_TYPE_MINI_ROLLER_COASTER: (539, 563, 397)
-RIDE_TYPE_SPIRAL_ROLLER_COASTER: (620, 373, 215)
-RIDE_TYPE_LOOPING_ROLLER_COASTER: (467, 441, 182)
-RIDE_TYPE_STAND_UP_ROLLER_COASTER: (553, 790, 558)
-RIDE_TYPE_LIM_LAUNCHED_ROLLER_COASTER: (680, 944, 573)
-RIDE_TYPE_TWISTER_ROLLER_COASTER: (778, 769, 425)
-RIDE_TYPE_GIGA_COASTER: (624, 359, 200)
-RIDE_TYPE_INVERTED_ROLLER_COASTER: (678, 850, 686)
-RIDE_TYPE_INVERTED_IMPULSE_COASTER: (643, 750, 569)
-RIDE_TYPE_MINI_SUSPENDED_COASTER: (512, 696, 475)
-RIDE_TYPE_MINE_RIDE: (644, 458, 381)
-RIDE_TYPE_HEARTLINE_TWISTER_COASTER: (474, 658, 462)
-RIDE_TYPE_LAY_DOWN_ROLLER_COASTER: (682, 666, 548)
-RIDE_TYPE_FLYING_ROLLER_COASTER: (719, 711, 678)
-RIDE_TYPE_REVERSE_FREEFALL_COASTER: (518, 747, 534)
-RIDE_TYPE_VERTICAL_DROP_ROLLER_COASTER: (639, 618, 282)
-RIDE_TYPE_AIR_POWERED_VERTICAL_COASTER: (873, 895, 701)
-RIDE_TYPE_SUSPENDED_MONORAIL: (336, 47, 23)
-RIDE_TYPE_LIFT: (563, 35, 102)
-RIDE_TYPE_MONORAIL_CYCLES: (226, 29, 1)
-RIDE_TYPE_FERRIS_WHEEL: (85, 50, 55)
-RIDE_TYPE_OBSERVATION_TOWER: (594, 0, 61)
-RIDE_TYPE_SPIRAL_SLIDE: (157, 140, 90)
-RIDE_TYPE_SPACE_RINGS: (167, 210, 650)
-RIDE_TYPE_CIRCUS: (210, 30, 0)
-RIDE_TYPE_FLYING_SAUCERS: (381, 85, 39)
-RIDE_TYPE_MAGIC_CARPET: (374, 340, 440)
-RIDE_TYPE_SWINGING_SHIP: (264, 245, 251)
-RIDE_TYPE_SWINGING_INVERTER_SHIP: (349, 468, 472)
-RIDE_TYPE_TOP_SPIN: (201, 480, 574)
-RIDE_TYPE_ROTO_DROP: (395, 1148, 1148)
-RIDE_TYPE_ENTERPRISE: (392, 647, 764)
-RIDE_TYPE_RIVER_RAPIDS: (376, 153, 90)
-RIDE_TYPE_RIVER_RAFTS: (263, 45, 43)
-RIDE_TYPE_DINGHY_SLIDE: (477, 577, 358)
-RIDE_TYPE_MINI_HELICOPTERS: (315, 50, 4)
-RIDE_TYPE_SUSPENDED_SWINGING_COASTER: (690, 691, 720)
-RIDE_TYPE_COMPACT_INVERTED_COASTER: (680, 830, 698)
-RIDE_TYPE_SPLASH_BOATS: (474, 204, 113)
-RIDE_TYPE_SUBMARINE_RIDE: (255, 180, 140)
+hypercoaster: (840, 766, 346)
+wooden_rc: (643, 1011, 626)
+wooden_rc: (700, 734, 428)
+miniature_railway: (465, 37, 27)
+log_flume: (522, 199, 107)
+bobsleigh_rc: (555, 548, 440)
+corkscrew_rc: (501, 533, 204)
+car_ride: (410, 58, 3)
+wooden_wild_mouse: (323, 381, 220)
+log_flume: (208, 69, 52)
+3d_cinema: (350, 240, 140)
+haunted_house: (341, 153, 10)
+monorail: (434, 25, 5)
+mini_golf: (306, 90, 0)
+wooden_rc: (634, 648, 377)
+wooden_rc: (71, 68, 41)
+steeplechase: (609, 509, 351)
+steeplechase: (587, 492, 338)
+classic_mini_rc: (244, 245, 170)
+shop: (-1, 0, 0)
+information_kiosk: (-1, 0, 0)
+food_stall: (-1, 0, 0)
+log_flume: (133, 37, 19)
+car_ride: (38, 29, 1)
+food_stall: (-1, 0, 0)
+crooked_house: (215, 62, 34)
+mine_train_rc: (35, 32, 22)
+toilets: (-1, 0, 0)
+drink_stall: (-1, 0, 0)
+food_stall: (-1, 0, 0)
+food_stall: (-1, 0, 0)
+ghost_train: (389, 43, 22)
+shop: (-1, 0, 0)
+car_ride: (40, 29, 2)
+spiral_slide: (178, 140, 90)
+twist: (193, 157, 250)
+merry_go_round: (125, 60, 75)
+merry_go_round: (106, 60, 75)
+dodgems: (275, 80, 35)
+twist: (173, 157, 250)
+launched_freefall: (379, 879, 543)
+boat_hire: (269, 89, 100)
+motion_simulator: (290, 350, 300)
+drink_stall: (-1, 0, 0)
+chairlift: (287, 55, 51)
+go_karts: (509, 288, 45)
+information_kiosk: (-1, 0, 0)
+food_stall: (-1, 0, 0)
+shop: (-1, 0, 0)
+maze: (191, 104, 0)
+twist: (180, 157, 250)
+drink_stall: (-1, 0, 0)
+drink_stall: (-1, 0, 0)
+shop: (-1, 0, 0)
+toilets: (-1, 0, 0)
+toilets: (-1, 0, 0)
+toilets: (-1, 0, 0)
+toilets: (-1, 0, 0)
+food_stall: (-1, 0, 0)
+log_flume: (586, 268, 172)
+information_kiosk: (-1, 0, 0)
+wooden_rc: (124, 150, 87)
+food_stall: (-1, 30, 0)
+crooked_house: (215, 62, 34)
+shop: (-1, 0, 0)
+shop: (-1, 0, 0)
+food_stall: (-1, 0, 0)
+food_stall: (-1, 0, 0)
+shop: (-1, 0, 0)
+food_stall: (-1, 0, 0)
+drink_stall: (-1, 0, 0)
+shop: (-1, 0, 0)
+food_stall: (-1, 0, 0)
+food_stall: (-1, 0, 0)
+information_kiosk: (-1, 0, 0)
+information_kiosk: (-1, 0, 0)
+food_stall: (-1, 0, 0)
+food_stall: (-1, 0, 0)
+food_stall: (-1, 0, 0)
+drink_stall: (-1, 0, 0)
+dodgems: (270, 80, 35)
+dodgems: (274, 80, 35)
+food_stall: (-1, 0, 0)
+food_stall: (-1, 0, 0)
+shop: (-1, 0, 0)
+shop: (-1, 0, 0)
+first_aid: (-1, 0, 0)
+cash_machine: (-1, 0, 0)
+multi_dimension_rc: (694, 833, 772)
+side_friction_rc: (486, 586, 338)
+reverser_rc: (548, 525, 387)
+inverted_hairpin_rc: (670, 770, 470)
+virginia_reel: (531, 542, 588)
+steel_wild_mouse: (631, 768, 473)
+mini_rc: (539, 563, 397)
+spiral_rc: (620, 373, 215)
+looping_rc: (467, 441, 182)
+stand_up_rc: (553, 790, 558)
+lim_launched_rc: (680, 944, 573)
+twister_rc: (778, 769, 425)
+giga_rc: (624, 359, 200)
+inverted_rc: (678, 850, 686)
+inverted_impulse_rc: (643, 750, 569)
+mini_suspended_rc: (512, 696, 475)
+mine_ride: (644, 458, 381)
+heartline_twister_rc: (474, 658, 462)
+lay_down_rc: (682, 666, 548)
+flying_rc: (719, 711, 678)
+reverse_freefall_rc: (518, 747, 534)
+vertical_drop_rc: (639, 618, 282)
+air_powered_vertical_rc: (873, 895, 701)
+suspended_monorail: (336, 47, 23)
+lift: (563, 35, 102)
+monorail_cycles: (226, 29, 1)
+ferris_wheel: (85, 50, 55)
+observation_tower: (594, 0, 61)
+spiral_slide: (157, 140, 90)
+space_rings: (167, 210, 650)
+circus: (210, 30, 0)
+flying_saucers: (381, 85, 39)
+magic_carpet: (374, 340, 440)
+swinging_ship: (264, 245, 251)
+swinging_inverter_ship: (349, 468, 472)
+top_spin: (201, 480, 574)
+roto_drop: (395, 1148, 1148)
+enterprise: (392, 647, 764)
+river_rapids: (376, 153, 90)
+river_rafts: (263, 45, 43)
+dinghy_slide: (477, 577, 358)
+mini_helicopters: (315, 50, 4)
+suspended_swinging_rc: (690, 691, 720)
+compact_inverted_rc: (680, 830, 698)
+splash_boats: (474, 204, 113)
+submarine_ride: (255, 180, 140)
diff --git a/test/tests/testdata/ratings/testReversedTrains.park.txt b/test/tests/testdata/ratings/testReversedTrains.park.txt
index 80a0810a2e..05b5c8049b 100644
--- a/test/tests/testdata/ratings/testReversedTrains.park.txt
+++ b/test/tests/testdata/ratings/testReversedTrains.park.txt
@@ -1,2 +1,2 @@
-RIDE_TYPE_HYPERCOASTER: (592, 537, 239)
-RIDE_TYPE_HYPERCOASTER: (600, 624, 294)
\ No newline at end of file
+hypercoaster: (592, 537, 239)
+hypercoaster: (600, 624, 294)