diff --git a/plugins/channelrx/CMakeLists.txt b/plugins/channelrx/CMakeLists.txt
index 1153de171..f04fd1fb1 100644
--- a/plugins/channelrx/CMakeLists.txt
+++ b/plugins/channelrx/CMakeLists.txt
@@ -15,7 +15,7 @@ add_subdirectory(localsink)
 add_subdirectory(filesink)
 add_subdirectory(freqtracker)
 add_subdirectory(demodchirpchat)
-add_subdirectory(demodvorsc)
+add_subdirectory(demodvor)
 add_subdirectory(demodpacket)
 add_subdirectory(demodais)
 add_subdirectory(demodpager)
diff --git a/plugins/channelrx/demodvorsc/CMakeLists.txt b/plugins/channelrx/demodvor/CMakeLists.txt
similarity index 52%
rename from plugins/channelrx/demodvorsc/CMakeLists.txt
rename to plugins/channelrx/demodvor/CMakeLists.txt
index d4f15de64..c488df18f 100644
--- a/plugins/channelrx/demodvorsc/CMakeLists.txt
+++ b/plugins/channelrx/demodvor/CMakeLists.txt
@@ -1,23 +1,23 @@
-project(vorsc)
+project(vor)
 
-set(vorsc_SOURCES
-    vordemodsc.cpp
-    vordemodscsettings.cpp
-    vordemodscbaseband.cpp
-    vordemodscsink.cpp
-    vordemodscplugin.cpp
-    vordemodscwebapiadapter.cpp
-    vordemodscreport.cpp
+set(vor_SOURCES
+    vordemod.cpp
+    vordemodsettings.cpp
+    vordemodbaseband.cpp
+    vordemodsink.cpp
+    vordemodplugin.cpp
+    vordemodwebapiadapter.cpp
+    vordemodreport.cpp
 )
 
-set(vorsc_HEADERS
-    vordemodsc.h
-    vordemodscsettings.h
-    vordemodscbaseband.h
-    vordemodscsink.h
-    vordemodscplugin.h
-    vordemodscwebapiadapter.h
-    vordemodscreport.h
+set(vor_HEADERS
+    vordemod.h
+    vordemodsettings.h
+    vordemodbaseband.h
+    vordemodsink.h
+    vordemodplugin.h
+    vordemodwebapiadapter.h
+    vordemodreport.h
 )
 
 include_directories(
@@ -25,29 +25,29 @@ include_directories(
 )
 
 if(NOT SERVER_MODE)
-    set(vorsc_SOURCES
-        ${vorsc_SOURCES}
-        vordemodscgui.cpp
-        vordemodscgui.ui
+    set(vor_SOURCES
+        ${vor_SOURCES}
+        vordemodgui.cpp
+        vordemodgui.ui
     )
-    set(vorsc_HEADERS
-        ${vorsc_HEADERS}
-        vordemodscgui.h
+    set(vor_HEADERS
+        ${vor_HEADERS}
+        vordemodgui.h
     )
 
-    set(TARGET_NAME demodvorsc)
+    set(TARGET_NAME demodvor)
     set(TARGET_LIB "Qt5::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME demodvorscsrv)
+    set(TARGET_NAME demodvorsrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()
 
 add_library(${TARGET_NAME} SHARED
-    ${vorsc_SOURCES}
+    ${vor_SOURCES}
 )
 
 target_link_libraries(${TARGET_NAME}
diff --git a/plugins/channelrx/demodvorsc/readme.md b/plugins/channelrx/demodvor/readme.md
similarity index 100%
rename from plugins/channelrx/demodvorsc/readme.md
rename to plugins/channelrx/demodvor/readme.md
diff --git a/plugins/channelrx/demodvorsc/vordemodsc.cpp b/plugins/channelrx/demodvor/vordemod.cpp
similarity index 99%
rename from plugins/channelrx/demodvorsc/vordemodsc.cpp
rename to plugins/channelrx/demodvor/vordemod.cpp
index 33cc8b5ab..6ada23dbc 100644
--- a/plugins/channelrx/demodvorsc/vordemodsc.cpp
+++ b/plugins/channelrx/demodvor/vordemod.cpp
@@ -39,8 +39,8 @@
 #include "util/db.h"
 #include "maincore.h"
 
-#include "vordemodscreport.h"
-#include "vordemodsc.h"
+#include "vordemodreport.h"
+#include "vordemod.h"
 
 MESSAGE_CLASS_DEFINITION(VORDemod::MsgConfigureVORDemod, Message)
 
diff --git a/plugins/channelrx/demodvorsc/vordemodsc.h b/plugins/channelrx/demodvor/vordemod.h
similarity index 99%
rename from plugins/channelrx/demodvorsc/vordemodsc.h
rename to plugins/channelrx/demodvor/vordemod.h
index 5dc5bf848..c1bf8dcaf 100644
--- a/plugins/channelrx/demodvorsc/vordemodsc.h
+++ b/plugins/channelrx/demodvor/vordemod.h
@@ -28,8 +28,8 @@
 #include "channel/channelapi.h"
 #include "util/message.h"
 
-#include "vordemodscbaseband.h"
-#include "vordemodscsettings.h"
+#include "vordemodbaseband.h"
+#include "vordemodsettings.h"
 
 class QNetworkAccessManager;
 class QNetworkReply;
diff --git a/plugins/channelrx/demodvorsc/vordemodscbaseband.cpp b/plugins/channelrx/demodvor/vordemodbaseband.cpp
similarity index 99%
rename from plugins/channelrx/demodvorsc/vordemodscbaseband.cpp
rename to plugins/channelrx/demodvor/vordemodbaseband.cpp
index a67cd9800..a7daed5c3 100644
--- a/plugins/channelrx/demodvorsc/vordemodscbaseband.cpp
+++ b/plugins/channelrx/demodvor/vordemodbaseband.cpp
@@ -22,8 +22,8 @@
 #include "dsp/dspcommands.h"
 #include "dsp/downchannelizer.h"
 
-#include "vordemodscbaseband.h"
-#include "vordemodscreport.h"
+#include "vordemodbaseband.h"
+#include "vordemodreport.h"
 
 MESSAGE_CLASS_DEFINITION(VORDemodBaseband::MsgConfigureVORDemodBaseband, Message)
 
diff --git a/plugins/channelrx/demodvorsc/vordemodscbaseband.h b/plugins/channelrx/demodvor/vordemodbaseband.h
similarity index 99%
rename from plugins/channelrx/demodvorsc/vordemodscbaseband.h
rename to plugins/channelrx/demodvor/vordemodbaseband.h
index 16df9cf87..39c2f37af 100644
--- a/plugins/channelrx/demodvorsc/vordemodscbaseband.h
+++ b/plugins/channelrx/demodvor/vordemodbaseband.h
@@ -26,7 +26,7 @@
 #include "util/message.h"
 #include "util/messagequeue.h"
 
-#include "vordemodscsink.h"
+#include "vordemodsink.h"
 
 class DownChannelizer;
 
diff --git a/plugins/channelrx/demodvorsc/vordemodscgui.cpp b/plugins/channelrx/demodvor/vordemodgui.cpp
similarity index 99%
rename from plugins/channelrx/demodvorsc/vordemodscgui.cpp
rename to plugins/channelrx/demodvor/vordemodgui.cpp
index 7f73c241d..30835d686 100644
--- a/plugins/channelrx/demodvorsc/vordemodscgui.cpp
+++ b/plugins/channelrx/demodvor/vordemodgui.cpp
@@ -37,10 +37,10 @@
 #include "channel/channelwebapiutils.h"
 #include "maincore.h"
 
-#include "ui_vordemodscgui.h"
-#include "vordemodsc.h"
-#include "vordemodscreport.h"
-#include "vordemodscgui.h"
+#include "ui_vordemodgui.h"
+#include "vordemod.h"
+#include "vordemodreport.h"
+#include "vordemodgui.h"
 
 VORDemodGUI* VORDemodGUI::create(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel)
 {
diff --git a/plugins/channelrx/demodvorsc/vordemodscgui.h b/plugins/channelrx/demodvor/vordemodgui.h
similarity index 99%
rename from plugins/channelrx/demodvorsc/vordemodscgui.h
rename to plugins/channelrx/demodvor/vordemodgui.h
index 11a553dfa..44bced0fa 100644
--- a/plugins/channelrx/demodvorsc/vordemodscgui.h
+++ b/plugins/channelrx/demodvor/vordemodgui.h
@@ -24,7 +24,7 @@
 #include "dsp/movingaverage.h"
 #include "util/messagequeue.h"
 #include "settings/rollupstate.h"
-#include "vordemodscsettings.h"
+#include "vordemodsettings.h"
 
 class PluginAPI;
 class DeviceUISet;
diff --git a/plugins/channelrx/demodvorsc/vordemodscgui.ui b/plugins/channelrx/demodvor/vordemodgui.ui
similarity index 100%
rename from plugins/channelrx/demodvorsc/vordemodscgui.ui
rename to plugins/channelrx/demodvor/vordemodgui.ui
diff --git a/plugins/channelrx/demodvorsc/vordemodscplugin.cpp b/plugins/channelrx/demodvor/vordemodplugin.cpp
similarity index 94%
rename from plugins/channelrx/demodvorsc/vordemodscplugin.cpp
rename to plugins/channelrx/demodvor/vordemodplugin.cpp
index c27969448..df9737680 100644
--- a/plugins/channelrx/demodvorsc/vordemodscplugin.cpp
+++ b/plugins/channelrx/demodvor/vordemodplugin.cpp
@@ -20,15 +20,15 @@
 #include "plugin/pluginapi.h"
 
 #ifndef SERVER_MODE
-#include "vordemodscgui.h"
+#include "vordemodgui.h"
 #endif
-#include "vordemodsc.h"
-#include "vordemodscwebapiadapter.h"
-#include "vordemodscplugin.h"
+#include "vordemod.h"
+#include "vordemodwebapiadapter.h"
+#include "vordemodplugin.h"
 
 const PluginDescriptor VORDemodPlugin::m_pluginDescriptor = {
     VORDemod::m_channelId,
-    QStringLiteral("VOR Single Channel Demodulator"),
+    QStringLiteral("VOR Demodulator"),
     QStringLiteral("6.20.2"),
     QStringLiteral("(c) Jon Beniston, M7RCE"),
     QStringLiteral("https://github.com/f4exb/sdrangel"),
diff --git a/plugins/channelrx/demodvorsc/vordemodscplugin.h b/plugins/channelrx/demodvor/vordemodplugin.h
similarity index 100%
rename from plugins/channelrx/demodvorsc/vordemodscplugin.h
rename to plugins/channelrx/demodvor/vordemodplugin.h
diff --git a/plugins/channelrx/demodvorsc/vordemodscreport.cpp b/plugins/channelrx/demodvor/vordemodreport.cpp
similarity index 98%
rename from plugins/channelrx/demodvorsc/vordemodscreport.cpp
rename to plugins/channelrx/demodvor/vordemodreport.cpp
index cb9fc4ee1..96fcbc7f6 100644
--- a/plugins/channelrx/demodvorsc/vordemodscreport.cpp
+++ b/plugins/channelrx/demodvor/vordemodreport.cpp
@@ -15,7 +15,7 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.          //
 ///////////////////////////////////////////////////////////////////////////////////
 
-#include "vordemodscreport.h"
+#include "vordemodreport.h"
 
 MESSAGE_CLASS_DEFINITION(VORDemodReport::MsgReportRadial, Message)
 MESSAGE_CLASS_DEFINITION(VORDemodReport::MsgReportIdent, Message)
diff --git a/plugins/channelrx/demodvorsc/vordemodscreport.h b/plugins/channelrx/demodvor/vordemodreport.h
similarity index 100%
rename from plugins/channelrx/demodvorsc/vordemodscreport.h
rename to plugins/channelrx/demodvor/vordemodreport.h
diff --git a/plugins/channelrx/demodvorsc/vordemodscsettings.cpp b/plugins/channelrx/demodvor/vordemodsettings.cpp
similarity index 99%
rename from plugins/channelrx/demodvorsc/vordemodscsettings.cpp
rename to plugins/channelrx/demodvor/vordemodsettings.cpp
index f4f0952db..d48fdd93f 100644
--- a/plugins/channelrx/demodvorsc/vordemodscsettings.cpp
+++ b/plugins/channelrx/demodvor/vordemodsettings.cpp
@@ -21,7 +21,7 @@
 #include "dsp/dspengine.h"
 #include "util/simpleserializer.h"
 #include "settings/serializable.h"
-#include "vordemodscsettings.h"
+#include "vordemodsettings.h"
 
 VORDemodSettings::VORDemodSettings() :
     m_channelMarker(nullptr),
diff --git a/plugins/channelrx/demodvorsc/vordemodscsettings.h b/plugins/channelrx/demodvor/vordemodsettings.h
similarity index 100%
rename from plugins/channelrx/demodvorsc/vordemodscsettings.h
rename to plugins/channelrx/demodvor/vordemodsettings.h
diff --git a/plugins/channelrx/demodvorsc/vordemodscsink.cpp b/plugins/channelrx/demodvor/vordemodsink.cpp
similarity index 99%
rename from plugins/channelrx/demodvorsc/vordemodscsink.cpp
rename to plugins/channelrx/demodvor/vordemodsink.cpp
index c94fb45f8..2fc56080b 100644
--- a/plugins/channelrx/demodvorsc/vordemodscsink.cpp
+++ b/plugins/channelrx/demodvor/vordemodsink.cpp
@@ -27,9 +27,9 @@
 #include "util/morse.h"
 #include "util/units.h"
 
-#include "vordemodscreport.h"
-#include "vordemodscsettings.h"
-#include "vordemodscsink.h"
+#include "vordemodreport.h"
+#include "vordemodsettings.h"
+#include "vordemodsink.h"
 
 VORDemodSCSink::VORDemodSCSink() :
         m_channelFrequencyOffset(0),
diff --git a/plugins/channelrx/demodvorsc/vordemodscsink.h b/plugins/channelrx/demodvor/vordemodsink.h
similarity index 99%
rename from plugins/channelrx/demodvorsc/vordemodscsink.h
rename to plugins/channelrx/demodvor/vordemodsink.h
index 6cc2a34b1..1086f628d 100644
--- a/plugins/channelrx/demodvorsc/vordemodscsink.h
+++ b/plugins/channelrx/demodvor/vordemodsink.h
@@ -30,7 +30,7 @@
 #include "util/doublebufferfifo.h"
 #include "util/messagequeue.h"
 
-#include "vordemodscsettings.h"
+#include "vordemodsettings.h"
 
 #include <vector>
 
diff --git a/plugins/channelrx/demodvorsc/vordemodscwebapiadapter.cpp b/plugins/channelrx/demodvor/vordemodwebapiadapter.cpp
similarity index 97%
rename from plugins/channelrx/demodvorsc/vordemodscwebapiadapter.cpp
rename to plugins/channelrx/demodvor/vordemodwebapiadapter.cpp
index 864984ad2..9b699cacd 100644
--- a/plugins/channelrx/demodvorsc/vordemodscwebapiadapter.cpp
+++ b/plugins/channelrx/demodvor/vordemodwebapiadapter.cpp
@@ -17,8 +17,8 @@
 ///////////////////////////////////////////////////////////////////////////////////
 
 #include "SWGChannelSettings.h"
-#include "vordemodsc.h"
-#include "vordemodscwebapiadapter.h"
+#include "vordemod.h"
+#include "vordemodwebapiadapter.h"
 
 VORDemodSCWebAPIAdapter::VORDemodSCWebAPIAdapter()
 {}
diff --git a/plugins/channelrx/demodvorsc/vordemodscwebapiadapter.h b/plugins/channelrx/demodvor/vordemodwebapiadapter.h
similarity index 98%
rename from plugins/channelrx/demodvorsc/vordemodscwebapiadapter.h
rename to plugins/channelrx/demodvor/vordemodwebapiadapter.h
index 8cf1ae192..c2b7b60c3 100644
--- a/plugins/channelrx/demodvorsc/vordemodscwebapiadapter.h
+++ b/plugins/channelrx/demodvor/vordemodwebapiadapter.h
@@ -20,7 +20,7 @@
 #define INCLUDE_VORDEMODSC_WEBAPIADAPTER_H
 
 #include "channel/channelwebapiadapter.h"
-#include "vordemodscsettings.h"
+#include "vordemodsettings.h"
 
 /**
  * Standalone API adapter only for the settings
diff --git a/plugins/channelrx/demodvormc/vordemodmcplugin.cpp b/plugins/channelrx/demodvormc/vordemodmcplugin.cpp
index 7ba829772..8027a177a 100644
--- a/plugins/channelrx/demodvormc/vordemodmcplugin.cpp
+++ b/plugins/channelrx/demodvormc/vordemodmcplugin.cpp
@@ -28,7 +28,7 @@
 
 const PluginDescriptor VORDemodMCPlugin::m_pluginDescriptor = {
     VORDemodMC::m_channelId,
-    QStringLiteral("VOR Demodulator"),
+    QStringLiteral("VOR Multi Channel Demodulator"),
     QStringLiteral("6.20.2"),
     QStringLiteral("(c) Jon Beniston, M7RCE"),
     QStringLiteral("https://github.com/f4exb/sdrangel"),