diff --git a/plugins/samplesource/airspy/airspygui.cpp b/plugins/samplesource/airspy/airspygui.cpp
index 10d540635..f1b26c489 100644
--- a/plugins/samplesource/airspy/airspygui.cpp
+++ b/plugins/samplesource/airspy/airspygui.cpp
@@ -39,7 +39,7 @@ AirspyGui::AirspyGui(DeviceSourceAPI *deviceAPI, QWidget* parent) :
 	m_lastEngineState((DSPDeviceSourceEngine::State)-1)
 {
     m_sampleSource = new AirspyInput(m_deviceAPI);
-    m_deviceAPI->setSource(m_sampleSource);
+    m_deviceAPI->setSampleSource(m_sampleSource);
 
     ui->setupUi(this);
 	ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold));
diff --git a/plugins/samplesource/bladerfinput/bladerfinputgui.cpp b/plugins/samplesource/bladerfinput/bladerfinputgui.cpp
index c0e2ec703..fd8903f75 100644
--- a/plugins/samplesource/bladerfinput/bladerfinputgui.cpp
+++ b/plugins/samplesource/bladerfinput/bladerfinputgui.cpp
@@ -38,7 +38,7 @@ BladerfInputGui::BladerfInputGui(DeviceSourceAPI *deviceAPI, QWidget* parent) :
 	m_lastEngineState((DSPDeviceSourceEngine::State)-1)
 {
     m_sampleSource = new BladerfInput(m_deviceAPI);
-    m_deviceAPI->setSource(m_sampleSource);
+    m_deviceAPI->setSampleSource(m_sampleSource);
 
 	ui->setupUi(this);
 	ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold));
diff --git a/plugins/samplesource/fcdpro/fcdprogui.cpp b/plugins/samplesource/fcdpro/fcdprogui.cpp
index 7a9f921d0..dcb1d3ad7 100644
--- a/plugins/samplesource/fcdpro/fcdprogui.cpp
+++ b/plugins/samplesource/fcdpro/fcdprogui.cpp
@@ -35,7 +35,7 @@ FCDProGui::FCDProGui(DeviceSourceAPI *deviceAPI, QWidget* parent) :
 	m_lastEngineState((DSPDeviceSourceEngine::State)-1)
 {
     m_sampleSource = new FCDProInput(m_deviceAPI);
-    m_deviceAPI->setSource(m_sampleSource);
+    m_deviceAPI->setSampleSource(m_sampleSource);
 
 	ui->setupUi(this);
 	ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold));
diff --git a/plugins/samplesource/fcdproplus/fcdproplusgui.cpp b/plugins/samplesource/fcdproplus/fcdproplusgui.cpp
index 5d91eee11..3d7c9baca 100644
--- a/plugins/samplesource/fcdproplus/fcdproplusgui.cpp
+++ b/plugins/samplesource/fcdproplus/fcdproplusgui.cpp
@@ -36,7 +36,7 @@ FCDProPlusGui::FCDProPlusGui(DeviceSourceAPI *deviceAPI, QWidget* parent) :
 	m_lastEngineState((DSPDeviceSourceEngine::State)-1)
 {
     m_sampleSource = new FCDProPlusInput(m_deviceAPI);
-    m_deviceAPI->setSource(m_sampleSource);
+    m_deviceAPI->setSampleSource(m_sampleSource);
 
 	ui->setupUi(this);
 
diff --git a/plugins/samplesource/filesource/filesourcegui.cpp b/plugins/samplesource/filesource/filesourcegui.cpp
index 3cbceaa50..76d0283ea 100644
--- a/plugins/samplesource/filesource/filesourcegui.cpp
+++ b/plugins/samplesource/filesource/filesourcegui.cpp
@@ -68,7 +68,7 @@ FileSourceGui::FileSourceGui(DeviceSourceAPI *deviceAPI, QWidget* parent) :
 
     m_sampleSource = new FileSourceInput(m_deviceAPI);
 	connect(m_sampleSource->getOutputMessageQueueToGUI(), SIGNAL(messageEnqueued()), this, SLOT(handleSourceMessages()));
-	m_deviceAPI->setSource(m_sampleSource);
+	m_deviceAPI->setSampleSource(m_sampleSource);
 
     connect(m_deviceAPI->getDeviceEngineOutputMessageQueue(), SIGNAL(messageEnqueued()), this, SLOT(handleDSPMessages()), Qt::QueuedConnection);
 }
