make uniqueName method much more smarter