Another name->label refactor.