temporarily restore old NameEntry stuff for comparison