Use current name cleaver, plus add support for expanded org names.