diff --git a/plugins/samplesource/CMakeLists.txt b/plugins/samplesource/CMakeLists.txt
index 6043a6995..5c144cffe 100644
--- a/plugins/samplesource/CMakeLists.txt
+++ b/plugins/samplesource/CMakeLists.txt
@@ -63,12 +63,12 @@ endif(LIBNANOMSG_FOUND AND LIBLZ4_FOUND)
 
 find_package(CM256cc)
 if(CM256CC_FOUND AND LIBNANOMSG_FOUND)
-    add_subdirectory(sdrdaemonfec)
+    add_subdirectory(sdrdaemonsource)
 endif(CM256CC_FOUND AND LIBNANOMSG_FOUND)
 
 if (BUILD_DEBIAN)
     if (LIBNANOMSG_FOUND)
-        add_subdirectory(sdrdaemonfec)
+        add_subdirectory(sdrdaemonsource)
     endif (LIBNANOMSG_FOUND)
     add_subdirectory(airspy)
     add_subdirectory(hackrfinput)
diff --git a/plugins/samplesource/sdrdaemonfec/CMakeLists.txt b/plugins/samplesource/sdrdaemonsource/CMakeLists.txt
similarity index 100%
rename from plugins/samplesource/sdrdaemonfec/CMakeLists.txt
rename to plugins/samplesource/sdrdaemonsource/CMakeLists.txt
diff --git a/plugins/samplesource/sdrdaemonfec/readme.md b/plugins/samplesource/sdrdaemonsource/readme.md
similarity index 100%
rename from plugins/samplesource/sdrdaemonfec/readme.md
rename to plugins/samplesource/sdrdaemonsource/readme.md
diff --git a/plugins/samplesource/sdrdaemonfec/sdrdaemonfec.pro b/plugins/samplesource/sdrdaemonsource/sdrdaemonfec.pro
similarity index 100%
rename from plugins/samplesource/sdrdaemonfec/sdrdaemonfec.pro
rename to plugins/samplesource/sdrdaemonsource/sdrdaemonfec.pro
diff --git a/plugins/samplesource/sdrdaemonfec/sdrdaemonfecbuffer.cpp b/plugins/samplesource/sdrdaemonsource/sdrdaemonfecbuffer.cpp
similarity index 99%
rename from plugins/samplesource/sdrdaemonfec/sdrdaemonfecbuffer.cpp
rename to plugins/samplesource/sdrdaemonsource/sdrdaemonfecbuffer.cpp
index eec6c681b..dbd73286f 100644
--- a/plugins/samplesource/sdrdaemonfec/sdrdaemonfecbuffer.cpp
+++ b/plugins/samplesource/sdrdaemonsource/sdrdaemonfecbuffer.cpp
@@ -14,6 +14,8 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.          //
 ///////////////////////////////////////////////////////////////////////////////////
 
+#include "sdrdaemonfecbuffer.h"
+
 #include <QDebug>
 #include <cassert>
 #include <cstring>
@@ -22,7 +24,6 @@
 #include <boost/crc.hpp>
 #include <boost/cstdint.hpp>
 
-#include "sdrdaemonfecbuffer.h"
 
 
 const int SDRdaemonFECBuffer::m_sampleSize = 2;
diff --git a/plugins/samplesource/sdrdaemonfec/sdrdaemonfecbuffer.h b/plugins/samplesource/sdrdaemonsource/sdrdaemonfecbuffer.h
similarity index 98%
rename from plugins/samplesource/sdrdaemonfec/sdrdaemonfecbuffer.h
rename to plugins/samplesource/sdrdaemonsource/sdrdaemonfecbuffer.h
index 3a18cfc13..6d7f65363 100644
--- a/plugins/samplesource/sdrdaemonfec/sdrdaemonfecbuffer.h
+++ b/plugins/samplesource/sdrdaemonsource/sdrdaemonfecbuffer.h
@@ -14,8 +14,8 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.          //
 ///////////////////////////////////////////////////////////////////////////////////
 
