diff --git a/definitions/MythicPlusSeasonRewardLevels.dbd b/definitions/MythicPlusSeasonRewardLevels.dbd
index 78a98233618..bf6a0df999d 100644
--- a/definitions/MythicPlusSeasonRewardLevels.dbd
+++ b/definitions/MythicPlusSeasonRewardLevels.dbd
@@ -5,7 +5,7 @@ int WeeklyRewardLevel
 int EndOfRunRewardLevel
 int Season // later moved to MythicPlusSeason
 int<MythicPlusSeason::ID> MythicPlusSeasonID
-int Type?
+int<WeeklyRewardChestActivityTier::ID> ActivityTierID?
 
 LAYOUT 4C011559
 BUILD 2.5.4.42581, 2.5.4.42695, 2.5.4.42757, 2.5.4.42800, 2.5.4.42869, 2.5.4.42870, 2.5.4.42873, 2.5.4.42917, 2.5.4.42940, 2.5.4.43400, 2.5.4.43638, 2.5.4.43861, 2.5.4.44036, 2.5.4.44171, 2.5.4.44400, 2.5.4.44833
@@ -119,7 +119,7 @@ BUILD 10.2.5.52206, 10.2.5.52330, 10.2.5.52432, 10.2.5.52554, 10.2.5.52646, 10.2
 BUILD 10.2.0.51521, 10.2.0.51601, 10.2.0.51685, 10.2.0.51790, 10.2.0.51825, 10.2.0.51851, 10.2.0.51973, 10.2.0.52038, 10.2.0.52068, 10.2.0.52095, 10.2.0.52106, 10.2.0.52129, 10.2.0.52148, 10.2.0.52188, 10.2.0.52301, 10.2.0.52393, 10.2.0.52485, 10.2.0.52545, 10.2.0.52607, 10.2.0.52649, 10.2.0.52808
 $noninline,id$ID<32>
 $relation$MythicPlusSeasonID<32>
-Type<32>
+ActivityTierID<32>
 DifficultyLevel<32>
 WeeklyRewardLevel<32>
 EndOfRunRewardLevel<32>
@@ -139,7 +139,7 @@ BUILD 11.0.2.55399, 11.0.2.55522, 11.0.2.55665, 11.0.2.55763, 11.0.2.55789, 11.0
 BUILD 11.0.0.54464, 11.0.0.54521, 11.0.0.54605, 11.0.0.54675, 11.0.0.54709, 11.0.0.54774, 11.0.0.54935, 11.0.0.55000, 11.0.0.55087, 11.0.0.55120, 11.0.0.55185, 11.0.0.55288, 11.0.0.55419, 11.0.0.55478, 11.0.0.55636, 11.0.0.55666, 11.0.0.55793, 11.0.0.55818, 11.0.0.55824, 11.0.0.55846, 11.0.0.55899, 11.0.0.55933, 11.0.0.55939, 11.0.0.55945, 11.0.0.55960, 11.0.0.56008
 $noninline,id$ID<32>
 $relation$MythicPlusSeasonID<32>
-Type<32>
+ActivityTierID<32>
 DifficultyLevel<32>
 WeeklyRewardLevel<32>
 EndOfRunRewardLevel<32>
diff --git a/definitions/NeighborhoodPlot.dbd b/definitions/NeighborhoodPlot.dbd
index 8867c6ca6b5..5a0087b830b 100644
--- a/definitions/NeighborhoodPlot.dbd
+++ b/definitions/NeighborhoodPlot.dbd
@@ -5,16 +5,16 @@ float HousePosition?
 float HouseRotation?
 float Field_12_0_0_63534_004?
 float Field_12_0_0_63534_005?
-float CornerStonePosition?
-float CornerStoneRotation?
+float CornerstonePosition?
+float CornerstoneRotation?
 int ID?
 int<NeighborhoodMap::ID> NeighborhoodMapID?
 int Field_12_0_0_63534_010?
