diff --git a/src/openrct2/GameStateSnapshots.cpp b/src/openrct2/GameStateSnapshots.cpp
index 6bd0fd18a0..826db59a94 100644
--- a/src/openrct2/GameStateSnapshots.cpp
+++ b/src/openrct2/GameStateSnapshots.cpp
@@ -338,10 +338,10 @@ struct GameStateSnapshots final : public IGameStateSnapshots
         COMPARE_FIELD(Vehicle, var_44);
         COMPARE_FIELD(Vehicle, mass);
         COMPARE_FIELD(Vehicle, update_flags);
-        COMPARE_FIELD(Vehicle, swing_sprite);
+        COMPARE_FIELD(Vehicle, SwingSprite);
         COMPARE_FIELD(Vehicle, current_station);
-        COMPARE_FIELD(Vehicle, swinging_car_var_0);
-        COMPARE_FIELD(Vehicle, var_4E);
+        COMPARE_FIELD(Vehicle, SwingPosition);
+        COMPARE_FIELD(Vehicle, SwingSpeed);
         COMPARE_FIELD(Vehicle, status);
         COMPARE_FIELD(Vehicle, sub_state);
         for (int i = 0; i < 32; i++)
diff --git a/src/openrct2/rct1/RCT1.h b/src/openrct2/rct1/RCT1.h
index 0fa870505d..63ea3f37fb 100644
--- a/src/openrct2/rct1/RCT1.h
+++ b/src/openrct2/rct1/RCT1.h
@@ -267,19 +267,19 @@ struct rct1_vehicle : RCT12SpriteBase
     uint16_t var_44;
     uint16_t mass;         // 0x46
     uint16_t update_flags; // 0x48
-    uint8_t swing_sprite;
+    uint8_t SwingSprite;
     uint8_t current_station; // 0x4B
     union
     {
-        int16_t swinging_car_var_0; // 0x4C
-        int16_t current_time;       // 0x4C
+        int16_t SwingPosition; // 0x4C
+        int16_t current_time;  // 0x4C
         struct
         {
             int8_t ferris_wheel_var_0; // 0x4C
             int8_t ferris_wheel_var_1; // 0x4D
         };
     };
-    int16_t var_4E;
+    int16_t SwingSpeed;
     uint8_t status;                  // 0x50
     uint8_t sub_state;               // 0x51
     uint16_t peep[32];               // 0x52
diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp
index 0969752dad..bb6a9a765c 100644
--- a/src/openrct2/rct1/S4Importer.cpp
+++ b/src/openrct2/rct1/S4Importer.cpp
@@ -1176,9 +1176,9 @@ private:
 
         dst->velocity = src->velocity;
         dst->acceleration = src->acceleration;
-        dst->swing_sprite = src->swing_sprite;
-        dst->swinging_car_var_0 = src->swinging_car_var_0;
-        dst->var_4E = src->var_4E;
+        dst->SwingSprite = src->SwingSprite;
+        dst->SwingPosition = src->SwingPosition;
+        dst->SwingSpeed = src->SwingSpeed;
         dst->restraints_position = src->restraints_position;
         dst->spin_sprite = src->spin_sprite;
         dst->sound_vector_factor = src->sound_vector_factor;
diff --git a/src/openrct2/rct2/RCT2.h b/src/openrct2/rct2/RCT2.h
index 7fd20e0787..bcafb95af6 100644
--- a/src/openrct2/rct2/RCT2.h
+++ b/src/openrct2/rct2/RCT2.h
@@ -483,12 +483,12 @@ struct RCT2SpriteVehicle : RCT12SpriteBase
     uint16_t var_44;
     uint16_t mass;         // 0x46
     uint16_t update_flags; // 0x48
