diff --git a/definitions/CreatureDifficultyTreasure.dbd b/definitions/CreatureDifficultyTreasure.dbd
index fe21742d313..0fb8e166047 100644
--- a/definitions/CreatureDifficultyTreasure.dbd
+++ b/definitions/CreatureDifficultyTreasure.dbd
@@ -3,8 +3,6 @@ int ID
 int Field_10_0_0_45141_000?
 int<PlayerCondition::ID> PlayerConditionID?
 int<CreatureDifficulty::ID> CreatureDifficultyID?
-int Field_10_2_0_51239_000?
-int Field_10_2_0_51239_001?
 
 LAYOUT 248ECDA6
 BUILD 10.1.7.50442, 10.1.7.50505, 10.1.7.50587, 10.1.7.50730, 10.1.7.50793, 10.1.7.50893, 10.1.7.51059, 10.1.7.51187, 10.1.7.51237, 10.1.7.51261, 10.1.7.51313
@@ -22,6 +20,6 @@ $noninline,relation$CreatureDifficultyID<32>
 LAYOUT 69361BEA
 BUILD 10.2.0.51239, 10.2.0.51297
 $noninline,id$ID<32>
-Field_10_2_0_51239_000<32>
-Field_10_2_0_51239_001<32>
+PlayerConditionID<32>
+Field_10_0_0_45141_000<32>
 $noninline,relation$CreatureDifficultyID<32>
diff --git a/definitions/ItemBonusSeasonUpgradeCost.dbd b/definitions/ItemBonusSeasonUpgradeCost.dbd
index c84aa412e65..30c3007990c 100644
--- a/definitions/ItemBonusSeasonUpgradeCost.dbd
+++ b/definitions/ItemBonusSeasonUpgradeCost.dbd
@@ -6,14 +6,7 @@ int OrderIndex?
 int<ItemBonusSeason::ID> ItemBonusSeasonID?
 int<Item::ID> FragmentItemID?
 int<CurrencyTypes::ID> FragmentsEarnedTrackingCurrencyID?
-locstring Field_10_2_0_51297_000_lang?
-int Field_10_2_0_51297_001?
-int Field_10_2_0_51297_002?
-int Field_10_2_0_51297_003?
-int Field_10_2_0_51297_004?
-int Field_10_2_0_51297_005?
-int Field_10_2_0_51297_006?
-int Field_10_2_0_51297_007?
+int<CurrencyTypes::ID> CurrencyID?
 
 LAYOUT BB4428AF
 BUILD 10.1.0.48898
@@ -38,11 +31,11 @@ FragmentsEarnedTrackingCurrencyID<32>
 
 LAYOUT 76231EF7
 BUILD 10.2.0.51297
-Field_10_2_0_51297_000_lang
-$id$Field_10_2_0_51297_001<32>
-Field_10_2_0_51297_002<32>
-Field_10_2_0_51297_003<32>
-Field_10_2_0_51297_004<32>
-$relation$Field_10_2_0_51297_005<32>
-Field_10_2_0_51297_006<32>
-Field_10_2_0_51297_007<32>
+SourceText_lang
+$id$ID<32>
+CostItemID<32>
+CurrencyID<32>
+OrderIndex<32>
+$relation$ItemBonusSeasonID<32>
+FragmentItemID<32>
+FragmentsEarnedTrackingCurrencyID<32>
diff --git a/definitions/SpellShapeshiftForm.dbd b/definitions/SpellShapeshiftForm.dbd
index 4f2d9ba1563..3319747cfd4 100644
--- a/definitions/SpellShapeshiftForm.dbd
+++ b/definitions/SpellShapeshiftForm.dbd
@@ -12,16 +12,6 @@ int<MountType::ID> MountTypeID
 int ExitSoundEntriesID
 int<FileData::ID> AttackIconFileID
 float DamageVariance
-locstring Field_10_2_0_51297_000_lang?
-int Field_10_2_0_51297_001?
-int Field_10_2_0_51297_002?
-int Field_10_2_0_51297_003?
-int Field_10_2_0_51297_004?
-int Field_10_2_0_51297_005?
-int Field_10_2_0_51297_006?
-float Field_10_2_0_51297_007?
-int Field_10_2_0_51297_008?
-int Field_10_2_0_51297_009?
 
 BUILD 0.5.3.3368
 BUILD 0.5.3.3368-0.5.5.3494
@@ -205,13 +195,13 @@ PresetSpellID<u32>[8]
 LAYOUT 887ACBCE
 BUILD 10.2.0.51297
 $noninline,id$ID<32>
-Field_10_2_0_51297_000_lang
-Field_10_2_0_51297_001<u32>
-Field_10_2_0_51297_002<8>
-Field_10_2_0_51297_003<32>
-Field_10_2_0_51297_004<32>
-Field_10_2_0_51297_005<8>
-Field_10_2_0_51297_006<16>
-Field_10_2_0_51297_007
-Field_10_2_0_51297_008<u16>
-Field_10_2_0_51297_009<u32>[8]
+Name_lang
+CreatureDisplayID<u32>
+CreatureType<8>
+Flags<32>
+AttackIconFileID<32>
+BonusActionBar<8>
+CombatRoundTime<16>
+DamageVariance
+MountTypeID<u16>
+PresetSpellID<u32>[8]