diff --git a/src/rct1/S4Importer.cpp b/src/rct1/S4Importer.cpp
index 14f124e627..b0228bcd14 100644
--- a/src/rct1/S4Importer.cpp
+++ b/src/rct1/S4Importer.cpp
@@ -434,13 +434,13 @@ void S4Importer::ImportRide(rct_ride * dst, rct1_ride * src)
     memset(dst, 0, sizeof(rct_ride));
 
     dst->type = RCT1::GetRideType(src->type);
-    if (RCT1::RideTypeHasVehicle(src->type))
+    if (RCT1::RideTypeUsesVehicles(src->type))
     {
-        dst->subtype = _rideTypeToRideEntryMap[src->type];
+        dst->subtype = _vehicleTypeToRideEntryMap[src->vehicle_type];
     }
     else
     {
-        dst->subtype = _vehicleTypeToRideEntryMap[src->vehicle_type];
+        dst->subtype = _rideTypeToRideEntryMap[src->type];
     }
 
     rct_ride_entry * rideEntry = get_ride_entry(dst->subtype);
diff --git a/src/rct1/import.h b/src/rct1/import.h
index ad7c1f6a49..ff8f52bf49 100644
--- a/src/rct1/import.h
+++ b/src/rct1/import.h
@@ -10,7 +10,7 @@ namespace RCT1
     uint8 GetTerrainEdge(uint8 terrainEdge);
 
     uint8 GetRideType(uint8 rideType);
-    bool RideTypeHasVehicle(uint8 rideType);
+    bool RideTypeUsesVehicles(uint8 rideType);
     bool PathIsQueue(uint8 pathType);
     uint8 NormalisePathAddition(uint8 pathAdditionType);
 
diff --git a/src/rct1/tables.cpp b/src/rct1/tables.cpp
index b5335116a4..36fa61e170 100644
--- a/src/rct1/tables.cpp
+++ b/src/rct1/tables.cpp
@@ -195,7 +195,7 @@ namespace RCT1
         return map[rideType];
     }
 
-    bool RideTypeHasVehicle(uint8 rideType)
+    bool RideTypeUsesVehicles(uint8 rideType)
     {
         switch (rideType) {
         case RCT1_RIDE_TYPE_HEDGE_MAZE:
@@ -222,9 +222,9 @@ namespace RCT1
         case RCT1_RIDE_TYPE_COFFEE_SHOP:
         case RCT1_RIDE_TYPE_FRIED_CHICKEN_STALL:
         case RCT1_RIDE_TYPE_LEMONADE_STALL:
-            return true;
-        default:
             return false;
+        default:
+            return true;
         }
     }