diff --git a/src/openrct2/ride/CableLift.cpp b/src/openrct2/ride/CableLift.cpp
index 5892adb7ee..a614b904c1 100644
--- a/src/openrct2/ride/CableLift.cpp
+++ b/src/openrct2/ride/CableLift.cpp
@@ -244,7 +244,7 @@ bool Vehicle::CableLiftUpdateTrackMotionForwards()
             if (!track_block_get_next(&input, &output, &outputZ, &outputDirection))
                 return false;
 
-            if (track_vangle_and_bank_end(trackType) != track_vangle_and_bank_start(output.element->AsTrack()->GetTrackType()))
+            if (track_pitch_and_roll_end(trackType) != track_pitch_and_roll_start(output.element->AsTrack()->GetTrackType()))
                 return false;
 
             TrackLocation = { output, outputZ };
@@ -305,8 +305,8 @@ bool Vehicle::CableLiftUpdateTrackMotionBackwards()
             if (!track_block_get_previous(input, &output))
                 return false;
 
-            if (track_vangle_and_bank_start(trackType)
-                != track_vangle_and_bank_end(output.begin_element->AsTrack()->GetTrackType()))
+            if (track_pitch_and_roll_start(trackType)
+                != track_pitch_and_roll_end(output.begin_element->AsTrack()->GetTrackType()))
                 return false;
 
             TrackLocation = { output.begin_x, output.begin_y, output.begin_z };
diff --git a/src/openrct2/ride/Track.cpp b/src/openrct2/ride/Track.cpp
index d99c20a2f8..2452d78872 100644
--- a/src/openrct2/ride/Track.cpp
+++ b/src/openrct2/ride/Track.cpp
@@ -560,12 +560,12 @@ const rct_trackdefinition FlatRideTrackDefinitions[256] =
 };
 // clang-format on
 
-VAngleAndBank track_vangle_and_bank_start(uint8_t trackType)
+PitchAndRoll track_pitch_and_roll_start(uint8_t trackType)
 {
     return { TrackDefinitions[trackType].vangle_start, TrackDefinitions[trackType].bank_start };
 }
 
-VAngleAndBank track_vangle_and_bank_end(uint8_t trackType)
+PitchAndRoll track_pitch_and_roll_end(uint8_t trackType)
 {
     return { TrackDefinitions[trackType].vangle_end, TrackDefinitions[trackType].bank_end };
 }
@@ -1130,7 +1130,7 @@ bool track_element_is_block_start(TileElement* trackElement)
     return false;
 }
 
-bank_type_t track_get_actual_bank(TileElement* tileElement, bank_type_t bank)
+roll_type_t track_get_actual_bank(TileElement* tileElement, roll_type_t bank)
 {
     auto ride = get_ride(tileElement->AsTrack()->GetRideIndex());
     if (ride != nullptr)
@@ -1141,7 +1141,7 @@ bank_type_t track_get_actual_bank(TileElement* tileElement, bank_type_t bank)
     return bank;
 }
 
