Finish the rest of the name info refactor.