Removed all duplicate Name checking