Renamed a few variables to use standard naming conventions.