diff --git a/plugins/samplesource/hackrfinput/hackrfinputgui.cpp b/plugins/samplesource/hackrfinput/hackrfinputgui.cpp
index d98d7845d..679db7b7f 100644
--- a/plugins/samplesource/hackrfinput/hackrfinputgui.cpp
+++ b/plugins/samplesource/hackrfinput/hackrfinputgui.cpp
@@ -41,7 +41,7 @@ HackRFInputGui::HackRFInputGui(DeviceSourceAPI *deviceAPI, QWidget* parent) :
 	m_lastEngineState((DSPDeviceSourceEngine::State)-1)
 {
     m_sampleSource = new HackRFInput(m_deviceAPI);
-    m_deviceAPI->setSource(m_sampleSource);
+    m_deviceAPI->setSampleSource(m_sampleSource);
 
     ui->setupUi(this);
 	ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold));
diff --git a/plugins/samplesource/limesdrinput/limesdrinputgui.cpp b/plugins/samplesource/limesdrinput/limesdrinputgui.cpp
index 33a80c3d1..4fbdc4322 100644
--- a/plugins/samplesource/limesdrinput/limesdrinputgui.cpp
+++ b/plugins/samplesource/limesdrinput/limesdrinputgui.cpp
@@ -42,7 +42,7 @@ LimeSDRInputGUI::LimeSDRInputGUI(DeviceSourceAPI *deviceAPI, QWidget* parent) :
 {
     m_limeSDRInput = new LimeSDRInput(m_deviceAPI);
     m_sampleSource = (DeviceSampleSource *) m_limeSDRInput;
-    m_deviceAPI->setSource(m_sampleSource);
+    m_deviceAPI->setSampleSource(m_sampleSource);
 
     ui->setupUi(this);
 
diff --git a/plugins/samplesource/plutosdrinput/plutosdrinputgui.cpp b/plugins/samplesource/plutosdrinput/plutosdrinputgui.cpp
index efb43e2ae..0494b3136 100644
--- a/plugins/samplesource/plutosdrinput/plutosdrinputgui.cpp
+++ b/plugins/samplesource/plutosdrinput/plutosdrinputgui.cpp
@@ -41,7 +41,7 @@ PlutoSDRInputGui::PlutoSDRInputGui(DeviceSourceAPI *deviceAPI, QWidget* parent)
     m_statusCounter(0)
 {
     m_sampleSource = new PlutoSDRInput(m_deviceAPI);
-    m_deviceAPI->setSource(m_sampleSource);
+    m_deviceAPI->setSampleSource(m_sampleSource);
 
     ui->setupUi(this);
     ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold));
diff --git a/plugins/samplesource/rtlsdr/rtlsdrgui.cpp b/plugins/samplesource/rtlsdr/rtlsdrgui.cpp
index 048acdf43..714d6da2c 100644
--- a/plugins/samplesource/rtlsdr/rtlsdrgui.cpp
+++ b/plugins/samplesource/rtlsdr/rtlsdrgui.cpp
@@ -37,7 +37,7 @@ RTLSDRGui::RTLSDRGui(DeviceSourceAPI *deviceAPI, QWidget* parent) :
 	m_lastEngineState((DSPDeviceSourceEngine::State)-1)
 {
     m_sampleSource = new RTLSDRInput(m_deviceAPI);
-    m_deviceAPI->setSource(m_sampleSource);
+    m_deviceAPI->setSampleSource(m_sampleSource);
 
     ui->setupUi(this);
 	ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold));
