Refactoring component names