Made rename variables to a standard