rename variables and properties