Move names into header