-    uint8_t swing_sprite;
+    uint8_t SwingSprite;
     uint8_t current_station; // 0x4B
     union
     {
-        int16_t swinging_car_var_0; // 0x4C
-        int16_t current_time;       // 0x4C
+        int16_t SwingPosition; // 0x4C
+        int16_t current_time;  // 0x4C
         struct
         {
             int8_t ferris_wheel_var_0; // 0x4C
@@ -497,7 +497,7 @@ struct RCT2SpriteVehicle : RCT12SpriteBase
     };
     union
     {
-        int16_t var_4E;
+        int16_t SwingSpeed;
         int16_t crash_z; // 0x4E
     };
     uint8_t status;                  // 0x50
diff --git a/src/openrct2/rct2/S6Exporter.cpp b/src/openrct2/rct2/S6Exporter.cpp
index a7743f63c6..cf9563d244 100644
--- a/src/openrct2/rct2/S6Exporter.cpp
+++ b/src/openrct2/rct2/S6Exporter.cpp
@@ -1046,7 +1046,7 @@ void S6Exporter::ExportSpriteVehicle(RCT2SpriteVehicle* dst, const Vehicle* src)
     dst->var_44 = src->var_44;
     dst->mass = src->mass;
     dst->update_flags = src->update_flags;
-    dst->swing_sprite = src->swing_sprite;
+    dst->SwingSprite = src->SwingSprite;
     dst->current_station = src->current_station;
     dst->current_time = src->current_time;
     dst->crash_z = src->crash_z;
diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp
index e9f5638816..58cfd0c5f4 100644
--- a/src/openrct2/rct2/S6Importer.cpp
+++ b/src/openrct2/rct2/S6Importer.cpp
@@ -1341,7 +1341,7 @@ public:
         dst->var_44 = src->var_44;
         dst->mass = src->mass;
         dst->update_flags = src->update_flags;
-        dst->swing_sprite = src->swing_sprite;
+        dst->SwingSprite = src->SwingSprite;
         dst->current_station = src->current_station;
         dst->current_time = src->current_time;
         dst->crash_z = src->crash_z;
diff --git a/src/openrct2/ride/CableLift.cpp b/src/openrct2/ride/CableLift.cpp
index f13f15480d..43290a0b50 100644
--- a/src/openrct2/ride/CableLift.cpp
+++ b/src/openrct2/ride/CableLift.cpp
@@ -44,9 +44,9 @@ Vehicle* cable_lift_segment_create(
     current->powered_acceleration = 80;
     current->velocity = 0;
     current->acceleration = 0;
-    current->swing_sprite = 0;
-    current->swinging_car_var_0 = 0;
-    current->var_4E = 0;
+    current->SwingSprite = 0;
+    current->SwingPosition = 0;
+    current->SwingSpeed = 0;
     current->restraints_position = 0;
     current->spin_sprite = 0;
     current->spin_speed = 0;
diff --git a/src/openrct2/ride/Ride.cpp b/src/openrct2/ride/Ride.cpp
index ff8b1ed8f4..2fcbad2985 100644
--- a/src/openrct2/ride/Ride.cpp
+++ b/src/openrct2/ride/Ride.cpp
@@ -4367,9 +4367,9 @@ static Vehicle* vehicle_create_car(
     vehicle->powered_acceleration = vehicleEntry->powered_acceleration;
     vehicle->velocity = 0;
     vehicle->acceleration = 0;
-    vehicle->swing_sprite = 0;
-    vehicle->swinging_car_var_0 = 0;
-    vehicle->var_4E = 0;
+    vehicle->SwingSprite = 0;
+    vehicle->SwingPosition = 0;
+    vehicle->SwingSpeed = 0;
     vehicle->restraints_position = 0;
     vehicle->spin_sprite = 0;
     vehicle->spin_speed = 0;
@@ -4794,7 +4794,7 @@ void loc_6DDF9C(Ride* ride, TileElement* tileElement)
             {
                 car->velocity = 0;
                 car->acceleration = 0;
-                car->swing_sprite = 0;
+                car->SwingSprite = 0;
                 car->remaining_distance += 13962;
 
                 uint16_t spriteIndex = car->next_vehicle_on_train;
diff --git a/src/openrct2/ride/Vehicle.cpp b/src/openrct2/ride/Vehicle.cpp
index 559b308729..adb72be657 100644
--- a/src/openrct2/ride/Vehicle.cpp
+++ b/src/openrct2/ride/Vehicle.cpp
@@ -1473,9 +1473,9 @@ bool Vehicle::OpenRestraints()
     {
         vehicle = GET_VEHICLE(vehicle_id);
 
-        vehicle->swinging_car_var_0 = 0;
-        vehicle->var_4E = 0;
-        vehicle->swing_sprite = 0;
+        vehicle->SwingPosition = 0;
+        vehicle->SwingSpeed = 0;
+        vehicle->SwingSprite = 0;
 
         auto curRide = get_ride(vehicle->ride);
         if (curRide == nullptr)
@@ -3629,7 +3629,7 @@ void Vehicle::UpdateCollisionSetup()
         train->MoveTo({ train->x, train->y, train->z });
         invalidate_sprite_2(train);
 
-        train->var_4E = 0;
+        train->SwingSpeed = 0;
     }
 
     (GET_VEHICLE(prev_vehicle_on_ride))->next_vehicle_on_ride = lastVehicle->next_vehicle_on_ride;
@@ -6940,15 +6940,15 @@ int32_t Vehicle::GetSwingAmount() const
 void Vehicle::UpdateSwingingCar()
 {
     int32_t dword_F64E08 = abs(_vehicleVelocityF64E08);
-    var_4E += (-swinging_car_var_0) >> 6;
+    SwingSpeed += (-SwingPosition) >> 6;
     int32_t swingAmount = GetSwingAmount();
     if (swingAmount < 0)
     {
-        var_4E -= dword_F64E08 >> (-swingAmount);
+        SwingSpeed -= dword_F64E08 >> (-swingAmount);
     }
     else if (swingAmount > 0)
     {
-        var_4E += dword_F64E08 >> swingAmount;
+        SwingSpeed += dword_F64E08 >> swingAmount;
     }
 
     auto vehicleEntry = Entry();
@@ -7008,21 +7008,21 @@ void Vehicle::UpdateSwingingCar()
         }
     }
 
-    swinging_car_var_0 += var_4E;
-    var_4E -= var_4E >> 5;
-    int16_t ax = swinging_car_var_0;
+    SwingPosition += SwingSpeed;
+    SwingSpeed -= SwingSpeed >> 5;
+    int16_t ax = SwingPosition;
     if (ax > dx)
     {
         ax = dx;
-        var_4E = 0;
+        SwingSpeed = 0;
     }
     if (ax < cx)
     {
         ax = cx;
-        var_4E = 0;
+        SwingSpeed = 0;
     }
 
-    swinging_car_var_0 = ax;
+    SwingPosition = ax;
     uint8_t swingSprite = 11;
     if (ax >= -10012)
     {
@@ -7072,9 +7072,9 @@ void Vehicle::UpdateSwingingCar()
             }
         }
     }
-    if (swingSprite != swing_sprite)
+    if (swingSprite != SwingSprite)
     {
-        swing_sprite = swingSprite;
+        SwingSprite = swingSprite;
         Invalidate();
     }
 }
