diff --git a/data/css/panel-wp-mixer-defaults.css b/data/css/panel-mixer-defaults.css
similarity index 100%
rename from data/css/panel-wp-mixer-defaults.css
rename to data/css/panel-mixer-defaults.css
diff --git a/data/css/panel-mixer-dim-mute.css b/data/css/panel-mixer-dim-mute.css
new file mode 100644
index 00000000..827aac42
--- /dev/null
+++ b/data/css/panel-mixer-dim-mute.css
@@ -0,0 +1,3 @@
+.wf-panel .mixer-popover .muted {
+    opacity: 0.5;
+}
diff --git a/data/css/panel-wp-mixer-dim-mute.css b/data/css/panel-wp-mixer-dim-mute.css
deleted file mode 100644
index b3572f86..00000000
--- a/data/css/panel-wp-mixer-dim-mute.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.wf-panel .wp-mixer-popover .muted {
-    opacity: 0.5;
-}
diff --git a/metadata/panel.xml b/metadata/panel.xml
index 3a8a45ac..9e802d83 100644
--- a/metadata/panel.xml
+++ b/metadata/panel.xml
@@ -342,8 +342,8 @@ If full_span is off, both sides of the panel will take the same amount of space,
 	</option>
 	</group>
 	<group>
-	<_short>Audio mixer (wireplumber)</_short>
-	<option name="wp_quick_target_choice" type="string">
+	<_short>Audio mixer</_short>
+	<option name="mixer_quick_target_choice" type="string">
 		<_short>Quick action target</_short>
 		<_long>Which audio control will be the target of the quick actions (scrolling and muting on the widget)</_long>
 		<default>default_sink</default>
@@ -360,47 +360,47 @@ If full_span is off, both sides of the panel will take the same amount of space,
 			<_name>Last changed volume</_name>
 		</desc>
 	</option>
-	<option name="wp_popup_on_change" type="bool">
+	<option name="mixer_popup_on_change" type="bool">
 		<_short>Pop up on change</_short>
 		<_long>Whether to show a popup with the new values upon a change to the quick action target</_long>
 		<default>true</default>
 	</option>
-	<option name="wp_popup_timeout" type="double">
+	<option name="mixer_popup_timeout" type="double">
 		<_short>Popup timeout</_short>
 		<default>2.5</default>
 		<min>0</min>
 	</option>
-	<option name="wp_slider_length" type="int">
+	<option name="mixer_slider_length" type="int">
 		<_short>Slider length</_short>
 		<default>300</default>
 		<min>1</min>
 	</option>
-	<option name="wp_scroll_sensitivity" type="double">
+	<option name="mixer_scroll_sensitivity" type="double">
 		<_short>Scroll sensitivity</_short>
 		<default>1</default>
 		<min>0</min>
 	</option>
-	<option name="wp_invert_scroll" type="bool">
+	<option name="mixer_invert_scroll" type="bool">
 		<_short>Invert scroll</_short>
 		<_long>Inverts which scroll direction raises and lowers volume</_long>
 		<default>false</default>
 	</option>
-	<option name="wp_icons_on_left" type="bool">
+	<option name="mixer_icons_on_left" type="bool">
 		<_short>Icons on left</_short>
 		<_long>Displays the mute and set default icon on the left</_long>
 		<default>false</default>
 	</option>
-	<option name="wp_stack_categories" type="bool">
+	<option name="mixer_stack_categories" type="bool">
 		<_short>Stack categories</_short>
 		<_long>Displays the outputs, inputs and streams stacked on top of each other instead of side by side</_long>
 		<default>false</default>
 	</option>
-	<option name="wp_spacing" type="int">
+	<option name="mixer_spacing" type="int">
 		<_short>Spacing between controls</_short>
 		<default>8</default>
 		<min>0</min>
 	</option>
-	<option name="wp_left_click_action" type="string">
+	<option name="mixer_left_click_action" type="string">
 		<_short>Left click action</_short>
 		<default>show_mixer</default>
 		<desc>
