Refactoring (renames) + revert mistaken change (OMS-189)