diff --git a/src/openrct2-ui/windows/Ride.cpp b/src/openrct2-ui/windows/Ride.cpp
index 3d401b4152..94eece6ac2 100644
--- a/src/openrct2-ui/windows/Ride.cpp
+++ b/src/openrct2-ui/windows/Ride.cpp
@@ -4169,10 +4169,10 @@ namespace OpenRCT2::Ui::Windows
             switch (trackColour)
             {
                 case 0:
-                    return (stationObjFlags & STATION_OBJECT_FLAGS::HAS_PRIMARY_COLOUR)
+                    return (stationObjFlags & StationObjectFlags::hasPrimaryColour)
                         || ride.getRideTypeDescriptor().HasFlag(RtdFlag::hasTrackColourMain);
                 case 1:
-                    return (stationObjFlags & STATION_OBJECT_FLAGS::HAS_SECONDARY_COLOUR)
+                    return (stationObjFlags & StationObjectFlags::hasSecondaryColour)
                         || ride.getRideTypeDescriptor().HasFlag(RtdFlag::hasTrackColourAdditional);
                 case 2:
                     return ride.getRideTypeDescriptor().HasFlag(RtdFlag::hasTrackColourSupports);
@@ -4921,7 +4921,7 @@ namespace OpenRCT2::Ui::Windows
                         GfxDrawSprite(clippedDpi, imageId.WithIndexOffset(4), { 34, 20 });
 
                         // Glass
-                        if (stationObj->Flags & STATION_OBJECT_FLAGS::IS_TRANSPARENT)
+                        if (stationObj->Flags & StationObjectFlags::isTransparent)
                         {
                             auto glassImageId = ImageId(stationObj->BaseImageId + 20).WithTransparency(trackColour.main);
                             GfxDrawSprite(clippedDpi, glassImageId, { 34, 20 });
diff --git a/src/openrct2/object/StationObject.cpp b/src/openrct2/object/StationObject.cpp
index e009773f0b..d32302bfdb 100644
--- a/src/openrct2/object/StationObject.cpp
+++ b/src/openrct2/object/StationObject.cpp
@@ -28,7 +28,7 @@ void StationObject::Load()
     {
         BaseImageId = LoadImages();
 
-        uint32_t shelterOffset = (Flags & STATION_OBJECT_FLAGS::IS_TRANSPARENT) ? 32 : 16;
+        uint32_t shelterOffset = (Flags & StationObjectFlags::isTransparent) ? 32 : 16;
         if (numImages > shelterOffset)
         {
             ShelterImageId = BaseImageId + shelterOffset;
@@ -56,23 +56,23 @@ void StationObject::DrawPreview(DrawPixelInfo& dpi, int32_t width, int32_t heigh
 
     auto imageId = ImageId(BaseImageId);
     auto tImageId = ImageId(BaseImageId + 16).WithTransparency(tcolour0);
-    if (Flags & STATION_OBJECT_FLAGS::HAS_PRIMARY_COLOUR)
+    if (Flags & StationObjectFlags::hasPrimaryColour)
     {
         imageId = imageId.WithPrimary(colour0);
     }
-    if (Flags & STATION_OBJECT_FLAGS::HAS_SECONDARY_COLOUR)
+    if (Flags & StationObjectFlags::hasSecondaryColour)
     {
         imageId = imageId.WithSecondary(colour1);
     }
 
     GfxDrawSprite(dpi, imageId, screenCoords);
-    if (Flags & STATION_OBJECT_FLAGS::IS_TRANSPARENT)
+    if (Flags & StationObjectFlags::isTransparent)
     {
         GfxDrawSprite(dpi, tImageId, screenCoords);
     }
 
     GfxDrawSprite(dpi, imageId.WithIndexOffset(4), screenCoords);
-    if (Flags & STATION_OBJECT_FLAGS::IS_TRANSPARENT)
+    if (Flags & StationObjectFlags::isTransparent)
     {
         GfxDrawSprite(dpi, tImageId.WithIndexOffset(4), screenCoords);
     }
@@ -91,11 +91,11 @@ void StationObject::ReadJson(IReadObjectContext* context, json_t& root)
         Flags = Json::GetFlags<uint32_t>(
             properties,
             {
-                { "hasPrimaryColour", STATION_OBJECT_FLAGS::HAS_PRIMARY_COLOUR },
-                { "hasSecondaryColour", STATION_OBJECT_FLAGS::HAS_SECONDARY_COLOUR },
-                { "isTransparent", STATION_OBJECT_FLAGS::IS_TRANSPARENT },
-                { "noPlatforms", STATION_OBJECT_FLAGS::NO_PLATFORMS },
-                { "hasShelter", STATION_OBJECT_FLAGS::HAS_SHELTER },
+                { "hasPrimaryColour", StationObjectFlags::hasPrimaryColour },
+                { "hasSecondaryColour", StationObjectFlags::hasSecondaryColour },
+                { "isTransparent", StationObjectFlags::isTransparent },
+                { "noPlatforms", StationObjectFlags::noPlatforms },
+                { "hasShelter", StationObjectFlags::hasShelter },
             });
     }
 
diff --git a/src/openrct2/object/StationObject.h b/src/openrct2/object/StationObject.h
index b0cfb615cc..c6a4bd4648 100644
--- a/src/openrct2/object/StationObject.h
+++ b/src/openrct2/object/StationObject.h
@@ -12,14 +12,14 @@
 #include "../drawing/ImageId.hpp"
 #include "Object.h"
 
-namespace OpenRCT2::STATION_OBJECT_FLAGS
+namespace OpenRCT2::StationObjectFlags
 {
-    const uint32_t HAS_PRIMARY_COLOUR = 1 << 0;
-    const uint32_t HAS_SECONDARY_COLOUR = 1 << 1;
-    const uint32_t IS_TRANSPARENT = 1 << 2;
-    const uint32_t NO_PLATFORMS = 1 << 3;
-    const uint32_t HAS_SHELTER = (1 << 4);
-} // namespace OpenRCT2::STATION_OBJECT_FLAGS
+    const uint32_t hasPrimaryColour = 1 << 0;
+    const uint32_t hasSecondaryColour = 1 << 1;
+    const uint32_t isTransparent = 1 << 2;
+    const uint32_t noPlatforms = 1 << 3;
+    const uint32_t hasShelter = (1 << 4);
+} // namespace OpenRCT2::StationObjectFlags
 
 class StationObject final : public Object
 {
diff --git a/src/openrct2/paint/tile_element/Paint.Entrance.cpp b/src/openrct2/paint/tile_element/Paint.Entrance.cpp
index 3fafbd3c18..2535d01491 100644
--- a/src/openrct2/paint/tile_element/Paint.Entrance.cpp
+++ b/src/openrct2/paint/tile_element/Paint.Entrance.cpp
@@ -139,7 +139,7 @@ static void PaintRideEntranceExit(PaintSession& session, uint8_t direction, int3
 
     PaintRideEntranceExitLightEffects(session, height, entranceEl);
 
-    auto hasGlass = (stationObj->Flags & STATION_OBJECT_FLAGS::IS_TRANSPARENT) != 0;
+    auto hasGlass = (stationObj->Flags & StationObjectFlags::isTransparent) != 0;
     auto colourPrimary = ride->trackColours[0].main;
     auto colourSecondary = ride->trackColours[0].additional;
     auto imageTemplate = ImageId(0, colourPrimary, colourSecondary);
diff --git a/src/openrct2/paint/track/coaster/MultiDimensionRollerCoaster.cpp b/src/openrct2/paint/track/coaster/MultiDimensionRollerCoaster.cpp
index 36eb7885f1..91963aa646 100644
--- a/src/openrct2/paint/track/coaster/MultiDimensionRollerCoaster.cpp
+++ b/src/openrct2/paint/track/coaster/MultiDimensionRollerCoaster.cpp
@@ -182,7 +182,7 @@ static void MultiDimensionRCTrackStation(
     const TrackElement& trackElement, SupportType supportType)
 {
     const auto* const stationObj = ride.getStationObject();
-    const bool noPlatforms = stationObj != nullptr && stationObj->Flags & STATION_OBJECT_FLAGS::NO_PLATFORMS;
+    const bool noPlatforms = stationObj != nullptr && stationObj->Flags & StationObjectFlags::noPlatforms;
 
     static constexpr uint32_t imageIds[2][kNumOrthogonalDirections][3] = {
         {
@@ -214,7 +214,7 @@ static void MultiDimensionRCTrackStation(
             { { 0, 3, height + 3 }, { 32, 26, 1 } });
     }
 
-    if (stationObj != nullptr && !(stationObj->Flags & STATION_OBJECT_FLAGS::NO_PLATFORMS))
+    if (stationObj != nullptr && !(stationObj->Flags & StationObjectFlags::noPlatforms))
     {
         DrawSupportsSideBySide(session, direction, height, session.SupportColours, supportType.metal);
 
diff --git a/src/openrct2/paint/track/gentle/Dodgems.cpp b/src/openrct2/paint/track/gentle/Dodgems.cpp
index bceba724dd..707b5765ca 100644
--- a/src/openrct2/paint/track/gentle/Dodgems.cpp
+++ b/src/openrct2/paint/track/gentle/Dodgems.cpp
@@ -60,7 +60,7 @@ static void PaintDodgems(
 
     const StationObject* stationObject = ride.getStationObject();
 
-    if (stationObject != nullptr && !(stationObject->Flags & STATION_OBJECT_FLAGS::NO_PLATFORMS))
+    if (stationObject != nullptr && !(stationObject->Flags & StationObjectFlags::noPlatforms))
     {
         auto imageId = session.SupportColours.WithIndex(SprDodgemsFloor);
         PaintAddImageAsParent(session, imageId, { 0, 0, height }, { { 1, 1, height }, { 30, 30, 1 } });
diff --git a/src/openrct2/paint/track/gentle/FlyingSaucers.cpp b/src/openrct2/paint/track/gentle/FlyingSaucers.cpp
index 59957c7206..614a16868b 100644
--- a/src/openrct2/paint/track/gentle/FlyingSaucers.cpp
+++ b/src/openrct2/paint/track/gentle/FlyingSaucers.cpp
@@ -52,7 +52,7 @@ static void PaintFlyingSaucers(
 
     const StationObject* stationObject = ride.getStationObject();
 
-    if (stationObject != nullptr && !(stationObject->Flags & STATION_OBJECT_FLAGS::NO_PLATFORMS))
+    if (stationObject != nullptr && !(stationObject->Flags & StationObjectFlags::noPlatforms))
     {
         auto imageId = session.TrackColours.WithIndex(SprFlyingSaucersFloor);
         PaintAddImageAsParent(session, imageId, { 0, 0, height }, { { 1, 1, height }, { 30, 30, 1 } });
diff --git a/src/openrct2/paint/track/gentle/SpiralSlide.cpp b/src/openrct2/paint/track/gentle/SpiralSlide.cpp
index 87193def93..c06f455787 100644
--- a/src/openrct2/paint/track/gentle/SpiralSlide.cpp
+++ b/src/openrct2/paint/track/gentle/SpiralSlide.cpp
@@ -215,7 +215,7 @@ static void PaintSpiralSlide(
     // Base
     const StationObject* stationObject = ride.getStationObject();
 
-    if (stationObject != nullptr && !(stationObject->Flags & STATION_OBJECT_FLAGS::NO_PLATFORMS))
+    if (stationObject != nullptr && !(stationObject->Flags & StationObjectFlags::noPlatforms))
     {
         auto imageId = session.SupportColours.WithIndex(
             rideEntry->Cars[0].base_image_id + ((direction & 1) ? SpiralSlideBaseB : SpiralSlideBaseA));
diff --git a/src/openrct2/paint/track/thrill/MagicCarpet.cpp b/src/openrct2/paint/track/thrill/MagicCarpet.cpp
index ed7c85ab4d..43d5279266 100644
--- a/src/openrct2/paint/track/thrill/MagicCarpet.cpp
+++ b/src/openrct2/paint/track/thrill/MagicCarpet.cpp
@@ -227,7 +227,7 @@ static void PaintMagicCarpet(
             DrawSupportsSideBySide(session, direction, height, session.SupportColours, MetalSupportType::Tubes);
             const StationObject* stationObject = ride.getStationObject();
 
-            if (stationObject != nullptr && !(stationObject->Flags & STATION_OBJECT_FLAGS::NO_PLATFORMS))
+            if (stationObject != nullptr && !(stationObject->Flags & StationObjectFlags::noPlatforms))
             {
                 auto imageId = session.SupportColours.WithIndex(SPR_STATION_BASE_D);
                 PaintAddImageAsParent(session, imageId, { 0, 0, height }, { 32, 32, 1 });
diff --git a/src/openrct2/paint/track/thrill/SwingingInverterShip.cpp b/src/openrct2/paint/track/thrill/SwingingInverterShip.cpp
index a273231ecc..474ccd04a4 100644
--- a/src/openrct2/paint/track/thrill/SwingingInverterShip.cpp
+++ b/src/openrct2/paint/track/thrill/SwingingInverterShip.cpp
@@ -140,7 +140,7 @@ static void PaintSwingingInverterShip(
     {
         DrawSupportsSideBySide(session, direction, height, session.SupportColours, MetalSupportType::Tubes);
 
-        if (stationObject != nullptr && !(stationObject->Flags & STATION_OBJECT_FLAGS::NO_PLATFORMS))
+        if (stationObject != nullptr && !(stationObject->Flags & StationObjectFlags::noPlatforms))
         {
             imageId = session.SupportColours.WithIndex(SPR_STATION_BASE_D);
             PaintAddImageAsParent(session, imageId, { 0, 0, height }, { 32, 32, 1 });
diff --git a/src/openrct2/paint/track/thrill/SwingingShip.cpp b/src/openrct2/paint/track/thrill/SwingingShip.cpp
index a390190d43..7540378387 100644
--- a/src/openrct2/paint/track/thrill/SwingingShip.cpp
+++ b/src/openrct2/paint/track/thrill/SwingingShip.cpp
@@ -172,7 +172,7 @@ static void PaintSwingingShip(
     else
     {
         DrawSupportsSideBySide(session, direction, height, session.SupportColours, MetalSupportType::Tubes);
-        if (stationObject != nullptr && !(stationObject->Flags & STATION_OBJECT_FLAGS::NO_PLATFORMS))
+        if (stationObject != nullptr && !(stationObject->Flags & StationObjectFlags::noPlatforms))
         {
             ImageIndex base = (direction & 1) ? SPR_STATION_BASE_A_NW_SE : SPR_STATION_BASE_A_SW_NE;
             imageId = session.SupportColours.WithIndex(base);
@@ -182,7 +182,7 @@ static void PaintSwingingShip(
 
     PaintUtilSetSegmentSupportHeight(session, kSegmentsAll, 0xFFFF, 0);
 
-    if (stationObject != nullptr && !(stationObject->Flags & STATION_OBJECT_FLAGS::NO_PLATFORMS))
+    if (stationObject != nullptr && !(stationObject->Flags & StationObjectFlags::noPlatforms))
     {
         if (direction & 1)
         {
diff --git a/src/openrct2/ride/Ride.cpp b/src/openrct2/ride/Ride.cpp
index b35610b390..2bbfa043f3 100644
--- a/src/openrct2/ride/Ride.cpp
+++ b/src/openrct2/ride/Ride.cpp
@@ -5459,7 +5459,7 @@ bool RideHasAdjacentStation(const Ride& ride)
 bool RideHasStationShelter(const Ride& ride)
 {
     const auto* stationObj = ride.getStationObject();
-    return stationObj != nullptr && (stationObj->Flags & STATION_OBJECT_FLAGS::HAS_SHELTER);
+    return stationObj != nullptr && (stationObj->Flags & StationObjectFlags::hasShelter);
 }
 
 bool RideHasRatings(const Ride& ride)
diff --git a/src/openrct2/ride/TrackPaint.cpp b/src/openrct2/ride/TrackPaint.cpp
index 18df9ebde6..31057f924c 100644
--- a/src/openrct2/ride/TrackPaint.cpp
+++ b/src/openrct2/ride/TrackPaint.cpp
@@ -100,7 +100,7 @@ bool TrackPaintUtilHasFence(
     enum edge_t edge, const CoordsXY& position, const TrackElement& trackElement, const Ride& ride, uint8_t rotation)
 {
     const auto* stationObject = ride.getStationObject();
-    if (stationObject != nullptr && stationObject->Flags & STATION_OBJECT_FLAGS::NO_PLATFORMS)
+    if (stationObject != nullptr && stationObject->Flags & StationObjectFlags::noPlatforms)
         return false;
 
     TileCoordsXY offset;
@@ -131,7 +131,7 @@ void TrackPaintUtilPaintFloor(
     PaintSession& session, uint8_t edges, ImageId colourFlags, uint16_t height, const uint32_t floorSprites[4],
     const StationObject* stationStyle)
 {
-    if (stationStyle != nullptr && stationStyle->Flags & STATION_OBJECT_FLAGS::NO_PLATFORMS)
+    if (stationStyle != nullptr && stationStyle->Flags & StationObjectFlags::noPlatforms)
         return;
 
     uint32_t imageId;
@@ -231,7 +231,7 @@ static bool TrackPaintUtilDrawStationImpl(
     const auto* stationObj = ride.getStationObject();
     const bool hasGreenLight = trackElement.HasGreenLight();
 
-    if (stationObj != nullptr && stationObj->Flags & STATION_OBJECT_FLAGS::NO_PLATFORMS)
+    if (stationObj != nullptr && stationObj->Flags & StationObjectFlags::noPlatforms)
         return false;
 
     bool hasFence;
@@ -445,7 +445,7 @@ bool TrackPaintUtilDrawStationInverted(
     const auto* stationObj = ride.getStationObject();
     const bool hasGreenLight = trackElement.HasGreenLight();
 
-    if (stationObj != nullptr && stationObj->Flags & STATION_OBJECT_FLAGS::NO_PLATFORMS)
+    if (stationObj != nullptr && stationObj->Flags & StationObjectFlags::noPlatforms)
         return false;
 
     auto colour = GetStationColourScheme(session, trackElement);
@@ -713,7 +713,7 @@ bool TrackPaintUtilDrawStationCovers2(
     PaintAddImageAsParent(session, imageId, offset, boundBox);
 
     // Glass
-    if (colour == TrackStationColour && (stationObject->Flags & STATION_OBJECT_FLAGS::IS_TRANSPARENT))
+    if (colour == TrackStationColour && (stationObject->Flags & StationObjectFlags::isTransparent))
     {
         imageId = ImageId(baseImageIndex + imageOffset + 12).WithTransparency(imageTemplate.GetPrimary());
         PaintAddImageAsChild(session, imageId, offset, boundBox);
@@ -727,7 +727,7 @@ bool TrackPaintUtilDrawNarrowStationPlatform(
 {
     CoordsXY position = session.MapPosition;
     const auto* stationObj = ride.getStationObject();
-    if (stationObj != nullptr && stationObj->Flags & STATION_OBJECT_FLAGS::NO_PLATFORMS)
+    if (stationObj != nullptr && stationObj->Flags & StationObjectFlags::noPlatforms)
         return false;
     auto colour = GetStationColourScheme(session, trackElement);
     if (direction & 1)
@@ -783,7 +783,7 @@ void TrackPaintUtilDrawPier(
     PaintSession& session, const Ride& ride, const StationObject* stationObj, const CoordsXY& position, Direction direction,
     int32_t height, const TrackElement& trackElement, uint8_t rotation)
 {
-    if (stationObj != nullptr && stationObj->Flags & STATION_OBJECT_FLAGS::NO_PLATFORMS)
+    if (stationObj != nullptr && stationObj->Flags & StationObjectFlags::noPlatforms)
         return;
     auto colour = GetStationColourScheme(session, trackElement);
     bool hasFence;