@@ -412,7 +412,7 @@ If full_span is off, both sides of the panel will take the same amount of space,
 			<_name>Show quick action target</_name>
 		</desc>
 	</option>
-	<option name="wp_middle_click_action" type="string">
+	<option name="mixer_middle_click_action" type="string">
 		<_short>Middle click action</_short>
 		<default>mute_quick_target</default>
 		<desc>
@@ -428,7 +428,7 @@ If full_span is off, both sides of the panel will take the same amount of space,
 			<_name>Mute quick action target</_name>
 		</desc>
 	</option>
-	<option name="wp_right_click_action" type="string">
+	<option name="mixer_right_click_action" type="string">
 		<_short>Right click action</_short>
 		<default>show_quick_target</default>
 		<desc>
@@ -444,12 +444,12 @@ If full_span is off, both sides of the panel will take the same amount of space,
 			<_name>Mute quick action target</_name>
 		</desc>
 	</option>
-	<option name="wp_icon_size" type="int">
+	<option name="mixer_icon_size" type="int">
 		<_short>Icon size</_short>
 		<default>0</default>
 		<min>0</min>
 	</option>
-	<option name="wp_popup_icon_size" type="int">
+	<option name="mixer_popup_icon_size" type="int">
 		<_short>Size of the icons in the popups</_short>
 		<default>0</default>
 		<min>0</min>
diff --git a/src/panel/meson.build b/src/panel/meson.build
index 65c9793e..fd9fbd2f 100644
--- a/src/panel/meson.build
+++ b/src/panel/meson.build
@@ -46,9 +46,9 @@ endif
 
 if wireplumber.found()
   widget_sources += [
-    'widgets/wp-mixer/wp-mixer.cpp',
-    'widgets/wp-mixer/wf-wp-control.cpp',
-    'widgets/wp-mixer/wp-common.cpp',
+    'widgets/mixer/mixer.cpp',
+    'widgets/mixer/mixer-control.cpp',
+    'widgets/mixer/wp-common.cpp',
   ]
   deps += [pipewire, wireplumber]
 else
diff --git a/src/panel/panel.cpp b/src/panel/panel.cpp
index 00c1a56a..7ead1c7e 100644
--- a/src/panel/panel.cpp
+++ b/src/panel/panel.cpp
@@ -32,7 +32,7 @@
     #include "widgets/volume.hpp"
 #endif
 #ifdef HAVE_WIREPLUMBER
-    #include "widgets/wp-mixer/wp-mixer.hpp"
+    #include "widgets/mixer/mixer.hpp"
 #endif
 #include "widgets/window-list/window-list.hpp"
 #include "widgets/notifications/notification-center.hpp"
@@ -243,7 +243,7 @@ class WayfirePanel::impl
         if (name == "wp-mixer")
         {
 #ifdef HAVE_WIREPLUMBER
-            return Widget(new WayfireWpMixer());
+            return Widget(new WayfireMixer());
 #else
             std::cerr << "Built without wireplumber support, mixer widget "
                          " is not available." << std::endl;
@@ -596,7 +596,7 @@ void WayfirePanelApp::on_activate()
         {"panel/battery_icon_size", ".battery image"},
         {"panel/network_icon_size", ".network"},
         {"panel/volume_icon_size", ".volume"},
-        {"panel/wp_icon_size", ".wp-mixer"},
+        {"panel/wp_icon_size", ".mixer"},
         {"panel/wp_popup_icon_size", ".mute-toggle, .default-button"},
         {"panel/notifications_icon_size", ".notification-center "},
         {"panel/tray_icon_size", ".tray-button"}
diff --git a/src/panel/widgets/wp-mixer/wf-wp-control.cpp b/src/panel/widgets/mixer/mixer-control.cpp
similarity index 88%
rename from src/panel/widgets/wp-mixer/wf-wp-control.cpp
rename to src/panel/widgets/mixer/mixer-control.cpp
index ac95de23..c625a290 100644
--- a/src/panel/widgets/wp-mixer/wf-wp-control.cpp
+++ b/src/panel/widgets/mixer/mixer-control.cpp
@@ -1,18 +1,18 @@
 #include <pipewire/keys.h>
 #include <gtkmm.h>
 
-#include "wf-wp-control.hpp"
+#include "mixer-control.hpp"
 #include "icon-select.hpp"
 
 #define ICON(volume) icon_from_range(volume_icons, volume)
 
-WfWpControl::WfWpControl(WpPipewireObject *obj, WayfireWpMixer *parent_widget)
+MixerControl::MixerControl(WpPipewireObject *obj, WayfireMixer *parent_widget)
 {
     object = obj;
     parent = parent_widget;
 }
 
-WfWpControl::~WfWpControl()
+MixerControl::~MixerControl()
 {
     mute_conn.disconnect();
     middle_conn.disconnect();
@@ -23,7 +23,7 @@ WfWpControl::~WfWpControl()
     }
 }
 
