Refactoring the CollectionNameEditor