First refactor of NamesEtc - moved to own class