@@ -8322,9 +8322,9 @@ loc_6DAEB9:
 
         if ((vehicleEntry->flags & VEHICLE_ENTRY_FLAG_25) && moveInfo->vehicle_sprite_type != 0)
         {
-            swing_sprite = 0;
-            swinging_car_var_0 = 0;
-            var_4E = 0;
+            SwingSprite = 0;
+            SwingPosition = 0;
+            SwingSpeed = 0;
         }
 
         // this == frontVehicle
@@ -8630,9 +8630,9 @@ loc_6DBA33:;
 
         if ((vehicleEntry->flags & VEHICLE_ENTRY_FLAG_25) && regs.bl != 0)
         {
-            swing_sprite = 0;
-            swinging_car_var_0 = 0;
-            var_4E = 0;
+            SwingSprite = 0;
+            SwingPosition = 0;
+            SwingSpeed = 0;
         }
 
         if (this == _vehicleFrontVehicle)
@@ -9032,9 +9032,9 @@ loc_6DC743:
     {
         if (vehicle->vehicle_sprite_type != 0)
         {
-            vehicle->swing_sprite = 0;
-            vehicle->swinging_car_var_0 = 0;
-            vehicle->var_4E = 0;
+            vehicle->SwingSprite = 0;
+            vehicle->SwingPosition = 0;
+            vehicle->SwingSpeed = 0;
         }
     }
 
@@ -9186,9 +9186,9 @@ loc_6DCC2C:
     {
         if (vehicle->vehicle_sprite_type != 0)
         {
-            vehicle->swing_sprite = 0;
-            vehicle->swinging_car_var_0 = 0;
-            vehicle->var_4E = 0;
+            vehicle->SwingSprite = 0;
+            vehicle->SwingPosition = 0;
+            vehicle->SwingSpeed = 0;
         }
     }
 
