class Map from model renamed as MapModel

+update references