-void WfWpControl::init()
+void MixerControl::init()
 {
     guint32 id = wp_proxy_get_bound_id(WP_PROXY(object));
 
@@ -128,19 +128,19 @@ void WfWpControl::init()
     update_icon();
 }
 
-void WfWpControl::set_btn_status_no_callbk(bool state)
+void MixerControl::set_btn_status_no_callbk(bool state)
 {
     mute_conn.block(true);
     button.set_active(state);
     mute_conn.block(false);
 }
 
-void WfWpControl::set_scale_target_value(double volume)
+void MixerControl::set_scale_target_value(double volume)
 {
     scale.set_target_value(volume);
 }
 
-void WfWpControl::update_icon()
+void MixerControl::update_icon()
 {
     if (button.get_active())
     {
@@ -153,13 +153,13 @@ void WfWpControl::update_icon()
     volume_icon.set_from_icon_name(ICON(get_scale_target_value()));
 }
 
-double WfWpControl::get_scale_target_value()
+double MixerControl::get_scale_target_value()
 {
     return scale.get_target_value();
 }
 
 // attaches elements to the grid at the appropriate place
-void WfWpControl::update_icons_pos()
+void MixerControl::update_icons_pos()
 {
     static WfOption<bool> icons_on_left{"panel/wp_icons_on_left"};
 
@@ -176,7 +176,7 @@ void WfWpControl::update_icons_pos()
     }
 }
 
-void WfWpControl::update_gestures()
+void MixerControl::update_gestures()
 {
     // the setting says that it is for quick target, but let’s have all the muting consistent
     static WfOption<std::string> str_wp_right_click_action{"panel/wp_right_click_action"};
@@ -199,7 +199,7 @@ void WfWpControl::update_gestures()
     }
 }
 
-void WfWpControl::handle_config_reload()
+void MixerControl::handle_config_reload()
 {
     remove(label);
     remove(scale);
@@ -212,17 +212,17 @@ void WfWpControl::handle_config_reload()
 }
 
 // used to make a copy to the face of the widget
-std::unique_ptr<WfWpControl> WfWpControl::copy()
+std::unique_ptr<MixerControl> MixerControl::copy()
 {
-    return std::make_unique<WfWpControl>(object, parent);
+    return std::make_unique<MixerControl>(object, parent);
 }
 
-WfWpControlDevice::~WfWpControlDevice()
+MixerControlDevice::~MixerControlDevice()
 {
     def_conn.disconnect();
 }
 
-void WfWpControlDevice::init()
+void MixerControlDevice::init()
 {
     add_css_class("wp-mixer-control");
     default_btn.add_css_class("default-button");
@@ -247,10 +247,10 @@ void WfWpControlDevice::init()
         WpCommon::get().set_default(object);
     });
 
-    WfWpControl::init();
+    MixerControl::init();
 }
 
-void WfWpControlDevice::set_def_status_no_callbk(bool state)
+void MixerControlDevice::set_def_status_no_callbk(bool state)
 {
     if (state)
     {
@@ -265,9 +265,9 @@ void WfWpControlDevice::set_def_status_no_callbk(bool state)
     def_conn.block(false);
 }
 
-void WfWpControlDevice::update_icons_pos()
+void MixerControlDevice::update_icons_pos()
 {
-    WfWpControl::update_icons_pos();
+    MixerControl::update_icons_pos();
     static WfOption<bool> icons_on_left{"panel/wp_icons_on_left"};
 
     if (icons_on_left)
@@ -279,8 +279,8 @@ void WfWpControlDevice::update_icons_pos()
     }
 }
 
