Implement name uniqueness control #35