Refactor name of operations to have OT prefix