Removed references to map_name in error messages.