-#ifndef PLUGINS_SAMPLESOURCE_SDRDAEMONFEC_SDRDAEMONFECBUFFER_H_
-#define PLUGINS_SAMPLESOURCE_SDRDAEMONFEC_SDRDAEMONFECBUFFER_H_
+#ifndef PLUGINS_SAMPLESOURCE_SDRDAEMONSOURCE_SDRDAEMONFECBUFFER_H_
+#define PLUGINS_SAMPLESOURCE_SDRDAEMONSOURCE_SDRDAEMONFECBUFFER_H_
 
 #include <QString>
 #include <QDebug>
@@ -270,4 +270,4 @@ private:
 
 
 
-#endif /* PLUGINS_SAMPLESOURCE_SDRDAEMONFEC_SDRDAEMONFECBUFFER_H_ */
+#endif /* PLUGINS_SAMPLESOURCE_SDRDAEMONSOURCE_SDRDAEMONFECBUFFER_H_ */
diff --git a/plugins/samplesource/sdrdaemonfec/sdrdaemonfecgui.cpp b/plugins/samplesource/sdrdaemonsource/sdrdaemonfecgui.cpp
similarity index 100%
rename from plugins/samplesource/sdrdaemonfec/sdrdaemonfecgui.cpp
rename to plugins/samplesource/sdrdaemonsource/sdrdaemonfecgui.cpp
index 7d53461eb..2b68362e2 100644
--- a/plugins/samplesource/sdrdaemonfec/sdrdaemonfecgui.cpp
+++ b/plugins/samplesource/sdrdaemonsource/sdrdaemonfecgui.cpp
@@ -14,6 +14,8 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.          //
 ///////////////////////////////////////////////////////////////////////////////////
 
+#include "sdrdaemonfecgui.h"
+
 #include <stdint.h>
 #include <sstream>
 #include <iostream>
@@ -37,8 +39,6 @@
 #include "mainwindow.h"
 #include "util/simpleserializer.h"
 
-#include "sdrdaemonfecgui.h"
-
 #include <device/devicesourceapi.h>
 #include <dsp/filerecord.h>
 
diff --git a/plugins/samplesource/sdrdaemonfec/sdrdaemonfecgui.h b/plugins/samplesource/sdrdaemonsource/sdrdaemonfecgui.h
similarity index 97%
rename from plugins/samplesource/sdrdaemonfec/sdrdaemonfecgui.h
rename to plugins/samplesource/sdrdaemonsource/sdrdaemonfecgui.h
index 3f000586b..73d82cefe 100644
--- a/plugins/samplesource/sdrdaemonfec/sdrdaemonfecgui.h
+++ b/plugins/samplesource/sdrdaemonsource/sdrdaemonfecgui.h
@@ -14,8 +14,8 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.          //
 ///////////////////////////////////////////////////////////////////////////////////
 
-#ifndef INCLUDE_SDRDAEMONFECGUI_H
-#define INCLUDE_SDRDAEMONFECGUI_H
+#ifndef INCLUDE_SDRDAEMONSOURCEGUI_H
+#define INCLUDE_SDRDAEMONSOURCEGUI_H
 
 #include <QTimer>
 #include <sys/time.h>
@@ -145,4 +145,4 @@ private slots:
 	void tick();
 };
 
