updated MapModel to handle names in messages