diff --git a/test/testpaint/TestTrack.cpp b/test/testpaint/TestTrack.cpp
index 258c0dd717..3b498085ac 100644
--- a/test/testpaint/TestTrack.cpp
+++ b/test/testpaint/TestTrack.cpp
@@ -49,7 +49,7 @@ public:
 
     virtual void ApplyTo(uint8 rideType, uint8 trackType, int variant,
                          rct_map_element *mapElement, rct_map_element *surfaceElement,
-                         rct_ride *ride, rct_ride_entry *rideEntry
+                         Ride *ride, rct_ride_entry *rideEntry
     ) abstract;
 };
 
@@ -69,7 +69,7 @@ public:
 
     virtual void ApplyTo(uint8 rideType, uint8 trackType, int variant,
                          rct_map_element *mapElement, rct_map_element *surfaceElement,
-                         rct_ride *ride, rct_ride_entry *rideEntry
+                         Ride *ride, rct_ride_entry *rideEntry
     ) override {
         if (variant == 0) {
             mapElement->properties.track.colour &= ~TRACK_ELEMENT_COLOUR_FLAG_CABLE_LIFT;
@@ -95,7 +95,7 @@ public:
 
     virtual void ApplyTo(uint8 rideType, uint8 trackType, int variant,
                          rct_map_element *mapElement, rct_map_element *surfaceElement,
-                         rct_ride *ride, rct_ride_entry *rideEntry
+                         Ride *ride, rct_ride_entry *rideEntry
     ) override {
         if (variant == 0) {
             mapElement->type &= ~TRACK_ELEMENT_FLAG_CHAIN_LIFT;
@@ -127,7 +127,7 @@ public:
 
     virtual void ApplyTo(uint8 rideType, uint8 trackType, int variant,
                          rct_map_element *mapElement, rct_map_element *surfaceElement,
-                         rct_ride *ride, rct_ride_entry *rideEntry
+                         Ride *ride, rct_ride_entry *rideEntry
     ) override {
         if (variant == 0) {
             mapElement->properties.track.colour &= ~TRACK_ELEMENT_COLOUR_FLAG_INVERTED;
@@ -159,7 +159,7 @@ public:
 
     virtual void ApplyTo(uint8 rideType, uint8 trackType, int variant,
                          rct_map_element *mapElement, rct_map_element *surfaceElement,
-                         rct_ride *ride, rct_ride_entry *rideEntry
+                         Ride *ride, rct_ride_entry *rideEntry
     ) override {
         ride->entrance_style = variant;
     }
@@ -186,7 +186,7 @@ static void CallOriginal(
         direction,
         height,
         (int) mapElement,
-        rideIndex * sizeof(rct_ride),
+        rideIndex * sizeof(Ride),
         trackSequence
     );
 }
diff --git a/test/testpaint/compat.c b/test/testpaint/compat.c
index bd6d5731ec..077d3d153d 100644
--- a/test/testpaint/compat.c
+++ b/test/testpaint/compat.c
@@ -30,7 +30,7 @@
 
 rct_map_element *gMapElements = (rct_map_element *) RCT2_ADDRESS_MAP_ELEMENTS;
 rct_map_element **gMapElementTilePointers = (rct_map_element **) RCT2_ADDRESS_TILE_MAP_ELEMENT_POINTERS;
-rct_ride *gRideList = RCT2_ADDRESS(RCT2_ADDRESS_RIDE_LIST, rct_ride);
+Ride *gRideList = RCT2_ADDRESS(RCT2_ADDRESS_RIDE_LIST, Ride);
 rct_sprite *sprite_list = RCT2_ADDRESS(RCT2_ADDRESS_SPRITE_LIST, rct_sprite);
 sint16 gMapSizeUnits;
 sint16 gMapBaseZ;
@@ -88,7 +88,7 @@ void scenery_paint(paint_session * session, uint8 direction, int height, rct_map
 void fence_paint(paint_session * session, uint8 direction, int height, rct_map_element *mapElement) { }
 void scenery_multiple_paint(paint_session * session, uint8 direction, uint16 height, rct_map_element *mapElement) { }
 
-rct_ride *get_ride(int index) {
+Ride *get_ride(int index) {
     if (index < 0 || index >= MAX_RIDES) {
         log_error("invalid index %d for ride", index);
         return NULL;
@@ -104,7 +104,7 @@ rct_ride_entry *get_ride_entry(int index) {
     return gRideEntries[index];
 }
 
-rct_ride_entry *get_ride_entry_by_ride(rct_ride *ride) {
+rct_ride_entry *get_ride_entry_by_ride(Ride *ride) {
     rct_ride_entry *type = get_ride_entry(ride->subtype);
     if (type == NULL) {
         log_error("Invalid ride subtype for ride");
diff --git a/test/testpaint/generate.cpp b/test/testpaint/generate.cpp
index 6cd101afed..1c51dad5ad 100644
--- a/test/testpaint/generate.cpp
+++ b/test/testpaint/generate.cpp
@@ -1022,7 +1022,7 @@ private:
             direction,
             height,
             (int)mapElement,
-            0 * sizeof(rct_ride),
+            0 * sizeof(Ride),
             trackSequence
         );
     }
diff --git a/test/tests/RideRatings.cpp b/test/tests/RideRatings.cpp
index 97ce4aae4a..19a65df84e 100644
--- a/test/tests/RideRatings.cpp
+++ b/test/tests/RideRatings.cpp
@@ -23,7 +23,7 @@ protected:
     {
         for (int rideId = 0; rideId < MAX_RIDES; rideId++)
         {
-            rct_ride * ride = get_ride(rideId);
+            Ride * ride = get_ride(rideId);
             if (ride->type != RIDE_TYPE_NULL)
             {
                 ride_ratings_update_ride(rideId);
@@ -35,7 +35,7 @@ protected:
     {
         for (int rideId = 0; rideId < MAX_RIDES; rideId++)
         {
-            rct_ride * ride = get_ride(rideId);
+            Ride * ride = get_ride(rideId);
             if (ride->type != RIDE_TYPE_NULL)
             {
                 std::string line = FormatRatings(ride);
@@ -44,7 +44,7 @@ protected:
         }
     }
 
-    std::string FormatRatings(rct_ride * ride)
+    std::string FormatRatings(Ride * ride)
     {
         rating_tuple ratings = ride->ratings;
         std::string line = String::StdFormat("%s: (%d, %d, %d)",
@@ -82,7 +82,7 @@ TEST_F(RideRatings, all)
     int expI = 0;
     for (int rideId = 0; rideId < MAX_RIDES; rideId++)
     {
-        rct_ride * ride = get_ride(rideId);
+        Ride * ride = get_ride(rideId);
         if (ride->type != RIDE_TYPE_NULL)
         {
             std::string actual = FormatRatings(ride);