A few variables renamed.
Renamed a few variables