Update to nameEntry()