-#endif // INCLUDE_SDRDAEMONGUI_H
+#endif // INCLUDE_SDRDAEMONSOURCEGUI_H
diff --git a/plugins/samplesource/sdrdaemonfec/sdrdaemonfecgui.ui b/plugins/samplesource/sdrdaemonsource/sdrdaemonfecgui.ui
similarity index 100%
rename from plugins/samplesource/sdrdaemonfec/sdrdaemonfecgui.ui
rename to plugins/samplesource/sdrdaemonsource/sdrdaemonfecgui.ui
diff --git a/plugins/samplesource/sdrdaemonfec/sdrdaemonfecinput.cpp b/plugins/samplesource/sdrdaemonsource/sdrdaemonfecinput.cpp
similarity index 97%
rename from plugins/samplesource/sdrdaemonfec/sdrdaemonfecinput.cpp
rename to plugins/samplesource/sdrdaemonsource/sdrdaemonfecinput.cpp
index ba1caf562..0e3bc471a 100644
--- a/plugins/samplesource/sdrdaemonfec/sdrdaemonfecinput.cpp
+++ b/plugins/samplesource/sdrdaemonsource/sdrdaemonfecinput.cpp
@@ -14,6 +14,8 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.          //
 ///////////////////////////////////////////////////////////////////////////////////
 
+#include "sdrdaemonfecinput.h"
+
 #include <string.h>
 #include <errno.h>
 #include <QDebug>
@@ -21,13 +23,11 @@
 #include "util/simpleserializer.h"
 #include "dsp/dspcommands.h"
 #include "dsp/dspengine.h"
-#include "sdrdaemonfecinput.h"
-
 #include <device/devicesourceapi.h>
 #include <dsp/filerecord.h>
 
-#include "sdrdaemonfecgui.h"
-#include "sdrdaemonfecudphandler.h"
+#include "../sdrdaemonsource/sdrdaemonfecgui.h"
+#include "../sdrdaemonsource/sdrdaemonfecudphandler.h"
 
 MESSAGE_CLASS_DEFINITION(SDRdaemonFECInput::MsgConfigureSDRdaemonFEC, Message)
 MESSAGE_CLASS_DEFINITION(SDRdaemonFECInput::MsgConfigureSDRdaemonUDPLink, Message)
diff --git a/plugins/samplesource/sdrdaemonfec/sdrdaemonfecinput.h b/plugins/samplesource/sdrdaemonsource/sdrdaemonfecinput.h
similarity index 98%
rename from plugins/samplesource/sdrdaemonfec/sdrdaemonfecinput.h
rename to plugins/samplesource/sdrdaemonsource/sdrdaemonfecinput.h
index d0765adb2..3bfbba204 100644
--- a/plugins/samplesource/sdrdaemonfec/sdrdaemonfecinput.h
+++ b/plugins/samplesource/sdrdaemonsource/sdrdaemonfecinput.h
@@ -14,8 +14,8 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.          //
 ///////////////////////////////////////////////////////////////////////////////////
 
-#ifndef INCLUDE_SDRDAEMONFECINPUT_H
-#define INCLUDE_SDRDAEMONFECINPUT_H
+#ifndef INCLUDE_SDRDAEMONSOURCEINPUT_H
+#define INCLUDE_SDRDAEMONSOURCEINPUT_H
 
 #include <dsp/devicesamplesource.h>
 #include <QString>
@@ -312,4 +312,4 @@ private:
     bool m_autoCorrBuffer;
 };
 
-#endif // INCLUDE_SDRDAEMONFECINPUT_H
+#endif // INCLUDE_SDRDAEMONSOURCEINPUT_H
diff --git a/plugins/samplesource/sdrdaemonfec/sdrdaemonfecplugin.cpp b/plugins/samplesource/sdrdaemonsource/sdrdaemonfecplugin.cpp
similarity index 100%
rename from plugins/samplesource/sdrdaemonfec/sdrdaemonfecplugin.cpp
rename to plugins/samplesource/sdrdaemonsource/sdrdaemonfecplugin.cpp
index 687d5a8df..4243eacc5 100644
--- a/plugins/samplesource/sdrdaemonfec/sdrdaemonfecplugin.cpp
+++ b/plugins/samplesource/sdrdaemonsource/sdrdaemonfecplugin.cpp
@@ -14,13 +14,13 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.          //
 ///////////////////////////////////////////////////////////////////////////////////
 
+#include "sdrdaemonfecplugin.h"
+
 #include <QtPlugin>
 #include <QAction>
 #include "plugin/pluginapi.h"
 #include "util/simpleserializer.h"
 
