From 0799c864e8579f993c3355c830f20ad58a349125 Mon Sep 17 00:00:00 2001
From: Robert Ancell <robert.ancell@canonical.com>
Date: Mon, 19 Nov 2018 12:57:52 +1300
Subject: [PATCH] sound: Rename new sound panel to replace old one

---
 panels/meson.build                            |   2 +-
 .../{sound-new => sound}/cc-alert-chooser.c   |   6 +-
 .../{sound-new => sound}/cc-alert-chooser.h   |   0
 .../{sound-new => sound}/cc-alert-chooser.ui  |   0
 .../{sound-new => sound}/cc-alert-selector.h  |   0
 .../{sound-new => sound}/cc-alert-selector.ui |   0
 .../{sound-new => sound}/cc-balance-slider.c  |   6 +-
 .../{sound-new => sound}/cc-balance-slider.h  |   0
 .../{sound-new => sound}/cc-balance-slider.ui |   0
 .../cc-device-combo-box.c                     |   6 +-
 .../cc-device-combo-box.h                     |   0
 .../cc-device-combo-box.ui                    |   0
 panels/{sound-new => sound}/cc-fade-slider.c  |   6 +-
 panels/{sound-new => sound}/cc-fade-slider.h  |   0
 panels/{sound-new => sound}/cc-fade-slider.ui |   0
 panels/{sound-new => sound}/cc-level-bar.c    |   0
 panels/{sound-new => sound}/cc-level-bar.h    |   0
 .../cc-output-test-dialog.c                   |   6 +-
 .../cc-output-test-dialog.h                   |   0
 .../cc-output-test-dialog.ui                  |   0
 .../cc-profile-combo-box.c                    |   6 +-
 .../cc-profile-combo-box.h                    |   0
 .../cc-profile-combo-box.ui                   |   0
 panels/{sound-new => sound}/cc-sound-button.c |   6 +-
 panels/{sound-new => sound}/cc-sound-button.h |   0
 .../{sound-new => sound}/cc-sound-button.ui   |   0
 .../cc-sound-panel.c}                         |  76 +++++++++---------
 .../cc-sound-panel.h}                         |   4 +-
 .../cc-sound-panel.ui}                        |   8 +-
 .../cc-speaker-test-button.c                  |   6 +-
 .../cc-speaker-test-button.h                  |   0
 .../cc-speaker-test-button.ui                 |   0
 .../{sound-new => sound}/cc-stream-list-box.c |   0
 .../{sound-new => sound}/cc-stream-list-box.h |   0
 panels/{sound-new => sound}/cc-stream-row.c   |   6 +-
 panels/{sound-new => sound}/cc-stream-row.h   |   0
 panels/{sound-new => sound}/cc-stream-row.ui  |   0
 .../cc-subwoofer-slider.c                     |   6 +-
 .../cc-subwoofer-slider.h                     |   0
 .../cc-subwoofer-slider.ui                    |   0
 .../{sound-new => sound}/cc-volume-slider.c   |   6 +-
 .../{sound-new => sound}/cc-volume-slider.h   |   0
 .../{sound-new => sound}/cc-volume-slider.ui  |   0
 .../gnome-sound-panel.desktop.in.in}          |   0
 .../gvc-mixer-stream-private.h                |   0
 .../audio-speaker-center-back-testing.svg     |   0
 .../icons/audio-speaker-center-back.svg       |   0
 .../icons/audio-speaker-center-testing.svg    |   0
 .../icons/audio-speaker-center.svg            |   0
 .../icons/audio-speaker-left-back-testing.svg |   0
 .../icons/audio-speaker-left-back.svg         |   0
 .../icons/audio-speaker-left-side-testing.svg |   0
 .../icons/audio-speaker-left-side.svg         |   0
 .../icons/audio-speaker-left-testing.svg      |   0
 .../icons/audio-speaker-left.svg              |   0
 .../icons/audio-speaker-mono-testing.svg      |   0
 .../icons/audio-speaker-mono.svg              |   0
 .../audio-speaker-right-back-testing.svg      |   0
 .../icons/audio-speaker-right-back.svg        |   0
 .../audio-speaker-right-side-testing.svg      |   0
 .../icons/audio-speaker-right-side.svg        |   0
 .../icons/audio-speaker-right-testing.svg     |   0
 .../icons/audio-speaker-right.svg             |   0
 .../icons/audio-speaker-testing.svg           |   0
 panels/{sound-new => sound}/meson.build       |   4 +-
 .../sound.gresource.xml}                      |   4 +-
 panels/{sound-new => sound}/sounds/bark.ogg   | Bin
 panels/{sound-new => sound}/sounds/drip.ogg   | Bin
 panels/{sound-new => sound}/sounds/glass.ogg  | Bin
 panels/{sound-new => sound}/sounds/sonar.ogg  | Bin
 po/POTFILES.in                                |  16 ++--
 shell/cc-panel-loader.c                       |   4 +-
 72 files changed, 92 insertions(+), 92 deletions(-)
 rename panels/{sound-new => sound}/cc-alert-chooser.c (98%)
 rename panels/{sound-new => sound}/cc-alert-chooser.h (100%)
 rename panels/{sound-new => sound}/cc-alert-chooser.ui (100%)
 rename panels/{sound-new => sound}/cc-alert-selector.h (100%)
 rename panels/{sound-new => sound}/cc-alert-selector.ui (100%)
 rename panels/{sound-new => sound}/cc-balance-slider.c (96%)
 rename panels/{sound-new => sound}/cc-balance-slider.h (100%)
 rename panels/{sound-new => sound}/cc-balance-slider.ui (100%)
 rename panels/{sound-new => sound}/cc-device-combo-box.c (97%)
 rename panels/{sound-new => sound}/cc-device-combo-box.h (100%)
 rename panels/{sound-new => sound}/cc-device-combo-box.ui (100%)
 rename panels/{sound-new => sound}/cc-fade-slider.c (96%)
 rename panels/{sound-new => sound}/cc-fade-slider.h (100%)
 rename panels/{sound-new => sound}/cc-fade-slider.ui (100%)
 rename panels/{sound-new => sound}/cc-level-bar.c (100%)
 rename panels/{sound-new => sound}/cc-level-bar.h (100%)
 rename panels/{sound-new => sound}/cc-output-test-dialog.c (98%)
 rename panels/{sound-new => sound}/cc-output-test-dialog.h (100%)
 rename panels/{sound-new => sound}/cc-output-test-dialog.ui (100%)
 rename panels/{sound-new => sound}/cc-profile-combo-box.c (96%)
 rename panels/{sound-new => sound}/cc-profile-combo-box.h (100%)
 rename panels/{sound-new => sound}/cc-profile-combo-box.ui (100%)
 rename panels/{sound-new => sound}/cc-sound-button.c (95%)
 rename panels/{sound-new => sound}/cc-sound-button.h (100%)
 rename panels/{sound-new => sound}/cc-sound-button.ui (100%)
 rename panels/{sound-new/cc-sound-new-panel.c => sound/cc-sound-panel.c} (73%)
 rename panels/{sound-new/cc-sound-new-panel.h => sound/cc-sound-panel.h} (84%)
 rename panels/{sound-new/cc-sound-new-panel.ui => sound/cc-sound-panel.ui} (98%)
 rename panels/{sound-new => sound}/cc-speaker-test-button.c (98%)
 rename panels/{sound-new => sound}/cc-speaker-test-button.h (100%)
 rename panels/{sound-new => sound}/cc-speaker-test-button.ui (100%)
 rename panels/{sound-new => sound}/cc-stream-list-box.c (100%)
 rename panels/{sound-new => sound}/cc-stream-list-box.h (100%)
 rename panels/{sound-new => sound}/cc-stream-row.c (95%)
 rename panels/{sound-new => sound}/cc-stream-row.h (100%)
 rename panels/{sound-new => sound}/cc-stream-row.ui (100%)
 rename panels/{sound-new => sound}/cc-subwoofer-slider.c (96%)
 rename panels/{sound-new => sound}/cc-subwoofer-slider.h (100%)
 rename panels/{sound-new => sound}/cc-subwoofer-slider.ui (100%)
 rename panels/{sound-new => sound}/cc-volume-slider.c (97%)
 rename panels/{sound-new => sound}/cc-volume-slider.h (100%)
 rename panels/{sound-new => sound}/cc-volume-slider.ui (100%)
 rename panels/{sound-new/gnome-sound-new-panel.desktop.in.in => sound/gnome-sound-panel.desktop.in.in} (100%)
 rename panels/{sound-new => sound}/gvc-mixer-stream-private.h (100%)
 rename panels/{sound-new => sound}/icons/audio-speaker-center-back-testing.svg (100%)
 rename panels/{sound-new => sound}/icons/audio-speaker-center-back.svg (100%)
 rename panels/{sound-new => sound}/icons/audio-speaker-center-testing.svg (100%)
 rename panels/{sound-new => sound}/icons/audio-speaker-center.svg (100%)
 rename panels/{sound-new => sound}/icons/audio-speaker-left-back-testing.svg (100%)
 rename panels/{sound-new => sound}/icons/audio-speaker-left-back.svg (100%)
 rename panels/{sound-new => sound}/icons/audio-speaker-left-side-testing.svg (100%)
 rename panels/{sound-new => sound}/icons/audio-speaker-left-side.svg (100%)
 rename panels/{sound-new => sound}/icons/audio-speaker-left-testing.svg (100%)
 rename panels/{sound-new => sound}/icons/audio-speaker-left.svg (100%)
 rename panels/{sound-new => sound}/icons/audio-speaker-mono-testing.svg (100%)
 rename panels/{sound-new => sound}/icons/audio-speaker-mono.svg (100%)
 rename panels/{sound-new => sound}/icons/audio-speaker-right-back-testing.svg (100%)
 rename panels/{sound-new => sound}/icons/audio-speaker-right-back.svg (100%)
 rename panels/{sound-new => sound}/icons/audio-speaker-right-side-testing.svg (100%)
 rename panels/{sound-new => sound}/icons/audio-speaker-right-side.svg (100%)
 rename panels/{sound-new => sound}/icons/audio-speaker-right-testing.svg (100%)
 rename panels/{sound-new => sound}/icons/audio-speaker-right.svg (100%)
 rename panels/{sound-new => sound}/icons/audio-speaker-testing.svg (100%)
 rename panels/{sound-new => sound}/meson.build (98%)
 rename panels/{sound-new/sound-new.gresource.xml => sound/sound.gresource.xml} (95%)
 rename panels/{sound-new => sound}/sounds/bark.ogg (100%)
 rename panels/{sound-new => sound}/sounds/drip.ogg (100%)
 rename panels/{sound-new => sound}/sounds/glass.ogg (100%)
 rename panels/{sound-new => sound}/sounds/sonar.ogg (100%)

