Add some more flexibility to conf and control_panel naming

closes #1055