rename variables a bit