diff --git a/panels/meson.build b/panels/meson.build
index 5f95fc756..95a44bb9d 100644
--- a/panels/meson.build
+++ b/panels/meson.build
@@ -17,7 +17,7 @@ panels = [
   'region',
   'search',
   'sharing',
-  'sound-new',
+  'sound',
   'universal-access',
   'user-accounts'
 ]
diff --git a/panels/sound-new/cc-alert-chooser.c b/panels/sound/cc-alert-chooser.c
similarity index 98%
rename from panels/sound-new/cc-alert-chooser.c
rename to panels/sound/cc-alert-chooser.c
index 0967a025b..8e60659f1 100644
--- a/panels/sound-new/cc-alert-chooser.c
+++ b/panels/sound/cc-alert-chooser.c
@@ -22,7 +22,7 @@
 #include "config.h"
 #include "cc-alert-chooser.h"
 #include "cc-sound-button.h"
-#include "cc-sound-new-resources.h"
+#include "cc-sound-resources.h"
 
 #define KEY_SOUNDS_SCHEMA "org.gnome.desktop.sound"
 
@@ -236,7 +236,7 @@ cc_alert_chooser_class_init (CcAlertChooserClass *klass)
 
   object_class->dispose = cc_alert_chooser_dispose;
 
-  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/sound-new/cc-alert-chooser.ui");
+  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/sound/cc-alert-chooser.ui");
 
   gtk_widget_class_bind_template_child (widget_class, CcAlertChooser, bark_button);
   gtk_widget_class_bind_template_child (widget_class, CcAlertChooser, drip_button);
@@ -254,7 +254,7 @@ cc_alert_chooser_init (CcAlertChooser *self)
   g_autofree gchar *alert_name = NULL;
   g_autoptr(GError) error = NULL;
 
-  g_resources_register (cc_sound_new_get_resource ());
+  g_resources_register (cc_sound_get_resource ());
 
   gtk_widget_init_template (GTK_WIDGET (self));
 
diff --git a/panels/sound-new/cc-alert-chooser.h b/panels/sound/cc-alert-chooser.h
similarity index 100%
rename from panels/sound-new/cc-alert-chooser.h
rename to panels/sound/cc-alert-chooser.h
diff --git a/panels/sound-new/cc-alert-chooser.ui b/panels/sound/cc-alert-chooser.ui
similarity index 100%
rename from panels/sound-new/cc-alert-chooser.ui
rename to panels/sound/cc-alert-chooser.ui
diff --git a/panels/sound-new/cc-alert-selector.h b/panels/sound/cc-alert-selector.h
similarity index 100%
rename from panels/sound-new/cc-alert-selector.h
rename to panels/sound/cc-alert-selector.h
diff --git a/panels/sound-new/cc-alert-selector.ui b/panels/sound/cc-alert-selector.ui
similarity index 100%
rename from panels/sound-new/cc-alert-selector.ui
rename to panels/sound/cc-alert-selector.ui
diff --git a/panels/sound-new/cc-balance-slider.c b/panels/sound/cc-balance-slider.c
similarity index 96%
rename from panels/sound-new/cc-balance-slider.c
rename to panels/sound/cc-balance-slider.c
index 7584393be..7cb8a04f0 100644
--- a/panels/sound-new/cc-balance-slider.c
+++ b/panels/sound/cc-balance-slider.c
@@ -16,7 +16,7 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "cc-sound-new-resources.h"
+#include "cc-sound-resources.h"
 #include "cc-balance-slider.h"
 #include "gvc-channel-map-private.h"
 
@@ -78,7 +78,7 @@ cc_balance_slider_class_init (CcBalanceSliderClass *klass)
 
   object_class->dispose = cc_balance_slider_dispose;
 
-  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/sound-new/cc-balance-slider.ui");
+  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/sound/cc-balance-slider.ui");
 
   gtk_widget_class_bind_template_child (widget_class, CcBalanceSlider, adjustment);
 