-void WfWpControlDevice::handle_config_reload()
+void MixerControlDevice::handle_config_reload()
 {
     remove(default_btn);
-    WfWpControl::handle_config_reload();
+    MixerControl::handle_config_reload();
 }
diff --git a/src/panel/widgets/wp-mixer/wf-wp-control.hpp b/src/panel/widgets/mixer/mixer-control.hpp
similarity index 72%
rename from src/panel/widgets/wp-mixer/wf-wp-control.hpp
rename to src/panel/widgets/mixer/mixer-control.hpp
index f3557d78..5ad49a0f 100644
--- a/src/panel/widgets/wp-mixer/wf-wp-control.hpp
+++ b/src/panel/widgets/mixer/mixer-control.hpp
@@ -3,12 +3,12 @@
 #include <gtkmm.h>
 #include <mutex>
 
-#include "wp-mixer.hpp"
+#include "mixer.hpp"
 #include "animated-scale.hpp"
 
-class WayfireWpMixer;
+class WayfireMixer;
 
-class WfWpControl : public Gtk::Grid
+class MixerControl : public Gtk::Grid
 {
     // Custom grid to facilitate handling
 
@@ -16,7 +16,7 @@ class WfWpControl : public Gtk::Grid
     WayfireAnimatedScale scale;
     Gtk::Image volume_icon;
     sigc::connection mute_conn;
-    WayfireWpMixer *parent;
+    WayfireMixer *parent;
     std::shared_ptr<Gtk::GestureClick> middle_click_mute, right_click_mute;
     sigc::connection middle_conn, right_conn;
     std::vector<sigc::connection> signals;
@@ -25,8 +25,8 @@ class WfWpControl : public Gtk::Grid
     WfOption<int> slider_length{"panel/wp_slider_length"};
 
   public:
-    WfWpControl(WpPipewireObject *obj, WayfireWpMixer *parent_widget);
-    ~WfWpControl();
+    MixerControl(WpPipewireObject *obj, WayfireMixer *parent_widget);
+    ~MixerControl();
     virtual void init();
 
     WpPipewireObject *object;
@@ -41,14 +41,14 @@ class WfWpControl : public Gtk::Grid
 
     virtual void handle_config_reload();
 
-    std::unique_ptr<WfWpControl> copy();
+    std::unique_ptr<MixerControl> copy();
 };
 
-// idea: would be neat to have a WfWpControlStream class that presents a dropdown to select which sink a
+// idea: would be neat to have a MixerControlStream class that presents a dropdown to select which sink a
 // stream goes to
 
 // sinks and sources: a control with a button to set itself as default for it’s category
-class WfWpControlDevice : public WfWpControl
+class MixerControlDevice : public MixerControl
 {
   private:
 
@@ -57,9 +57,9 @@ class WfWpControlDevice : public WfWpControl
     void update_icons_pos();
 
   public:
-    WfWpControlDevice(WpPipewireObject *obj, WayfireWpMixer *parent_widget) : WfWpControl(obj, parent_widget)
+    MixerControlDevice(WpPipewireObject *obj, WayfireMixer *parent_widget) : MixerControl(obj, parent_widget)
     {}
-    ~WfWpControlDevice();
+    ~MixerControlDevice();
     void init();
 
     Gtk::ToggleButton default_btn;
diff --git a/src/panel/widgets/wp-mixer/wp-mixer.cpp b/src/panel/widgets/mixer/mixer.cpp
similarity index 95%
rename from src/panel/widgets/wp-mixer/wp-mixer.cpp
rename to src/panel/widgets/mixer/mixer.cpp
index ea74f13a..a60bd2dd 100644
--- a/src/panel/widgets/wp-mixer/wp-mixer.cpp
+++ b/src/panel/widgets/mixer/mixer.cpp
@@ -2,33 +2,33 @@
 #include <wp/proxy-interfaces.h>
 #include <wp/proxy.h>
 
-#include "wp-mixer.hpp"
-#include "wf-wp-control.hpp"
+#include "mixer.hpp"
+#include "mixer-control.hpp"
 #include "icon-select.hpp"
 
 #define ICON(volume) icon_from_range(volume_icons, volume)
 
-bool WayfireWpMixer::on_popover_timeout(int timer)
+bool WayfireMixer::on_popover_timeout(int timer)
 {
     popover_timeout.disconnect();
     popover->popdown();
     return false;
 }
 
-void WayfireWpMixer::check_set_popover_timeout()
+void WayfireMixer::check_set_popover_timeout()
 {
     popover_timeout.disconnect();
 
     popover_timeout = Glib::signal_timeout().connect(sigc::bind(sigc::mem_fun(*this,
-        &WayfireWpMixer::on_popover_timeout), 0), timeout * 1000);
+        &WayfireMixer::on_popover_timeout), 0), timeout * 1000);
 }
 
