Added back map name.
Renamed things