-int<GameObjects::ID> Field_12_0_0_63534_011?
+int<GameObjects::ID> CornerstoneGameObjectID?
 int PlotIndex?
 int WorldState?
-float Field_12_0_0_63724_008?
-int<GameObjects::ID> Field_12_0_0_64741_015?
+float TeleportPosition?
+int<GameObjects::ID> PlotGameObjectID?
 int<GameObjects::ID> Field_12_0_0_64741_016?
 
 LAYOUT 928CA287
@@ -25,12 +25,12 @@ HousePosition[3]
 HouseRotation[3]
 Field_12_0_0_63534_004[3]
 Field_12_0_0_63534_005[3]
-CornerStonePosition[3]
-CornerStoneRotation[3]
+CornerstonePosition[3]
+CornerstoneRotation[3]
 $id$ID<32>
 NeighborhoodMapID<32>
 Field_12_0_0_63534_010<32>
-Field_12_0_0_63534_011<32>
+CornerstoneGameObjectID<32>
 PlotIndex<32>
 WorldState<32>
 
@@ -43,13 +43,13 @@ HousePosition[3]
 HouseRotation[3]
 Field_12_0_0_63534_004[3]
 Field_12_0_0_63534_005[3]
-CornerStonePosition[3]
-CornerStoneRotation[3]
-Field_12_0_0_63724_008[3]
+CornerstonePosition[3]
+CornerstoneRotation[3]
+TeleportPosition[3]
 $id$ID<32>
 NeighborhoodMapID<32>
 Field_12_0_0_63534_010<32>
-Field_12_0_0_63534_011<32>
+CornerstoneGameObjectID<32>
 PlotIndex<32>
 WorldState<32>
 
@@ -63,13 +63,13 @@ HousePosition[3]
 HouseRotation[3]
 Field_12_0_0_63534_004[3]
 Field_12_0_0_63534_005[3]
-CornerStonePosition[3]
-CornerStoneRotation[3]
-Field_12_0_0_63724_008[3]
+CornerstonePosition[3]
+CornerstoneRotation[3]
+TeleportPosition[3]
 $id$ID<32>
 $relation$NeighborhoodMapID<32>
 Field_12_0_0_63534_010<32>
-Field_12_0_0_63534_011<32>
+CornerstoneGameObjectID<32>
 PlotIndex<32>
 WorldState<32>
 
@@ -81,16 +81,16 @@ HousePosition[3]
 HouseRotation[3]
 Field_12_0_0_63534_004[3]
 Field_12_0_0_63534_005[3]
-CornerStonePosition[3]
-CornerStoneRotation[3]
-Field_12_0_0_63724_008[3]
+CornerstonePosition[3]
+CornerstoneRotation[3]
+TeleportPosition[3]
 $id$ID<32>
 $relation$NeighborhoodMapID<32>
 Field_12_0_0_63534_010<32>
-Field_12_0_0_63534_011<32>
+CornerstoneGameObjectID<32>
 PlotIndex<32>
 WorldState<32>
-Field_12_0_0_64741_015<32>
+PlotGameObjectID<32>
 Field_12_0_0_64741_016<32>
 
 LAYOUT D3F98FFB
@@ -99,14 +99,14 @@ Cost<u64>
 Name
 Field_12_0_0_63534_004[3]
 Field_12_0_0_63534_005[3]
-CornerStonePosition[3]
-CornerStoneRotation[3]
-Field_12_0_0_63724_008[3]
+CornerstonePosition[3]
+CornerstoneRotation[3]
+TeleportPosition[3]
 $id$ID<32>
 $relation$NeighborhoodMapID<32>
 Field_12_0_0_63534_010<32>
-Field_12_0_0_63534_011<32>
+CornerstoneGameObjectID<32>
 PlotIndex<32>
 WorldState<32>
-Field_12_0_0_64741_015<32>
+PlotGameObjectID<32>
 Field_12_0_0_64741_016<32>