-void WayfireWpMixer::cancel_popover_timeout()
+void WayfireMixer::cancel_popover_timeout()
 {
     popover_timeout.disconnect();
 }
 
-void WayfireWpMixer::reload_config()
+void WayfireMixer::reload_config()
 {
     // adjust margins and spacing
     auto set_spacing = [&] (Gtk::Box& box)
@@ -202,7 +202,7 @@ void WayfireWpMixer::reload_config()
     }
 }
 
-void WayfireWpMixer::handle_config_reload()
+void WayfireMixer::handle_config_reload()
 {
     left_conn.disconnect();
     middle_conn.disconnect();
@@ -215,7 +215,7 @@ void WayfireWpMixer::handle_config_reload()
     }
 }
 
-void WayfireWpMixer::init(Gtk::Box *container)
+void WayfireMixer::init(Gtk::Box *container)
 {
     // sets up the "widget part"
 
@@ -329,7 +329,7 @@ void WayfireWpMixer::init(Gtk::Box *container)
     WpCommon::get().add_widget(this);
 }
 
-void WayfireWpMixer::update_icon()
+void WayfireMixer::update_icon()
 {
     // depends on quick_target widget
     if (!quick_target)
@@ -347,14 +347,14 @@ void WayfireWpMixer::update_icon()
     main_image.set_from_icon_name(ICON(quick_target->get_scale_target_value()));
 }
 
-void WayfireWpMixer::set_quick_target_from(WfWpControl *from)
+void WayfireMixer::set_quick_target_from(MixerControl *from)
 {
     quick_target = from->copy();
     quick_target->init();
     button->set_tooltip_text(quick_target->label.get_text());
 }
 
