diff --git a/src/Makefile.am b/src/Makefile.am
index 629219c..7257260 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -28,6 +28,7 @@ pavucontrol_SOURCES= \
   minimalstreamwidget.h minimalstreamwidget.cc \
   channelwidget.h channelwidget.cc \
   streamwidget.h streamwidget.cc \
+  devicewidget.h devicewidget.cc \
   cardwidget.h cardwidget.cc \
   sinkwidget.h sinkwidget.cc \
   sourcewidget.h sourcewidget.cc \
diff --git a/src/sinkwidget.cc b/src/sinkwidget.cc
index 8d21bb0..fa90a75 100644
--- a/src/sinkwidget.cc
+++ b/src/sinkwidget.cc
@@ -27,7 +27,7 @@
 #include "i18n.h"
 
 SinkWidget::SinkWidget(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& x) :
-    StreamWidget(cobject, x),
+    DeviceWidget(cobject, x),
     defaultMenuItem("_Default", true){
 
     add_events(Gdk::BUTTON_PRESS_MASK);
@@ -40,8 +40,8 @@ SinkWidget::SinkWidget(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade:
 
 SinkWidget* SinkWidget::create() {
     SinkWidget* w;
-    Glib::RefPtr<Gnome::Glade::Xml> x = Gnome::Glade::Xml::create(GLADE_FILE, "streamWidget");
-    x->get_widget_derived("streamWidget", w);
+    Glib::RefPtr<Gnome::Glade::Xml> x = Gnome::Glade::Xml::create(GLADE_FILE, "deviceWidget");
+    x->get_widget_derived("deviceWidget", w);
     return w;
 }
 
@@ -57,7 +57,7 @@ void SinkWidget::executeVolumeUpdate() {
 }
 
 void SinkWidget::onMuteToggleButton() {
-    StreamWidget::onMuteToggleButton();
+    DeviceWidget::onMuteToggleButton();
 
     if (updating)
         return;
diff --git a/src/sinkwidget.h b/src/sinkwidget.h
index d5ce315..c833e78 100644
--- a/src/sinkwidget.h
+++ b/src/sinkwidget.h
@@ -23,9 +23,9 @@
 
 #include "pavucontrol.h"
 
-#include "streamwidget.h"
+#include "devicewidget.h"
 
-class SinkWidget : public StreamWidget {
+class SinkWidget : public DeviceWidget {
 public:
     SinkWidget(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& x);
     static SinkWidget* create();
diff --git a/src/sourcewidget.cc b/src/sourcewidget.cc
index dc13f7f..c77f4f2 100644
--- a/src/sourcewidget.cc
+++ b/src/sourcewidget.cc
@@ -27,7 +27,7 @@
 #include "i18n.h"
 
 SourceWidget::SourceWidget(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& x) :
-    StreamWidget(cobject, x),
+    DeviceWidget(cobject, x),
     defaultMenuItem(_("_Default"), true){
 
     add_events(Gdk::BUTTON_PRESS_MASK);
@@ -40,8 +40,8 @@ SourceWidget::SourceWidget(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Gl
 
 SourceWidget* SourceWidget::create() {
     SourceWidget* w;
-    Glib::RefPtr<Gnome::Glade::Xml> x = Gnome::Glade::Xml::create(GLADE_FILE, "streamWidget");
-    x->get_widget_derived("streamWidget", w);
+    Glib::RefPtr<Gnome::Glade::Xml> x = Gnome::Glade::Xml::create(GLADE_FILE, "deviceWidget");
+    x->get_widget_derived("deviceWidget", w);
     return w;
 }
 
@@ -57,7 +57,7 @@ void SourceWidget::executeVolumeUpdate() {
 }
 
 void SourceWidget::onMuteToggleButton() {
-    StreamWidget::onMuteToggleButton();
+    DeviceWidget::onMuteToggleButton();
 
     if (updating)
         return;
diff --git a/src/sourcewidget.h b/src/sourcewidget.h
index 2fd137e..04ee4af 100644
--- a/src/sourcewidget.h
+++ b/src/sourcewidget.h
@@ -23,9 +23,9 @@
 
 #include "pavucontrol.h"
 
-#include "streamwidget.h"
+#include "devicewidget.h"
 
-class SourceWidget : public StreamWidget {
+class SourceWidget : public DeviceWidget {
 public:
     SourceWidget(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& x);
     static SourceWidget* create();