Change internal 'map' objects to 'mapobj.'  This closes #56