Renamed variables for consistency within file