rename variables to fit aliases