Issue34 rename variables