OGM-208 Renaming MappingService into OptionsService