Change fields named "Name" to "Identifier."

Getting the name via s.Name.Name was too annoying. Now these fields
are embedded Identifier types, so s.Name can be used directly.