diff --git a/src/openrct2/object/AudioObject.h b/src/openrct2/object/AudioObject.h
index 32c7aef5ec..0fdcadf545 100644
--- a/src/openrct2/object/AudioObject.h
+++ b/src/openrct2/object/AudioObject.h
@@ -23,7 +23,7 @@ private:
     AudioSampleTable _loadedSampleTable;
 
 public:
-    static constexpr ObjectType objectType = ObjectType::Audio;
+    static constexpr ObjectType kObjectType = ObjectType::Audio;
 
     void ReadJson(IReadObjectContext* context, json_t& root) override;
     void Load() override;
diff --git a/src/openrct2/object/BannerObject.h b/src/openrct2/object/BannerObject.h
index 18c077a987..177f2127a0 100644
--- a/src/openrct2/object/BannerObject.h
+++ b/src/openrct2/object/BannerObject.h
@@ -19,7 +19,7 @@ private:
     BannerSceneryEntry _legacyType = {};
 
 public:
-    static constexpr ObjectType objectType = ObjectType::Banners;
+    static constexpr ObjectType kObjectType = ObjectType::Banners;
 
     void* GetLegacyData() override
     {
diff --git a/src/openrct2/object/EntranceObject.h b/src/openrct2/object/EntranceObject.h
index ce5fb15f28..bdcd157338 100644
--- a/src/openrct2/object/EntranceObject.h
+++ b/src/openrct2/object/EntranceObject.h
@@ -20,7 +20,7 @@ private:
     EntranceEntry _legacyType = {};
 
 public:
-    static constexpr ObjectType objectType = ObjectType::ParkEntrance;
+    static constexpr ObjectType kObjectType = ObjectType::ParkEntrance;
 
     void* GetLegacyData() override
     {
diff --git a/src/openrct2/object/FootpathObject.h b/src/openrct2/object/FootpathObject.h
index cce65563fd..119391ef06 100644
--- a/src/openrct2/object/FootpathObject.h
+++ b/src/openrct2/object/FootpathObject.h
@@ -22,7 +22,7 @@ private:
     PathRailingsDescriptor _pathRailingsDescriptor = {};
 
 public:
-    static constexpr ObjectType objectType = ObjectType::Paths;
+    static constexpr ObjectType kObjectType = ObjectType::Paths;
 
     void* GetLegacyData() override
     {
diff --git a/src/openrct2/object/FootpathRailingsObject.h b/src/openrct2/object/FootpathRailingsObject.h
index 028534f404..e1ec306ca8 100644
--- a/src/openrct2/object/FootpathRailingsObject.h
+++ b/src/openrct2/object/FootpathRailingsObject.h
@@ -26,7 +26,7 @@ public:
     PathRailingsDescriptor _descriptor = {};
 
 public:
-    static constexpr ObjectType objectType = ObjectType::FootpathRailings;
+    static constexpr ObjectType kObjectType = ObjectType::FootpathRailings;
 
     void ReadJson(IReadObjectContext* context, json_t& root) override;
     void Load() override;
diff --git a/src/openrct2/object/FootpathSurfaceObject.h b/src/openrct2/object/FootpathSurfaceObject.h
index 08aea17fb6..84a6aca363 100644
--- a/src/openrct2/object/FootpathSurfaceObject.h
+++ b/src/openrct2/object/FootpathSurfaceObject.h
@@ -22,7 +22,7 @@ public:
     PathSurfaceDescriptor _descriptor = {};
 
 public:
-    static constexpr ObjectType objectType = ObjectType::FootpathSurface;
+    static constexpr ObjectType kObjectType = ObjectType::FootpathSurface;
 
     void ReadJson(IReadObjectContext* context, json_t& root) override;
     void Load() override;
diff --git a/src/openrct2/object/LargeSceneryObject.h b/src/openrct2/object/LargeSceneryObject.h
index 8572d8baf7..ab0bc1baa9 100644
--- a/src/openrct2/object/LargeSceneryObject.h
+++ b/src/openrct2/object/LargeSceneryObject.h
@@ -24,7 +24,7 @@ private:
     std::unique_ptr<LargeSceneryText> _3dFont;
 
 public:
-    static constexpr ObjectType objectType = ObjectType::LargeScenery;
+    static constexpr ObjectType kObjectType = ObjectType::LargeScenery;
 
     void* GetLegacyData() override
     {
diff --git a/src/openrct2/object/MusicObject.h b/src/openrct2/object/MusicObject.h
index 274353736c..2495980f5f 100644
--- a/src/openrct2/object/MusicObject.h
+++ b/src/openrct2/object/MusicObject.h
@@ -53,7 +53,7 @@ private:
     uint32_t _previewImageId{};
 
 public:
-    static constexpr ObjectType objectType = ObjectType::Music;
+    static constexpr ObjectType kObjectType = ObjectType::Music;
 
     StringId NameStringId{};
 
diff --git a/src/openrct2/object/ObjectManager.h b/src/openrct2/object/ObjectManager.h
index 98e0fb301e..eee1357f8e 100644
--- a/src/openrct2/object/ObjectManager.h
+++ b/src/openrct2/object/ObjectManager.h
@@ -28,7 +28,7 @@ struct IObjectManager
     virtual Object* GetLoadedObject(ObjectType objectType, size_t index) = 0;
     template<typename TClass> TClass* GetLoadedObject(size_t index)
     {
-        return static_cast<TClass*>(GetLoadedObject(TClass::objectType, index));
+        return static_cast<TClass*>(GetLoadedObject(TClass::kObjectType, index));
     }
     virtual Object* GetLoadedObject(const ObjectEntryDescriptor& entry) = 0;
     virtual ObjectEntryIndex GetLoadedObjectEntryIndex(std::string_view identifier) = 0;
diff --git a/src/openrct2/object/PathAdditionObject.h b/src/openrct2/object/PathAdditionObject.h
index 505cdc08f8..a51f3132d7 100644
--- a/src/openrct2/object/PathAdditionObject.h
+++ b/src/openrct2/object/PathAdditionObject.h
@@ -18,7 +18,7 @@ private:
     PathAdditionEntry _legacyType = {};
 
 public:
-    static constexpr ObjectType objectType = ObjectType::PathAdditions;
+    static constexpr ObjectType kObjectType = ObjectType::PathAdditions;
 
     void* GetLegacyData() override
     {
diff --git a/src/openrct2/object/PeepNamesObject.h b/src/openrct2/object/PeepNamesObject.h
index 919708c113..abdc834a0b 100644
--- a/src/openrct2/object/PeepNamesObject.h
+++ b/src/openrct2/object/PeepNamesObject.h
@@ -22,7 +22,7 @@ private:
     std::vector<std::string> _surnames;
 
 public:
-    static constexpr ObjectType objectType = ObjectType::PeepNames;
+    static constexpr ObjectType kObjectType = ObjectType::PeepNames;
 
     void ReadJson(IReadObjectContext* context, json_t& root) override;
     void Load() override;
diff --git a/src/openrct2/object/RideObject.h b/src/openrct2/object/RideObject.h
index 110dc3fb07..d41bf85829 100644
--- a/src/openrct2/object/RideObject.h
+++ b/src/openrct2/object/RideObject.h
@@ -26,7 +26,7 @@ private:
     std::vector<std::array<CoordsXY, 3>> _peepLoadingWaypoints[OpenRCT2::RCT2::ObjectLimits::MaxCarTypesPerRideEntry];
 
 public:
-    static constexpr ObjectType objectType = ObjectType::Ride;
+    static constexpr ObjectType kObjectType = ObjectType::Ride;
 
     void* GetLegacyData() override
     {
diff --git a/src/openrct2/object/SceneryGroupObject.h b/src/openrct2/object/SceneryGroupObject.h
index 91c270043e..c99846d117 100644
--- a/src/openrct2/object/SceneryGroupObject.h
+++ b/src/openrct2/object/SceneryGroupObject.h
@@ -25,7 +25,7 @@ private:
     std::vector<ObjectEntryDescriptor> _items;
 
 public:
-    static constexpr ObjectType objectType = ObjectType::SceneryGroup;
+    static constexpr ObjectType kObjectType = ObjectType::SceneryGroup;
 
     void* GetLegacyData() override
     {
diff --git a/src/openrct2/object/SmallSceneryObject.h b/src/openrct2/object/SmallSceneryObject.h
index 906fa776a1..c9406863ee 100644
--- a/src/openrct2/object/SmallSceneryObject.h
+++ b/src/openrct2/object/SmallSceneryObject.h
@@ -22,7 +22,7 @@ private:
     std::vector<uint8_t> _frameOffsets;
 
 public:
-    static constexpr ObjectType objectType = ObjectType::SmallScenery;
+    static constexpr ObjectType kObjectType = ObjectType::SmallScenery;
 
     void* GetLegacyData() override
     {
diff --git a/src/openrct2/object/StationObject.h b/src/openrct2/object/StationObject.h
index ed119fd05f..7874e21d4f 100644
--- a/src/openrct2/object/StationObject.h
+++ b/src/openrct2/object/StationObject.h
@@ -24,7 +24,7 @@ namespace OpenRCT2::STATION_OBJECT_FLAGS
 class StationObject final : public Object
 {
 public:
-    static constexpr ObjectType objectType = ObjectType::Station;
+    static constexpr ObjectType kObjectType = ObjectType::Station;
 
     StringId NameStringId{};
     ImageIndex BaseImageId = ImageIndexUndefined;
diff --git a/src/openrct2/object/TerrainEdgeObject.h b/src/openrct2/object/TerrainEdgeObject.h
index 113b3464b2..ea77f40656 100644
--- a/src/openrct2/object/TerrainEdgeObject.h
+++ b/src/openrct2/object/TerrainEdgeObject.h
@@ -15,7 +15,7 @@ class TerrainEdgeObject final : public Object
 {
 private:
 public:
-    static constexpr ObjectType objectType = ObjectType::TerrainEdge;
+    static constexpr ObjectType kObjectType = ObjectType::TerrainEdge;
 
     StringId NameStringId{};
     uint32_t IconImageId{};
diff --git a/src/openrct2/object/TerrainSurfaceObject.h b/src/openrct2/object/TerrainSurfaceObject.h
index aebf3f9692..9b06c21855 100644
--- a/src/openrct2/object/TerrainSurfaceObject.h
+++ b/src/openrct2/object/TerrainSurfaceObject.h
@@ -35,7 +35,7 @@ private:
     static constexpr auto kNumImagesInEntry = 19;
 
 public:
-    static constexpr ObjectType objectType = ObjectType::TerrainSurface;
+    static constexpr ObjectType kObjectType = ObjectType::TerrainSurface;
 
     static constexpr uint8_t kNoValue = 0xFF;
     StringId NameStringId{};
diff --git a/src/openrct2/object/WallObject.h b/src/openrct2/object/WallObject.h
index 8b85548427..7be5bc2a5d 100644
--- a/src/openrct2/object/WallObject.h
+++ b/src/openrct2/object/WallObject.h
@@ -18,7 +18,7 @@ private:
     WallSceneryEntry _legacyType = {};
 
 public:
-    static constexpr ObjectType objectType = ObjectType::Walls;
+    static constexpr ObjectType kObjectType = ObjectType::Walls;
 
     void* GetLegacyData() override
     {
diff --git a/src/openrct2/object/WaterObject.h b/src/openrct2/object/WaterObject.h
index 096261f9d2..30408bc493 100644
--- a/src/openrct2/object/WaterObject.h
+++ b/src/openrct2/object/WaterObject.h
@@ -20,7 +20,7 @@ private:
     WaterObjectEntry _legacyType = {};
 
 public:
-    static constexpr ObjectType objectType = ObjectType::Water;
+    static constexpr ObjectType kObjectType = ObjectType::Water;
 
     void* GetLegacyData() override
     {
diff --git a/src/openrct2/world/Map.h b/src/openrct2/world/Map.h
index 49f7da9cad..bfe64cab2e 100644
--- a/src/openrct2/world/Map.h
+++ b/src/openrct2/world/Map.h
@@ -183,13 +183,13 @@ TileElement* TileElementInsert(const CoordsXYZ& loc, int32_t occupiedQuadrants,
 
 template<typename T = TileElement> T* MapGetFirstTileElementWithBaseHeightBetween(const TileCoordsXYRangedZ& loc)
 {
-    auto* element = MapGetFirstTileElementWithBaseHeightBetween(loc, T::ElementType);
+    auto* element = MapGetFirstTileElementWithBaseHeightBetween(loc, T::kElementType);
     return element != nullptr ? element->template as<T>() : nullptr;
 }
 
 template<typename T> T* TileElementInsert(const CoordsXYZ& loc, int32_t occupiedQuadrants)
 {
-    auto* element = TileElementInsert(loc, occupiedQuadrants, T::ElementType);
+    auto* element = TileElementInsert(loc, occupiedQuadrants, T::kElementType);
     return (element != nullptr) ? element->template as<T>() : nullptr;
 }
 
diff --git a/src/openrct2/world/tile_element/BannerElement.h b/src/openrct2/world/tile_element/BannerElement.h
index 929c46da70..6c127f5727 100644
--- a/src/openrct2/world/tile_element/BannerElement.h
+++ b/src/openrct2/world/tile_element/BannerElement.h
@@ -17,7 +17,7 @@ struct BannerSceneryEntry;
 #pragma pack(push, 1)
 struct BannerElement : TileElementBase
 {
-    static constexpr TileElementType ElementType = TileElementType::Banner;
+    static constexpr TileElementType kElementType = TileElementType::Banner;
 
 private:
     BannerIndex index;    // 5
diff --git a/src/openrct2/world/tile_element/EntranceElement.h b/src/openrct2/world/tile_element/EntranceElement.h
index c57c97722b..d6b4789e9c 100644
--- a/src/openrct2/world/tile_element/EntranceElement.h
+++ b/src/openrct2/world/tile_element/EntranceElement.h
@@ -42,7 +42,7 @@ struct EntranceElement;
 
 struct EntranceElement : TileElementBase
 {
-    static constexpr TileElementType ElementType = TileElementType::Entrance;
+    static constexpr TileElementType kElementType = TileElementType::Entrance;
 
 private:
     uint8_t entranceType;        // 5
diff --git a/src/openrct2/world/tile_element/LargeSceneryElement.h b/src/openrct2/world/tile_element/LargeSceneryElement.h
index 437e207337..9a45dfddb0 100644
--- a/src/openrct2/world/tile_element/LargeSceneryElement.h
+++ b/src/openrct2/world/tile_element/LargeSceneryElement.h
@@ -24,7 +24,7 @@ enum
 #pragma pack(push, 1)
 struct LargeSceneryElement : TileElementBase
 {
-    static constexpr TileElementType ElementType = TileElementType::LargeScenery;
+    static constexpr TileElementType kElementType = TileElementType::LargeScenery;
 
 private:
     ObjectEntryIndex EntryIndex;
diff --git a/src/openrct2/world/tile_element/PathElement.h b/src/openrct2/world/tile_element/PathElement.h
index bb3c759f13..75eb619871 100644
--- a/src/openrct2/world/tile_element/PathElement.h
+++ b/src/openrct2/world/tile_element/PathElement.h
@@ -59,7 +59,7 @@ enum
 #pragma pack(push, 1)
 struct PathElement : TileElementBase
 {
-    static constexpr TileElementType ElementType = TileElementType::Path;
+    static constexpr TileElementType kElementType = TileElementType::Path;
 
 private:
     ObjectEntryIndex SurfaceIndex;  // 5
diff --git a/src/openrct2/world/tile_element/SmallSceneryElement.h b/src/openrct2/world/tile_element/SmallSceneryElement.h
index a025314025..ec890822a9 100644
--- a/src/openrct2/world/tile_element/SmallSceneryElement.h
+++ b/src/openrct2/world/tile_element/SmallSceneryElement.h
@@ -22,7 +22,7 @@ enum
 #pragma pack(push, 1)
 struct SmallSceneryElement : TileElementBase
 {
-    static constexpr TileElementType ElementType = TileElementType::SmallScenery;
+    static constexpr TileElementType kElementType = TileElementType::SmallScenery;
 
 private:
     ObjectEntryIndex entryIndex; // 5
diff --git a/src/openrct2/world/tile_element/SurfaceElement.h b/src/openrct2/world/tile_element/SurfaceElement.h
index 4d4c3c63a9..ca8c1900bc 100644
--- a/src/openrct2/world/tile_element/SurfaceElement.h
+++ b/src/openrct2/world/tile_element/SurfaceElement.h
@@ -44,7 +44,7 @@ constexpr uint8_t kTileElementSurfaceParkFenceMask = 0x0F;
 #pragma pack(push, 1)
 struct SurfaceElement : TileElementBase
 {
-    static constexpr TileElementType ElementType = TileElementType::Surface;
+    static constexpr TileElementType kElementType = TileElementType::Surface;
 
 private:
     uint8_t Slope;
diff --git a/src/openrct2/world/tile_element/TileElementBase.h b/src/openrct2/world/tile_element/TileElementBase.h
index a57a45de00..f4b5ba44a9 100644
--- a/src/openrct2/world/tile_element/TileElementBase.h
+++ b/src/openrct2/world/tile_element/TileElementBase.h
@@ -89,7 +89,7 @@ struct TileElementBase
         if constexpr (std::is_same_v<TType, TileElement>)
             return reinterpret_cast<const TileElement*>(this);
         else
-            return GetType() == TType::ElementType ? reinterpret_cast<const TType*>(this) : nullptr;
+            return GetType() == TType::kElementType ? reinterpret_cast<const TType*>(this) : nullptr;
     }
 
     template<typename TType> TType* as()
@@ -97,7 +97,7 @@ struct TileElementBase
         if constexpr (std::is_same_v<TType, TileElement>)
             return reinterpret_cast<TileElement*>(this);
         else
-            return GetType() == TType::ElementType ? reinterpret_cast<TType*>(this) : nullptr;
+            return GetType() == TType::kElementType ? reinterpret_cast<TType*>(this) : nullptr;
     }
 
     const SurfaceElement* AsSurface() const;
diff --git a/src/openrct2/world/tile_element/TrackElement.h b/src/openrct2/world/tile_element/TrackElement.h
index bec0b0c443..7ed7a55917 100644
--- a/src/openrct2/world/tile_element/TrackElement.h
+++ b/src/openrct2/world/tile_element/TrackElement.h
@@ -52,7 +52,7 @@ enum
 
 struct TrackElement : TileElementBase
 {
-    static constexpr TileElementType ElementType = TileElementType::Track;
+    static constexpr TileElementType kElementType = TileElementType::Track;
 
 private:
     OpenRCT2::TrackElemType TrackType;
diff --git a/src/openrct2/world/tile_element/WallElement.h b/src/openrct2/world/tile_element/WallElement.h
index 453acac36f..f032fabcfb 100644
--- a/src/openrct2/world/tile_element/WallElement.h
+++ b/src/openrct2/world/tile_element/WallElement.h
@@ -29,7 +29,7 @@ enum
 #pragma pack(push, 1)
 struct WallElement : TileElementBase
 {
-    static constexpr TileElementType ElementType = TileElementType::Wall;
+    static constexpr TileElementType kElementType = TileElementType::Wall;
 
 private:
     ObjectEntryIndex entryIndex; // 05