Renamed some variables that do not need to be in a dictionary.