diff --git a/plugins/channelrx/CMakeLists.txt b/plugins/channelrx/CMakeLists.txt
index 7c8c51318..1153de171 100644
--- a/plugins/channelrx/CMakeLists.txt
+++ b/plugins/channelrx/CMakeLists.txt
@@ -2,7 +2,7 @@ project(demod)
 
 if (Qt5Quick_FOUND AND Qt5QuickWidgets_FOUND AND Qt5Positioning_FOUND)
     add_subdirectory(demodadsb)
-    add_subdirectory(demodvor)
+    add_subdirectory(demodvormc)
 endif()
 
 add_subdirectory(demodam)
diff --git a/plugins/channelrx/demodvor/CMakeLists.txt b/plugins/channelrx/demodvormc/CMakeLists.txt
similarity index 56%
rename from plugins/channelrx/demodvor/CMakeLists.txt
rename to plugins/channelrx/demodvormc/CMakeLists.txt
index fdd035c46..46490ec17 100644
--- a/plugins/channelrx/demodvor/CMakeLists.txt
+++ b/plugins/channelrx/demodvormc/CMakeLists.txt
@@ -1,23 +1,23 @@
-project(vor)
+project(vormc)
 
-set(vor_SOURCES
-    vordemod.cpp
-    vordemodsettings.cpp
-    vordemodbaseband.cpp
-    vordemodsink.cpp
-    vordemodplugin.cpp
-    vordemodwebapiadapter.cpp
-    vordemodreport.cpp
+set(vormc_SOURCES
+    vordemodmc.cpp
+    vordemodmcsettings.cpp
+    vordemodmcbaseband.cpp
+    vordemodmcsink.cpp
+    vordemodmcplugin.cpp
+    vordemodmcwebapiadapter.cpp
+    vordemodmcreport.cpp
 )
 
-set(vor_HEADERS
-    vordemod.h
-    vordemodsettings.h
-    vordemodbaseband.h
-    vordemodsink.h
-    vordemodplugin.h
-    vordemodwebapiadapter.h
-    vordemodreport.h
+set(vormc_HEADERS
+    vordemodmc.h
+    vordemodmcsettings.h
+    vordemodmcbaseband.h
+    vordemodmcsink.h
+    vordemodmcplugin.h
+    vordemodmcwebapiadapter.h
+    vordemodmcreport.h
 )
 
 
@@ -26,33 +26,33 @@ include_directories(
 )
 
 if(NOT SERVER_MODE)
-    set(vor_SOURCES
-        ${vor_SOURCES}
-        vordemodgui.cpp
-        vordemodgui.ui
+    set(vormc_SOURCES
+        ${vormc_SOURCES}
+        vordemodmcgui.cpp
+        vordemodmcgui.ui
         map.qrc
         icons.qrc
     )
-    set(vor_HEADERS
-        ${vor_HEADERS}
-        vordemodgui.h
+    set(vormc_HEADERS
+        ${vormc_HEADERS}
+        vordemodmcgui.h
         navaid.h
         ../demodadsb/csv.h
     )
 
-    set(TARGET_NAME demodvor)
+    set(TARGET_NAME demodvormc)
     set(TARGET_LIB "Qt5::Widgets" Qt5::Quick Qt5::QuickWidgets Qt5::Positioning)
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME demodvorsrv)
+    set(TARGET_NAME demodvormcsrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()
 
 add_library(${TARGET_NAME} SHARED
-    ${vor_SOURCES}
+    ${vormc_SOURCES}
 )
 
 target_link_libraries(${TARGET_NAME}
diff --git a/plugins/channelrx/demodvor/icons.qrc b/plugins/channelrx/demodvormc/icons.qrc
similarity index 100%
rename from plugins/channelrx/demodvor/icons.qrc
rename to plugins/channelrx/demodvormc/icons.qrc
diff --git a/plugins/channelrx/demodvor/icons/compass.png b/plugins/channelrx/demodvormc/icons/compass.png
similarity index 100%
rename from plugins/channelrx/demodvor/icons/compass.png
rename to plugins/channelrx/demodvormc/icons/compass.png
diff --git a/plugins/channelrx/demodvor/icons/vor.png b/plugins/channelrx/demodvormc/icons/vor.png
similarity index 100%
rename from plugins/channelrx/demodvor/icons/vor.png
rename to plugins/channelrx/demodvormc/icons/vor.png
diff --git a/plugins/channelrx/demodvor/map.qrc b/plugins/channelrx/demodvormc/map.qrc
similarity index 100%
rename from plugins/channelrx/demodvor/map.qrc
rename to plugins/channelrx/demodvormc/map.qrc
diff --git a/plugins/channelrx/demodvor/map/MapStation.qml b/plugins/channelrx/demodvormc/map/MapStation.qml
similarity index 100%
rename from plugins/channelrx/demodvor/map/MapStation.qml
rename to plugins/channelrx/demodvormc/map/MapStation.qml
diff --git a/plugins/channelrx/demodvor/map/VOR-DME.png b/plugins/channelrx/demodvormc/map/VOR-DME.png
similarity index 100%
rename from plugins/channelrx/demodvor/map/VOR-DME.png
rename to plugins/channelrx/demodvormc/map/VOR-DME.png
diff --git a/plugins/channelrx/demodvor/map/VOR.png b/plugins/channelrx/demodvormc/map/VOR.png
similarity index 100%
rename from plugins/channelrx/demodvor/map/VOR.png
rename to plugins/channelrx/demodvormc/map/VOR.png
diff --git a/plugins/channelrx/demodvor/map/VORTAC.png b/plugins/channelrx/demodvormc/map/VORTAC.png
similarity index 100%
rename from plugins/channelrx/demodvor/map/VORTAC.png
rename to plugins/channelrx/demodvormc/map/VORTAC.png
diff --git a/plugins/channelrx/demodvor/map/antenna.png b/plugins/channelrx/demodvormc/map/antenna.png
similarity index 100%
rename from plugins/channelrx/demodvor/map/antenna.png
rename to plugins/channelrx/demodvormc/map/antenna.png
diff --git a/plugins/channelrx/demodvor/map/map.qml b/plugins/channelrx/demodvormc/map/map.qml
similarity index 100%
rename from plugins/channelrx/demodvor/map/map.qml
rename to plugins/channelrx/demodvormc/map/map.qml
diff --git a/plugins/channelrx/demodvor/navaid.h b/plugins/channelrx/demodvormc/navaid.h
similarity index 100%
rename from plugins/channelrx/demodvor/navaid.h
rename to plugins/channelrx/demodvormc/navaid.h
diff --git a/plugins/channelrx/demodvor/readme.md b/plugins/channelrx/demodvormc/readme.md
similarity index 100%
rename from plugins/channelrx/demodvor/readme.md
rename to plugins/channelrx/demodvormc/readme.md
diff --git a/plugins/channelrx/demodvor/vordemod.cpp b/plugins/channelrx/demodvormc/vordemodmc.cpp
similarity index 99%
rename from plugins/channelrx/demodvor/vordemod.cpp
rename to plugins/channelrx/demodvormc/vordemodmc.cpp
index fa4fd4b10..4623f56b9 100644
--- a/plugins/channelrx/demodvor/vordemod.cpp
+++ b/plugins/channelrx/demodvormc/vordemodmc.cpp
@@ -16,7 +16,7 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.          //
 ///////////////////////////////////////////////////////////////////////////////////
 
-#include "vordemod.h"
+#include "vordemodmc.h"
 
 #include <QTime>
 #include <QDebug>
diff --git a/plugins/channelrx/demodvor/vordemod.h b/plugins/channelrx/demodvormc/vordemodmc.h
similarity index 99%
rename from plugins/channelrx/demodvor/vordemod.h
rename to plugins/channelrx/demodvormc/vordemodmc.h
index f6325b5d8..20799a1d4 100644
--- a/plugins/channelrx/demodvor/vordemod.h
+++ b/plugins/channelrx/demodvormc/vordemodmc.h
@@ -28,8 +28,8 @@
 #include "channel/channelapi.h"
 #include "util/message.h"
 
-#include "vordemodbaseband.h"
-#include "vordemodsettings.h"
+#include "vordemodmcbaseband.h"
+#include "vordemodmcsettings.h"
 
 class QNetworkAccessManager;
 class QNetworkReply;
diff --git a/plugins/channelrx/demodvor/vordemodbaseband.cpp b/plugins/channelrx/demodvormc/vordemodmcbaseband.cpp
similarity index 99%
rename from plugins/channelrx/demodvor/vordemodbaseband.cpp
rename to plugins/channelrx/demodvormc/vordemodmcbaseband.cpp
index 9cdebd04f..063ffa34f 100644
--- a/plugins/channelrx/demodvor/vordemodbaseband.cpp
+++ b/plugins/channelrx/demodvormc/vordemodmcbaseband.cpp
@@ -22,8 +22,8 @@
 #include "dsp/dspcommands.h"
 #include "dsp/downchannelizer.h"
 
-#include "vordemodbaseband.h"
-#include "vordemodreport.h"
+#include "vordemodmcbaseband.h"
+#include "vordemodmcreport.h"
 
 MESSAGE_CLASS_DEFINITION(VORDemodMCBaseband::MsgConfigureVORDemodBaseband, Message)
 
diff --git a/plugins/channelrx/demodvor/vordemodbaseband.h b/plugins/channelrx/demodvormc/vordemodmcbaseband.h
similarity index 99%
rename from plugins/channelrx/demodvor/vordemodbaseband.h
rename to plugins/channelrx/demodvormc/vordemodmcbaseband.h
index 13f1633b4..dac1f9ae3 100644
--- a/plugins/channelrx/demodvor/vordemodbaseband.h
+++ b/plugins/channelrx/demodvormc/vordemodmcbaseband.h
@@ -26,7 +26,7 @@
 #include "util/message.h"
 #include "util/messagequeue.h"
 
-#include "vordemodsink.h"
+#include "vordemodmcsink.h"
 
 class DownChannelizer;
 
diff --git a/plugins/channelrx/demodvor/vordemodgui.cpp b/plugins/channelrx/demodvormc/vordemodmcgui.cpp
similarity index 99%
rename from plugins/channelrx/demodvor/vordemodgui.cpp
rename to plugins/channelrx/demodvormc/vordemodmcgui.cpp
index 30ffacafd..c86912709 100644
--- a/plugins/channelrx/demodvor/vordemodgui.cpp
+++ b/plugins/channelrx/demodvormc/vordemodmcgui.cpp
@@ -27,12 +27,12 @@
 #include <QMessageBox>
 #include <QAction>
 
-#include "vordemodgui.h"
+#include "vordemodmcgui.h"
 
 #include "device/deviceuiset.h"
 #include "dsp/dspengine.h"
 #include "dsp/dspcommands.h"
-#include "ui_vordemodgui.h"
+#include "ui_vordemodmcgui.h"
 #include "plugin/pluginapi.h"
 #include "util/simpleserializer.h"
 #include "util/db.h"
@@ -46,9 +46,9 @@
 #include "channel/channelwebapiutils.h"
 #include "maincore.h"
 
-#include "vordemod.h"
-#include "vordemodreport.h"
-#include "vordemodsink.h"
+#include "vordemodmc.h"
+#include "vordemodmcreport.h"
+#include "vordemodmcsink.h"
 
 #define VOR_COL_NAME            0
 #define VOR_COL_FREQUENCY       1
diff --git a/plugins/channelrx/demodvor/vordemodgui.h b/plugins/channelrx/demodvormc/vordemodmcgui.h
similarity index 99%
rename from plugins/channelrx/demodvor/vordemodgui.h
rename to plugins/channelrx/demodvormc/vordemodmcgui.h
index 9be477bf1..4a08a14a1 100644
--- a/plugins/channelrx/demodvor/vordemodgui.h
+++ b/plugins/channelrx/demodvormc/vordemodmcgui.h
@@ -38,7 +38,7 @@
 #include "util/httpdownloadmanager.h"
 #include "util/azel.h"
 #include "settings/rollupstate.h"
-#include "vordemodsettings.h"
+#include "vordemodmcsettings.h"
 #include "navaid.h"
 
 class PluginAPI;
diff --git a/plugins/channelrx/demodvor/vordemodgui.ui b/plugins/channelrx/demodvormc/vordemodmcgui.ui
similarity index 100%
rename from plugins/channelrx/demodvor/vordemodgui.ui
rename to plugins/channelrx/demodvormc/vordemodmcgui.ui
diff --git a/plugins/channelrx/demodvor/vordemodplugin.cpp b/plugins/channelrx/demodvormc/vordemodmcplugin.cpp
similarity index 95%
rename from plugins/channelrx/demodvor/vordemodplugin.cpp
rename to plugins/channelrx/demodvormc/vordemodmcplugin.cpp
index c41a6464d..7ba829772 100644
--- a/plugins/channelrx/demodvor/vordemodplugin.cpp
+++ b/plugins/channelrx/demodvormc/vordemodmcplugin.cpp
@@ -20,11 +20,11 @@
 #include "plugin/pluginapi.h"
 
 #ifndef SERVER_MODE
-#include "vordemodgui.h"
+#include "vordemodmcgui.h"
 #endif
-#include "vordemod.h"
-#include "vordemodwebapiadapter.h"
-#include "vordemodplugin.h"
+#include "vordemodmc.h"
+#include "vordemodmcwebapiadapter.h"
+#include "vordemodmcplugin.h"
 
 const PluginDescriptor VORDemodMCPlugin::m_pluginDescriptor = {
     VORDemodMC::m_channelId,
@@ -88,5 +88,5 @@ ChannelGUI* VORDemodMCPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, Baseb
 
 ChannelWebAPIAdapter* VORDemodMCPlugin::createChannelWebAPIAdapter() const
 {
-    return new VORDemodWebAPIAdapter();
+    return new VORDemodMCWebAPIAdapter();
 }
diff --git a/plugins/channelrx/demodvor/vordemodplugin.h b/plugins/channelrx/demodvormc/vordemodmcplugin.h
similarity index 100%
rename from plugins/channelrx/demodvor/vordemodplugin.h
rename to plugins/channelrx/demodvormc/vordemodmcplugin.h
diff --git a/plugins/channelrx/demodvor/vordemodreport.cpp b/plugins/channelrx/demodvormc/vordemodmcreport.cpp
similarity index 98%
rename from plugins/channelrx/demodvor/vordemodreport.cpp
rename to plugins/channelrx/demodvormc/vordemodmcreport.cpp
index 61c4ddba6..524713e44 100644
--- a/plugins/channelrx/demodvor/vordemodreport.cpp
+++ b/plugins/channelrx/demodvormc/vordemodmcreport.cpp
@@ -15,7 +15,7 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.          //
 ///////////////////////////////////////////////////////////////////////////////////
 
-#include "vordemodreport.h"
+#include "vordemodmcreport.h"
 
 MESSAGE_CLASS_DEFINITION(VORDemodMCReport::MsgReportFreqOffset, Message)
 MESSAGE_CLASS_DEFINITION(VORDemodMCReport::MsgReportRadial, Message)
diff --git a/plugins/channelrx/demodvor/vordemodreport.h b/plugins/channelrx/demodvormc/vordemodmcreport.h
similarity index 100%
rename from plugins/channelrx/demodvor/vordemodreport.h
rename to plugins/channelrx/demodvormc/vordemodmcreport.h
diff --git a/plugins/channelrx/demodvor/vordemodsettings.cpp b/plugins/channelrx/demodvormc/vordemodmcsettings.cpp
similarity index 99%
rename from plugins/channelrx/demodvor/vordemodsettings.cpp
rename to plugins/channelrx/demodvormc/vordemodmcsettings.cpp
index 5bd4f2d79..fbcfcf6ee 100644
--- a/plugins/channelrx/demodvor/vordemodsettings.cpp
+++ b/plugins/channelrx/demodvormc/vordemodmcsettings.cpp
@@ -21,7 +21,7 @@
 #include "dsp/dspengine.h"
 #include "util/simpleserializer.h"
 #include "settings/serializable.h"
-#include "vordemodsettings.h"
+#include "vordemodmcsettings.h"
 
 VORDemodMCSettings::VORDemodMCSettings() :
     m_channelMarker(nullptr),
diff --git a/plugins/channelrx/demodvor/vordemodsettings.h b/plugins/channelrx/demodvormc/vordemodmcsettings.h
similarity index 100%
rename from plugins/channelrx/demodvor/vordemodsettings.h
rename to plugins/channelrx/demodvormc/vordemodmcsettings.h
diff --git a/plugins/channelrx/demodvor/vordemodsink.cpp b/plugins/channelrx/demodvormc/vordemodmcsink.cpp
similarity index 99%
rename from plugins/channelrx/demodvor/vordemodsink.cpp
rename to plugins/channelrx/demodvormc/vordemodmcsink.cpp
index 8dfa47a03..ab84286c1 100644
--- a/plugins/channelrx/demodvor/vordemodsink.cpp
+++ b/plugins/channelrx/demodvormc/vordemodmcsink.cpp
@@ -27,8 +27,8 @@
 #include "util/morse.h"
 #include "util/units.h"
 
-#include "vordemodsink.h"
-#include "vordemodreport.h"
+#include "vordemodmcsink.h"
+#include "vordemodmcreport.h"
 
 VORDemodMCSink::VORDemodMCSink(const VORDemodMCSettings& settings, int subChannel,
                 MessageQueue *messageQueueToGUI) :
diff --git a/plugins/channelrx/demodvor/vordemodsink.h b/plugins/channelrx/demodvormc/vordemodmcsink.h
similarity index 99%
rename from plugins/channelrx/demodvor/vordemodsink.h
rename to plugins/channelrx/demodvormc/vordemodmcsink.h
index d4bf9fda6..fb6228b87 100644
--- a/plugins/channelrx/demodvor/vordemodsink.h
+++ b/plugins/channelrx/demodvormc/vordemodmcsink.h
@@ -30,7 +30,7 @@
 #include "util/doublebufferfifo.h"
 #include "util/messagequeue.h"
 
-#include "vordemodsettings.h"
+#include "vordemodmcsettings.h"
 
 #include <vector>
 
diff --git a/plugins/channelrx/demodvor/vordemodwebapiadapter.cpp b/plugins/channelrx/demodvormc/vordemodmcwebapiadapter.cpp
similarity index 88%
rename from plugins/channelrx/demodvor/vordemodwebapiadapter.cpp
rename to plugins/channelrx/demodvormc/vordemodmcwebapiadapter.cpp
index abe64e3de..7352e9d16 100644
--- a/plugins/channelrx/demodvor/vordemodwebapiadapter.cpp
+++ b/plugins/channelrx/demodvormc/vordemodmcwebapiadapter.cpp
@@ -17,16 +17,16 @@
 ///////////////////////////////////////////////////////////////////////////////////
 
 #include "SWGChannelSettings.h"
-#include "vordemod.h"
-#include "vordemodwebapiadapter.h"
+#include "vordemodmc.h"
+#include "vordemodmcwebapiadapter.h"
 
-VORDemodWebAPIAdapter::VORDemodWebAPIAdapter()
+VORDemodMCWebAPIAdapter::VORDemodMCWebAPIAdapter()
 {}
 
-VORDemodWebAPIAdapter::~VORDemodWebAPIAdapter()
+VORDemodMCWebAPIAdapter::~VORDemodMCWebAPIAdapter()
 {}
 
-int VORDemodWebAPIAdapter::webapiSettingsGet(
+int VORDemodMCWebAPIAdapter::webapiSettingsGet(
         SWGSDRangel::SWGChannelSettings& response,
         QString& errorMessage)
 {
@@ -38,7 +38,7 @@ int VORDemodWebAPIAdapter::webapiSettingsGet(
     return 200;
 }
 
-int VORDemodWebAPIAdapter::webapiSettingsPutPatch(
+int VORDemodMCWebAPIAdapter::webapiSettingsPutPatch(
         bool force,
         const QStringList& channelSettingsKeys,
         SWGSDRangel::SWGChannelSettings& response,
diff --git a/plugins/channelrx/demodvor/vordemodwebapiadapter.h b/plugins/channelrx/demodvormc/vordemodmcwebapiadapter.h
similarity index 93%
rename from plugins/channelrx/demodvor/vordemodwebapiadapter.h
rename to plugins/channelrx/demodvormc/vordemodmcwebapiadapter.h
index 08b76113a..f2cbb378c 100644
--- a/plugins/channelrx/demodvor/vordemodwebapiadapter.h
+++ b/plugins/channelrx/demodvormc/vordemodmcwebapiadapter.h
@@ -20,15 +20,15 @@
 #define INCLUDE_VORDEMOD_WEBAPIADAPTER_H
 
 #include "channel/channelwebapiadapter.h"
-#include "vordemodsettings.h"
+#include "vordemodmcsettings.h"
 
 /**
  * Standalone API adapter only for the settings
  */
-class VORDemodWebAPIAdapter : public ChannelWebAPIAdapter {
+class VORDemodMCWebAPIAdapter : public ChannelWebAPIAdapter {
 public:
-    VORDemodWebAPIAdapter();
-    virtual ~VORDemodWebAPIAdapter();
+    VORDemodMCWebAPIAdapter();
+    virtual ~VORDemodMCWebAPIAdapter();
 
     virtual QByteArray serialize() const { return m_settings.serialize(); }
     virtual bool deserialize(const QByteArray& data) { return m_settings.deserialize(data); }