Some Renaming and Miniscule Tweaking