@@ -88,7 +88,7 @@ cc_balance_slider_class_init (CcBalanceSliderClass *klass)
 void
 cc_balance_slider_init (CcBalanceSlider *self)
 {
-  g_resources_register (cc_sound_new_get_resource ());
+  g_resources_register (cc_sound_get_resource ());
 
   gtk_widget_init_template (GTK_WIDGET (self));
 }
diff --git a/panels/sound-new/cc-balance-slider.h b/panels/sound/cc-balance-slider.h
similarity index 100%
rename from panels/sound-new/cc-balance-slider.h
rename to panels/sound/cc-balance-slider.h
diff --git a/panels/sound-new/cc-balance-slider.ui b/panels/sound/cc-balance-slider.ui
similarity index 100%
rename from panels/sound-new/cc-balance-slider.ui
rename to panels/sound/cc-balance-slider.ui
diff --git a/panels/sound-new/cc-device-combo-box.c b/panels/sound/cc-device-combo-box.c
similarity index 97%
rename from panels/sound-new/cc-device-combo-box.c
rename to panels/sound/cc-device-combo-box.c
index 851f024ae..a4dc3b951 100644
--- a/panels/sound-new/cc-device-combo-box.c
+++ b/panels/sound/cc-device-combo-box.c
@@ -17,7 +17,7 @@
  */
 
 #include "cc-device-combo-box.h"
-#include "cc-sound-new-resources.h"
+#include "cc-sound-resources.h"
 
 struct _CcDeviceComboBox
 {
@@ -120,7 +120,7 @@ cc_device_combo_box_class_init (CcDeviceComboBoxClass *klass)
 
   object_class->dispose = cc_device_combo_box_dispose;
 
-  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/sound-new/cc-device-combo-box.ui");
+  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/sound/cc-device-combo-box.ui");
 
   gtk_widget_class_bind_template_child (widget_class, CcDeviceComboBox, device_model);
 }
@@ -128,7 +128,7 @@ cc_device_combo_box_class_init (CcDeviceComboBoxClass *klass)
 void
 cc_device_combo_box_init (CcDeviceComboBox *self)
 {
-  g_resources_register (cc_sound_new_get_resource ());
+  g_resources_register (cc_sound_get_resource ());
 
   gtk_widget_init_template (GTK_WIDGET (self));
 }
diff --git a/panels/sound-new/cc-device-combo-box.h b/panels/sound/cc-device-combo-box.h
similarity index 100%
rename from panels/sound-new/cc-device-combo-box.h
rename to panels/sound/cc-device-combo-box.h
diff --git a/panels/sound-new/cc-device-combo-box.ui b/panels/sound/cc-device-combo-box.ui
similarity index 100%
rename from panels/sound-new/cc-device-combo-box.ui
rename to panels/sound/cc-device-combo-box.ui
diff --git a/panels/sound-new/cc-fade-slider.c b/panels/sound/cc-fade-slider.c
similarity index 96%
rename from panels/sound-new/cc-fade-slider.c
rename to panels/sound/cc-fade-slider.c
index c8aa57cee..888f21423 100644
--- a/panels/sound-new/cc-fade-slider.c
+++ b/panels/sound/cc-fade-slider.c
@@ -16,7 +16,7 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "cc-sound-new-resources.h"
+#include "cc-sound-resources.h"
 #include "cc-fade-slider.h"
 #include "gvc-channel-map-private.h"
 
@@ -78,7 +78,7 @@ cc_fade_slider_class_init (CcFadeSliderClass *klass)
 
   object_class->dispose = cc_fade_slider_dispose;
 
-  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/sound-new/cc-fade-slider.ui");
+  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/sound/cc-fade-slider.ui");
 
   gtk_widget_class_bind_template_child (widget_class, CcFadeSlider, adjustment);
 
@@ -88,7 +88,7 @@ cc_fade_slider_class_init (CcFadeSliderClass *klass)
 void
 cc_fade_slider_init (CcFadeSlider *self)
 {
-  g_resources_register (cc_sound_new_get_resource ());
+  g_resources_register (cc_sound_get_resource ());
 
   gtk_widget_init_template (GTK_WIDGET (self));
 }
diff --git a/panels/sound-new/cc-fade-slider.h b/panels/sound/cc-fade-slider.h
similarity index 100%
rename from panels/sound-new/cc-fade-slider.h
rename to panels/sound/cc-fade-slider.h
diff --git a/panels/sound-new/cc-fade-slider.ui b/panels/sound/cc-fade-slider.ui
similarity index 100%
rename from panels/sound-new/cc-fade-slider.ui
rename to panels/sound/cc-fade-slider.ui
diff --git a/panels/sound-new/cc-level-bar.c b/panels/sound/cc-level-bar.c
similarity index 100%
rename from panels/sound-new/cc-level-bar.c
rename to panels/sound/cc-level-bar.c
diff --git a/panels/sound-new/cc-level-bar.h b/panels/sound/cc-level-bar.h
similarity index 100%
rename from panels/sound-new/cc-level-bar.h
rename to panels/sound/cc-level-bar.h
diff --git a/panels/sound-new/cc-output-test-dialog.c b/panels/sound/cc-output-test-dialog.c
similarity index 98%
rename from panels/sound-new/cc-output-test-dialog.c
rename to panels/sound/cc-output-test-dialog.c
index fe82c5c9b..67c0a2795 100644
--- a/panels/sound-new/cc-output-test-dialog.c
+++ b/panels/sound/cc-output-test-dialog.c
@@ -20,7 +20,7 @@
 #include <glib/gi18n.h>
 
 #include "cc-output-test-dialog.h"
-#include "cc-sound-new-resources.h"
+#include "cc-sound-resources.h"
 #include "cc-speaker-test-button.h"
 
 struct _CcOutputTestDialog
@@ -64,7 +64,7 @@ cc_output_test_dialog_class_init (CcOutputTestDialogClass *klass)
 
   object_class->dispose = cc_output_test_dialog_dispose;
 
-  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/sound-new/cc-output-test-dialog.ui");
+  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/sound/cc-output-test-dialog.ui");
 
   gtk_widget_class_bind_template_child (widget_class, CcOutputTestDialog, front_center_speaker_button);
   gtk_widget_class_bind_template_child (widget_class, CcOutputTestDialog, front_left_speaker_button);
@@ -87,7 +87,7 @@ cc_output_test_dialog_init (CcOutputTestDialog *self)
   GtkSettings *settings;
   g_autofree gchar *theme_name = NULL;
 
-  g_resources_register (cc_sound_new_get_resource ());
+  g_resources_register (cc_sound_get_resource ());
 
   gtk_widget_init_template (GTK_WIDGET (self));
 
diff --git a/panels/sound-new/cc-output-test-dialog.h b/panels/sound/cc-output-test-dialog.h
similarity index 100%
rename from panels/sound-new/cc-output-test-dialog.h
rename to panels/sound/cc-output-test-dialog.h
diff --git a/panels/sound-new/cc-output-test-dialog.ui b/panels/sound/cc-output-test-dialog.ui
similarity index 100%
rename from panels/sound-new/cc-output-test-dialog.ui
rename to panels/sound/cc-output-test-dialog.ui
diff --git a/panels/sound-new/cc-profile-combo-box.c b/panels/sound/cc-profile-combo-box.c
similarity index 96%
rename from panels/sound-new/cc-profile-combo-box.c
rename to panels/sound/cc-profile-combo-box.c
index 403d9ee0d..da7b9b048 100644
--- a/panels/sound-new/cc-profile-combo-box.c
+++ b/panels/sound/cc-profile-combo-box.c
@@ -17,7 +17,7 @@
  */
 
 #include "cc-profile-combo-box.h"
