Renamed some classes and variables in map section to clarify their purpose.