-bank_type_t track_get_actual_bank_2(int32_t rideType, bool isInverted, bank_type_t bank)
+roll_type_t track_get_actual_bank_2(int32_t rideType, bool isInverted, roll_type_t bank)
 {
     if (RideTypeDescriptors[rideType].Flags & RIDE_TYPE_FLAG_HAS_ALTERNATIVE_TRACK_TYPE)
     {
@@ -1160,7 +1160,7 @@ bank_type_t track_get_actual_bank_2(int32_t rideType, bool isInverted, bank_type
     return bank;
 }
 
-bank_type_t track_get_actual_bank_3(bool useInvertedSprites, TileElement* tileElement)
+roll_type_t track_get_actual_bank_3(bool useInvertedSprites, TileElement* tileElement)
 {
     auto trackType = tileElement->AsTrack()->GetTrackType();
     auto bankStart = TrackDefinitions[trackType].bank_start;
diff --git a/src/openrct2/ride/Track.h b/src/openrct2/ride/Track.h
index 1a552f13f7..17b9a443f0 100644
--- a/src/openrct2/ride/Track.h
+++ b/src/openrct2/ride/Track.h
@@ -18,33 +18,33 @@ constexpr const uint16_t RideConstructionSpecialPieceSelected = 0x100;
 constexpr const int32_t BLOCK_BRAKE_BASE_SPEED = 0x20364;
 
 using track_type_t = uint16_t;
-using bank_type_t = uint8_t;
-using vangle_type_t = uint8_t;
+using roll_type_t = uint8_t;
+using pitch_type_t = uint8_t;
 
 #pragma pack(push, 1)
 struct rct_trackdefinition
 {
     uint8_t type;
-    vangle_type_t vangle_end;
-    vangle_type_t vangle_start;
-    bank_type_t bank_end;
-    bank_type_t bank_start;
+    pitch_type_t vangle_end;
+    pitch_type_t vangle_start;
+    roll_type_t bank_end;
+    roll_type_t bank_start;
     int8_t preview_z_offset;
     uint8_t pad[2] = {};
 };
 assert_struct_size(rct_trackdefinition, 8);
 #pragma pack(pop)
 
-struct VAngleAndBank
+struct PitchAndRoll
 {
-    vangle_type_t VAngle;
-    bank_type_t Bank;
+    pitch_type_t Pitch;
+    roll_type_t Roll;
 };
-constexpr bool operator==(const VAngleAndBank& vb1, const VAngleAndBank& vb2)
+constexpr bool operator==(const PitchAndRoll& vb1, const PitchAndRoll& vb2)
 {
-    return vb1.VAngle == vb2.VAngle && vb1.Bank == vb2.Bank;
+    return vb1.Pitch == vb2.Pitch && vb1.Roll == vb2.Roll;
 }
-constexpr bool operator!=(const VAngleAndBank& vb1, const VAngleAndBank& vb2)
+constexpr bool operator!=(const PitchAndRoll& vb1, const PitchAndRoll& vb2)
 {
     return !(vb1 == vb2);
 }
@@ -554,8 +554,8 @@ struct track_circuit_iterator
 extern const rct_trackdefinition FlatRideTrackDefinitions[256];
 extern const rct_trackdefinition TrackDefinitions[256];
 
-VAngleAndBank track_vangle_and_bank_start(uint8_t trackType);
-VAngleAndBank track_vangle_and_bank_end(uint8_t trackType);
+PitchAndRoll track_pitch_and_roll_start(uint8_t trackType);
+PitchAndRoll track_pitch_and_roll_end(uint8_t trackType);
 
 int32_t track_is_connected_by_shape(TileElement* a, TileElement* b);
 
@@ -575,9 +575,9 @@ bool track_element_is_block_start(TileElement* trackElement);
 bool track_element_is_covered(int32_t trackElementType);
 bool track_type_is_station(track_type_t trackType);
 
-bank_type_t track_get_actual_bank(TileElement* tileElement, bank_type_t bank);
-bank_type_t track_get_actual_bank_2(int32_t rideType, bool isInverted, bank_type_t bank);
-bank_type_t track_get_actual_bank_3(bool useInvertedSprites, TileElement* tileElement);
+roll_type_t track_get_actual_bank(TileElement* tileElement, roll_type_t bank);
+roll_type_t track_get_actual_bank_2(int32_t rideType, bool isInverted, roll_type_t bank);
+roll_type_t track_get_actual_bank_3(bool useInvertedSprites, TileElement* tileElement);
 
 bool track_add_station_element(CoordsXYZD loc, ride_id_t rideIndex, int32_t flags, bool fromTrackDesign);
 bool track_remove_station_element(int32_t x, int32_t y, int32_t z, Direction direction, ride_id_t rideIndex, int32_t flags);
diff --git a/src/openrct2/ride/Vehicle.cpp b/src/openrct2/ride/Vehicle.cpp
index 89474213e5..75e8f88af8 100644
--- a/src/openrct2/ride/Vehicle.cpp
+++ b/src/openrct2/ride/Vehicle.cpp
@@ -7479,10 +7479,10 @@ static void vehicle_update_scenery_door(Vehicle* vehicle)
  *
  *  rct2: 0x006DB38B
  */
-static VAngleAndBank VAngleAndBankStart(bool useInvertedSprites, TileElement* tileElement)
+static PitchAndRoll PitchAndRollStart(bool useInvertedSprites, TileElement* tileElement)
 {
     auto trackType = tileElement->AsTrack()->GetTrackType();
-    return VAngleAndBank{ TrackDefinitions[trackType].vangle_start, track_get_actual_bank_3(useInvertedSprites, tileElement) };
+    return PitchAndRoll{ TrackDefinitions[trackType].vangle_start, track_get_actual_bank_3(useInvertedSprites, tileElement) };
 }
 
 static void VehicleUpdateGoKartAttemptSwitchLanes(Vehicle* vehicle)
@@ -7937,7 +7937,7 @@ bool Vehicle::UpdateTrackMotionForwardsGetNewTrack(uint16_t trackType, Ride* cur
 {
     CoordsXYZD location = {};
 
-    auto vangleAndBankEnd = track_vangle_and_bank_end(trackType);
+    auto pitchAndRollEnd = track_pitch_and_roll_end(trackType);
     TileElement* tileElement = map_get_track_element_at_of_type_seq(TrackLocation, trackType, 0);
 
     if (tileElement == nullptr)
@@ -8025,7 +8025,7 @@ bool Vehicle::UpdateTrackMotionForwardsGetNewTrack(uint16_t trackType, Ride* cur
             }
         }
 
-        if (VAngleAndBankStart(HasUpdateFlag(VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES), tileElement) != vangleAndBankEnd)
+        if (PitchAndRollStart(HasUpdateFlag(VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES), tileElement) != pitchAndRollEnd)
         {
             return false;
         }
@@ -8358,7 +8358,7 @@ loc_6DB967:
     return false;
 }
 
-static VAngleAndBank VAngleAndBankEnd(Ride* curRide, bool useInvertedSprites, uint16_t trackType, TileElement* tileElement)
+static PitchAndRoll PitchAndRollEnd(Ride* curRide, bool useInvertedSprites, uint16_t trackType, TileElement* tileElement)
 {
     bool isInverted = useInvertedSprites ^ tileElement->AsTrack()->IsInverted();
     return { TrackDefinitions[trackType].vangle_end,
@@ -8371,7 +8371,7 @@ static VAngleAndBank VAngleAndBankEnd(Ride* curRide, bool useInvertedSprites, ui
  */
 bool Vehicle::UpdateTrackMotionBackwardsGetNewTrack(uint16_t trackType, Ride* curRide, uint16_t* progress)
 {
-    auto vangleAndBankStart = track_vangle_and_bank_start(trackType);
+    auto pitchAndRollStart = track_pitch_and_roll_start(trackType);
     TileElement* tileElement = map_get_track_element_at_of_type_seq(TrackLocation, trackType, 0);
 
     if (tileElement == nullptr)
@@ -8416,8 +8416,8 @@ bool Vehicle::UpdateTrackMotionBackwardsGetNewTrack(uint16_t trackType, Ride* cu
             return false;
         }
 
-        if (VAngleAndBankEnd(curRide, HasUpdateFlag(VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES), trackType, tileElement)
-            != vangleAndBankStart)
+        if (PitchAndRollEnd(curRide, HasUpdateFlag(VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES), trackType, tileElement)
+            != pitchAndRollStart)
         {
             return false;
         }
@@ -8804,8 +8804,8 @@ loc_6DC476:
         direction = outDirection;
     }
 
-    if (VAngleAndBankStart(HasUpdateFlag(VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES), tileElement)
-        != track_vangle_and_bank_end(GetTrackType()))
+    if (PitchAndRollStart(HasUpdateFlag(VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES), tileElement)
+        != track_pitch_and_roll_end(GetTrackType()))
     {
         goto loc_6DC9BC;
     }
@@ -9011,8 +9011,8 @@ loc_6DCA9A:
         tileElement = trackBeginEnd.begin_element;
     }
 
-    if (VAngleAndBankStart(HasUpdateFlag(VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES), tileElement)
-        != track_vangle_and_bank_end(GetTrackType()))
+    if (PitchAndRollStart(HasUpdateFlag(VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES), tileElement)
+        != track_pitch_and_roll_end(GetTrackType()))
     {
         goto loc_6DCD4A;
     }