API: Addressed various map API naming inconsistencies