This should fix the dupe names issue.