diff --git a/plugins/channelrx/chanalyzer/chanalyzergui.cpp b/plugins/channelrx/chanalyzer/chanalyzergui.cpp
index 62088a1f8..ff5be180f 100644
--- a/plugins/channelrx/chanalyzer/chanalyzergui.cpp
+++ b/plugins/channelrx/chanalyzer/chanalyzergui.cpp
@@ -387,8 +387,8 @@ ChannelAnalyzerGUI::ChannelAnalyzerGUI(PluginAPI* pluginAPI, DeviceUISet *device
 
 	m_spectrumVis = new SpectrumVis(SDR_RX_SCALEF, ui->glSpectrum);
 	m_scopeVis = new ScopeVisNG(ui->glScope);
-	m_spectrumScopeComboVis = new SpectrumScopeNGComboVis(m_spectrumVis, m_scopeVis);
-	m_channelAnalyzer = (ChannelAnalyzer*) rxChannel; //new ChannelAnalyzerNG(m_deviceUISet->m_deviceSourceAPI);
+	m_spectrumScopeComboVis = new SpectrumScopeComboVis(m_spectrumVis, m_scopeVis);
+	m_channelAnalyzer = (ChannelAnalyzer*) rxChannel; //new ChannelAnalyzer(m_deviceUISet->m_deviceSourceAPI);
 	m_channelAnalyzer->setSampleSink(m_spectrumScopeComboVis);
 	m_channelAnalyzer->setMessageQueueToGUI(getInputMessageQueue());
 
diff --git a/plugins/channelrx/chanalyzer/chanalyzergui.h b/plugins/channelrx/chanalyzer/chanalyzergui.h
index 48c55695a..bc24ca660 100644
--- a/plugins/channelrx/chanalyzer/chanalyzergui.h
+++ b/plugins/channelrx/chanalyzer/chanalyzergui.h
@@ -30,7 +30,7 @@ class PluginAPI;
 class DeviceUISet;
 class BasebandSampleSink;
 class ChannelAnalyzer;
-class SpectrumScopeNGComboVis;
+class SpectrumScopeComboVis;
 class SpectrumVis;
 class ScopeVisNG;
 
@@ -71,7 +71,7 @@ private:
 	MovingAverageUtil<double, double, 40> m_channelPowerAvg;
 
 	ChannelAnalyzer* m_channelAnalyzer;
-	SpectrumScopeNGComboVis* m_spectrumScopeComboVis;
+	SpectrumScopeComboVis* m_spectrumScopeComboVis;
 	SpectrumVis* m_spectrumVis;
 	ScopeVisNG* m_scopeVis;
 	MessageQueue m_inputMessageQueue;
diff --git a/sdrgui/dsp/spectrumscopengcombovis.cpp b/sdrgui/dsp/spectrumscopengcombovis.cpp
index 01e23b76f..7c4fbfb41 100644
--- a/sdrgui/dsp/spectrumscopengcombovis.cpp
+++ b/sdrgui/dsp/spectrumscopengcombovis.cpp
@@ -2,37 +2,37 @@
 #include "dsp/dspcommands.h"
 #include "util/messagequeue.h"
 
-SpectrumScopeNGComboVis::SpectrumScopeNGComboVis(SpectrumVis* spectrumVis, ScopeVisNG* scopeVis) :
+SpectrumScopeComboVis::SpectrumScopeComboVis(SpectrumVis* spectrumVis, ScopeVisNG* scopeVis) :
 	m_spectrumVis(spectrumVis),
 	m_scopeVis(scopeVis)
 {
-	setObjectName("SpectrumScopeNGComboVis");
+	setObjectName("SpectrumScopeComboVis");
 }
 
-SpectrumScopeNGComboVis::~SpectrumScopeNGComboVis()
+SpectrumScopeComboVis::~SpectrumScopeComboVis()
 {
 }
 
-void SpectrumScopeNGComboVis::feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool positiveOnly __attribute__((unused)))
+void SpectrumScopeComboVis::feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool positiveOnly __attribute__((unused)))
 {
 	m_scopeVis->feed(begin, end, false);
 	SampleVector::const_iterator triggerPoint = m_scopeVis->getTriggerPoint();
 	m_spectrumVis->feedTriggered(triggerPoint, end, positiveOnly);
 }
 
-void SpectrumScopeNGComboVis::start()
+void SpectrumScopeComboVis::start()
 {
 	m_spectrumVis->start();
 	m_scopeVis->start();
 }
 
-void SpectrumScopeNGComboVis::stop()
+void SpectrumScopeComboVis::stop()
 {
 	m_spectrumVis->stop();
 	m_scopeVis->stop();
 }
 
-bool SpectrumScopeNGComboVis::handleMessage(const Message& message)
+bool SpectrumScopeComboVis::handleMessage(const Message& message)
 {
 	bool spectDone = m_spectrumVis->handleMessage(message);
 	bool scopeDone = m_scopeVis->handleMessage(message);
diff --git a/sdrgui/dsp/spectrumscopengcombovis.h b/sdrgui/dsp/spectrumscopengcombovis.h
index 24ee8ce37..9d3f157f4 100644
--- a/sdrgui/dsp/spectrumscopengcombovis.h
+++ b/sdrgui/dsp/spectrumscopengcombovis.h
@@ -8,11 +8,11 @@
 
 class Message;
 
-class SDRGUI_API SpectrumScopeNGComboVis : public BasebandSampleSink {
+class SDRGUI_API SpectrumScopeComboVis : public BasebandSampleSink {
 public:
 
-    SpectrumScopeNGComboVis(SpectrumVis* spectrumVis, ScopeVisNG* scopeVis);
-	virtual ~SpectrumScopeNGComboVis();
+    SpectrumScopeComboVis(SpectrumVis* spectrumVis, ScopeVisNG* scopeVis);
+	virtual ~SpectrumScopeComboVis();
 
 	virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool positiveOnly);
 	virtual void start();