diff --git a/plugins/samplesink/bladerfoutput/CMakeLists.txt b/plugins/samplesink/bladerfoutput/CMakeLists.txt
index 6b3d35250..50dac2417 100644
--- a/plugins/samplesink/bladerfoutput/CMakeLists.txt
+++ b/plugins/samplesink/bladerfoutput/CMakeLists.txt
@@ -19,7 +19,7 @@ set(bladerfoutput_HEADERS
 )
 
 set(bladerfoutput_FORMS
-	bladerfoutputgui.ui
+	bladerf1outputgui.ui
 )
 
 if (BUILD_DEBIAN)
diff --git a/plugins/samplesink/bladerfoutput/bladerfoutputgui.ui b/plugins/samplesink/bladerfoutput/bladerf1outputgui.ui
similarity index 99%
rename from plugins/samplesink/bladerfoutput/bladerfoutputgui.ui
rename to plugins/samplesink/bladerfoutput/bladerf1outputgui.ui
index d8ce68767..ec2607191 100644
--- a/plugins/samplesink/bladerfoutput/bladerfoutputgui.ui
+++ b/plugins/samplesink/bladerfoutput/bladerf1outputgui.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>BladerfOutputGui</class>
- <widget class="QWidget" name="BladerfOutputGui">
+ <class>Bladerf1OutputGui</class>
+ <widget class="QWidget" name="Bladerf1OutputGui">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -29,7 +29,7 @@
    </font>
   </property>
   <property name="windowTitle">
-   <string>BladeRF</string>
+   <string>BladeRF1</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <property name="spacing">
diff --git a/plugins/samplesink/bladerfoutput/bladerfoutputgui.cpp b/plugins/samplesink/bladerfoutput/bladerfoutputgui.cpp
index 6f120df64..467abd92c 100644
--- a/plugins/samplesink/bladerfoutput/bladerfoutputgui.cpp
+++ b/plugins/samplesink/bladerfoutput/bladerfoutputgui.cpp
@@ -19,7 +19,7 @@
 
 #include <libbladeRF.h>
 
-#include "ui_bladerfoutputgui.h"
+#include "ui_bladerf1outputgui.h"
 #include "gui/colormapper.h"
 #include "gui/glspectrum.h"
 #include "dsp/dspengine.h"
@@ -28,11 +28,9 @@
 #include "device/deviceuiset.h"
 #include "bladerfoutputgui.h"
 
-#include "../../../devices/bladerf1/devicebladerf1values.h"
-
 BladerfOutputGui::BladerfOutputGui(DeviceUISet *deviceUISet, QWidget* parent) :
 	QWidget(parent),
-	ui(new Ui::BladerfOutputGui),
+	ui(new Ui::Bladerf1OutputGui),
 	m_deviceUISet(deviceUISet),
 	m_doApplySettings(true),
 	m_forceSettings(true),
diff --git a/plugins/samplesink/bladerfoutput/bladerfoutputgui.h b/plugins/samplesink/bladerfoutput/bladerfoutputgui.h
index 1cd815e48..3d54f4ca4 100644
--- a/plugins/samplesink/bladerfoutput/bladerfoutputgui.h
+++ b/plugins/samplesink/bladerfoutput/bladerfoutputgui.h
@@ -29,7 +29,7 @@ class DeviceSampleSink;
 class DeviceUISet;
 
 namespace Ui {
-	class BladerfOutputGui;
+	class Bladerf1OutputGui;
 }
 
 class BladerfOutputGui : public QWidget, public PluginInstanceGUI {
@@ -52,7 +52,7 @@ public:
 	virtual bool handleMessage(const Message& message);
 
 private:
-	Ui::BladerfOutputGui* ui;
+	Ui::Bladerf1OutputGui* ui;
 
 	DeviceUISet* m_deviceUISet;
 	bool m_doApplySettings;
diff --git a/plugins/samplesource/bladerfinput/CMakeLists.txt b/plugins/samplesource/bladerfinput/CMakeLists.txt
index a39e263fe..586083e8c 100644
--- a/plugins/samplesource/bladerfinput/CMakeLists.txt
+++ b/plugins/samplesource/bladerfinput/CMakeLists.txt
@@ -19,7 +19,7 @@ set(bladerfinput_HEADERS
 )
 
 set(bladerfinput_FORMS
-	bladerfinputgui.ui
+	bladerf1inputgui.ui
 )
 
 if (BUILD_DEBIAN)
diff --git a/plugins/samplesource/bladerfinput/bladerfinputgui.ui b/plugins/samplesource/bladerfinput/bladerf1inputgui.ui
similarity index 99%
rename from plugins/samplesource/bladerfinput/bladerfinputgui.ui
rename to plugins/samplesource/bladerfinput/bladerf1inputgui.ui
index 1d53891d7..2a231f2fd 100644
--- a/plugins/samplesource/bladerfinput/bladerfinputgui.ui
+++ b/plugins/samplesource/bladerfinput/bladerf1inputgui.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>BladerfInputGui</class>
- <widget class="QWidget" name="BladerfInputGui">
+ <class>Bladerf1InputGui</class>
+ <widget class="QWidget" name="Bladerf1InputGui">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -29,7 +29,7 @@
    </font>
   </property>
   <property name="windowTitle">
-   <string>BladeRF</string>
+   <string>BladeRF1</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <property name="spacing">
diff --git a/plugins/samplesource/bladerfinput/bladerfinputgui.cpp b/plugins/samplesource/bladerfinput/bladerfinputgui.cpp
index 568effb5c..1ca20e0f8 100644
--- a/plugins/samplesource/bladerfinput/bladerfinputgui.cpp
+++ b/plugins/samplesource/bladerfinput/bladerfinputgui.cpp
@@ -14,14 +14,14 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.          //
 ///////////////////////////////////////////////////////////////////////////////////
 
-#include "../bladerfinput/bladerfinputgui.h"
+#include "bladerfinputgui.h"
 
 #include <QDebug>
 #include <QMessageBox>
 
 #include <libbladeRF.h>
 
-#include "ui_bladerfinputgui.h"
+#include "ui_bladerf1inputgui.h"
 #include "gui/colormapper.h"
 #include "gui/glspectrum.h"
 #include "dsp/dspengine.h"
@@ -31,7 +31,7 @@
 
 BladerfInputGui::BladerfInputGui(DeviceUISet *deviceUISet, QWidget* parent) :
 	QWidget(parent),
-	ui(new Ui::BladerfInputGui),
+	ui(new Ui::Bladerf1InputGui),
 	m_deviceUISet(deviceUISet),
 	m_forceSettings(true),
 	m_doApplySettings(true),
diff --git a/plugins/samplesource/bladerfinput/bladerfinputgui.h b/plugins/samplesource/bladerfinput/bladerfinputgui.h
index cc7ca4da4..28da01e0a 100644
--- a/plugins/samplesource/bladerfinput/bladerfinputgui.h
+++ b/plugins/samplesource/bladerfinput/bladerfinputgui.h
@@ -28,7 +28,7 @@
 class DeviceUISet;
 
 namespace Ui {
-	class BladerfInputGui;
+	class Bladerf1InputGui;
 }
 
 class BladerfInputGui : public QWidget, public PluginInstanceGUI {
@@ -51,7 +51,7 @@ public:
 	virtual bool handleMessage(const Message& message);
 
 private:
-	Ui::BladerfInputGui* ui;
+	Ui::Bladerf1InputGui* ui;
 
 	DeviceUISet* m_deviceUISet;
 	bool m_forceSettings;