Update naming rules to work with new Candidate term.