Ofp10: Fixup naming