diff --git a/definitions/FootstepTerrainLookup.dbd b/definitions/FootstepTerrainLookup.dbd
index 31c5051d1bf..32060ac9599 100644
--- a/definitions/FootstepTerrainLookup.dbd
+++ b/definitions/FootstepTerrainLookup.dbd
@@ -1,7 +1,7 @@
 COLUMNS
 int ID
-int CreatureFootstepID
-int<TerrainType::ID> TerrainSoundID
+int<SpellVisualEffectName::ID> CreatureFootstepID
+int<TerrainTypeSounds::ID> TerrainSoundID
 int<SoundEntries::ID> SoundID
 int<SoundEntries::ID> SoundIDSplash
 
diff --git a/definitions/TerrainType.dbd b/definitions/TerrainType.dbd
index 2924d86f16e..098a6ff842e 100644
--- a/definitions/TerrainType.dbd
+++ b/definitions/TerrainType.dbd
@@ -4,7 +4,7 @@ int TerrainID
 string TerrainDesc
 int FootstepSprayRun
 int FootstepSprayWalk
-int SoundID
+int<TerrainTypeSounds::ID> SoundID
 int Flags
 
 LAYOUT 4BE35F10
@@ -111,7 +111,7 @@ BUILD 8.0.1.25902, 8.0.1.25976, 8.0.1.26010, 8.0.1.26032, 8.0.1.26095, 8.0.1.261
 BUILD 7.3.5.25928, 7.3.5.25937, 7.3.5.25944, 7.3.5.25946, 7.3.5.25950, 7.3.5.25961, 7.3.5.25996, 7.3.5.26124, 7.3.5.26365, 7.3.5.26654, 7.3.5.26755, 7.3.5.26822, 7.3.5.26899, 7.3.5.26972
 BUILD 7.3.2.25079, 7.3.2.25163, 7.3.2.25196, 7.3.2.25208, 7.3.2.25255, 7.3.2.25326, 7.3.2.25383, 7.3.2.25442, 7.3.2.25455, 7.3.2.25477, 7.3.2.25480, 7.3.2.25497, 7.3.2.25516, 7.3.2.25549
 BUILD 7.3.0.24473, 7.3.0.24484, 7.3.0.24492, 7.3.0.24500, 7.3.0.24539, 7.3.0.24563, 7.3.0.24608, 7.3.0.24651, 7.3.0.24681, 7.3.0.24692, 7.3.0.24700, 7.3.0.24715, 7.3.0.24727, 7.3.0.24730, 7.3.0.24738, 7.3.0.24744, 7.3.0.24758, 7.3.0.24759, 7.3.0.24781, 7.3.0.24793, 7.3.0.24829, 7.3.0.24834, 7.3.0.24843, 7.3.0.24845, 7.3.0.24852, 7.3.0.24853, 7.3.0.24864, 7.3.0.24878, 7.3.0.24887, 7.3.0.24896, 7.3.0.24904, 7.3.0.24920, 7.3.0.24931, 7.3.0.24956, 7.3.0.24970, 7.3.0.24974, 7.3.0.25021, 7.3.0.25195
-$noninline,id$ID<32>
+$noninline,id$TerrainID<32>
 TerrainDesc
 FootstepSprayRun<u16>
 FootstepSprayWalk<u16>
@@ -123,7 +123,7 @@ BUILD 10.0.0.43342
 BUILD 9.2.5.42850, 9.2.5.43022, 9.2.5.43057, 9.2.5.43180, 9.2.5.43254, 9.2.5.43412
 BUILD 9.2.0.41089, 9.2.0.41257, 9.2.0.41360, 9.2.0.41462, 9.2.0.41726, 9.2.0.41827, 9.2.0.41962, 9.2.0.42069, 9.2.0.42174, 9.2.0.42257, 9.2.0.42277, 9.2.0.42354, 9.2.0.42399, 9.2.0.42423, 9.2.0.42488, 9.2.0.42521, 9.2.0.42538, 9.2.0.42560, 9.2.0.42578, 9.2.0.42614, 9.2.0.42698, 9.2.0.42825, 9.2.0.42852, 9.2.0.42937, 9.2.0.42979, 9.2.0.43114, 9.2.0.43206, 9.2.0.43340, 9.2.0.43345
 BUILD 9.1.5.39977, 9.1.5.40071, 9.1.5.40078, 9.1.5.40196, 9.1.5.40290, 9.1.5.40383, 9.1.5.40496, 9.1.5.40622, 9.1.5.40696, 9.1.5.40738, 9.1.5.40772, 9.1.5.40843, 9.1.5.40871, 9.1.5.40906, 9.1.5.40944, 9.1.5.40966, 9.1.5.41031, 9.1.5.41079, 9.1.5.41288, 9.1.5.41323, 9.1.5.41359, 9.1.5.41488, 9.1.5.41793, 9.1.5.42010
-$noninline,id$ID<32>
+$noninline,id$TerrainID<32>
 TerrainDesc
 FootstepSprayRun<u16>
 FootstepSprayWalk<u16>
@@ -141,7 +141,7 @@ BUILD 10.0.2.45480, 10.0.2.45505, 10.0.2.45569, 10.0.2.45632, 10.0.2.45698, 10.0
 BUILD 10.0.0.44167, 10.0.0.44351, 10.0.0.44402, 10.0.0.44475, 10.0.0.44559, 10.0.0.44592, 10.0.0.44622, 10.0.0.44645, 10.0.0.44649, 10.0.0.44691, 10.0.0.44707, 10.0.0.44795, 10.0.0.44840, 10.0.0.44876, 10.0.0.44895, 10.0.0.44933, 10.0.0.44999, 10.0.0.45025, 10.0.0.45093, 10.0.0.45141, 10.0.0.45193, 10.0.0.45232, 10.0.0.45335, 10.0.0.45454, 10.0.0.45570, 10.0.0.45661, 10.0.0.45697, 10.0.0.45778, 10.0.0.45970, 10.0.0.46047, 10.0.0.46112, 10.0.0.46181, 10.0.0.46247, 10.0.0.46270, 10.0.0.46293, 10.0.0.46313, 10.0.0.46340, 10.0.0.46366, 10.0.0.46455, 10.0.0.46547, 10.0.0.46549, 10.0.0.46597
 BUILD 9.2.7.44444, 9.2.7.44767, 9.2.7.44931, 9.2.7.44981, 9.2.7.45114, 9.2.7.45161, 9.2.7.45338, 9.2.7.45745
 BUILD 9.2.5.43519, 9.2.5.43630, 9.2.5.43741, 9.2.5.43810, 9.2.5.43903, 9.2.5.43971, 9.2.5.44015, 9.2.5.44061, 9.2.5.44127, 9.2.5.44232, 9.2.5.44325, 9.2.5.44730, 9.2.5.44908
-$noninline,id$ID<32>
+$noninline,id$TerrainID<32>
 TerrainDesc
 FootstepSprayRun<u16>
 FootstepSprayWalk<u16>