diff --git a/plugins/channelrx/demodapt/aptdemod.cpp b/plugins/channelrx/demodapt/aptdemod.cpp
index 1f9692ca6..0cb4b24cb 100644
--- a/plugins/channelrx/demodapt/aptdemod.cpp
+++ b/plugins/channelrx/demodapt/aptdemod.cpp
@@ -415,7 +415,7 @@ void APTDemod::webapiUpdateChannelSettings(
     if (channelSettingsKeys.contains("transparencyThreshold")) {
         settings.m_transparencyThreshold = response.getAptDemodSettings()->getTransparencyThreshold();
     }
-    if (channelSettingsKeys.contains("m_opacityThreshold")) {
+    if (channelSettingsKeys.contains("opacityThreshold")) {
         settings.m_opacityThreshold = response.getAptDemodSettings()->getOpacityThreshold();
     }
     if (channelSettingsKeys.contains("palettes")) {
diff --git a/plugins/channelrx/demodapt/aptdemodbaseband.cpp b/plugins/channelrx/demodapt/aptdemodbaseband.cpp
index 9a1d4f68d..2de354b23 100644
--- a/plugins/channelrx/demodapt/aptdemodbaseband.cpp
+++ b/plugins/channelrx/demodapt/aptdemodbaseband.cpp
@@ -156,7 +156,7 @@ bool APTDemodBaseband::handleMessage(const Message& cmd)
 
 void APTDemodBaseband::applySettings(const QStringList& settingsKeys, const APTDemodSettings& settings, bool force)
 {
-    if ((settingsKeys.contains("m_inputFrequencyOffset")) || force)
+    if ((settingsKeys.contains("inputFrequencyOffset")) || force)
     {
         m_channelizer->setChannelization(APTDEMOD_AUDIO_SAMPLE_RATE, settings.m_inputFrequencyOffset);
         m_sink.applyChannelSettings(m_channelizer->getChannelSampleRate(), m_channelizer->getChannelFrequencyOffset());
diff --git a/plugins/channelrx/demodatv/atvdemod.cpp b/plugins/channelrx/demodatv/atvdemod.cpp
index b0a0b4084..27d20ce5a 100644
--- a/plugins/channelrx/demodatv/atvdemod.cpp
+++ b/plugins/channelrx/demodatv/atvdemod.cpp
@@ -174,7 +174,7 @@ void ATVDemod::applySettings(const QStringList& settingsKeys, const ATVDemodSett
 {
     qDebug() << "ATVDemod::applySettings:" << settings.getDebugString(settingsKeys, force);
 
-    if (settingsKeys.contains("m_streamIndex") && m_settings.m_streamIndex != settings.m_streamIndex)
+    if (settingsKeys.contains("streamIndex") && m_settings.m_streamIndex != settings.m_streamIndex)
     {
         if (m_deviceAPI->getSampleMIMO()) // change of stream is possible for MIMO devices only
         {
diff --git a/plugins/channelrx/demodatv/atvdemodbaseband.cpp b/plugins/channelrx/demodatv/atvdemodbaseband.cpp
index 00bad7a2b..e1e1668ab 100644
--- a/plugins/channelrx/demodatv/atvdemodbaseband.cpp
+++ b/plugins/channelrx/demodatv/atvdemodbaseband.cpp
@@ -151,7 +151,7 @@ void ATVDemodBaseband::applySettings(const QStringList& settingsKeys, const ATVD
 {
     qDebug() << "ATVDemodBaseband::applySettings" << settings.getDebugString(settingsKeys, force);
 
-    if ((settingsKeys.contains("m_inputFrequencyOffset") && (settings.m_inputFrequencyOffset != m_settings.m_inputFrequencyOffset)) || force)
+    if ((settingsKeys.contains("inputFrequencyOffset") && (settings.m_inputFrequencyOffset != m_settings.m_inputFrequencyOffset)) || force)
     {
         unsigned int desiredSampleRate = m_channelizer->getBasebandSampleRate();
         m_channelizer->setChannelization(desiredSampleRate, settings.m_inputFrequencyOffset);
diff --git a/plugins/channelrx/demoddab/dabdemod.cpp b/plugins/channelrx/demoddab/dabdemod.cpp
index 7c62cb930..0e8bec89a 100644
--- a/plugins/channelrx/demoddab/dabdemod.cpp
+++ b/plugins/channelrx/demoddab/dabdemod.cpp
@@ -477,7 +477,7 @@ void DABDemod::webapiUpdateChannelSettings(
     if (channelSettingsKeys.contains("program")) {
         settings.m_program = *response.getDabDemodSettings()->getProgram();
     }
-    if (channelSettingsKeys.contains("m_volume")) {
+    if (channelSettingsKeys.contains("volume")) {
         settings.m_volume = response.getDabDemodSettings()->getVolume();
     }
     if (channelSettingsKeys.contains("audioMute")) {
diff --git a/plugins/channelrx/demodfreedv/freedvdemodsink.cpp b/plugins/channelrx/demodfreedv/freedvdemodsink.cpp
index 3f6ce20a1..30e73761f 100644
--- a/plugins/channelrx/demodfreedv/freedvdemodsink.cpp
+++ b/plugins/channelrx/demodfreedv/freedvdemodsink.cpp
@@ -507,7 +507,7 @@ void FreeDVDemodSink::applySettings(const QStringList& settingsKeys, const FreeD
 {
     qDebug() << "FreeDVDemodSink::applySettings:" << settings.getDebugString(settingsKeys, force);
 
-    if ((settingsKeys.contains("m_volume") && (settings.m_volume != m_settings.m_volume)) || force)
+    if ((settingsKeys.contains("volume") && (settings.m_volume != m_settings.m_volume)) || force)
     {
         m_volume = settings.m_volume;
         m_volume /= 4.0; // for 3276.8
diff --git a/plugins/channelrx/demodft8/ft8demod.cpp b/plugins/channelrx/demodft8/ft8demod.cpp
index 5ef40f11f..202f666bc 100644
--- a/plugins/channelrx/demodft8/ft8demod.cpp
+++ b/plugins/channelrx/demodft8/ft8demod.cpp
@@ -440,7 +440,7 @@ void FT8Demod::webapiUpdateChannelSettings(
     if (channelSettingsKeys.contains("recordWav")) {
         settings.m_recordWav = response.getFt8DemodSettings()->getRecordWav() != 0;
     }
-    if (channelSettingsKeys.contains("m_logMessages")) {
+    if (channelSettingsKeys.contains("logMessages")) {
         settings.m_logMessages = response.getFt8DemodSettings()->getLogMessages() != 0;
     }
     if (channelSettingsKeys.contains("nbDecoderThreads")) {
diff --git a/plugins/channelrx/demodils/ilsdemodbaseband.cpp b/plugins/channelrx/demodils/ilsdemodbaseband.cpp
index eef131ff6..04b1f4967 100644
--- a/plugins/channelrx/demodils/ilsdemodbaseband.cpp
+++ b/plugins/channelrx/demodils/ilsdemodbaseband.cpp
@@ -166,7 +166,7 @@ bool ILSDemodBaseband::handleMessage(const Message& cmd)
 
 void ILSDemodBaseband::applySettings(const QStringList& settingsKeys, const ILSDemodSettings& settings, bool force)
 {
-    if ((settingsKeys.contains("m_inputFrequencyOffset") && (settings.m_inputFrequencyOffset != m_settings.m_inputFrequencyOffset)) || force)
+    if ((settingsKeys.contains("inputFrequencyOffset") && (settings.m_inputFrequencyOffset != m_settings.m_inputFrequencyOffset)) || force)
     {
         m_channelizer->setChannelization(ILSDemodSettings::ILSDEMOD_CHANNEL_SAMPLE_RATE, settings.m_inputFrequencyOffset);
         m_sink.applyChannelSettings(m_channelizer->getChannelSampleRate(), m_channelizer->getChannelFrequencyOffset());
@@ -177,7 +177,7 @@ void ILSDemodBaseband::applySettings(const QStringList& settingsKeys, const ILSD
         }
     }
 
-    if ((settingsKeys.contains("m_audioDeviceName") && (settings.m_audioDeviceName != m_settings.m_audioDeviceName)) || force)
+    if ((settingsKeys.contains("audioDeviceName") && (settings.m_audioDeviceName != m_settings.m_audioDeviceName)) || force)
     {
         AudioDeviceManager *audioDeviceManager = DSPEngine::instance()->getAudioDeviceManager();
         int audioDeviceIndex = audioDeviceManager->getOutputDeviceIndex(settings.m_audioDeviceName);
diff --git a/plugins/channelrx/freqtracker/freqtracker.cpp b/plugins/channelrx/freqtracker/freqtracker.cpp
index 37ba8f936..45c7be45c 100644
--- a/plugins/channelrx/freqtracker/freqtracker.cpp
+++ b/plugins/channelrx/freqtracker/freqtracker.cpp
@@ -227,6 +227,10 @@ void FreqTracker::setCenterFrequency(qint64 frequency)
 
 void FreqTracker::applySettings(const QStringList& settingsKeys, const FreqTrackerSettings& settings, bool force)
 {
+    if (settingsKeys.empty()) {
+        return; // nothing to apply
+    }
+
     if (!settings.m_tracking) {
         qDebug() << "FreqTracker::applySettings:" << settings.getDebugString(settingsKeys, force);
     }
diff --git a/plugins/channelrx/freqtracker/freqtrackerbaseband.cpp b/plugins/channelrx/freqtracker/freqtrackerbaseband.cpp
index ec4d9a8a0..adc090874 100644
--- a/plugins/channelrx/freqtracker/freqtrackerbaseband.cpp
+++ b/plugins/channelrx/freqtracker/freqtrackerbaseband.cpp
@@ -134,6 +134,10 @@ bool FreqTrackerBaseband::handleMessage(const Message& cmd)
 
 void FreqTrackerBaseband::applySettings(const QStringList& settingsKeys, const FreqTrackerSettings& settings, bool force)
 {
+    if (settingsKeys.empty()) {
+        return; // nothing to apply
+    }
+
     if ((settingsKeys.contains("inputFrequencyOffset") && (m_settings.m_inputFrequencyOffset != settings.m_inputFrequencyOffset))
      || (settingsKeys.contains("log2Decim") && (m_settings.m_log2Decim != settings.m_log2Decim)) || force)
     {
diff --git a/plugins/channelrx/freqtracker/freqtrackersink.cpp b/plugins/channelrx/freqtracker/freqtrackersink.cpp
index 2940da900..442dd5726 100644
--- a/plugins/channelrx/freqtracker/freqtrackersink.cpp
+++ b/plugins/channelrx/freqtracker/freqtrackersink.cpp
@@ -249,15 +249,19 @@ void FreqTrackerSink::applyChannelSettings(int sinkSampleRate, int channelSample
 
 void FreqTrackerSink::applySettings(const QStringList& settingsKeys, const FreqTrackerSettings& settings, bool force)
 {
+    if (settingsKeys.empty()) {
+        return; // nothing to apply
+    }
+
     if (!settings.m_tracking) {
         qDebug() << "FreqTrackerSink::applySettings:" << settings.getDebugString(settingsKeys, force);
     }
 
-    if ((settingsKeys.contains("m_squelch") && (m_settings.m_squelch != settings.m_squelch)) || force) {
+    if ((settingsKeys.contains("squelch") && (m_settings.m_squelch != settings.m_squelch)) || force) {
         m_squelchLevel = CalcDb::powerFromdB(settings.m_squelch);
     }
 
-    if ((settingsKeys.contains("m_tracking") && (m_settings.m_tracking != settings.m_tracking)) || force)
+    if ((settingsKeys.contains("tracking") && (m_settings.m_tracking != settings.m_tracking)) || force)
     {
         m_avgDeltaFreq = 0.0;
         m_lastCorrAbs = 0;
@@ -269,7 +273,7 @@ void FreqTrackerSink::applySettings(const QStringList& settingsKeys, const FreqT
         }
     }
 
-    if ((settingsKeys.contains("m_trackerType") && (m_settings.m_trackerType != settings.m_trackerType)) || force)
+    if ((settingsKeys.contains("trackerType") && (m_settings.m_trackerType != settings.m_trackerType)) || force)
     {
         m_lastCorrAbs = 0;
         m_avgDeltaFreq = 0.0;
@@ -287,7 +291,7 @@ void FreqTrackerSink::applySettings(const QStringList& settingsKeys, const FreqT
         }
     }
 
-    if ((settingsKeys.contains("m_pllPskOrder") && (m_settings.m_pllPskOrder != settings.m_pllPskOrder)) || force)
+    if ((settingsKeys.contains("pllPskOrder") && (m_settings.m_pllPskOrder != settings.m_pllPskOrder)) || force)
     {
         if (settings.m_pllPskOrder < 32) {
             m_pll.setPskOrder(settings.m_pllPskOrder);
@@ -296,9 +300,9 @@ void FreqTrackerSink::applySettings(const QStringList& settingsKeys, const FreqT
 
     bool useInterpolator = false;
 
-    if ((settingsKeys.contains("m_rrcRolloff") && (m_settings.m_rrcRolloff != settings.m_rrcRolloff))
-     || (settingsKeys.contains("m_rfBandwidth") && (m_settings.m_rfBandwidth != settings.m_rfBandwidth))
-     || (settingsKeys.contains("m_squelchGate") && (m_settings.m_squelchGate != settings.m_squelchGate)) || force) {
+    if ((settingsKeys.contains("rrcRolloff") && (m_settings.m_rrcRolloff != settings.m_rrcRolloff))
+     || (settingsKeys.contains("rfBandwidth") && (m_settings.m_rfBandwidth != settings.m_rfBandwidth))
+     || (settingsKeys.contains("squelchGate") && (m_settings.m_squelchGate != settings.m_squelchGate)) || force) {
         useInterpolator = true;
     }
 
diff --git a/plugins/channelrx/localsink/localsink.cpp b/plugins/channelrx/localsink/localsink.cpp
index ed0e924a5..8acdb8e69 100644
--- a/plugins/channelrx/localsink/localsink.cpp
+++ b/plugins/channelrx/localsink/localsink.cpp
@@ -384,7 +384,7 @@ void LocalSink::applySettings(const LocalSinkSettings& settings, const QList<QSt
                 settingsKeys.contains("reverseAPIAddress") ||
                 settingsKeys.contains("reverseAPIPort") ||
                 settingsKeys.contains("reverseAPIFeatureSetIndex") ||
-                settingsKeys.contains("m_reverseAPIFeatureIndex");
+                settingsKeys.contains("reverseAPIFeatureIndex");
         webapiReverseSendSettings(settingsKeys, settings, fullUpdate || force);
     }
 
diff --git a/plugins/channeltx/modam/ammodbaseband.cpp b/plugins/channeltx/modam/ammodbaseband.cpp
index 4b7f1a62c..0c86da331 100644
--- a/plugins/channeltx/modam/ammodbaseband.cpp
+++ b/plugins/channeltx/modam/ammodbaseband.cpp
@@ -185,14 +185,14 @@ bool AMModBaseband::handleMessage(const Message& cmd)
 
 void AMModBaseband::applySettings(const QStringList& settingsKeys, const AMModSettings& settings, bool force)
 {
-    if ((settingsKeys.contains("m_inputFrequencyOffset") && (m_settings.m_inputFrequencyOffset != settings.m_inputFrequencyOffset)) || force)
+    if ((settingsKeys.contains("inputFrequencyOffset") && (m_settings.m_inputFrequencyOffset != settings.m_inputFrequencyOffset)) || force)
     {
         m_channelizer->setChannelization(m_source.getAudioSampleRate(), settings.m_inputFrequencyOffset);
         m_source.applyChannelSettings(m_channelizer->getChannelSampleRate(), m_channelizer->getChannelFrequencyOffset());
         m_source.applyAudioSampleRate(m_source.getAudioSampleRate()); // reapply in case of channel sample rate change
     }
 
-    if ((settingsKeys.contains("m_audioDeviceName") && (settings.m_audioDeviceName != m_settings.m_audioDeviceName)) || force)
+    if ((settingsKeys.contains("audioDeviceName") && (settings.m_audioDeviceName != m_settings.m_audioDeviceName)) || force)
     {
         AudioDeviceManager *audioDeviceManager = DSPEngine::instance()->getAudioDeviceManager();
         int audioDeviceIndex = audioDeviceManager->getInputDeviceIndex(settings.m_audioDeviceName);
@@ -207,7 +207,7 @@ void AMModBaseband::applySettings(const QStringList& settingsKeys, const AMModSe
         }
     }
 
-    if ((settingsKeys.contains("m_modAFInput") && (settings.m_modAFInput != m_settings.m_modAFInput)) || force)
+    if ((settingsKeys.contains("modAFInput") && (settings.m_modAFInput != m_settings.m_modAFInput)) || force)
     {
         AudioDeviceManager *audioDeviceManager = DSPEngine::instance()->getAudioDeviceManager();
         int audioDeviceIndex = audioDeviceManager->getInputDeviceIndex(settings.m_audioDeviceName);
@@ -219,7 +219,7 @@ void AMModBaseband::applySettings(const QStringList& settingsKeys, const AMModSe
         }
     }
 
-    if ((settingsKeys.contains("m_feedbackAudioDeviceName") && (settings.m_feedbackAudioDeviceName != m_settings.m_feedbackAudioDeviceName)) || force)
+    if ((settingsKeys.contains("feedbackAudioDeviceName") && (settings.m_feedbackAudioDeviceName != m_settings.m_feedbackAudioDeviceName)) || force)
     {
         AudioDeviceManager *audioDeviceManager = DSPEngine::instance()->getAudioDeviceManager();
         int audioDeviceIndex = audioDeviceManager->getOutputDeviceIndex(settings.m_feedbackAudioDeviceName);
diff --git a/plugins/channeltx/moddatv/datvmodsource.cpp b/plugins/channeltx/moddatv/datvmodsource.cpp
index 63ec75257..1253727e4 100644
--- a/plugins/channeltx/moddatv/datvmodsource.cpp
+++ b/plugins/channeltx/moddatv/datvmodsource.cpp
@@ -692,9 +692,9 @@ void DATVModSource::applySettings(const QStringList& settingsKeys, const DATVMod
 {
     qDebug() << "DATVModSource::applySettings:" << settings.getDebugString(settingsKeys, force);
 
-    if ((settingsKeys.contains("m_rfBandwidth") && settings.m_rfBandwidth != m_settings.m_rfBandwidth)
-        || (settingsKeys.contains("m_modulation") && settings.m_modulation != m_settings.m_modulation)
-        || (settingsKeys.contains("m_symbolRate") && settings.m_symbolRate != m_settings.m_symbolRate)
+    if ((settingsKeys.contains("rfBandwidth") && settings.m_rfBandwidth != m_settings.m_rfBandwidth)
+        || (settingsKeys.contains("modulation") && settings.m_modulation != m_settings.m_modulation)
+        || (settingsKeys.contains("symbolRate") && settings.m_symbolRate != m_settings.m_symbolRate)
         || force)
     {
         if (settings.m_symbolRate > 0)
@@ -718,9 +718,9 @@ void DATVModSource::applySettings(const QStringList& settingsKeys, const DATVMod
             qWarning() << "DATVModSource::applySettings: symbolRate must be greater than 0.";
     }
 
-    if ((settingsKeys.contains("m_source") && settings.m_source != m_settings.m_source)
-        || (settingsKeys.contains("m_udpAddress") && settings.m_udpAddress != m_settings.m_udpAddress)
-        || (settingsKeys.contains("m_udpPort") && settings.m_udpPort != m_settings.m_udpPort)
+    if ((settingsKeys.contains("source") && settings.m_source != m_settings.m_source)
+        || (settingsKeys.contains("udpAddress") && settings.m_udpAddress != m_settings.m_udpAddress)
+        || (settingsKeys.contains("udpPort") && settings.m_udpPort != m_settings.m_udpPort)
         || force)
     {
         if (m_udpSocket)
@@ -740,8 +740,8 @@ void DATVModSource::applySettings(const QStringList& settingsKeys, const DATVMod
         }
     }
 
-    if ((settingsKeys.contains("m_standard") && settings.m_standard != m_settings.m_standard)
-        || (settingsKeys.contains("m_modulation") && settings.m_modulation != m_settings.m_modulation)
+    if ((settingsKeys.contains("standard") && settings.m_standard != m_settings.m_standard)
+        || (settingsKeys.contains("modulation") && settings.m_modulation != m_settings.m_modulation)
         || force)
     {
         m_symbolSel = 0;
@@ -750,10 +750,10 @@ void DATVModSource::applySettings(const QStringList& settingsKeys, const DATVMod
         m_sampleIdx = 0;
     }
 
-    if ((settingsKeys.contains("m_standard") && settings.m_standard != m_settings.m_standard)
-        || (settingsKeys.contains("m_modulation") && settings.m_modulation != m_settings.m_modulation)
-        || (settingsKeys.contains("m_fec") && settings.m_fec != m_settings.m_fec)
-        || (settingsKeys.contains("m_rollOff") && settings.m_rollOff != m_settings.m_rollOff)
+    if ((settingsKeys.contains("standard") && settings.m_standard != m_settings.m_standard)
+        || (settingsKeys.contains("modulation") && settings.m_modulation != m_settings.m_modulation)
+        || (settingsKeys.contains("fec") && settings.m_fec != m_settings.m_fec)
+        || (settingsKeys.contains("rollOff") && settings.m_rollOff != m_settings.m_rollOff)
         || force)
     {
         if (settings.m_standard == DATVModSettings::DVB_S)
@@ -865,15 +865,15 @@ void DATVModSource::applySettings(const QStringList& settingsKeys, const DATVMod
         }
     }
 
-    if ((settingsKeys.contains("m_imageServiceProvider") && settings.m_imageServiceProvider != m_settings.m_imageServiceProvider) || force) {
+    if ((settingsKeys.contains("imageServiceProvider") && settings.m_imageServiceProvider != m_settings.m_imageServiceProvider) || force) {
         m_tsGenerator.set_service_provider(settings.m_imageServiceProvider.toStdString());
     }
 
-    if ((settingsKeys.contains("m_imageServiceName") && settings.m_imageServiceName != m_settings.m_imageServiceName) || force) {
+    if ((settingsKeys.contains("imageServiceName") && settings.m_imageServiceName != m_settings.m_imageServiceName) || force) {
         m_tsGenerator.set_service_name(settings.m_imageServiceName.toStdString());
     }
 
-    if ((settingsKeys.contains("m_imageCodec") && settings.m_imageCodec != m_settings.m_imageCodec) || force) {
+    if ((settingsKeys.contains("imageCodec") && settings.m_imageCodec != m_settings.m_imageCodec) || force) {
         m_tsGenerator.set_codec(settings.m_imageCodec);
     }
 
diff --git a/plugins/channeltx/modfreedv/freedvmodbaseband.cpp b/plugins/channeltx/modfreedv/freedvmodbaseband.cpp
index a158fba5a..8b1d41841 100644
--- a/plugins/channeltx/modfreedv/freedvmodbaseband.cpp
+++ b/plugins/channeltx/modfreedv/freedvmodbaseband.cpp
@@ -173,7 +173,7 @@ bool FreeDVModBaseband::handleMessage(const Message& cmd)
 
 void FreeDVModBaseband::applySettings(const QStringList& settingsKeys, const FreeDVModSettings& settings, bool force)
 {
-    if ((settingsKeys.contains("m_freeDVMode") && settings.m_freeDVMode != m_settings.m_freeDVMode) || force)
+    if ((settingsKeys.contains("freeDVMode") && settings.m_freeDVMode != m_settings.m_freeDVMode) || force)
     {
         int modemSampleRate = FreeDVModSettings::getModSampleRate(settings.m_freeDVMode);
         m_source.applyFreeDVMode(settings.m_freeDVMode);
@@ -181,13 +181,13 @@ void FreeDVModBaseband::applySettings(const QStringList& settingsKeys, const Fre
         m_source.applyChannelSettings(m_channelizer->getChannelSampleRate(), m_channelizer->getChannelFrequencyOffset());
     }
 
-    if ((settingsKeys.contains("m_inputFrequencyOffset") && settings.m_inputFrequencyOffset != m_settings.m_inputFrequencyOffset) || force)
+    if ((settingsKeys.contains("inputFrequencyOffset") && settings.m_inputFrequencyOffset != m_settings.m_inputFrequencyOffset) || force)
     {
         m_channelizer->setChannelization(m_source.getModemSampleRate(), settings.m_inputFrequencyOffset);
         m_source.applyChannelSettings(m_channelizer->getChannelSampleRate(), m_channelizer->getChannelFrequencyOffset());
     }
 
-    if ((settingsKeys.contains("m_audioDeviceName") && settings.m_audioDeviceName != m_settings.m_audioDeviceName) || force)
+    if ((settingsKeys.contains("audioDeviceName") && settings.m_audioDeviceName != m_settings.m_audioDeviceName) || force)
     {
         AudioDeviceManager *audioDeviceManager = DSPEngine::instance()->getAudioDeviceManager();
         int audioDeviceIndex = audioDeviceManager->getInputDeviceIndex(settings.m_audioDeviceName);
@@ -199,7 +199,7 @@ void FreeDVModBaseband::applySettings(const QStringList& settingsKeys, const Fre
         }
     }
 
-    if ((settingsKeys.contains("m_modAFInput") && settings.m_modAFInput != m_settings.m_modAFInput) || force)
+    if ((settingsKeys.contains("modAFInput") && settings.m_modAFInput != m_settings.m_modAFInput) || force)
     {
         AudioDeviceManager *audioDeviceManager = DSPEngine::instance()->getAudioDeviceManager();
         int audioDeviceIndex = audioDeviceManager->getInputDeviceIndex(settings.m_audioDeviceName);
diff --git a/plugins/channeltx/modnfm/nfmmodbaseband.cpp b/plugins/channeltx/modnfm/nfmmodbaseband.cpp
index 872e59104..55fd89e57 100644
--- a/plugins/channeltx/modnfm/nfmmodbaseband.cpp
+++ b/plugins/channeltx/modnfm/nfmmodbaseband.cpp
@@ -184,7 +184,7 @@ bool NFMModBaseband::handleMessage(const Message& cmd)
 
 void NFMModBaseband::applySettings(const QStringList& settingsKeys, const NFMModSettings& settings, bool force)
 {
-    if ((settingsKeys.contains("m_inputFrequencyOffset") && settings.m_inputFrequencyOffset != m_settings.m_inputFrequencyOffset) || force)
+    if ((settingsKeys.contains("inputFrequencyOffset") && settings.m_inputFrequencyOffset != m_settings.m_inputFrequencyOffset) || force)
     {
         m_channelizer->setChannelization(m_source.getAudioSampleRate(), settings.m_inputFrequencyOffset);
         m_source.applyChannelSettings(m_channelizer->getChannelSampleRate(), m_channelizer->getChannelFrequencyOffset());
@@ -192,7 +192,7 @@ void NFMModBaseband::applySettings(const QStringList& settingsKeys, const NFMMod
 
     }
 
-    if ((settingsKeys.contains("m_audioDeviceName") && settings.m_audioDeviceName != m_settings.m_audioDeviceName) || force)
+    if ((settingsKeys.contains("audioDeviceName") && settings.m_audioDeviceName != m_settings.m_audioDeviceName) || force)
     {
         AudioDeviceManager *audioDeviceManager = DSPEngine::instance()->getAudioDeviceManager();
         int audioDeviceIndex = audioDeviceManager->getInputDeviceIndex(settings.m_audioDeviceName);
@@ -207,7 +207,7 @@ void NFMModBaseband::applySettings(const QStringList& settingsKeys, const NFMMod
         }
     }
 
-    if ((settingsKeys.contains("m_modAFInput") && settings.m_modAFInput != m_settings.m_modAFInput) || force)
+    if ((settingsKeys.contains("modAFInput") && settings.m_modAFInput != m_settings.m_modAFInput) || force)
     {
         AudioDeviceManager *audioDeviceManager = DSPEngine::instance()->getAudioDeviceManager();
         int audioDeviceIndex = audioDeviceManager->getInputDeviceIndex(settings.m_audioDeviceName);
@@ -219,7 +219,7 @@ void NFMModBaseband::applySettings(const QStringList& settingsKeys, const NFMMod
         }
     }
 
-    if ((settingsKeys.contains("m_feedbackAudioDeviceName") && settings.m_feedbackAudioDeviceName != m_settings.m_feedbackAudioDeviceName) || force)
+    if ((settingsKeys.contains("feedbackAudioDeviceName") && settings.m_feedbackAudioDeviceName != m_settings.m_feedbackAudioDeviceName) || force)
     {
         AudioDeviceManager *audioDeviceManager = DSPEngine::instance()->getAudioDeviceManager();
         int audioDeviceIndex = audioDeviceManager->getOutputDeviceIndex(settings.m_feedbackAudioDeviceName);
diff --git a/plugins/feature/afc/afc.cpp b/plugins/feature/afc/afc.cpp
index 5c9ddb46b..7ffa5d157 100644
--- a/plugins/feature/afc/afc.cpp
+++ b/plugins/feature/afc/afc.cpp
@@ -271,7 +271,7 @@ void AFC::applySettings(const AFCSettings& settings, const QList<QString>& setti
                 settingsKeys.contains("reverseAPIAddress") ||
                 settingsKeys.contains("reverseAPIPort") ||
                 settingsKeys.contains("reverseAPIFeatureSetIndex") ||
-                settingsKeys.contains("m_reverseAPIFeatureIndex");
+                settingsKeys.contains("reverseAPIFeatureIndex");
         webapiReverseSendSettings(settingsKeys, settings, fullUpdate || force);
     }
 
diff --git a/plugins/feature/ais/ais.cpp b/plugins/feature/ais/ais.cpp
index 23df56062..1b5fa3695 100644
--- a/plugins/feature/ais/ais.cpp
+++ b/plugins/feature/ais/ais.cpp
@@ -142,7 +142,7 @@ void AIS::applySettings(const AISSettings& settings, const QList<QString>& setti
                 settingsKeys.contains("reverseAPIAddress") ||
                 settingsKeys.contains("reverseAPIPort") ||
                 settingsKeys.contains("reverseAPIFeatureSetIndex") ||
-                settingsKeys.contains("m_reverseAPIFeatureIndex");
+                settingsKeys.contains("reverseAPIFeatureIndex");
         webapiReverseSendSettings(settingsKeys, settings, fullUpdate || force);
     }
 
diff --git a/plugins/feature/antennatools/antennatools.cpp b/plugins/feature/antennatools/antennatools.cpp
index 6ff591953..397b93bdd 100644
--- a/plugins/feature/antennatools/antennatools.cpp
+++ b/plugins/feature/antennatools/antennatools.cpp
@@ -107,7 +107,7 @@ void AntennaTools::applySettings(const AntennaToolsSettings& settings, const QLi
                 settingsKeys.contains("reverseAPIAddress") ||
                 settingsKeys.contains("reverseAPIPort") ||
                 settingsKeys.contains("reverseAPIFeatureSetIndex") ||
-+                settingsKeys.contains("m_reverseAPIFeatureIndex");
++                settingsKeys.contains("reverseAPIFeatureIndex");
         webapiReverseSendSettings(settingsKeys, settings, fullUpdate || force);
     }
 
diff --git a/plugins/feature/aprs/aprs.cpp b/plugins/feature/aprs/aprs.cpp
index 3b889c983..52961fd99 100644
--- a/plugins/feature/aprs/aprs.cpp
+++ b/plugins/feature/aprs/aprs.cpp
@@ -220,7 +220,7 @@ void APRS::applySettings(const APRSSettings& settings, const QList<QString>& set
                 settingsKeys.contains("reverseAPIAddress") ||
                 settingsKeys.contains("reverseAPIPort") ||
                 settingsKeys.contains("reverseAPIFeatureSetIndex") ||
-                settingsKeys.contains("m_reverseAPIFeatureIndex");
+                settingsKeys.contains("reverseAPIFeatureIndex");
         webapiReverseSendSettings(settingsKeys, settings, fullUpdate || force);
     }
 
diff --git a/plugins/feature/demodanalyzer/demodanalyzer.cpp b/plugins/feature/demodanalyzer/demodanalyzer.cpp
index 5e9bf95b3..c08934848 100644
--- a/plugins/feature/demodanalyzer/demodanalyzer.cpp
+++ b/plugins/feature/demodanalyzer/demodanalyzer.cpp
@@ -297,7 +297,7 @@ void DemodAnalyzer::applySettings(const DemodAnalyzerSettings& settings, const Q
                 settingsKeys.contains("reverseAPIAddress") ||
                 settingsKeys.contains("reverseAPIPort") ||
                 settingsKeys.contains("reverseAPIFeatureSetIndex") ||
-                settingsKeys.contains("m_reverseAPIFeatureIndex");
+                settingsKeys.contains("reverseAPIFeatureIndex");
         webapiReverseSendSettings(settingsKeys, settings, fullUpdate || force);
     }
 
diff --git a/plugins/feature/denoiser/denoiser.cpp b/plugins/feature/denoiser/denoiser.cpp
index 4df8d7cc3..5a96619ca 100644
--- a/plugins/feature/denoiser/denoiser.cpp
+++ b/plugins/feature/denoiser/denoiser.cpp
@@ -299,7 +299,7 @@ void Denoiser::applySettings(const DenoiserSettings& settings, const QList<QStri
                 settingsKeys.contains("reverseAPIAddress") ||
                 settingsKeys.contains("reverseAPIPort") ||
                 settingsKeys.contains("reverseAPIFeatureSetIndex") ||
-                settingsKeys.contains("m_reverseAPIFeatureIndex");
+                settingsKeys.contains("reverseAPIFeatureIndex");
         webapiReverseSendSettings(settingsKeys, settings, fullUpdate || force);
     }
 
diff --git a/plugins/feature/gs232controller/gs232controller.cpp b/plugins/feature/gs232controller/gs232controller.cpp
index 52a2298c3..64165afd7 100644
--- a/plugins/feature/gs232controller/gs232controller.cpp
+++ b/plugins/feature/gs232controller/gs232controller.cpp
@@ -301,7 +301,7 @@ void GS232Controller::applySettings(const GS232ControllerSettings& settings, con
                 settingsKeys.contains("reverseAPIAddress") ||
                 settingsKeys.contains("reverseAPIPort") ||
                 settingsKeys.contains("reverseAPIFeatureSetIndex") ||
-                settingsKeys.contains("m_reverseAPIFeatureIndex");
+                settingsKeys.contains("reverseAPIFeatureIndex");
         webapiReverseSendSettings(settingsKeys, settings, fullUpdate || force);
     }
 
@@ -742,4 +742,3 @@ void GS232Controller::scanSerialPorts()
         m_serialPorts = serialPorts;
     }
 }
-
diff --git a/plugins/feature/jogdialcontroller/jogdialcontroller.cpp b/plugins/feature/jogdialcontroller/jogdialcontroller.cpp
index ac4511efb..1a0eaff66 100644
--- a/plugins/feature/jogdialcontroller/jogdialcontroller.cpp
+++ b/plugins/feature/jogdialcontroller/jogdialcontroller.cpp
@@ -180,7 +180,7 @@ void JogdialController::applySettings(const JogdialControllerSettings& settings,
                 settingsKeys.contains("reverseAPIAddress") ||
                 settingsKeys.contains("reverseAPIPort") ||
                 settingsKeys.contains("reverseAPIFeatureSetIndex") ||
-                settingsKeys.contains("m_reverseAPIFeatureIndex");
+                settingsKeys.contains("reverseAPIFeatureIndex");
         webapiReverseSendSettings(settingsKeys, settings, fullUpdate || force);
     }
 
diff --git a/plugins/feature/map/map.cpp b/plugins/feature/map/map.cpp
index 5c4a1921f..9184531ba 100644
--- a/plugins/feature/map/map.cpp
+++ b/plugins/feature/map/map.cpp
@@ -151,7 +151,7 @@ void Map::applySettings(const MapSettings& settings, const QList<QString>& setti
                 settingsKeys.contains("reverseAPIAddress") ||
                 settingsKeys.contains("reverseAPIPort") ||
                 settingsKeys.contains("reverseAPIFeatureSetIndex") ||
-                settingsKeys.contains("m_reverseAPIFeatureIndex");
+                settingsKeys.contains("reverseAPIFeatureIndex");
         webapiReverseSendSettings(settingsKeys, settings, fullUpdate || force);
     }
 
diff --git a/plugins/feature/morsedecoder/morsedecoder.cpp b/plugins/feature/morsedecoder/morsedecoder.cpp
index a744ede3b..1d6298b25 100644
--- a/plugins/feature/morsedecoder/morsedecoder.cpp
+++ b/plugins/feature/morsedecoder/morsedecoder.cpp
@@ -345,7 +345,7 @@ void MorseDecoder::applySettings(const MorseDecoderSettings& settings, const QLi
                 settingsKeys.contains("reverseAPIAddress") ||
                 settingsKeys.contains("reverseAPIPort") ||
                 settingsKeys.contains("reverseAPIFeatureSetIndex") ||
-                settingsKeys.contains("m_reverseAPIFeatureIndex");
+                settingsKeys.contains("reverseAPIFeatureIndex");
         webapiReverseSendSettings(settingsKeys, settings, fullUpdate || force);
     }
 
diff --git a/plugins/feature/pertester/pertester.cpp b/plugins/feature/pertester/pertester.cpp
index 6a5316b07..c504fffa7 100644
--- a/plugins/feature/pertester/pertester.cpp
+++ b/plugins/feature/pertester/pertester.cpp
@@ -202,7 +202,7 @@ void PERTester::applySettings(const PERTesterSettings& settings, const QList<QSt
                 settingsKeys.contains("reverseAPIAddress") ||
                 settingsKeys.contains("reverseAPIPort") ||
                 settingsKeys.contains("reverseAPIFeatureSetIndex") ||
-                settingsKeys.contains("m_reverseAPIFeatureIndex");
+                settingsKeys.contains("reverseAPIFeatureIndex");
         webapiReverseSendSettings(settingsKeys, settings, fullUpdate || force);
     }
 
diff --git a/plugins/feature/radiosonde/radiosonde.cpp b/plugins/feature/radiosonde/radiosonde.cpp
index 0db07161f..c1dae7c00 100644
--- a/plugins/feature/radiosonde/radiosonde.cpp
+++ b/plugins/feature/radiosonde/radiosonde.cpp
@@ -145,7 +145,7 @@ void Radiosonde::applySettings(const RadiosondeSettings& settings, const QList<Q
                 settingsKeys.contains("reverseAPIAddress") ||
                 settingsKeys.contains("reverseAPIPort") ||
                 settingsKeys.contains("reverseAPIFeatureSetIndex") ||
-                settingsKeys.contains("m_reverseAPIFeatureIndex");
+                settingsKeys.contains("reverseAPIFeatureIndex");
         webapiReverseSendSettings(settingsKeys, settings, fullUpdate || force);
     }
 
diff --git a/plugins/feature/rigctlserver/rigctlserver.cpp b/plugins/feature/rigctlserver/rigctlserver.cpp
index 5f481617f..a7470432d 100644
--- a/plugins/feature/rigctlserver/rigctlserver.cpp
+++ b/plugins/feature/rigctlserver/rigctlserver.cpp
@@ -179,7 +179,7 @@ void RigCtlServer::applySettings(const RigCtlServerSettings& settings, const QLi
                 settingsKeys.contains("reverseAPIAddress") ||
                 settingsKeys.contains("reverseAPIPort") ||
                 settingsKeys.contains("reverseAPIFeatureSetIndex") ||
-                settingsKeys.contains("m_reverseAPIFeatureIndex");
+                settingsKeys.contains("reverseAPIFeatureIndex");
         webapiReverseSendSettings(settingsKeys, settings, fullUpdate || force);
     }
 
diff --git a/plugins/feature/satellitetracker/satellitetracker.cpp b/plugins/feature/satellitetracker/satellitetracker.cpp
index 32fbecc2d..01fc7107c 100644
--- a/plugins/feature/satellitetracker/satellitetracker.cpp
+++ b/plugins/feature/satellitetracker/satellitetracker.cpp
@@ -222,7 +222,7 @@ void SatelliteTracker::applySettings(const SatelliteTrackerSettings& settings, c
                 settingsKeys.contains("reverseAPIAddress") ||
                 settingsKeys.contains("reverseAPIPort") ||
                 settingsKeys.contains("reverseAPIFeatureSetIndex") ||
-                settingsKeys.contains("m_reverseAPIFeatureIndex");
+                settingsKeys.contains("reverseAPIFeatureIndex");
         webapiReverseSendSettings(settingsKeys, settings, fullUpdate || force);
     }
 
diff --git a/plugins/feature/sid/sid.cpp b/plugins/feature/sid/sid.cpp
index 394de6387..a8be2dca5 100644
--- a/plugins/feature/sid/sid.cpp
+++ b/plugins/feature/sid/sid.cpp
@@ -172,7 +172,7 @@ void SIDMain::applySettings(const SIDSettings& settings, const QList<QString>& s
                 settingsKeys.contains("reverseAPIAddress") ||
                 settingsKeys.contains("reverseAPIPort") ||
                 settingsKeys.contains("reverseAPIFeatureSetIndex") ||
-                settingsKeys.contains("m_reverseAPIFeatureIndex");
+                settingsKeys.contains("reverseAPIFeatureIndex");
         webapiReverseSendSettings(settingsKeys, settings, fullUpdate || force);
     }
 
diff --git a/plugins/feature/simpleptt/simpleptt.cpp b/plugins/feature/simpleptt/simpleptt.cpp
index da472263f..ab85d51e1 100644
--- a/plugins/feature/simpleptt/simpleptt.cpp
+++ b/plugins/feature/simpleptt/simpleptt.cpp
@@ -220,7 +220,7 @@ void SimplePTT::applySettings(const SimplePTTSettings& settings, const QList<QSt
                 settingsKeys.contains("reverseAPIAddress") ||
                 settingsKeys.contains("reverseAPIPort") ||
                 settingsKeys.contains("reverseAPIFeatureSetIndex") ||
-                settingsKeys.contains("m_reverseAPIFeatureIndex");
+                settingsKeys.contains("reverseAPIFeatureIndex");
         webapiReverseSendSettings(settingsKeys, settings, fullUpdate || force);
     }
 
diff --git a/plugins/feature/skymap/skymap.cpp b/plugins/feature/skymap/skymap.cpp
index 3c6771d56..1ab429b67 100644
--- a/plugins/feature/skymap/skymap.cpp
+++ b/plugins/feature/skymap/skymap.cpp
@@ -122,7 +122,7 @@ void SkyMap::applySettings(const SkyMapSettings& settings, const QList<QString>&
                 settingsKeys.contains("reverseAPIAddress") ||
                 settingsKeys.contains("reverseAPIPort") ||
                 settingsKeys.contains("reverseAPIFeatureSetIndex") ||
-                settingsKeys.contains("m_reverseAPIFeatureIndex");
+                settingsKeys.contains("reverseAPIFeatureIndex");
         webapiReverseSendSettings(settingsKeys, settings, fullUpdate || force);
     }
 
diff --git a/plugins/feature/startracker/startracker.cpp b/plugins/feature/startracker/startracker.cpp
index 1f33d784a..6740c269b 100644
--- a/plugins/feature/startracker/startracker.cpp
+++ b/plugins/feature/startracker/startracker.cpp
@@ -259,7 +259,7 @@ void StarTracker::applySettings(const StarTrackerSettings& settings, const QList
                 settingsKeys.contains("reverseAPIAddress") ||
                 settingsKeys.contains("reverseAPIPort") ||
                 settingsKeys.contains("reverseAPIFeatureSetIndex") ||
-                settingsKeys.contains("m_reverseAPIFeatureIndex");
+                settingsKeys.contains("reverseAPIFeatureIndex");
         webapiReverseSendSettings(settingsKeys, settings, fullUpdate || force);
     }
 
diff --git a/plugins/feature/startracker/startrackerworker.cpp b/plugins/feature/startracker/startrackerworker.cpp
index b37bfdbed..f567d65c2 100644
--- a/plugins/feature/startracker/startrackerworker.cpp
+++ b/plugins/feature/startracker/startrackerworker.cpp
@@ -163,7 +163,7 @@ void StarTrackerWorker::applySettings(const StarTrackerSettings& settings, const
     if (settingsKeys.contains("drawSunOnMap")
      || settingsKeys.contains("drawMoonOnMap")
      || settingsKeys.contains("drawStarOnMap")
-     || settingsKeys.contains("m_target"))
+     || settingsKeys.contains("target"))
     {
         if (!settings.m_drawSunOnMap && m_settings.m_drawSunOnMap)
             removeFromMap("Sun");
diff --git a/plugins/feature/vorlocalizer/vorlocalizer.cpp b/plugins/feature/vorlocalizer/vorlocalizer.cpp
index ab9512ae1..6e5d7d010 100644
--- a/plugins/feature/vorlocalizer/vorlocalizer.cpp
+++ b/plugins/feature/vorlocalizer/vorlocalizer.cpp
@@ -353,7 +353,7 @@ void VORLocalizer::applySettings(const VORLocalizerSettings& settings, const QLi
                 settingsKeys.contains("reverseAPIAddress") ||
                 settingsKeys.contains("reverseAPIPort") ||
                 settingsKeys.contains("reverseAPIFeatureSetIndex") ||
-                settingsKeys.contains("m_reverseAPIFeatureIndex");
+                settingsKeys.contains("reverseAPIFeatureIndex");
         webapiReverseSendSettings(settingsKeys, settings, fullUpdate || force);
     }
 
diff --git a/plugins/samplemimo/audiocatsiso/audiocatsiso.cpp b/plugins/samplemimo/audiocatsiso/audiocatsiso.cpp
index a2c974694..c50e0eea4 100644
--- a/plugins/samplemimo/audiocatsiso/audiocatsiso.cpp
+++ b/plugins/samplemimo/audiocatsiso/audiocatsiso.cpp
@@ -969,7 +969,7 @@ void AudioCATSISO::webapiReverseSendSettings(const QList<QString>& deviceSetting
     if (deviceSettingsKeys.contains("catPTTMethodIndex")) {
         swgAudioCATSISOSettings->setCatPttMethodIndex(settings.m_catPTTMethodIndex);
     }
-    if (deviceSettingsKeys.contains("m_catDTRHigh")) {
+    if (deviceSettingsKeys.contains("catDTRHigh")) {
         swgAudioCATSISOSettings->setCatDtrHigh(settings.m_catDTRHigh ? 1 : 0);
     }
     if (deviceSettingsKeys.contains("catRTSHigh")) {
diff --git a/plugins/samplemimo/plutosdrmimo/plutosdrmimo.cpp b/plugins/samplemimo/plutosdrmimo/plutosdrmimo.cpp
index de69e98a7..25b6eb1d5 100644
--- a/plugins/samplemimo/plutosdrmimo/plutosdrmimo.cpp
+++ b/plugins/samplemimo/plutosdrmimo/plutosdrmimo.cpp
@@ -461,7 +461,7 @@ bool PlutoSDRMIMO::applySettings(const PlutoSDRMIMOSettings& settings, const QLi
         settingsKeys.contains("lpfRxFIREnable") ||
         settingsKeys.contains("lpfRxFIRlog2Decim") ||
         settingsKeys.contains("lpfRxFIRBW") ||
-        settingsKeys.contains("m_lpfRxFIRGain") || force)
+        settingsKeys.contains("lpfRxFIRGain") || force)
     {
         if (plutoBox)
         {
diff --git a/plugins/samplesource/fileinput/fileinputsettings.cpp b/plugins/samplesource/fileinput/fileinputsettings.cpp
index 11cd03578..e36aa55ff 100644
--- a/plugins/samplesource/fileinput/fileinputsettings.cpp
+++ b/plugins/samplesource/fileinput/fileinputsettings.cpp
@@ -184,7 +184,7 @@ QString FileInputSettings::getDebugString(const QStringList& settingsKeys, bool
     if (settingsKeys.contains("title") || force) {
         ostr << " m_title: " << m_title.toStdString();
     }
-    if (settingsKeys.contains("m_fileName") || force) {
+    if (settingsKeys.contains("fileName") || force) {
         ostr << " m_fileName: " << m_fileName.toStdString();
     }
     if (settingsKeys.contains("accelerationFactor") || force) {
diff --git a/plugins/samplesource/sdrplayv3/sdrplayv3settings.cpp b/plugins/samplesource/sdrplayv3/sdrplayv3settings.cpp
index 3e8a8e4e2..ce62a11e2 100644
--- a/plugins/samplesource/sdrplayv3/sdrplayv3settings.cpp
+++ b/plugins/samplesource/sdrplayv3/sdrplayv3settings.cpp
@@ -231,7 +231,7 @@ void SDRPlayV3Settings::applySettings(const QStringList& settingsKeys, const SDR
     if (settingsKeys.contains("iqOrder")) {
         m_iqOrder = settings.m_iqOrder;
     }
-    if (settingsKeys.contains("m_transverterDeltaFrequency")) {
+    if (settingsKeys.contains("transverterDeltaFrequency")) {
         m_transverterDeltaFrequency = settings.m_transverterDeltaFrequency;
     }
     if (settingsKeys.contains("replayOffset")) {
diff --git a/plugins/samplesource/sigmffileinput/sigmffileinputsettings.cpp b/plugins/samplesource/sigmffileinput/sigmffileinputsettings.cpp
index c7b703551..80d529df1 100644
--- a/plugins/samplesource/sigmffileinput/sigmffileinputsettings.cpp
+++ b/plugins/samplesource/sigmffileinput/sigmffileinputsettings.cpp
@@ -135,7 +135,7 @@ QString SigMFFileInputSettings::getDebugString(const QStringList& settingsKeys,
     if (settingsKeys.contains("title") || force) {
         ostr << " m_title: " << m_title.toStdString();
     }
-    if (settingsKeys.contains("m_fileName") || force) {
+    if (settingsKeys.contains("fileName") || force) {
         ostr << " m_fileName: " << m_fileName.toStdString();
     }
     if (settingsKeys.contains("accelerationFactor") || force) {