Uniformity Edits

Changed all ID variables to match.