diff --git a/sdrbase/device/deviceenumerator.cpp b/sdrbase/device/deviceenumerator.cpp
index 6a5a578ba..9212846a7 100644
--- a/sdrbase/device/deviceenumerator.cpp
+++ b/sdrbase/device/deviceenumerator.cpp
@@ -376,11 +376,11 @@ int DeviceEnumerator::getFileInputDeviceIndex() const
     return -1;
 }
 
-int DeviceEnumerator::getFileSinkDeviceIndex() const
+int DeviceEnumerator::getFileOutputDeviceIndex() const
 {
     for (DevicesEnumeration::const_iterator it = m_txEnumeration.begin(); it != m_txEnumeration.end(); ++it)
     {
-        if (it->m_samplingDevice.id == PluginManager::getFileSinkDeviceId()) {
+        if (it->m_samplingDevice.id == PluginManager::getFileOutputDeviceId()) {
             return it->m_index;
         }
     }
diff --git a/sdrbase/device/deviceenumerator.h b/sdrbase/device/deviceenumerator.h
index 9ac35b4e1..108422e7c 100644
--- a/sdrbase/device/deviceenumerator.h
+++ b/sdrbase/device/deviceenumerator.h
@@ -57,7 +57,7 @@ public:
     PluginInterface *getTxPluginInterface(int deviceIndex) { return m_txEnumeration[deviceIndex].m_pluginInterface; }
     PluginInterface *getMIMOPluginInterface(int deviceIndex) { return m_mimoEnumeration[deviceIndex].m_pluginInterface; }
     int getFileInputDeviceIndex() const;  //!< Get Rx default device
-    int getFileSinkDeviceIndex() const;   //!< Get Tx default device
+    int getFileOutputDeviceIndex() const;   //!< Get Tx default device
     int getRxSamplingDeviceIndex(const QString& deviceId, int sequence);
     int getTxSamplingDeviceIndex(const QString& deviceId, int sequence);
     int getMIMOSamplingDeviceIndex(const QString& deviceId, int sequence);
diff --git a/sdrbase/plugin/pluginmanager.h b/sdrbase/plugin/pluginmanager.h
index 0a04c31dd..fbe7c8da7 100644
--- a/sdrbase/plugin/pluginmanager.h
+++ b/sdrbase/plugin/pluginmanager.h
@@ -91,7 +91,7 @@ public:
 	const PluginInterface *getDevicePluginInterface(const QString& deviceId) const;
 
 	static const QString& getFileInputDeviceId() { return m_fileInputDeviceTypeID; }
-	static const QString& getFileSinkDeviceId() { return m_fileOutputDeviceTypeID; }
+	static const QString& getFileOutputDeviceId() { return m_fileOutputDeviceTypeID; }
 
 private:
 	struct SamplingDevice { //!< This is the device registration
diff --git a/sdrgui/mainwindow.cpp b/sdrgui/mainwindow.cpp
index b35d3aa68..dc77a1e00 100644
--- a/sdrgui/mainwindow.cpp
+++ b/sdrgui/mainwindow.cpp
@@ -406,7 +406,7 @@ void MainWindow::addSinkDevice()
     ui->tabInputsSelect->setTabToolTip(deviceTabIndex, QString(uidCStr));
 
     // create a file sink by default
-    int fileSinkDeviceIndex = DeviceEnumerator::instance()->getFileSinkDeviceIndex();
+    int fileSinkDeviceIndex = DeviceEnumerator::instance()->getFileOutputDeviceIndex();
     const PluginInterface::SamplingDevice *samplingDevice = DeviceEnumerator::instance()->getTxSamplingDevice(fileSinkDeviceIndex);
     m_deviceUIs.back()->m_deviceAPI->setSamplingDeviceSequence(samplingDevice->sequence);
     m_deviceUIs.back()->m_deviceAPI->setDeviceNbItems(samplingDevice->deviceNbItems);
@@ -1769,7 +1769,7 @@ void MainWindow::sampleSinkChanged()
         if (deviceUI->m_deviceAPI->getSamplingDeviceId().size() == 0) // non existent device => replace by default
         {
             qDebug("MainWindow::sampleSinkChanged: non existent device replaced by File Sink");
-            int fileSinkDeviceIndex = DeviceEnumerator::instance()->getFileSinkDeviceIndex();
+            int fileSinkDeviceIndex = DeviceEnumerator::instance()->getFileOutputDeviceIndex();
             const PluginInterface::SamplingDevice *samplingDevice = DeviceEnumerator::instance()->getTxSamplingDevice(fileSinkDeviceIndex);
             deviceUI->m_deviceAPI->setSamplingDeviceSequence(samplingDevice->sequence);
             deviceUI->m_deviceAPI->setDeviceNbItems(samplingDevice->deviceNbItems);
diff --git a/sdrsrv/maincore.cpp b/sdrsrv/maincore.cpp
index efe4985b9..d290979db 100644
--- a/sdrsrv/maincore.cpp
+++ b/sdrsrv/maincore.cpp
@@ -299,7 +299,7 @@ void MainCore::addSinkDevice()
     QList<QString> channelNames;
 
     // create a file sink by default
-    int fileSinkDeviceIndex = DeviceEnumerator::instance()->getFileSinkDeviceIndex();
+    int fileSinkDeviceIndex = DeviceEnumerator::instance()->getFileOutputDeviceIndex();
     const PluginInterface::SamplingDevice *samplingDevice = DeviceEnumerator::instance()->getTxSamplingDevice(fileSinkDeviceIndex);
     m_deviceSets.back()->m_deviceAPI->setSamplingDeviceSequence(samplingDevice->sequence);
     m_deviceSets.back()->m_deviceAPI->setDeviceNbItems(samplingDevice->deviceNbItems);
@@ -523,7 +523,7 @@ void MainCore::changeSampleSink(int deviceSetIndex, int selectedDeviceIndex)
         if (deviceSet->m_deviceAPI->getSamplingDeviceId().size() == 0) // non existent device => replace by default
         {
             qDebug("MainCore::changeSampleSink: non existent device replaced by File Sink");
-            int fileSinkDeviceIndex = DeviceEnumerator::instance()->getFileSinkDeviceIndex();
+            int fileSinkDeviceIndex = DeviceEnumerator::instance()->getFileOutputDeviceIndex();
             const PluginInterface::SamplingDevice *samplingDevice = DeviceEnumerator::instance()->getTxSamplingDevice(fileSinkDeviceIndex);
             deviceSet->m_deviceAPI->setSamplingDeviceSequence(samplingDevice->sequence);
             deviceSet->m_deviceAPI->setDeviceNbItems(samplingDevice->deviceNbItems);