rename OCSReturnableFactor to OCSAtomicFactor