Fix unique names where names that were supposed to be different could end up the same.
Fix unique names where names that were supposed to be different could end up the same.