diff --git a/src/openrct2/ride/Vehicle.h b/src/openrct2/ride/Vehicle.h
index b0b5be0997..46e5262d80 100644
--- a/src/openrct2/ride/Vehicle.h
+++ b/src/openrct2/ride/Vehicle.h
@@ -221,11 +221,11 @@ struct Vehicle : SpriteBase
     uint16_t var_44;
     uint16_t mass;
     uint16_t update_flags;
-    uint8_t swing_sprite;
+    uint8_t SwingSprite;
     StationIndex current_station;
     union
     {
-        int16_t swinging_car_var_0;
+        int16_t SwingPosition;
         int16_t current_time;
         struct
         {
@@ -235,7 +235,7 @@ struct Vehicle : SpriteBase
     };
     union
     {
-        int16_t var_4E;
+        int16_t SwingSpeed;
         int16_t crash_z;
     };
     VEHICLE_STATUS status;
diff --git a/src/openrct2/ride/VehiclePaint.cpp b/src/openrct2/ride/VehiclePaint.cpp
index a3893f709e..990b7fbc32 100644
--- a/src/openrct2/ride/VehiclePaint.cpp
+++ b/src/openrct2/ride/VehiclePaint.cpp
@@ -958,7 +958,7 @@ static void vehicle_sprite_paint_6D520E(
     paint_session* session, const Vehicle* vehicle, int32_t ebx, int32_t ecx, int32_t z,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
-    vehicle_sprite_paint(session, vehicle, ebx + vehicle->swing_sprite, ecx, z, vehicleEntry);
+    vehicle_sprite_paint(session, vehicle, ebx + vehicle->SwingSprite, ecx, z, vehicleEntry);
 }
 
 // 6D51EB
@@ -974,7 +974,7 @@ static void vehicle_sprite_paint_6D51EB(
     {
         ebx = ebx / 8;
     }
-    ebx = (ebx * vehicleEntry->base_num_frames) + vehicle->swing_sprite + vehicleEntry->base_image_id;
+    ebx = (ebx * vehicleEntry->base_num_frames) + vehicle->SwingSprite + vehicleEntry->base_image_id;
     vehicle_sprite_paint(session, vehicle, ebx, ecx, z, vehicleEntry);
 }
 
diff --git a/src/openrct2/ride/water/SubmarineRide.cpp b/src/openrct2/ride/water/SubmarineRide.cpp
index 38aa5eebb9..e58333051e 100644
--- a/src/openrct2/ride/water/SubmarineRide.cpp
+++ b/src/openrct2/ride/water/SubmarineRide.cpp
@@ -54,7 +54,7 @@ void vehicle_visual_submarine(
         }
         baseImage_id *= vehicleEntry->base_num_frames;
         baseImage_id += vehicleEntry->base_image_id;
-        baseImage_id += vehicle->swing_sprite;
+        baseImage_id += vehicle->SwingSprite;
     }
 
     vehicle_boundbox bb = VehicleBoundboxes[vehicleEntry->draw_order][imageDirection / 2];
diff --git a/test/tests/S6ImportExportTests.cpp b/test/tests/S6ImportExportTests.cpp
index 20380a00a4..c3186b1ec5 100644
--- a/test/tests/S6ImportExportTests.cpp
+++ b/test/tests/S6ImportExportTests.cpp
@@ -291,10 +291,10 @@ static void CompareSpriteDataVehicle(const Vehicle& left, const Vehicle& right)
     COMPARE_FIELD(var_44);
     COMPARE_FIELD(mass);
     COMPARE_FIELD(update_flags);
-    COMPARE_FIELD(swing_sprite);
+    COMPARE_FIELD(SwingSprite);
     COMPARE_FIELD(current_station);
-    COMPARE_FIELD(swinging_car_var_0);
-    COMPARE_FIELD(var_4E);
+    COMPARE_FIELD(SwingPosition);
+    COMPARE_FIELD(SwingSpeed);
     COMPARE_FIELD(status);
     COMPARE_FIELD(sub_state);
     for (int i = 0; i < 32; i++)