Added a scope to the name uniqueness test