rename variables - conflicts