Rename variables, fix heightmap rendering