minor reorg, scope ops names