Names refac