-WayfireWpMixer::~WayfireWpMixer()
+WayfireMixer::~WayfireMixer()
 {
     WpCommon::get().rem_widget(this);
     gtk_widget_unparent(GTK_WIDGET(popover->gobj()));
diff --git a/src/panel/widgets/wp-mixer/wp-mixer.hpp b/src/panel/widgets/mixer/mixer.hpp
similarity index 88%
rename from src/panel/widgets/wp-mixer/wp-mixer.hpp
rename to src/panel/widgets/mixer/mixer.hpp
index e4918e2d..7f3b67ba 100644
--- a/src/panel/widgets/wp-mixer/wp-mixer.hpp
+++ b/src/panel/widgets/mixer/mixer.hpp
@@ -9,7 +9,7 @@ extern "C" {
 
 #include "widget.hpp"
 #include "wf-popover.hpp"
-#include "wf-wp-control.hpp"
+#include "mixer-control.hpp"
 #include "wp-common.hpp"
 
 enum class QuickTargetChoice // config
@@ -19,9 +19,9 @@ enum class QuickTargetChoice // config
     DEFAULT_SOURCE,
 };
 
-class WfWpControl;
+class MixerControl;
 
-class WayfireWpMixer : public WayfireWidget
+class WayfireMixer : public WayfireWidget
 {
   private:
     void init(Gtk::Box *container) override;
@@ -63,13 +63,13 @@ class WayfireWpMixer : public WayfireWidget
      * configured by panel/wp_quick_target_choice. idea: add pinning?
      */
     QuickTargetChoice quick_target_choice;
-    std::unique_ptr<WfWpControl> quick_target;
-    void set_quick_target_from(WfWpControl *from);
+    std::unique_ptr<MixerControl> quick_target;
+    void set_quick_target_from(MixerControl *from);
 
     Gtk::Box master_box, sinks_box, sources_box, streams_box;
     // idea: add a category for stuff that listens to an audio source
 
-    std::map<WpPipewireObject*, std::unique_ptr<WfWpControl>> objects_to_controls;
+    std::map<WpPipewireObject*, std::unique_ptr<MixerControl>> objects_to_controls;
 
     /** Update the icon based on volume and muted state of the quick_target widget */
     void update_icon();
@@ -84,5 +84,5 @@ class WayfireWpMixer : public WayfireWidget
 
     void handle_config_reload() override;
 
-    virtual ~WayfireWpMixer();
+    virtual ~WayfireMixer();
 };
diff --git a/src/panel/widgets/wp-mixer/wp-common.cpp b/src/panel/widgets/mixer/wp-common.cpp
similarity index 94%
rename from src/panel/widgets/wp-mixer/wp-common.cpp
rename to src/panel/widgets/mixer/wp-common.cpp
index d727708a..422d8e02 100644
--- a/src/panel/widgets/wp-mixer/wp-common.cpp
+++ b/src/panel/widgets/mixer/wp-common.cpp
@@ -119,7 +119,7 @@ void WpCommon::on_all_plugins_loaded()
     wp_core_install_object_manager(instance->core, instance->object_manager);
 }
 
-void WpCommon::catch_up_to_current_state(WayfireWpMixer *widget)
+void WpCommon::catch_up_to_current_state(WayfireMixer *widget)
 {
     // catch up to objects already registered by the manager
     WpIterator *reg_objs = wp_object_manager_new_iterator(object_manager);
@@ -131,29 +131,29 @@ void WpCommon::catch_up_to_current_state(WayfireWpMixer *widget)
     }
 }
 
