Add oc mock includes and proper rename to rmote