Fixed issue with duplicate names