Refactoring panel names to better merge with horizon.