Renamed some poorly named variables.