Updated Patch A/B nomenclature