diff --git a/src/openrct2/rct12/RCT12.cpp b/src/openrct2/rct12/RCT12.cpp
index c6425262bc..5cb2039b19 100644
--- a/src/openrct2/rct12/RCT12.cpp
+++ b/src/openrct2/rct12/RCT12.cpp
@@ -31,7 +31,7 @@ using namespace OpenRCT2;
 
 RCT12TileElementType RCT12TileElementBase::GetType() const
 {
-    auto elem_type = static_cast<RCT12TileElementType>((this->Type & TILE_ELEMENT_TYPE_MASK) >> 2);
+    auto elem_type = static_cast<RCT12TileElementType>((this->Type & kTileElementTypeMask) >> 2);
     switch (elem_type)
     {
         case RCT12TileElementType::Surface:
diff --git a/src/openrct2/world/TileElement.h b/src/openrct2/world/TileElement.h
index c30991abc4..21615f17d9 100644
--- a/src/openrct2/world/TileElement.h
+++ b/src/openrct2/world/TileElement.h
@@ -701,7 +701,7 @@ enum
 };
 
 constexpr uint8_t kTileElementQuadrantMask{ 0b11000000 };
-#define TILE_ELEMENT_TYPE_MASK 0b00111100
+constexpr uint8_t kTileElementTypeMask{ 0b00111100 };
 #define TILE_ELEMENT_DIRECTION_MASK 0b00000011
 #define TILE_ELEMENT_OCCUPIED_QUADRANTS_MASK 0b00001111
 
diff --git a/src/openrct2/world/TileElementBase.cpp b/src/openrct2/world/TileElementBase.cpp
index e25bb596a5..de48fba9ce 100644
--- a/src/openrct2/world/TileElementBase.cpp
+++ b/src/openrct2/world/TileElementBase.cpp
@@ -12,13 +12,13 @@
 
 TileElementType TileElementBase::GetType() const
 {
-    return static_cast<TileElementType>((this->Type & TILE_ELEMENT_TYPE_MASK) >> 2);
+    return static_cast<TileElementType>((this->Type & kTileElementTypeMask) >> 2);
 }
 
 void TileElementBase::SetType(TileElementType newType)
 {
-    this->Type &= ~TILE_ELEMENT_TYPE_MASK;
-    this->Type |= ((EnumValue(newType) << 2) & TILE_ELEMENT_TYPE_MASK);
+    this->Type &= ~kTileElementTypeMask;
+    this->Type |= ((EnumValue(newType) << 2) & kTileElementTypeMask);
 }
 
 Direction TileElementBase::GetDirection() const