Movement: rename variables, more consistent