diff --git a/plugins/samplesource/sdrdaemonsource/sdrdaemonsourcegui.cpp b/plugins/samplesource/sdrdaemonsource/sdrdaemonsourcegui.cpp
index 94d60dab1..b01825d68 100644
--- a/plugins/samplesource/sdrdaemonsource/sdrdaemonsourcegui.cpp
+++ b/plugins/samplesource/sdrdaemonsource/sdrdaemonsourcegui.cpp
@@ -99,7 +99,7 @@ SDRdaemonSourceGui::SDRdaemonSourceGui(DeviceSourceAPI *deviceAPI, QWidget* pare
 
     m_sampleSource = new SDRdaemonSourceInput(m_deviceAPI);
 	connect(m_sampleSource->getOutputMessageQueueToGUI(), SIGNAL(messageEnqueued()), this, SLOT(handleSourceMessages()));
-	m_deviceAPI->setSource(m_sampleSource);
+	m_deviceAPI->setSampleSource(m_sampleSource);
 
 	displaySettings();
 
diff --git a/plugins/samplesource/sdrplay/sdrplaygui.cpp b/plugins/samplesource/sdrplay/sdrplaygui.cpp
index 370da66e1..52dc7c57f 100644
--- a/plugins/samplesource/sdrplay/sdrplaygui.cpp
+++ b/plugins/samplesource/sdrplay/sdrplaygui.cpp
@@ -34,7 +34,7 @@ SDRPlayGui::SDRPlayGui(DeviceSourceAPI *deviceAPI, QWidget* parent) :
     m_deviceAPI(deviceAPI)
 {
     m_sampleSource = new SDRPlayInput(m_deviceAPI);
-    m_deviceAPI->setSource(m_sampleSource);
+    m_deviceAPI->setSampleSource(m_sampleSource);
 
     ui->setupUi(this);
     ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold));
diff --git a/sdrbase/device/devicesourceapi.cpp b/sdrbase/device/devicesourceapi.cpp
index 798770d64..5bce91e7c 100644
--- a/sdrbase/device/devicesourceapi.cpp
+++ b/sdrbase/device/devicesourceapi.cpp
@@ -68,12 +68,12 @@ void DeviceSourceAPI::removeThreadedSink(ThreadedBasebandSampleSink* sink)
     m_deviceSourceEngine->removeThreadedSink(sink);
 }
 
-void DeviceSourceAPI::setSource(DeviceSampleSource* source)
+void DeviceSourceAPI::setSampleSource(DeviceSampleSource* source)
 {
     m_deviceSourceEngine->setSource(source);
 }
 
-DeviceSampleSource *DeviceSourceAPI::getSource()
+DeviceSampleSource *DeviceSourceAPI::getSampleSource()
 {
     return m_deviceSourceEngine->getSource();
 }
diff --git a/sdrbase/device/devicesourceapi.h b/sdrbase/device/devicesourceapi.h
index b472ea183..0f0714a14 100644
--- a/sdrbase/device/devicesourceapi.h
+++ b/sdrbase/device/devicesourceapi.h
@@ -49,8 +49,8 @@ public:
     void removeSink(BasebandSampleSink* sink);    //!< Remove a sample sink from device engine
     void addThreadedSink(ThreadedBasebandSampleSink* sink);     //!< Add a sample sink that will run on its own thread to device engine
     void removeThreadedSink(ThreadedBasebandSampleSink* sink);  //!< Remove a sample sink that runs on its own thread from device engine
-    void setSource(DeviceSampleSource* source); //!< Set device sample source
-    DeviceSampleSource *getSource();      //!< Return pointer to the device sample source
+    void setSampleSource(DeviceSampleSource* source); //!< Set device sample source
+    DeviceSampleSource *getSampleSource();      //!< Return pointer to the device sample source
     bool initAcquisition();               //!< Initialize device engine acquisition sequence
     bool startAcquisition();              //!< Start device engine acquisition sequence
     void stopAcquisition();               //!< Stop device engine acquisition sequence