-void WpCommon::add_object_to_widget(WpPipewireObject *object, WayfireWpMixer *widget)
+void WpCommon::add_object_to_widget(WpPipewireObject *object, WayfireMixer *widget)
 {
     // adds a new control to the appropriate section of a widget
 
     const std::string_view type{wp_pipewire_object_get_property(object, PW_KEY_MEDIA_CLASS)};
 
     bool recheck_default = false;
-    WfWpControl *control;
+    MixerControl *control;
     Gtk::Box *which_box;
     if (type == "Audio/Sink")
     {
         which_box = &(widget->sinks_box);
-        control   = new WfWpControlDevice(object, widget);
+        control   = new MixerControlDevice(object, widget);
         recheck_default = true;
     } else if (type == "Audio/Source")
     {
         which_box = &(widget->sources_box);
-        control   = new WfWpControlDevice(object, widget);
+        control   = new MixerControlDevice(object, widget);
         recheck_default = true;
     } else if (type == "Stream/Output/Audio")
     {
         which_box = &(widget->streams_box);
-        control   = new WfWpControl(object, (WayfireWpMixer*)widget);
+        control   = new MixerControl(object, (WayfireMixer*)widget);
     } else
     {
         std::cout << "Could not match pipewire object media class, ignoring\n";
@@ -161,7 +161,7 @@ void WpCommon::add_object_to_widget(WpPipewireObject *object, WayfireWpMixer *wi
     }
 
     control->init();
-    widget->objects_to_controls.insert({object, std::unique_ptr<WfWpControl>(control)});
+    widget->objects_to_controls.insert({object, std::unique_ptr<MixerControl>(control)});
     which_box->append((Gtk::Widget&)*control);
 
     // we added new controls, so maybe one of them is a default
@@ -199,7 +199,7 @@ void WpCommon::on_object_added(WpObjectManager *manager, gpointer object, gpoint
 
 void WpCommon::on_mixer_changed(gpointer mixer_api, guint id, gpointer data)
 {
-    // update the visual of the appropriate WfWpControl according to external changes on all widgets
+    // update the visual of the appropriate MixerControl according to external changes on all widgets
 
     auto info = instance->get_volume_and_mute(id);
 
@@ -209,7 +209,7 @@ void WpCommon::on_mixer_changed(gpointer mixer_api, guint id, gpointer data)
     // for each widget
     for (auto widget : instance->widgets)
     {
-        WfWpControl *control = nullptr;
+        MixerControl *control = nullptr;
 
         // first, find the appropriate control
         for (auto & it : widget->objects_to_controls)
@@ -281,7 +281,7 @@ void WpCommon::on_mixer_changed(gpointer mixer_api, guint id, gpointer data)
 
         if (widget->quick_target &&
             (!widget->popover->is_visible() ||
-             (widget->popover->get_child() != (WfWpControl*)&widget->quick_target)))
+             (widget->popover->get_child() != (MixerControl*)&widget->quick_target)))
         {
             // put the quick_target in the popover and show
             widget->popover->set_child(*widget->quick_target);
@@ -324,7 +324,7 @@ void WpCommon::on_default_nodes_changed(gpointer default_nodes_api, gpointer dat
         for (const auto & entry : widget->objects_to_controls)
         {
             auto obj  = WP_PIPEWIRE_OBJECT(entry.first);
-            auto ctrl = static_cast<WfWpControlDevice*>(entry.second.get());
+            auto ctrl = static_cast<MixerControlDevice*>(entry.second.get());
 
             guint32 bound_id = wp_proxy_get_bound_id(WP_PROXY(obj));
             if (bound_id == SPA_ID_INVALID)
@@ -378,7 +378,7 @@ void WpCommon::on_object_removed(WpObjectManager *manager, gpointer object, gpoi
             return;
         }
 
-        WfWpControl *control = it->second.get();
+        MixerControl *control = it->second.get();
         auto *box = (Gtk::Box*)control->get_parent();
         if (box)
         {
@@ -396,13 +396,13 @@ void WpCommon::on_object_removed(WpObjectManager *manager, gpointer object, gpoi
     }
 }
 
-void WpCommon::add_widget(WayfireWpMixer *widget)
+void WpCommon::add_widget(WayfireMixer *widget)
 {
     widgets.push_back(widget);
     catch_up_to_current_state(widget);
 }
 
-void WpCommon::rem_widget(WayfireWpMixer *widget)
+void WpCommon::rem_widget(WayfireMixer *widget)
 {
     widgets.erase(std::find(widgets.begin(), widgets.end(), widget));
 }
diff --git a/src/panel/widgets/wp-mixer/wp-common.hpp b/src/panel/widgets/mixer/wp-common.hpp
similarity index 79%
rename from src/panel/widgets/wp-mixer/wp-common.hpp
rename to src/panel/widgets/mixer/wp-common.hpp
index 2df289ba..5e303b5c 100644
--- a/src/panel/widgets/wp-mixer/wp-common.hpp
+++ b/src/panel/widgets/mixer/wp-common.hpp
@@ -8,8 +8,9 @@ extern "C" {
 #include <wp/wp.h>
 }
 
-#include "wp-mixer.hpp"
-class WayfireWpMixer;
+#include "mixer.hpp"
+
+class WayfireMixer;
 
 class WpCommon
 {
@@ -23,13 +24,13 @@ class WpCommon
     WpPlugin *mixer_api = nullptr;
     WpPlugin *default_nodes_api = nullptr;
 
-    std::vector<WayfireWpMixer*> widgets;
+    std::vector<WayfireMixer*> widgets;
 
-    void catch_up_to_current_state(WayfireWpMixer *widget);
+    void catch_up_to_current_state(WayfireMixer *widget);
     static void on_mixer_plugin_loaded(WpCore *core, GAsyncResult *res, gpointer data);
     static void on_default_nodes_plugin_loaded(WpCore *core, GAsyncResult *res, gpointer data);
     static void on_all_plugins_loaded();
-    void add_object_to_widget(WpPipewireObject *object, WayfireWpMixer *widget);
+    void add_object_to_widget(WpPipewireObject *object, WayfireMixer *widget);
     static void on_object_added(WpObjectManager *manager, gpointer object, gpointer data);
     static void on_mixer_changed(gpointer mixer_api, guint id, gpointer data);
     static void on_default_nodes_changed(gpointer default_nodes_api, gpointer data);
@@ -37,8 +38,8 @@ class WpCommon
 
   public:
 
-    void add_widget(WayfireWpMixer *widget);
-    void rem_widget(WayfireWpMixer *widget);
+    void add_widget(WayfireMixer *widget);
+    void rem_widget(WayfireMixer *widget);
 
     void re_evaluate_def_nodes();
 
diff --git a/wf-shell.ini.example b/wf-shell.ini.example
index a86e709d..b0bb4360 100644
--- a/wf-shell.ini.example
+++ b/wf-shell.ini.example
@@ -14,7 +14,7 @@ randomize = 0
 [panel]
 # widgets_* is a space-separated list of widgets to be displayed
 # at the corresponding part of the panel
-# Supported widgets are: launchers clock network battery window-list volume wp-mixer menu notifications tray command-output
+# Supported widgets are: launchers clock network battery window-list volume mixer menu notifications tray command-output
 # Special widgets are "spacing" and "separator" widgets, they can be used to add padding everywhere on the panel
 # To use them, just append the amount of pixels you want as a padding
 # to the word "spacing" or "separator" and use it as a plugin
@@ -140,7 +140,7 @@ menu_logout_command = wayland-logout
 # after scrolling on the volume icon
 volume_display_timeout = 2.5
 
-# Configuration for the wireplumber mixer widget
+# Configuration for the mixer widget
 # This shows an almost full-featured mixer for the audio using Pipewire/Wireplumber
 # It allows for individual control of the volume of all apps, microphones and speakers,
 # as well as muting and choosing a default device.
@@ -149,40 +149,40 @@ volume_display_timeout = 2.5
 # Which audio control will be the target of scrolling, muting... on the icon
 # Can be default_sink for default output device, default_source for default input device,
 # or last_change for whichever volume was changed last, including apps
-wp_quick_target_choice = default_sink # or default_source, or last_change
+mixer_quick_target_choice = default_sink # or default_source, or last_change
 
 # Pop up a slider when the volume of the quick target changes
-wp_popup_on_change = true
+mixer_popup_on_change = true
 
 # Number of seconds the popup will display for,
 # wether due to scrolling or an external volume change
-wp_popup_timeout = 2.5
+mixer_popup_timeout = 2.5
 
 # Length of the volume sliders
-wp_slider_length = 300
+mixer_slider_length = 300
 
 # Multiplier to the volume change when scrolling
-wp_scroll_sensitivity = 1
+mixer_scroll_sensitivity = 1
 
-wp_invert_scroll = false
+mixer_invert_scroll = false
 
 # Set to true to show icons (mute, set default) on the left
-wp_icons_on_left = false
+mixer_icons_on_left = false
 
 # Spacing between the controls of the mixer
-wp_spacing = 8
+mixer_spacing = 8
 
 # Actions to be tied to left, right and middle click on the widget
 # Can be:
 #   - show_mixer: show the whole mixer
 #   - mute_quick_target: mute the target of quick actions
 #   - show_quick_target: show the target of quick actions
-wp_left_click_action = show_mixer # uniquely, cannot be mute
-wp_middle_click_action = mute_quick_target
-wp_right_click_action = show_quick_target
+mixer_left_click_action = show_mixer # uniquely, cannot be mute
+mixer_middle_click_action = mute_quick_target
+mixer_right_click_action = show_quick_target
 
 # Size of the icons
-wp_icon_size = 32
+mixer_icon_size = 32
 
 # Configuration for the tray widget
 # Amount of smooth scrolling needed to trigger one scroll wheel step