Refactoring naming of panels