Snow Leopard: Rename variables