-#include "sdrdaemonfecplugin.h"
-
 #include <device/devicesourceapi.h>
 
 #include "sdrdaemonfecgui.h"
diff --git a/plugins/samplesource/sdrdaemonfec/sdrdaemonfecplugin.h b/plugins/samplesource/sdrdaemonsource/sdrdaemonfecplugin.h
similarity index 94%
rename from plugins/samplesource/sdrdaemonfec/sdrdaemonfecplugin.h
rename to plugins/samplesource/sdrdaemonsource/sdrdaemonfecplugin.h
index 04999635d..f812cc01b 100644
--- a/plugins/samplesource/sdrdaemonfec/sdrdaemonfecplugin.h
+++ b/plugins/samplesource/sdrdaemonsource/sdrdaemonfecplugin.h
@@ -14,8 +14,8 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.          //
 ///////////////////////////////////////////////////////////////////////////////////
 
-#ifndef INCLUDE_SDRDAEMONFECPLUGIN_H
-#define INCLUDE_SDRDAEMONFECPLUGIN_H
+#ifndef INCLUDE_SDRDAEMONSOURCEPLUGIN_H
+#define INCLUDE_SDRDAEMONSOURCEPLUGIN_H
 
 #include <QObject>
 #include "plugin/plugininterface.h"
@@ -45,4 +45,4 @@ private:
 	static const PluginDescriptor m_pluginDescriptor;
 };
 
-#endif // INCLUDE_SDRDAEMONFECPLUGIN_H
+#endif // INCLUDE_SDRDAEMONSOURCEPLUGIN_H
diff --git a/plugins/samplesource/sdrdaemonfec/sdrdaemonfecsettings.cpp b/plugins/samplesource/sdrdaemonsource/sdrdaemonfecsettings.cpp
similarity index 99%
rename from plugins/samplesource/sdrdaemonfec/sdrdaemonfecsettings.cpp
rename to plugins/samplesource/sdrdaemonsource/sdrdaemonfecsettings.cpp
index b5b2ea307..43abf78ab 100644
--- a/plugins/samplesource/sdrdaemonfec/sdrdaemonfecsettings.cpp
+++ b/plugins/samplesource/sdrdaemonsource/sdrdaemonfecsettings.cpp
@@ -14,9 +14,10 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.          //
 ///////////////////////////////////////////////////////////////////////////////////
 
-#include "util/simpleserializer.h"
 #include "sdrdaemonfecsettings.h"
 
