Made map-selector conform to the underscore standard for names.