Changed naming scheme in ControlPanel