Implement name uniqueness control
fixup