diff --git a/plugins/samplesource/airspy/airspyplugin.cpp b/plugins/samplesource/airspy/airspyplugin.cpp
index fd3314553..21e9b7072 100644
--- a/plugins/samplesource/airspy/airspyplugin.cpp
+++ b/plugins/samplesource/airspy/airspyplugin.cpp
@@ -115,14 +115,14 @@ PluginInterface::SampleSourceDevices AirspyPlugin::enumSampleSources()
 	return result;
 }
 
-PluginGUI* AirspyPlugin::createSampleSourcePluginGUI(const QString& sourceName, const QByteArray& address)
+PluginGUI* AirspyPlugin::createSampleSourcePluginGUI(const QString& sourceId)
 {
 	if (!m_pluginAPI)
 	{
 		return 0;
 	}
 
-	if(sourceName == "org.osmocom.sdr.samplesource.airspy")
+	if(sourceId == "org.osmocom.sdr.samplesource.airspy")
 	{
 		AirspyGui* gui = new AirspyGui(m_pluginAPI);
 		m_pluginAPI->setInputGUI(gui);
diff --git a/plugins/samplesource/airspy/airspyplugin.h b/plugins/samplesource/airspy/airspyplugin.h
index cada63d88..39a6caeec 100644
--- a/plugins/samplesource/airspy/airspyplugin.h
+++ b/plugins/samplesource/airspy/airspyplugin.h
@@ -31,8 +31,8 @@ public:
 	const PluginDescriptor& getPluginDescriptor() const;
 	void initPlugin(PluginAPI* pluginAPI);
 
-	SampleSourceDevices enumSampleSources();
-	PluginGUI* createSampleSourcePluginGUI(const QString& sourceName, const QByteArray& address);
+	virtual SampleSourceDevices enumSampleSources();
+	virtual PluginGUI* createSampleSourcePluginGUI(const QString& sourceId);
 
 private:
 	static const PluginDescriptor m_pluginDescriptor;
diff --git a/plugins/samplesource/bladerf/bladerfplugin.cpp b/plugins/samplesource/bladerf/bladerfplugin.cpp
index 4db7faf81..1fbe0767c 100644
--- a/plugins/samplesource/bladerf/bladerfplugin.cpp
+++ b/plugins/samplesource/bladerf/bladerfplugin.cpp
@@ -73,14 +73,14 @@ PluginInterface::SampleSourceDevices BlderfPlugin::enumSampleSources()
 	return result;
 }
 
-PluginGUI* BlderfPlugin::createSampleSourcePluginGUI(const QString& sourceName, const QByteArray& address)
+PluginGUI* BlderfPlugin::createSampleSourcePluginGUI(const QString& sourceId)
 {
 	if (!m_pluginAPI)
 	{
 		return 0;
 	}
 
-	if(sourceName == "org.osmocom.sdr.samplesource.bladerf")
+	if(sourceId == "org.osmocom.sdr.samplesource.bladerf")
 	{
 		BladerfGui* gui = new BladerfGui(m_pluginAPI);
 		m_pluginAPI->setInputGUI(gui);
diff --git a/plugins/samplesource/bladerf/bladerfplugin.h b/plugins/samplesource/bladerf/bladerfplugin.h
index ad3860048..7604aa8b0 100644
--- a/plugins/samplesource/bladerf/bladerfplugin.h
+++ b/plugins/samplesource/bladerf/bladerfplugin.h
@@ -31,8 +31,8 @@ public:
 	const PluginDescriptor& getPluginDescriptor() const;
 	void initPlugin(PluginAPI* pluginAPI);
 
-	SampleSourceDevices enumSampleSources();
-	PluginGUI* createSampleSourcePluginGUI(const QString& sourceName, const QByteArray& address);
+	virtual SampleSourceDevices enumSampleSources();
+	virtual PluginGUI* createSampleSourcePluginGUI(const QString& sourceId);
 
 private:
 	static const PluginDescriptor m_pluginDescriptor;
diff --git a/plugins/samplesource/fcdproplus/fcdproplusplugin.cpp b/plugins/samplesource/fcdproplus/fcdproplusplugin.cpp
index a18675c62..5a85da525 100644
--- a/plugins/samplesource/fcdproplus/fcdproplusplugin.cpp
+++ b/plugins/samplesource/fcdproplus/fcdproplusplugin.cpp
@@ -72,9 +72,9 @@ PluginInterface::SampleSourceDevices FCDProPlusPlugin::enumSampleSources()
 	return result;
 }
 
-PluginGUI* FCDProPlusPlugin::createSampleSourcePluginGUI(const QString& sourceName, const QByteArray& address)
+PluginGUI* FCDProPlusPlugin::createSampleSourcePluginGUI(const QString& sourceId)
 {
-	if(sourceName == fcd_traits<ProPlus>::interfaceIID)
+	if(sourceId == fcd_traits<ProPlus>::interfaceIID)
 	{
 		FCDProPlusGui* gui = new FCDProPlusGui(m_pluginAPI);
 		m_pluginAPI->setInputGUI(gui);
diff --git a/plugins/samplesource/fcdproplus/fcdproplusplugin.h b/plugins/samplesource/fcdproplus/fcdproplusplugin.h
index 448b8cfd2..5ba26eea8 100644
--- a/plugins/samplesource/fcdproplus/fcdproplusplugin.h
+++ b/plugins/samplesource/fcdproplus/fcdproplusplugin.h
@@ -15,8 +15,8 @@ public:
 	const PluginDescriptor& getPluginDescriptor() const;
 	void initPlugin(PluginAPI* pluginAPI);
 
-	SampleSourceDevices enumSampleSources();
-	PluginGUI* createSampleSourcePluginGUI(const QString& sourceName, const QByteArray& address);
+	virtual SampleSourceDevices enumSampleSources();
+	virtual PluginGUI* createSampleSourcePluginGUI(const QString& sourceId);
 
 private:
 	static const PluginDescriptor m_pluginDescriptor;
diff --git a/plugins/samplesource/rtlsdr/rtlsdrplugin.cpp b/plugins/samplesource/rtlsdr/rtlsdrplugin.cpp
index 62fe77508..7695a5a54 100644
--- a/plugins/samplesource/rtlsdr/rtlsdrplugin.cpp
+++ b/plugins/samplesource/rtlsdr/rtlsdrplugin.cpp
@@ -57,9 +57,9 @@ PluginInterface::SampleSourceDevices RTLSDRPlugin::enumSampleSources()
 	return result;
 }
 
-PluginGUI* RTLSDRPlugin::createSampleSourcePluginGUI(const QString& sourceName, const QByteArray& address)
+PluginGUI* RTLSDRPlugin::createSampleSourcePluginGUI(const QString& sourceId)
 {
-	if(sourceName == "org.osmocom.sdr.samplesource.rtl-sdr") {
+	if(sourceId == "org.osmocom.sdr.samplesource.rtl-sdr") {
 		RTLSDRGui* gui = new RTLSDRGui(m_pluginAPI);
 		m_pluginAPI->setInputGUI(gui);
 		return gui;
diff --git a/plugins/samplesource/rtlsdr/rtlsdrplugin.h b/plugins/samplesource/rtlsdr/rtlsdrplugin.h
index 3775daa7e..0ba636809 100644
--- a/plugins/samplesource/rtlsdr/rtlsdrplugin.h
+++ b/plugins/samplesource/rtlsdr/rtlsdrplugin.h
@@ -15,8 +15,8 @@ public:
 	const PluginDescriptor& getPluginDescriptor() const;
 	void initPlugin(PluginAPI* pluginAPI);
 
-	SampleSourceDevices enumSampleSources();
-	PluginGUI* createSampleSourcePluginGUI(const QString& sourceName, const QByteArray& address);
+	virtual SampleSourceDevices enumSampleSources();
+	virtual PluginGUI* createSampleSourcePluginGUI(const QString& sourceId);
 
 private:
 	static const PluginDescriptor m_pluginDescriptor;