rename variables
rename class variables