-#include "cc-sound-new-resources.h"
+#include "cc-sound-resources.h"
 
 struct _CcProfileComboBox
 {
@@ -70,7 +70,7 @@ cc_profile_combo_box_class_init (CcProfileComboBoxClass *klass)
 
   object_class->dispose = cc_profile_combo_box_dispose;
 
-  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/sound-new/cc-profile-combo-box.ui");
+  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/sound/cc-profile-combo-box.ui");
 
   gtk_widget_class_bind_template_child (widget_class, CcProfileComboBox, profile_model);
 
@@ -80,7 +80,7 @@ cc_profile_combo_box_class_init (CcProfileComboBoxClass *klass)
 void
 cc_profile_combo_box_init (CcProfileComboBox *self)
 {
-  g_resources_register (cc_sound_new_get_resource ());
+  g_resources_register (cc_sound_get_resource ());
 
   gtk_widget_init_template (GTK_WIDGET (self));
 }
diff --git a/panels/sound-new/cc-profile-combo-box.h b/panels/sound/cc-profile-combo-box.h
similarity index 100%
rename from panels/sound-new/cc-profile-combo-box.h
rename to panels/sound/cc-profile-combo-box.h
diff --git a/panels/sound-new/cc-profile-combo-box.ui b/panels/sound/cc-profile-combo-box.ui
similarity index 100%
rename from panels/sound-new/cc-profile-combo-box.ui
rename to panels/sound/cc-profile-combo-box.ui
diff --git a/panels/sound-new/cc-sound-button.c b/panels/sound/cc-sound-button.c
similarity index 95%
rename from panels/sound-new/cc-sound-button.c
rename to panels/sound/cc-sound-button.c
index db27f3637..f8e8d09a3 100644
--- a/panels/sound-new/cc-sound-button.c
+++ b/panels/sound/cc-sound-button.c
@@ -17,7 +17,7 @@
  */
 
 #include "cc-sound-button.h"
-#include "cc-sound-new-resources.h"
+#include "cc-sound-resources.h"
 
 struct _CcSoundButton
 {
@@ -78,7 +78,7 @@ cc_sound_button_class_init (CcSoundButtonClass *klass)
   object_class->set_property = cc_sound_button_set_property;
   object_class->get_property = cc_sound_button_get_property;
 
-  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/sound-new/cc-sound-button.ui");
+  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/sound/cc-sound-button.ui");
 
   gtk_widget_class_bind_template_child (widget_class, CcSoundButton, image);
   gtk_widget_class_bind_template_child (widget_class, CcSoundButton, label);
@@ -94,7 +94,7 @@ cc_sound_button_class_init (CcSoundButtonClass *klass)
 void
 cc_sound_button_init (CcSoundButton *self)
 {
-  g_resources_register (cc_sound_new_get_resource ());
+  g_resources_register (cc_sound_get_resource ());
 
   gtk_widget_init_template (GTK_WIDGET (self));
 }
diff --git a/panels/sound-new/cc-sound-button.h b/panels/sound/cc-sound-button.h
similarity index 100%
rename from panels/sound-new/cc-sound-button.h
rename to panels/sound/cc-sound-button.h
diff --git a/panels/sound-new/cc-sound-button.ui b/panels/sound/cc-sound-button.ui
similarity index 100%
rename from panels/sound-new/cc-sound-button.ui
rename to panels/sound/cc-sound-button.ui
diff --git a/panels/sound-new/cc-sound-new-panel.c b/panels/sound/cc-sound-panel.c
similarity index 73%
rename from panels/sound-new/cc-sound-new-panel.c
rename to panels/sound/cc-sound-panel.c
index 863318444..0c28980f6 100644
--- a/panels/sound-new/cc-sound-new-panel.c
+++ b/panels/sound/cc-sound-panel.c
@@ -38,13 +38,13 @@
 #include "cc-level-bar.h"
 #include "cc-output-test-dialog.h"
 #include "cc-profile-combo-box.h"
-#include "cc-sound-new-panel.h"
-#include "cc-sound-new-resources.h"
+#include "cc-sound-panel.h"
+#include "cc-sound-resources.h"
 #include "cc-stream-list-box.h"
 #include "cc-subwoofer-slider.h"
 #include "cc-volume-slider.h"
 
-struct _CcSoundNewPanel
+struct _CcSoundPanel
 {
   CcPanel            parent_instance;
 
@@ -74,7 +74,7 @@ struct _CcSoundNewPanel
   GSettings         *sound_settings;
 };
 
-CC_PANEL_REGISTER (CcSoundNewPanel, cc_sound_new_panel)
+CC_PANEL_REGISTER (CcSoundPanel, cc_sound_panel)
 
 enum
 {
@@ -85,14 +85,14 @@ enum
 #define KEY_SOUNDS_SCHEMA "org.gnome.desktop.sound"
 
 static void
-allow_amplified_changed_cb (CcSoundNewPanel *self)
+allow_amplified_changed_cb (CcSoundPanel *self)
 {
   cc_volume_slider_set_is_amplified (self->output_volume_slider,
                                      g_settings_get_boolean (self->sound_settings, "allow-volume-above-100-percent"));
 }
 
 static void
-output_device_changed_cb (CcSoundNewPanel *self)
+output_device_changed_cb (CcSoundPanel *self)
 {
   GvcMixerUIDevice *device;
   GvcMixerStream *stream = NULL;
@@ -125,7 +125,7 @@ output_device_changed_cb (CcSoundNewPanel *self)
 }
 
 static void
-input_device_changed_cb (CcSoundNewPanel *self)
+input_device_changed_cb (CcSoundPanel *self)
 {
   GvcMixerUIDevice *device;
   GvcMixerStream *stream = NULL;
@@ -143,7 +143,7 @@ input_device_changed_cb (CcSoundNewPanel *self)
 }
 
 static void
-test_output_configuration_button_clicked_cb (CcSoundNewPanel *self)
+test_output_configuration_button_clicked_cb (CcSoundPanel *self)
 {
   GvcMixerUIDevice *device;
   GvcMixerStream *stream = NULL;
@@ -160,55 +160,55 @@ test_output_configuration_button_clicked_cb (CcSoundNewPanel *self)
 }
 
 static const char *
-cc_sound_new_panel_get_help_uri (CcPanel *panel)
+cc_sound_panel_get_help_uri (CcPanel *panel)
 {
   return "help:gnome-help/media#sound";
 }
 
 static void
-cc_sound_new_panel_finalize (GObject *object)
+cc_sound_panel_finalize (GObject *object)
 {
-  CcSoundNewPanel *panel = CC_SOUND_NEW_PANEL (object);
+  CcSoundPanel *panel = CC_SOUND_PANEL (object);
 
   g_clear_object (&panel->mixer_control);
   g_clear_object (&panel->sound_settings);
 
-  G_OBJECT_CLASS (cc_sound_new_panel_parent_class)->finalize (object);
+  G_OBJECT_CLASS (cc_sound_panel_parent_class)->finalize (object);
 }
 
 static void
-cc_sound_new_panel_class_init (CcSoundNewPanelClass *klass)
+cc_sound_panel_class_init (CcSoundPanelClass *klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
   GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
   CcPanelClass *panel_class = CC_PANEL_CLASS (klass);
 
-  panel_class->get_help_uri = cc_sound_new_panel_get_help_uri;
+  panel_class->get_help_uri = cc_sound_panel_get_help_uri;
 
-  object_class->finalize = cc_sound_new_panel_finalize;
+  object_class->finalize = cc_sound_panel_finalize;
 
-  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/sound-new/cc-sound-new-panel.ui");
+  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/sound/cc-sound-panel.ui");
 
-  gtk_widget_class_bind_template_child (widget_class, CcSoundNewPanel, balance_slider);
-  gtk_widget_class_bind_template_child (widget_class, CcSoundNewPanel, fade_row);
-  gtk_widget_class_bind_template_child (widget_class, CcSoundNewPanel, fade_slider);
-  gtk_widget_class_bind_template_child (widget_class, CcSoundNewPanel, input_device_combo_box);
-  gtk_widget_class_bind_template_child (widget_class, CcSoundNewPanel, input_level_bar);
-  gtk_widget_class_bind_template_child (widget_class, CcSoundNewPanel, input_list_box);
-  gtk_widget_class_bind_template_child (widget_class, CcSoundNewPanel, input_profile_combo_box);
-  gtk_widget_class_bind_template_child (widget_class, CcSoundNewPanel, input_profile_row);
-  gtk_widget_class_bind_template_child (widget_class, CcSoundNewPanel, input_volume_slider);
-  gtk_widget_class_bind_template_child (widget_class, CcSoundNewPanel, label_size_group);
-  gtk_widget_class_bind_template_child (widget_class, CcSoundNewPanel, main_box);
-  gtk_widget_class_bind_template_child (widget_class, CcSoundNewPanel, output_device_combo_box);
-  gtk_widget_class_bind_template_child (widget_class, CcSoundNewPanel, output_level_bar);
-  gtk_widget_class_bind_template_child (widget_class, CcSoundNewPanel, output_list_box);
-  gtk_widget_class_bind_template_child (widget_class, CcSoundNewPanel, output_profile_combo_box);
-  gtk_widget_class_bind_template_child (widget_class, CcSoundNewPanel, output_profile_row);
-  gtk_widget_class_bind_template_child (widget_class, CcSoundNewPanel, output_volume_slider);
-  gtk_widget_class_bind_template_child (widget_class, CcSoundNewPanel, stream_list_box);
-  gtk_widget_class_bind_template_child (widget_class, CcSoundNewPanel, subwoofer_row);
-  gtk_widget_class_bind_template_child (widget_class, CcSoundNewPanel, subwoofer_slider);
+  gtk_widget_class_bind_template_child (widget_class, CcSoundPanel, balance_slider);
+  gtk_widget_class_bind_template_child (widget_class, CcSoundPanel, fade_row);
+  gtk_widget_class_bind_template_child (widget_class, CcSoundPanel, fade_slider);
+  gtk_widget_class_bind_template_child (widget_class, CcSoundPanel, input_device_combo_box);
+  gtk_widget_class_bind_template_child (widget_class, CcSoundPanel, input_level_bar);
+  gtk_widget_class_bind_template_child (widget_class, CcSoundPanel, input_list_box);
+  gtk_widget_class_bind_template_child (widget_class, CcSoundPanel, input_profile_combo_box);
+  gtk_widget_class_bind_template_child (widget_class, CcSoundPanel, input_profile_row);
+  gtk_widget_class_bind_template_child (widget_class, CcSoundPanel, input_volume_slider);
+  gtk_widget_class_bind_template_child (widget_class, CcSoundPanel, label_size_group);
+  gtk_widget_class_bind_template_child (widget_class, CcSoundPanel, main_box);
+  gtk_widget_class_bind_template_child (widget_class, CcSoundPanel, output_device_combo_box);
+  gtk_widget_class_bind_template_child (widget_class, CcSoundPanel, output_level_bar);
+  gtk_widget_class_bind_template_child (widget_class, CcSoundPanel, output_list_box);
+  gtk_widget_class_bind_template_child (widget_class, CcSoundPanel, output_profile_combo_box);
+  gtk_widget_class_bind_template_child (widget_class, CcSoundPanel, output_profile_row);
+  gtk_widget_class_bind_template_child (widget_class, CcSoundPanel, output_volume_slider);
+  gtk_widget_class_bind_template_child (widget_class, CcSoundPanel, stream_list_box);
+  gtk_widget_class_bind_template_child (widget_class, CcSoundPanel, subwoofer_row);
+  gtk_widget_class_bind_template_child (widget_class, CcSoundPanel, subwoofer_slider);
 
   gtk_widget_class_bind_template_callback (widget_class, input_device_changed_cb);
   gtk_widget_class_bind_template_callback (widget_class, output_device_changed_cb);
@@ -226,9 +226,9 @@ cc_sound_new_panel_class_init (CcSoundNewPanelClass *klass)
 }
 
 static void
-cc_sound_new_panel_init (CcSoundNewPanel *self)
+cc_sound_panel_init (CcSoundPanel *self)
 {
-  g_resources_register (cc_sound_new_get_resource ());
+  g_resources_register (cc_sound_get_resource ());
 
   gtk_widget_init_template (GTK_WIDGET (self));
 
diff --git a/panels/sound-new/cc-sound-new-panel.h b/panels/sound/cc-sound-panel.h
similarity index 84%
rename from panels/sound-new/cc-sound-new-panel.h
rename to panels/sound/cc-sound-panel.h
index a0c5804ac..468f2c4af 100644
--- a/panels/sound-new/cc-sound-new-panel.h
+++ b/panels/sound/cc-sound-panel.h
@@ -22,7 +22,7 @@
 
 G_BEGIN_DECLS
 
-#define CC_TYPE_SOUND_NEW_PANEL (cc_sound_new_panel_get_type ())
-G_DECLARE_FINAL_TYPE (CcSoundNewPanel, cc_sound_new_panel, CC, SOUND_NEW_PANEL, CcPanel)
+#define CC_TYPE_SOUND_PANEL (cc_sound_panel_get_type ())
+G_DECLARE_FINAL_TYPE (CcSoundPanel, cc_sound_panel, CC, SOUND_PANEL, CcPanel)
 
 G_END_DECLS
diff --git a/panels/sound-new/cc-sound-new-panel.ui b/panels/sound/cc-sound-panel.ui
similarity index 98%
rename from panels/sound-new/cc-sound-new-panel.ui
rename to panels/sound/cc-sound-panel.ui
index a22434137..a6ce920b2 100644
--- a/panels/sound-new/cc-sound-new-panel.ui
+++ b/panels/sound/cc-sound-panel.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
-  <template class="CcSoundNewPanel" parent="CcPanel">
+  <template class="CcSoundPanel" parent="CcPanel">
     <property name="visible">True</property>
     <child>
       <object class="GtkScrolledWindow">
@@ -108,14 +108,14 @@
                                           <object class="CcDeviceComboBox" id="output_device_combo_box">
                                             <property name="visible">True</property>
                                             <property name="hexpand">True</property>
-                                            <signal name="changed" handler="output_device_changed_cb" object="CcSoundNewPanel" swapped="yes"/>
+                                            <signal name="changed" handler="output_device_changed_cb" object="CcSoundPanel" swapped="yes"/>
                                           </object>
                                         </child>
                                         <child>
                                           <object class="GtkButton">
                                             <property name="visible">True</property>
                                             <property name="label" translatable="yes">Test</property>
-                                            <signal name="clicked" handler="test_output_configuration_button_clicked_cb" object="CcSoundNewPanel" swapped="yes"/>
+                                            <signal name="clicked" handler="test_output_configuration_button_clicked_cb" object="CcSoundPanel" swapped="yes"/>
                                           </object>
                                         </child>
                                       </object>
@@ -289,7 +289,7 @@
                                       <object class="CcDeviceComboBox" id="input_device_combo_box">
                                         <property name="visible">True</property>
                                         <property name="hexpand">True</property>
-                                        <signal name="changed" handler="input_device_changed_cb" object="CcSoundNewPanel" swapped="yes"/>
+                                        <signal name="changed" handler="input_device_changed_cb" object="CcSoundPanel" swapped="yes"/>
                                       </object>
                                     </child>
                                     <child>
diff --git a/panels/sound-new/cc-speaker-test-button.c b/panels/sound/cc-speaker-test-button.c
similarity index 98%
rename from panels/sound-new/cc-speaker-test-button.c
rename to panels/sound/cc-speaker-test-button.c
index 2cdc64b1b..833b3990b 100644
--- a/panels/sound-new/cc-speaker-test-button.c
+++ b/panels/sound/cc-speaker-test-button.c
@@ -19,7 +19,7 @@
 #include <gsound.h>
 #include <pulse/pulseaudio.h>
 
-#include "cc-sound-new-resources.h"
+#include "cc-sound-resources.h"
 #include "cc-speaker-test-button.h"
 
 struct _CcSpeakerTestButton
@@ -202,7 +202,7 @@ cc_speaker_test_button_class_init (CcSpeakerTestButtonClass *klass)
 
   object_class->dispose = cc_speaker_test_button_dispose;
 
-  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/sound-new/cc-speaker-test-button.ui");
+  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/sound/cc-speaker-test-button.ui");
 
   gtk_widget_class_bind_template_child (widget_class, CcSpeakerTestButton, image);
   gtk_widget_class_bind_template_child (widget_class, CcSpeakerTestButton, label);
@@ -213,7 +213,7 @@ cc_speaker_test_button_class_init (CcSpeakerTestButtonClass *klass)
 void
 cc_speaker_test_button_init (CcSpeakerTestButton *self)
 {
-  g_resources_register (cc_sound_new_get_resource ());
+  g_resources_register (cc_sound_get_resource ());
 
   gtk_widget_init_template (GTK_WIDGET (self));
 
diff --git a/panels/sound-new/cc-speaker-test-button.h b/panels/sound/cc-speaker-test-button.h
similarity index 100%
rename from panels/sound-new/cc-speaker-test-button.h
rename to panels/sound/cc-speaker-test-button.h
diff --git a/panels/sound-new/cc-speaker-test-button.ui b/panels/sound/cc-speaker-test-button.ui
similarity index 100%
rename from panels/sound-new/cc-speaker-test-button.ui
rename to panels/sound/cc-speaker-test-button.ui
diff --git a/panels/sound-new/cc-stream-list-box.c b/panels/sound/cc-stream-list-box.c
similarity index 100%
rename from panels/sound-new/cc-stream-list-box.c
rename to panels/sound/cc-stream-list-box.c
diff --git a/panels/sound-new/cc-stream-list-box.h b/panels/sound/cc-stream-list-box.h
similarity index 100%
rename from panels/sound-new/cc-stream-list-box.h
rename to panels/sound/cc-stream-list-box.h
diff --git a/panels/sound-new/cc-stream-row.c b/panels/sound/cc-stream-row.c
similarity index 95%
rename from panels/sound-new/cc-stream-row.c
rename to panels/sound/cc-stream-row.c
index fdc4ed615..a750e82e4 100644
--- a/panels/sound-new/cc-stream-row.c
+++ b/panels/sound/cc-stream-row.c
@@ -16,7 +16,7 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "cc-sound-new-resources.h"
+#include "cc-sound-resources.h"
 #include "cc-stream-row.h"
 #include "cc-volume-slider.h"
 
@@ -53,7 +53,7 @@ cc_stream_row_class_init (CcStreamRowClass *klass)
 
   object_class->dispose = cc_stream_row_dispose;
 
-  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/sound-new/cc-stream-row.ui");
+  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/sound/cc-stream-row.ui");
 
   gtk_widget_class_bind_template_child (widget_class, CcStreamRow, label_box);
   gtk_widget_class_bind_template_child (widget_class, CcStreamRow, icon_image);
@@ -64,7 +64,7 @@ cc_stream_row_class_init (CcStreamRowClass *klass)
 void
 cc_stream_row_init (CcStreamRow *self)
 {
-  g_resources_register (cc_sound_new_get_resource ());
+  g_resources_register (cc_sound_get_resource ());
 
   gtk_widget_init_template (GTK_WIDGET (self));
 }
diff --git a/panels/sound-new/cc-stream-row.h b/panels/sound/cc-stream-row.h
similarity index 100%
rename from panels/sound-new/cc-stream-row.h
rename to panels/sound/cc-stream-row.h
diff --git a/panels/sound-new/cc-stream-row.ui b/panels/sound/cc-stream-row.ui
similarity index 100%
rename from panels/sound-new/cc-stream-row.ui
rename to panels/sound/cc-stream-row.ui
diff --git a/panels/sound-new/cc-subwoofer-slider.c b/panels/sound/cc-subwoofer-slider.c
similarity index 96%
rename from panels/sound-new/cc-subwoofer-slider.c
rename to panels/sound/cc-subwoofer-slider.c
index 676e611cd..15884b994 100644
--- a/panels/sound-new/cc-subwoofer-slider.c
+++ b/panels/sound/cc-subwoofer-slider.c
@@ -19,7 +19,7 @@
 #include <pulse/pulseaudio.h>
 #include <gvc-mixer-control.h>
 
-#include "cc-sound-new-resources.h"
+#include "cc-sound-resources.h"
 #include "cc-subwoofer-slider.h"
 #include "gvc-channel-map-private.h"
 
@@ -81,7 +81,7 @@ cc_subwoofer_slider_class_init (CcSubwooferSliderClass *klass)
 
   object_class->dispose = cc_subwoofer_slider_dispose;
 
-  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/sound-new/cc-subwoofer-slider.ui");
+  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/sound/cc-subwoofer-slider.ui");
 
   gtk_widget_class_bind_template_child (widget_class, CcSubwooferSlider, adjustment);
 
@@ -93,7 +93,7 @@ cc_subwoofer_slider_init (CcSubwooferSlider *self)
 {
   gdouble vol_max_norm;
 
-  g_resources_register (cc_sound_new_get_resource ());
+  g_resources_register (cc_sound_get_resource ());
 
   gtk_widget_init_template (GTK_WIDGET (self));
 
diff --git a/panels/sound-new/cc-subwoofer-slider.h b/panels/sound/cc-subwoofer-slider.h
similarity index 100%
rename from panels/sound-new/cc-subwoofer-slider.h
rename to panels/sound/cc-subwoofer-slider.h
diff --git a/panels/sound-new/cc-subwoofer-slider.ui b/panels/sound/cc-subwoofer-slider.ui
similarity index 100%
rename from panels/sound-new/cc-subwoofer-slider.ui
rename to panels/sound/cc-subwoofer-slider.ui
diff --git a/panels/sound-new/cc-volume-slider.c b/panels/sound/cc-volume-slider.c
similarity index 97%
rename from panels/sound-new/cc-volume-slider.c
rename to panels/sound/cc-volume-slider.c
index ff5cec8ef..8f58f656b 100644
--- a/panels/sound-new/cc-volume-slider.c
+++ b/panels/sound/cc-volume-slider.c
@@ -22,7 +22,7 @@
 #include <gvc-mixer-control.h>
 #include <canberra-gtk.h>
 
-#include "cc-sound-new-resources.h"
+#include "cc-sound-resources.h"
 #include "cc-volume-slider.h"
 
 struct _CcVolumeSlider
@@ -106,7 +106,7 @@ cc_volume_slider_class_init (CcVolumeSliderClass *klass)
 
   object_class->dispose = cc_volume_slider_dispose;
 
-  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/sound-new/cc-volume-slider.ui");
+  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/sound/cc-volume-slider.ui");
 
   gtk_widget_class_bind_template_child (widget_class, CcVolumeSlider, mute_button);
   gtk_widget_class_bind_template_child (widget_class, CcVolumeSlider, volume_adjustment);
@@ -121,7 +121,7 @@ cc_volume_slider_init (CcVolumeSlider *self)
 {
   gdouble vol_max_norm;
 
-  g_resources_register (cc_sound_new_get_resource ());
+  g_resources_register (cc_sound_get_resource ());
 
   gtk_widget_init_template (GTK_WIDGET (self));
 
diff --git a/panels/sound-new/cc-volume-slider.h b/panels/sound/cc-volume-slider.h
similarity index 100%
rename from panels/sound-new/cc-volume-slider.h
rename to panels/sound/cc-volume-slider.h
diff --git a/panels/sound-new/cc-volume-slider.ui b/panels/sound/cc-volume-slider.ui
similarity index 100%
rename from panels/sound-new/cc-volume-slider.ui
rename to panels/sound/cc-volume-slider.ui
diff --git a/panels/sound-new/gnome-sound-new-panel.desktop.in.in b/panels/sound/gnome-sound-panel.desktop.in.in
similarity index 100%
rename from panels/sound-new/gnome-sound-new-panel.desktop.in.in
rename to panels/sound/gnome-sound-panel.desktop.in.in
diff --git a/panels/sound-new/gvc-mixer-stream-private.h b/panels/sound/gvc-mixer-stream-private.h
similarity index 100%
rename from panels/sound-new/gvc-mixer-stream-private.h
rename to panels/sound/gvc-mixer-stream-private.h
diff --git a/panels/sound-new/icons/audio-speaker-center-back-testing.svg b/panels/sound/icons/audio-speaker-center-back-testing.svg
similarity index 100%
rename from panels/sound-new/icons/audio-speaker-center-back-testing.svg
rename to panels/sound/icons/audio-speaker-center-back-testing.svg
diff --git a/panels/sound-new/icons/audio-speaker-center-back.svg b/panels/sound/icons/audio-speaker-center-back.svg
similarity index 100%
rename from panels/sound-new/icons/audio-speaker-center-back.svg
rename to panels/sound/icons/audio-speaker-center-back.svg
diff --git a/panels/sound-new/icons/audio-speaker-center-testing.svg b/panels/sound/icons/audio-speaker-center-testing.svg
similarity index 100%
rename from panels/sound-new/icons/audio-speaker-center-testing.svg
rename to panels/sound/icons/audio-speaker-center-testing.svg
diff --git a/panels/sound-new/icons/audio-speaker-center.svg b/panels/sound/icons/audio-speaker-center.svg
similarity index 100%
rename from panels/sound-new/icons/audio-speaker-center.svg
rename to panels/sound/icons/audio-speaker-center.svg
diff --git a/panels/sound-new/icons/audio-speaker-left-back-testing.svg b/panels/sound/icons/audio-speaker-left-back-testing.svg
similarity index 100%
rename from panels/sound-new/icons/audio-speaker-left-back-testing.svg
rename to panels/sound/icons/audio-speaker-left-back-testing.svg
diff --git a/panels/sound-new/icons/audio-speaker-left-back.svg b/panels/sound/icons/audio-speaker-left-back.svg
similarity index 100%
rename from panels/sound-new/icons/audio-speaker-left-back.svg
rename to panels/sound/icons/audio-speaker-left-back.svg
diff --git a/panels/sound-new/icons/audio-speaker-left-side-testing.svg b/panels/sound/icons/audio-speaker-left-side-testing.svg
similarity index 100%
rename from panels/sound-new/icons/audio-speaker-left-side-testing.svg
rename to panels/sound/icons/audio-speaker-left-side-testing.svg
diff --git a/panels/sound-new/icons/audio-speaker-left-side.svg b/panels/sound/icons/audio-speaker-left-side.svg
similarity index 100%
rename from panels/sound-new/icons/audio-speaker-left-side.svg
rename to panels/sound/icons/audio-speaker-left-side.svg
diff --git a/panels/sound-new/icons/audio-speaker-left-testing.svg b/panels/sound/icons/audio-speaker-left-testing.svg
similarity index 100%
rename from panels/sound-new/icons/audio-speaker-left-testing.svg
rename to panels/sound/icons/audio-speaker-left-testing.svg
diff --git a/panels/sound-new/icons/audio-speaker-left.svg b/panels/sound/icons/audio-speaker-left.svg
similarity index 100%
rename from panels/sound-new/icons/audio-speaker-left.svg
rename to panels/sound/icons/audio-speaker-left.svg
diff --git a/panels/sound-new/icons/audio-speaker-mono-testing.svg b/panels/sound/icons/audio-speaker-mono-testing.svg
similarity index 100%
rename from panels/sound-new/icons/audio-speaker-mono-testing.svg
rename to panels/sound/icons/audio-speaker-mono-testing.svg
diff --git a/panels/sound-new/icons/audio-speaker-mono.svg b/panels/sound/icons/audio-speaker-mono.svg
similarity index 100%
rename from panels/sound-new/icons/audio-speaker-mono.svg
rename to panels/sound/icons/audio-speaker-mono.svg
diff --git a/panels/sound-new/icons/audio-speaker-right-back-testing.svg b/panels/sound/icons/audio-speaker-right-back-testing.svg
similarity index 100%
rename from panels/sound-new/icons/audio-speaker-right-back-testing.svg
rename to panels/sound/icons/audio-speaker-right-back-testing.svg
diff --git a/panels/sound-new/icons/audio-speaker-right-back.svg b/panels/sound/icons/audio-speaker-right-back.svg
similarity index 100%
rename from panels/sound-new/icons/audio-speaker-right-back.svg
rename to panels/sound/icons/audio-speaker-right-back.svg
diff --git a/panels/sound-new/icons/audio-speaker-right-side-testing.svg b/panels/sound/icons/audio-speaker-right-side-testing.svg
similarity index 100%
rename from panels/sound-new/icons/audio-speaker-right-side-testing.svg
rename to panels/sound/icons/audio-speaker-right-side-testing.svg
diff --git a/panels/sound-new/icons/audio-speaker-right-side.svg b/panels/sound/icons/audio-speaker-right-side.svg
similarity index 100%
rename from panels/sound-new/icons/audio-speaker-right-side.svg
rename to panels/sound/icons/audio-speaker-right-side.svg
diff --git a/panels/sound-new/icons/audio-speaker-right-testing.svg b/panels/sound/icons/audio-speaker-right-testing.svg
similarity index 100%
rename from panels/sound-new/icons/audio-speaker-right-testing.svg
rename to panels/sound/icons/audio-speaker-right-testing.svg
diff --git a/panels/sound-new/icons/audio-speaker-right.svg b/panels/sound/icons/audio-speaker-right.svg
similarity index 100%
rename from panels/sound-new/icons/audio-speaker-right.svg
rename to panels/sound/icons/audio-speaker-right.svg
diff --git a/panels/sound-new/icons/audio-speaker-testing.svg b/panels/sound/icons/audio-speaker-testing.svg
similarity index 100%
rename from panels/sound-new/icons/audio-speaker-testing.svg
rename to panels/sound/icons/audio-speaker-testing.svg
diff --git a/panels/sound-new/meson.build b/panels/sound/meson.build
similarity index 98%
rename from panels/sound-new/meson.build
rename to panels/sound/meson.build
index a93f0d386..fa0f1281f 100644
--- a/panels/sound-new/meson.build
+++ b/panels/sound/meson.build
@@ -39,7 +39,7 @@ sources = files(
   'cc-output-test-dialog.c',
   'cc-profile-combo-box.c',
   'cc-sound-button.c',
-  'cc-sound-new-panel.c',
+  'cc-sound-panel.c',
   'cc-speaker-test-button.c',
   'cc-stream-list-box.c',
   'cc-stream-row.c',
@@ -74,7 +74,7 @@ resource_data = files(
   'cc-output-test-dialog.ui',
   'cc-profile-combo-box.ui',
   'cc-sound-button.ui',
-  'cc-sound-new-panel.ui',
+  'cc-sound-panel.ui',
   'cc-speaker-test-button.ui',
   'cc-stream-row.ui',
   'cc-subwoofer-slider.ui',
diff --git a/panels/sound-new/sound-new.gresource.xml b/panels/sound/sound.gresource.xml
similarity index 95%
rename from panels/sound-new/sound-new.gresource.xml
rename to panels/sound/sound.gresource.xml
index 12c70a669..b3a0643c7 100644
--- a/panels/sound-new/sound-new.gresource.xml
+++ b/panels/sound/sound.gresource.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
-  <gresource prefix="/org/gnome/control-center/sound-new">
+  <gresource prefix="/org/gnome/control-center/sound">
     <file preprocess="xml-stripblanks">cc-alert-chooser.ui</file>
     <file preprocess="xml-stripblanks">cc-balance-slider.ui</file>
     <file preprocess="xml-stripblanks">cc-device-combo-box.ui</file>
@@ -8,7 +8,7 @@
     <file preprocess="xml-stripblanks">cc-output-test-dialog.ui</file>
     <file preprocess="xml-stripblanks">cc-profile-combo-box.ui</file>
     <file preprocess="xml-stripblanks">cc-sound-button.ui</file>
-    <file preprocess="xml-stripblanks">cc-sound-new-panel.ui</file>
+    <file preprocess="xml-stripblanks">cc-sound-panel.ui</file>
     <file preprocess="xml-stripblanks">cc-speaker-test-button.ui</file>
     <file preprocess="xml-stripblanks">cc-stream-row.ui</file>
     <file preprocess="xml-stripblanks">cc-subwoofer-slider.ui</file>
diff --git a/panels/sound-new/sounds/bark.ogg b/panels/sound/sounds/bark.ogg
similarity index 100%
rename from panels/sound-new/sounds/bark.ogg
rename to panels/sound/sounds/bark.ogg
diff --git a/panels/sound-new/sounds/drip.ogg b/panels/sound/sounds/drip.ogg
similarity index 100%
rename from panels/sound-new/sounds/drip.ogg
rename to panels/sound/sounds/drip.ogg
diff --git a/panels/sound-new/sounds/glass.ogg b/panels/sound/sounds/glass.ogg
similarity index 100%
rename from panels/sound-new/sounds/glass.ogg
rename to panels/sound/sounds/glass.ogg
diff --git a/panels/sound-new/sounds/sonar.ogg b/panels/sound/sounds/sonar.ogg
similarity index 100%
rename from panels/sound-new/sounds/sonar.ogg
rename to panels/sound/sounds/sonar.ogg
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 0a3d682fd..d896f53d1 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -179,14 +179,14 @@ panels/sharing/cc-sharing-panel.ui
 panels/sharing/gnome-sharing-panel.desktop.in.in
 panels/sharing/networks.ui
 panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in
-panels/sound-new/cc-alert-slider.ui
-panels/sound-new/cc-balance-slider.ui
-panels/sound-new/cc-fade-slider.ui
-panels/sound-new/cc-output-test-dialog.c
-panels/sound-new/cc-output-test-dialog.ui
-panels/sound-new/cc-sound-panel.ui
-panels/sound-new/cc-volume-slider.c
-panels/sound-new/gnome-sound-panel.desktop.in.in
+panels/sound/cc-alert-slider.ui
+panels/sound/cc-balance-slider.ui
+panels/sound/cc-fade-slider.ui
+panels/sound/cc-output-test-dialog.c
+panels/sound/cc-output-test-dialog.ui
+panels/sound/cc-sound-panel.ui
+panels/sound/cc-volume-slider.c
+panels/sound/gnome-sound-panel.desktop.in.in
 panels/thunderbolt/cc-bolt-device-dialog.c
 panels/thunderbolt/cc-bolt-device-dialog.ui
 panels/thunderbolt/cc-bolt-device-entry.c
diff --git a/shell/cc-panel-loader.c b/shell/cc-panel-loader.c
index 6fb2ede48..5eeb44e60 100644
--- a/shell/cc-panel-loader.c
+++ b/shell/cc-panel-loader.c
@@ -56,7 +56,7 @@ extern GType cc_privacy_panel_get_type (void);
 extern GType cc_region_panel_get_type (void);
 extern GType cc_search_panel_get_type (void);
 extern GType cc_sharing_panel_get_type (void);
-extern GType cc_sound_new_panel_get_type (void);
+extern GType cc_sound_panel_get_type (void);
 #ifdef BUILD_THUNDERBOLT
 extern GType cc_bolt_panel_get_type (void);
 #endif /* BUILD_THUNDERBOLT */
@@ -109,7 +109,7 @@ static CcPanelLoaderVtable default_panels[] =
   PANEL_TYPE("region",           cc_region_panel_get_type,               NULL),
   PANEL_TYPE("search",           cc_search_panel_get_type,               NULL),
   PANEL_TYPE("sharing",          cc_sharing_panel_get_type,              NULL),
-  PANEL_TYPE("sound",            cc_sound_new_panel_get_type,            NULL),
+  PANEL_TYPE("sound",            cc_sound_panel_get_type,                NULL),
 #ifdef BUILD_THUNDERBOLT
   PANEL_TYPE("thunderbolt",      cc_bolt_panel_get_type,                 NULL),
 #endif