+#include "util/simpleserializer.h"
+
 SDRdaemonFECSettings::SDRdaemonFECSettings()
 {
     resetToDefaults();
diff --git a/plugins/samplesource/sdrdaemonfec/sdrdaemonfecsettings.h b/plugins/samplesource/sdrdaemonsource/sdrdaemonfecsettings.h
similarity index 88%
rename from plugins/samplesource/sdrdaemonfec/sdrdaemonfecsettings.h
rename to plugins/samplesource/sdrdaemonsource/sdrdaemonfecsettings.h
index 9acd6d293..b1a4342fd 100644
--- a/plugins/samplesource/sdrdaemonfec/sdrdaemonfecsettings.h
+++ b/plugins/samplesource/sdrdaemonsource/sdrdaemonfecsettings.h
@@ -14,10 +14,11 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.          //
 ///////////////////////////////////////////////////////////////////////////////////
 
-#ifndef PLUGINS_SAMPLESOURCE_SDRDAEMONFEC_SDRDAEMONFECSETTINGS_H_
-#define PLUGINS_SAMPLESOURCE_SDRDAEMONFEC_SDRDAEMONFECSETTINGS_H_
+#ifndef PLUGINS_SAMPLESOURCE_SDRDAEMONSOURCE_SDRDAEMONSOURCESETTINGS_H_
+#define PLUGINS_SAMPLESOURCE_SDRDAEMONSOURCE_SDRDAEMONSOURCESETTINGS_H_
 
 #include <QByteArray>
+#include <QString>
 
 struct SDRdaemonFECSettings {
     quint64 m_centerFrequency;
@@ -39,4 +40,4 @@ struct SDRdaemonFECSettings {
     bool deserialize(const QByteArray& data);
 };
 
-#endif /* PLUGINS_SAMPLESOURCE_SDRDAEMONFEC_SDRDAEMONFECSETTINGS_H_ */
+#endif /* PLUGINS_SAMPLESOURCE_SDRDAEMONSOURCE_SDRDAEMONSOURCESETTINGS_H_ */
diff --git a/plugins/samplesource/sdrdaemonfec/sdrdaemonfecudphandler.cpp b/plugins/samplesource/sdrdaemonsource/sdrdaemonfecudphandler.cpp
similarity index 99%
rename from plugins/samplesource/sdrdaemonfec/sdrdaemonfecudphandler.cpp
rename to plugins/samplesource/sdrdaemonsource/sdrdaemonfecudphandler.cpp
index cdd8fd136..f0f9656e7 100644
--- a/plugins/samplesource/sdrdaemonfec/sdrdaemonfecudphandler.cpp
+++ b/plugins/samplesource/sdrdaemonsource/sdrdaemonfecudphandler.cpp
@@ -14,6 +14,8 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.          //
 ///////////////////////////////////////////////////////////////////////////////////
 
+#include "sdrdaemonfecudphandler.h"
+
 #include <QUdpSocket>
 #include <QDebug>
 #include <QTimer>
@@ -21,9 +23,8 @@
 
 #include "dsp/dspcommands.h"
 #include "dsp/dspengine.h"
-#include "sdrdaemonfecinput.h"
-#include "sdrdaemonfecudphandler.h"
 #include <device/devicesourceapi.h>
+#include "../sdrdaemonsource/sdrdaemonfecinput.h"
 
 SDRdaemonFECUDPHandler::SDRdaemonFECUDPHandler(SampleSinkFifo *sampleFifo, MessageQueue *outputMessageQueueToGUI, DeviceSourceAPI *devieAPI) :
     m_deviceAPI(devieAPI),
diff --git a/plugins/samplesource/sdrdaemonfec/sdrdaemonfecudphandler.h b/plugins/samplesource/sdrdaemonsource/sdrdaemonfecudphandler.h
similarity index 92%
rename from plugins/samplesource/sdrdaemonfec/sdrdaemonfecudphandler.h
rename to plugins/samplesource/sdrdaemonsource/sdrdaemonfecudphandler.h
index 024c8d9e6..caf4de6ec 100644
--- a/plugins/samplesource/sdrdaemonfec/sdrdaemonfecudphandler.h
+++ b/plugins/samplesource/sdrdaemonsource/sdrdaemonfecudphandler.h
@@ -14,8 +14,8 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.          //
 ///////////////////////////////////////////////////////////////////////////////////
 
-#ifndef PLUGINS_SAMPLESOURCE_SDRDAEMONFEC_SDRDAEMONFECUDPHANDLER_H_
-#define PLUGINS_SAMPLESOURCE_SDRDAEMONFEC_SDRDAEMONFECUDPHANDLER_H_
+#ifndef PLUGINS_SAMPLESOURCE_SDRDAEMONSOURCE_SDRDAEMONFECUDPHANDLER_H_
+#define PLUGINS_SAMPLESOURCE_SDRDAEMONSOURCE_SDRDAEMONFECUDPHANDLER_H_
 
 #include <QObject>
 #include <QUdpSocket>
@@ -83,4 +83,4 @@ private slots:
 
 
 
-#endif /* PLUGINS_SAMPLESOURCE_SDRDAEMON_SDRDAEMONUDPHANDLER_H_ */
+#endif /* PLUGINS_SAMPLESOURCE_SDRDAEMONSOURCE_SDRDAEMONFECUDPHANDLER_H_ */