diff --git a/src/openrct2/GameStateSnapshots.cpp b/src/openrct2/GameStateSnapshots.cpp
index a589850c01..4731ae81a9 100644
--- a/src/openrct2/GameStateSnapshots.cpp
+++ b/src/openrct2/GameStateSnapshots.cpp
@@ -273,7 +273,7 @@ struct GameStateSnapshots final : public IGameStateSnapshots
         COMPARE_FIELD(Peep, cash_in_pocket);
         COMPARE_FIELD(Peep, cash_spent);
         COMPARE_FIELD(Peep, time_in_park);
-        COMPARE_FIELD(Peep, rejoin_queue_timeout);
+        COMPARE_FIELD(Peep, RejoinQueueTimeout);
         COMPARE_FIELD(Peep, PreviousRide);
         COMPARE_FIELD(Peep, PreviousRideTimeOut);
         for (int i = 0; i < PEEP_MAX_THOUGHTS; i++)
diff --git a/src/openrct2/peep/Guest.cpp b/src/openrct2/peep/Guest.cpp
index f8994f48e1..6791f252ec 100644
--- a/src/openrct2/peep/Guest.cpp
+++ b/src/openrct2/peep/Guest.cpp
@@ -2547,7 +2547,7 @@ void Guest::GoToRideEntrance(Ride* ride)
     SetState(PEEP_STATE_ENTERING_RIDE);
     sub_state = PEEP_RIDE_IN_ENTRANCE;
 
-    rejoin_queue_timeout = 0;
+    RejoinQueueTimeout = 0;
     GuestTimeOnRide = 0;
 
     RemoveFromQueue();
@@ -3948,7 +3948,7 @@ void Guest::UpdateRideFreeVehicleCheck()
 
     if (ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_NO_VEHICLES))
     {
-        if (ride->status != RIDE_STATUS_OPEN || ride->vehicle_change_timeout != 0 || (++rejoin_queue_timeout) == 0)
+        if (ride->status != RIDE_STATUS_OPEN || ride->vehicle_change_timeout != 0 || (++RejoinQueueTimeout) == 0)
         {
             peep_update_ride_no_free_vehicle_rejoin_queue(this, ride);
             return;
@@ -4017,7 +4017,7 @@ void Guest::UpdateRideFreeVehicleCheck()
     }
 
     Vehicle* currentTrain = GET_VEHICLE(ride->vehicles[current_train]);
-    if (ride->status == RIDE_STATUS_OPEN && ++rejoin_queue_timeout != 0
+    if (ride->status == RIDE_STATUS_OPEN && ++RejoinQueueTimeout != 0
         && !currentTrain->UpdateFlag(VEHICLE_UPDATE_FLAG_TRAIN_READY_DEPART))
     {
         return;
diff --git a/src/openrct2/peep/Peep.h b/src/openrct2/peep/Peep.h
index 50a8bc94b5..9acaf9c79e 100644
--- a/src/openrct2/peep/Peep.h
+++ b/src/openrct2/peep/Peep.h
@@ -681,7 +681,7 @@ struct Peep : SpriteBase
     money32 cash_in_pocket;
     money32 cash_spent;
     int32_t time_in_park;
-    int8_t rejoin_queue_timeout; // whilst waiting for a free vehicle (or pair) in the entrance
+    int8_t RejoinQueueTimeout; // whilst waiting for a free vehicle (or pair) in the entrance
     uint8_t PreviousRide;
     uint16_t PreviousRideTimeOut;
     rct_peep_thought Thoughts[PEEP_MAX_THOUGHTS];
diff --git a/src/openrct2/rct2/S6Exporter.cpp b/src/openrct2/rct2/S6Exporter.cpp
index 0ef7ac7cd6..d4ccf26890 100644
--- a/src/openrct2/rct2/S6Exporter.cpp
+++ b/src/openrct2/rct2/S6Exporter.cpp
@@ -1195,7 +1195,7 @@ void S6Exporter::ExportSpritePeep(RCT2SpritePeep* dst, const Peep* src)
     dst->cash_in_pocket = src->cash_in_pocket;
     dst->cash_spent = src->cash_spent;
     dst->time_in_park = src->time_in_park;
-    dst->rejoin_queue_timeout = src->rejoin_queue_timeout;
+    dst->rejoin_queue_timeout = src->RejoinQueueTimeout;
     dst->previous_ride = src->PreviousRide;
     dst->previous_ride_time_out = src->PreviousRideTimeOut;
     for (size_t i = 0; i < std::size(src->Thoughts); i++)
diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp
index 39f0e656cd..b9fc8278c1 100644
--- a/src/openrct2/rct2/S6Importer.cpp
+++ b/src/openrct2/rct2/S6Importer.cpp
@@ -1460,7 +1460,7 @@ public:
         dst->cash_in_pocket = src->cash_in_pocket;
         dst->cash_spent = src->cash_spent;
         dst->time_in_park = src->time_in_park;
-        dst->rejoin_queue_timeout = src->rejoin_queue_timeout;
+        dst->RejoinQueueTimeout = src->rejoin_queue_timeout;
         dst->PreviousRide = src->previous_ride;
         dst->PreviousRideTimeOut = src->previous_ride_time_out;
         for (size_t i = 0; i < std::size(src->thoughts); i++)
diff --git a/test/tests/S6ImportExportTests.cpp b/test/tests/S6ImportExportTests.cpp
index 10a55d574f..d9d12f6a5e 100644
--- a/test/tests/S6ImportExportTests.cpp
+++ b/test/tests/S6ImportExportTests.cpp
@@ -217,7 +217,7 @@ static void CompareSpriteDataPeep(const Peep& left, const Peep& right)
     COMPARE_FIELD(cash_in_pocket);
     COMPARE_FIELD(cash_spent);
     COMPARE_FIELD(time_in_park);
-    COMPARE_FIELD(rejoin_queue_timeout);
+    COMPARE_FIELD(RejoinQueueTimeout);
     COMPARE_FIELD(PreviousRide);
     COMPARE_FIELD(PreviousRideTimeOut);
     for (int i = 0; i < PEEP_MAX_THOUGHTS; i++)