Normalize old %clf-* to %clf2-* placeholders