Part of #6993: Move a bunch of uses of Ident to Name

This does a large chunk of #6993. It is based on top of #17654.