diff --git a/src/openrct2/world/Surface.cpp b/src/openrct2/world/Surface.cpp
index 3f3ab83963..347a767088 100644
--- a/src/openrct2/world/Surface.cpp
+++ b/src/openrct2/world/Surface.cpp
@@ -28,9 +28,9 @@ TerrainSurfaceObject* SurfaceElement::GetSurfaceStyleObject() const
     return static_cast<TerrainSurfaceObject*>(objManager.GetLoadedObject(ObjectType::TerrainSurface, GetSurfaceObjectIndex()));
 }
 
-uint32_t SurfaceElement::GetEdgeStyle() const
+ObjectEntryIndex SurfaceElement::GetEdgeStyle() const
 {
-    return EdgeStyle;
+    return EdgeObjectIndex;
 }
 
 TerrainEdgeObject* SurfaceElement::GetEdgeStyleObject() const
@@ -44,9 +44,9 @@ void SurfaceElement::SetSurfaceObjectIndex(ObjectEntryIndex newStyle)
     SurfaceStyle = static_cast<ObjectEntryIndex>(newStyle);
 }
 
-void SurfaceElement::SetEdgeStyle(uint32_t newStyle)
+void SurfaceElement::SetEdgeStyle(ObjectEntryIndex newIndex)
 {
-    EdgeStyle = newStyle;
+    EdgeObjectIndex = static_cast<ObjectEntryIndex>(newIndex);
 }
 
 int32_t SurfaceElement::GetWaterHeight() const
diff --git a/src/openrct2/world/TileElement.h b/src/openrct2/world/TileElement.h
index 6b0b9937d5..e5d0bff3cc 100644
--- a/src/openrct2/world/TileElement.h
+++ b/src/openrct2/world/TileElement.h
@@ -195,7 +195,7 @@ private:
     uint8_t GrassLength;
     uint8_t Ownership;
     uint8_t SurfaceStyle;
-    uint8_t EdgeStyle;
+    uint8_t EdgeObjectIndex;
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wunused-private-field"
     uint8_t Pad0B[5];
@@ -209,9 +209,9 @@ public:
     TerrainSurfaceObject* GetSurfaceStyleObject() const;
     void SetSurfaceObjectIndex(ObjectEntryIndex newStyle);
 
-    uint32_t GetEdgeStyle() const;
+    ObjectEntryIndex GetEdgeStyle() const;
     TerrainEdgeObject* GetEdgeStyleObject() const;
-    void SetEdgeStyle(uint32_t newStyle);
+    void SetEdgeStyle(ObjectEntryIndex newStyle);
 
     bool CanGrassGrow() const;
     uint8_t GetGrassLength() const;