Update for new valid names in names package.