Rename variables and functions