Few variable renames

Tiny Changes.