Fix a typo and add utility names (OMS-510)