Part of #6993. Moved a bunch of uses of Ident to Name