Merge pull request #18538 from eileenmcnaughton/name