diff --git a/include-gpl/audio/audiodeviceinfo.h b/include-gpl/audio/audiodeviceinfo.h
index ca285f549..c2a018651 100644
--- a/include-gpl/audio/audiodeviceinfo.h
+++ b/include-gpl/audio/audiodeviceinfo.h
@@ -21,7 +21,7 @@
 #include <QStringList>
 #include "util/export.h"
 
-class SDRANGELOVE_API AudioDeviceInfo {
+class SDRANGEL_API AudioDeviceInfo {
 public:
 	struct Device {
 		QString name;
diff --git a/include-gpl/audio/audiofifo.h b/include-gpl/audio/audiofifo.h
index 8b99e3be5..ce6b1ba89 100644
--- a/include-gpl/audio/audiofifo.h
+++ b/include-gpl/audio/audiofifo.h
@@ -23,7 +23,7 @@
 #include <QWaitCondition>
 #include "util/export.h"
 
-class SDRANGELOVE_API AudioFifo : public QObject {
+class SDRANGEL_API AudioFifo : public QObject {
 	Q_OBJECT
 public:
 	AudioFifo();
diff --git a/include-gpl/audio/audiooutput.h b/include-gpl/audio/audiooutput.h
index 1260ebf17..eeb802333 100644
--- a/include-gpl/audio/audiooutput.h
+++ b/include-gpl/audio/audiooutput.h
@@ -29,7 +29,7 @@ class QAudioOutput;
 class AudioFifo;
 class AudioOutputPipe;
 
-class SDRANGELOVE_API AudioOutput : QIODevice {
+class SDRANGEL_API AudioOutput : QIODevice {
 public:
 	AudioOutput();
 	virtual ~AudioOutput();
diff --git a/include-gpl/dsp/channelizer.h b/include-gpl/dsp/channelizer.h
index 5f2bca3fc..d988bd0b8 100644
--- a/include-gpl/dsp/channelizer.h
+++ b/include-gpl/dsp/channelizer.h
@@ -9,10 +9,10 @@
 class MessageQueue;
 class IntHalfbandFilter;
 
-class SDRANGELOVE_API Channelizer : public SampleSink {
+class SDRANGEL_API Channelizer : public SampleSink {
 	Q_OBJECT
 public:
-	class SDRANGELOVE_API MsgChannelizerNotification : public Message {
+	class SDRANGEL_API MsgChannelizerNotification : public Message {
 		MESSAGE_CLASS_DECLARATION
 
 	public:
diff --git a/include-gpl/dsp/dspcommands.h b/include-gpl/dsp/dspcommands.h
index 0ab9c9b86..094c584cc 100644
--- a/include-gpl/dsp/dspcommands.h
+++ b/include-gpl/dsp/dspcommands.h
@@ -28,27 +28,27 @@ class SampleSink;
 class ThreadedSampleSink;
 class AudioFifo;
 
-class SDRANGELOVE_API DSPPing : public Message {
+class SDRANGEL_API DSPPing : public Message {
 	MESSAGE_CLASS_DECLARATION
 };
 
-class SDRANGELOVE_API DSPExit : public Message {
+class SDRANGEL_API DSPExit : public Message {
 	MESSAGE_CLASS_DECLARATION
 };
 
-class SDRANGELOVE_API DSPAcquisitionInit : public Message {
+class SDRANGEL_API DSPAcquisitionInit : public Message {
 	MESSAGE_CLASS_DECLARATION
 };
 
-class SDRANGELOVE_API DSPAcquisitionStart : public Message {
+class SDRANGEL_API DSPAcquisitionStart : public Message {
 	MESSAGE_CLASS_DECLARATION
 };
 
-class SDRANGELOVE_API DSPAcquisitionStop : public Message {
+class SDRANGEL_API DSPAcquisitionStop : public Message {
 	MESSAGE_CLASS_DECLARATION
 };
 
-class SDRANGELOVE_API DSPGetSourceDeviceDescription : public Message {
+class SDRANGEL_API DSPGetSourceDeviceDescription : public Message {
 	MESSAGE_CLASS_DECLARATION
 
 public:
@@ -59,7 +59,7 @@ private:
 	QString m_deviceDescription;
 };
 
-class SDRANGELOVE_API DSPGetErrorMessage : public Message {
+class SDRANGEL_API DSPGetErrorMessage : public Message {
 	MESSAGE_CLASS_DECLARATION
 
 public:
@@ -70,7 +70,7 @@ private:
 	QString m_errorMessage;
 };
 
-class SDRANGELOVE_API DSPSetSource : public Message {
+class SDRANGEL_API DSPSetSource : public Message {
 	MESSAGE_CLASS_DECLARATION
 
 public:
@@ -82,7 +82,7 @@ private:
 	SampleSource* m_sampleSource;
 };
 
-class SDRANGELOVE_API DSPAddSink : public Message {
+class SDRANGEL_API DSPAddSink : public Message {
 	MESSAGE_CLASS_DECLARATION
 
 public:
@@ -94,7 +94,7 @@ private:
 	SampleSink* m_sampleSink;
 };
 
-class SDRANGELOVE_API DSPRemoveSink : public Message {
+class SDRANGEL_API DSPRemoveSink : public Message {
 	MESSAGE_CLASS_DECLARATION
 
 public:
@@ -106,7 +106,7 @@ private:
 	SampleSink* m_sampleSink;
 };
 
-class SDRANGELOVE_API DSPAddThreadedSampleSink : public Message {
+class SDRANGEL_API DSPAddThreadedSampleSink : public Message {
 	MESSAGE_CLASS_DECLARATION
 
 public:
@@ -118,7 +118,7 @@ private:
 	ThreadedSampleSink* m_threadedSampleSink;
 };
 
-class SDRANGELOVE_API DSPRemoveThreadedSampleSink : public Message {
+class SDRANGEL_API DSPRemoveThreadedSampleSink : public Message {
 	MESSAGE_CLASS_DECLARATION
 
 public:
@@ -130,7 +130,7 @@ private:
 	ThreadedSampleSink* m_threadedSampleSink;
 };
 
-class SDRANGELOVE_API DSPAddAudioSink : public Message {
+class SDRANGEL_API DSPAddAudioSink : public Message {
 	MESSAGE_CLASS_DECLARATION
 
 public:
@@ -142,7 +142,7 @@ private:
 	AudioFifo* m_audioFifo;
 };
 
-class SDRANGELOVE_API DSPRemoveAudioSink : public Message {
+class SDRANGEL_API DSPRemoveAudioSink : public Message {
 	MESSAGE_CLASS_DECLARATION
 
 public:
@@ -154,7 +154,7 @@ private:
 	AudioFifo* m_audioFifo;
 };
 
-class SDRANGELOVE_API DSPConfigureSpectrumVis : public Message {
+class SDRANGEL_API DSPConfigureSpectrumVis : public Message {
 	MESSAGE_CLASS_DECLARATION
 
 public:
@@ -175,7 +175,7 @@ private:
 	FFTWindow::Function m_window;
 };
 
-class SDRANGELOVE_API DSPConfigureCorrection : public Message {
+class SDRANGEL_API DSPConfigureCorrection : public Message {
 	MESSAGE_CLASS_DECLARATION
 
 public:
@@ -194,7 +194,7 @@ private:
 
 };
 
-class SDRANGELOVE_API DSPEngineReport : public Message {
+class SDRANGEL_API DSPEngineReport : public Message {
 	MESSAGE_CLASS_DECLARATION
 
 public:
@@ -212,7 +212,7 @@ private:
 	quint64 m_centerFrequency;
 };
 
-class SDRANGELOVE_API DSPConfigureScopeVis : public Message {
+class SDRANGEL_API DSPConfigureScopeVis : public Message {
 	MESSAGE_CLASS_DECLARATION
 
 public:
@@ -233,7 +233,7 @@ private:
 	Real m_triggerLevelLow;
 };
 
-class SDRANGELOVE_API DSPSignalNotification : public Message {
+class SDRANGEL_API DSPSignalNotification : public Message {
 	MESSAGE_CLASS_DECLARATION
 
 public:
@@ -251,7 +251,7 @@ private:
 	qint64 m_centerFrequency;
 };
 
-class SDRANGELOVE_API DSPConfigureChannelizer : public Message {
+class SDRANGEL_API DSPConfigureChannelizer : public Message {
 	MESSAGE_CLASS_DECLARATION
 
 public:
diff --git a/include-gpl/dsp/dspengine.h b/include-gpl/dsp/dspengine.h
index 22fd44a93..69fb614e0 100644
--- a/include-gpl/dsp/dspengine.h
+++ b/include-gpl/dsp/dspengine.h
@@ -35,7 +35,7 @@ class SampleSink;
 class ThreadedSampleSink;
 class AudioFifo;
 
-class SDRANGELOVE_API DSPEngine : public QThread {
+class SDRANGEL_API DSPEngine : public QThread {
 	Q_OBJECT
 
 public:
diff --git a/include-gpl/dsp/fftengine.h b/include-gpl/dsp/fftengine.h
index bf8f4243d..05665241a 100644
--- a/include-gpl/dsp/fftengine.h
+++ b/include-gpl/dsp/fftengine.h
@@ -4,7 +4,7 @@
 #include "dsp/dsptypes.h"
 #include "util/export.h"
 
-class SDRANGELOVE_API FFTEngine {
+class SDRANGEL_API FFTEngine {
 public:
 	virtual ~FFTEngine();
 
diff --git a/include-gpl/dsp/fftwindow.h b/include-gpl/dsp/fftwindow.h
index 095dc291d..89da43478 100644
--- a/include-gpl/dsp/fftwindow.h
+++ b/include-gpl/dsp/fftwindow.h
@@ -24,7 +24,7 @@
 #include "dsp/dsptypes.h"
 #include "util/export.h"
 
-class SDRANGELOVE_API FFTWindow {
+class SDRANGEL_API FFTWindow {
 public:
 	enum Function {
 		Bartlett,
diff --git a/include-gpl/dsp/filesink.h b/include-gpl/dsp/filesink.h
index e13871d28..52c1f4be2 100644
--- a/include-gpl/dsp/filesink.h
+++ b/include-gpl/dsp/filesink.h
@@ -11,7 +11,7 @@
 #include "util/message.h"
 #include "util/messagequeue.h"
 
-class SDRANGELOVE_API FileSink : public SampleSink {
+class SDRANGEL_API FileSink : public SampleSink {
 public:
 
     struct Header
diff --git a/include-gpl/dsp/interpolator.h b/include-gpl/dsp/interpolator.h
index 326b911db..ed6d7b0d4 100644
--- a/include-gpl/dsp/interpolator.h
+++ b/include-gpl/dsp/interpolator.h
@@ -11,7 +11,7 @@
 #include <unistd.h>
 #endif
 
-class SDRANGELOVE_API Interpolator {
+class SDRANGEL_API Interpolator {
 public:
 	Interpolator();
 	~Interpolator();
diff --git a/include-gpl/dsp/inthalfbandfilter.h b/include-gpl/dsp/inthalfbandfilter.h
index 1b3fe0a31..204d58f2c 100644
--- a/include-gpl/dsp/inthalfbandfilter.h
+++ b/include-gpl/dsp/inthalfbandfilter.h
@@ -13,7 +13,7 @@
 #define HB_FILTERORDER 32
 #define HB_SHIFT 14
 
-class SDRANGELOVE_API IntHalfbandFilter {
+class SDRANGEL_API IntHalfbandFilter {
 public:
 	IntHalfbandFilter();
 
diff --git a/include-gpl/dsp/nco.h b/include-gpl/dsp/nco.h
index 55db852fa..7a0ed9c81 100644
--- a/include-gpl/dsp/nco.h
+++ b/include-gpl/dsp/nco.h
@@ -21,7 +21,7 @@
 #include "dsp/dsptypes.h"
 #include "util/export.h"
 
-class SDRANGELOVE_API NCO {
+class SDRANGEL_API NCO {
 private:
 	enum {
 		TableSize = (1 << 12),
diff --git a/include-gpl/dsp/nullsink.h b/include-gpl/dsp/nullsink.h
index 65c70867a..4f87ae9b6 100644
--- a/include-gpl/dsp/nullsink.h
+++ b/include-gpl/dsp/nullsink.h
@@ -6,7 +6,7 @@
 
 class Message;
 
-class SDRANGELOVE_API NullSink : public SampleSink {
+class SDRANGEL_API NullSink : public SampleSink {
 public:
 
 	NullSink();
diff --git a/include-gpl/dsp/scopevis.h b/include-gpl/dsp/scopevis.h
index c774bed32..ee82da430 100644
--- a/include-gpl/dsp/scopevis.h
+++ b/include-gpl/dsp/scopevis.h
@@ -9,7 +9,7 @@
 class GLScope;
 class MessageQueue;
 
-class SDRANGELOVE_API ScopeVis : public SampleSink {
+class SDRANGEL_API ScopeVis : public SampleSink {
 public:
 	enum TriggerChannel {
 		TriggerFreeRun,
diff --git a/include-gpl/dsp/spectrumscopecombovis.h b/include-gpl/dsp/spectrumscopecombovis.h
index 2c5837c6e..04b2ceccd 100644
--- a/include-gpl/dsp/spectrumscopecombovis.h
+++ b/include-gpl/dsp/spectrumscopecombovis.h
@@ -8,7 +8,7 @@
 
 class Message;
 
-class SDRANGELOVE_API SpectrumScopeComboVis : public SampleSink {
+class SDRANGEL_API SpectrumScopeComboVis : public SampleSink {
 public:
 
 	SpectrumScopeComboVis(SpectrumVis* spectrumVis, ScopeVis* scopeVis);
diff --git a/include-gpl/dsp/spectrumvis.h b/include-gpl/dsp/spectrumvis.h
index 9c3b6d3a0..9edbbe9ef 100644
--- a/include-gpl/dsp/spectrumvis.h
+++ b/include-gpl/dsp/spectrumvis.h
@@ -10,10 +10,10 @@
 class GLSpectrum;
 class MessageQueue;
 
-class SDRANGELOVE_API SpectrumVis : public SampleSink {
+class SDRANGEL_API SpectrumVis : public SampleSink {
 
 public:
-	class SDRANGELOVE_API MsgConfigureSpectrumVis : public Message {
+	class SDRANGEL_API MsgConfigureSpectrumVis : public Message {
 		MESSAGE_CLASS_DECLARATION
 
 	public:
diff --git a/include-gpl/gui/colormapper.h b/include-gpl/gui/colormapper.h
index 6b8674d21..0aa3e5407 100644
--- a/include-gpl/gui/colormapper.h
+++ b/include-gpl/gui/colormapper.h
@@ -12,7 +12,7 @@
 #include <utility>
 #include "util/export.h"
 
-class SDRANGELOVE_API ColorMapper
+class SDRANGEL_API ColorMapper
 {
 public:
 	enum Theme {
diff --git a/include-gpl/gui/glscope.h b/include-gpl/gui/glscope.h
index ce291a46c..cb9fe3db5 100644
--- a/include-gpl/gui/glscope.h
+++ b/include-gpl/gui/glscope.h
@@ -30,7 +30,7 @@
 class DSPEngine;
 class ScopeVis;
 
-class SDRANGELOVE_API GLScope: public QGLWidget {
+class SDRANGEL_API GLScope: public QGLWidget {
 	Q_OBJECT
 
 public:
diff --git a/include-gpl/gui/glscopegui.h b/include-gpl/gui/glscopegui.h
index 042343baa..32e2b5a7e 100644
--- a/include-gpl/gui/glscopegui.h
+++ b/include-gpl/gui/glscopegui.h
@@ -14,7 +14,7 @@ class MessageQueue;
 class ScopeVis;
 class GLScope;
 
-class SDRANGELOVE_API GLScopeGUI : public QWidget {
+class SDRANGEL_API GLScopeGUI : public QWidget {
 	Q_OBJECT
 
 public:
diff --git a/include-gpl/gui/glspectrum.h b/include-gpl/gui/glspectrum.h
index 5ab51a195..c2b4a59b5 100644
--- a/include-gpl/gui/glspectrum.h
+++ b/include-gpl/gui/glspectrum.h
@@ -26,7 +26,7 @@
 #include "dsp/channelmarker.h"
 #include "util/export.h"
 
-class SDRANGELOVE_API GLSpectrum : public QGLWidget {
+class SDRANGEL_API GLSpectrum : public QGLWidget {
 	Q_OBJECT
 
 public:
diff --git a/include-gpl/gui/glspectrumgui.h b/include-gpl/gui/glspectrumgui.h
index fd1b5bcb6..51514aeb5 100644
--- a/include-gpl/gui/glspectrumgui.h
+++ b/include-gpl/gui/glspectrumgui.h
@@ -13,7 +13,7 @@ class MessageQueue;
 class SpectrumVis;
 class GLSpectrum;
 
-class SDRANGELOVE_API GLSpectrumGUI : public QWidget {
+class SDRANGEL_API GLSpectrumGUI : public QWidget {
 	Q_OBJECT
 
 public:
diff --git a/include-gpl/gui/indicator.h b/include-gpl/gui/indicator.h
index 596956f19..66e505810 100644
--- a/include-gpl/gui/indicator.h
+++ b/include-gpl/gui/indicator.h
@@ -21,7 +21,7 @@
 #include <QWidget>
 #include "util/export.h"
 
-class SDRANGELOVE_API Indicator : public QWidget {
+class SDRANGEL_API Indicator : public QWidget {
 private:
 	Q_OBJECT;
 
diff --git a/include-gpl/gui/scale.h b/include-gpl/gui/scale.h
index 82f6f8fb4..4a5356cfa 100644
--- a/include-gpl/gui/scale.h
+++ b/include-gpl/gui/scale.h
@@ -19,7 +19,7 @@
 #include "gui/scaleengine.h"
 #include "util/export.h"
 
-class SDRANGELOVE_API Scale : public QWidget {
+class SDRANGEL_API Scale : public QWidget {
 	Q_OBJECT
 
 public:
diff --git a/include-gpl/gui/scaleengine.h b/include-gpl/gui/scaleengine.h
index 38693a831..c9353f76a 100644
--- a/include-gpl/gui/scaleengine.h
+++ b/include-gpl/gui/scaleengine.h
@@ -24,7 +24,7 @@
 #include "physicalunit.h"
 #include "util/export.h"
 
-class SDRANGELOVE_API ScaleEngine {
+class SDRANGEL_API ScaleEngine {
 public:
 	struct Tick {
 		float pos;
diff --git a/include-gpl/gui/scopewindow.h b/include-gpl/gui/scopewindow.h
index 2761dcc0d..59c2d7d6e 100644
--- a/include-gpl/gui/scopewindow.h
+++ b/include-gpl/gui/scopewindow.h
@@ -28,7 +28,7 @@ namespace Ui {
 	class ScopeWindow;
 }
 
-class SDRANGELOVE_API ScopeWindow : public QWidget {
+class SDRANGEL_API ScopeWindow : public QWidget {
 	Q_OBJECT
 
 public:
diff --git a/include-gpl/gui/valuedial.h b/include-gpl/gui/valuedial.h
index 0f58e024f..4cb82f9cc 100644
--- a/include-gpl/gui/valuedial.h
+++ b/include-gpl/gui/valuedial.h
@@ -20,7 +20,7 @@
 #include "gui/colormapper.h"
 #include "util/export.h"
 
-class SDRANGELOVE_API ValueDial : public QWidget {
+class SDRANGEL_API ValueDial : public QWidget {
 	Q_OBJECT
 
 public:
diff --git a/include-gpl/mainwindow.h b/include-gpl/mainwindow.h
index c177ee678..30d3018fc 100644
--- a/include-gpl/mainwindow.h
+++ b/include-gpl/mainwindow.h
@@ -44,7 +44,7 @@ namespace Ui {
 	class MainWindow;
 }
 
-class SDRANGELOVE_API MainWindow : public QMainWindow {
+class SDRANGEL_API MainWindow : public QMainWindow {
 	Q_OBJECT
 
 public:
diff --git a/include-gpl/plugin/pluginmanager.h b/include-gpl/plugin/pluginmanager.h
index dc51c0398..7ff55ab5e 100644
--- a/include-gpl/plugin/pluginmanager.h
+++ b/include-gpl/plugin/pluginmanager.h
@@ -15,7 +15,7 @@ class MainWindow;
 class SampleSource;
 class Message;
 
-class SDRANGELOVE_API PluginManager : public QObject {
+class SDRANGEL_API PluginManager : public QObject {
 	Q_OBJECT
 
 public:
diff --git a/include/dsp/channelmarker.h b/include/dsp/channelmarker.h
index d5d9dffc8..66ed138ab 100644
--- a/include/dsp/channelmarker.h
+++ b/include/dsp/channelmarker.h
@@ -5,7 +5,7 @@
 #include <QColor>
 #include "util/export.h"
 
-class SDRANGELOVE_API ChannelMarker : public QObject {
+class SDRANGEL_API ChannelMarker : public QObject {
 	Q_OBJECT
 
 public:
diff --git a/include/dsp/samplefifo.h b/include/dsp/samplefifo.h
index 24a2a6146..58eac0596 100644
--- a/include/dsp/samplefifo.h
+++ b/include/dsp/samplefifo.h
@@ -24,7 +24,7 @@
 #include "dsp/dsptypes.h"
 #include "util/export.h"
 
-class SDRANGELOVE_API SampleFifo : public QObject {
+class SDRANGEL_API SampleFifo : public QObject {
 	Q_OBJECT
 
 private:
diff --git a/include/dsp/samplesink.h b/include/dsp/samplesink.h
index dbb55ab04..e4e39f5da 100644
--- a/include/dsp/samplesink.h
+++ b/include/dsp/samplesink.h
@@ -8,7 +8,7 @@
 
 class Message;
 
-class SDRANGELOVE_API SampleSink : public QObject {
+class SDRANGEL_API SampleSink : public QObject {
 	Q_OBJECT
 public:
 	SampleSink();
diff --git a/include/dsp/samplesource.h b/include/dsp/samplesource.h
index 1eb52aa31..041d1b0e7 100644
--- a/include/dsp/samplesource.h
+++ b/include/dsp/samplesource.h
@@ -24,7 +24,7 @@
 #include "util/messagequeue.h"
 #include "util/export.h"
 
-class SDRANGELOVE_API SampleSource : public QObject {
+class SDRANGEL_API SampleSource : public QObject {
 	Q_OBJECT
 public:
 	SampleSource();
diff --git a/include/dsp/threadedsamplesink.h b/include/dsp/threadedsamplesink.h
index 38da91426..f134b0e82 100644
--- a/include/dsp/threadedsamplesink.h
+++ b/include/dsp/threadedsamplesink.h
@@ -49,7 +49,7 @@ public slots:
 /**
  * This class is a wrapper for SampleSink that runs the SampleSink object in its own thread
  */
-class SDRANGELOVE_API ThreadedSampleSink : public QObject {
+class SDRANGEL_API ThreadedSampleSink : public QObject {
 	Q_OBJECT
 
 public:
diff --git a/include/gui/basicchannelsettingswidget.h b/include/gui/basicchannelsettingswidget.h
index 8782bbaca..2f96b6db6 100644
--- a/include/gui/basicchannelsettingswidget.h
+++ b/include/gui/basicchannelsettingswidget.h
@@ -10,7 +10,7 @@ namespace Ui {
 
 class ChannelMarker;
 
-class SDRANGELOVE_API BasicChannelSettingsWidget : public QWidget {
+class SDRANGEL_API BasicChannelSettingsWidget : public QWidget {
 	Q_OBJECT
 
 public:
diff --git a/include/gui/rollupwidget.h b/include/gui/rollupwidget.h
index d34085c06..f695f395c 100644
--- a/include/gui/rollupwidget.h
+++ b/include/gui/rollupwidget.h
@@ -4,7 +4,7 @@
 #include <QWidget>
 #include "util/export.h"
 
-class SDRANGELOVE_API RollupWidget : public QWidget {
+class SDRANGEL_API RollupWidget : public QWidget {
 	Q_OBJECT
 
 public:
diff --git a/include/plugin/pluginapi.h b/include/plugin/pluginapi.h
index 739d4461c..89077e6f9 100644
--- a/include/plugin/pluginapi.h
+++ b/include/plugin/pluginapi.h
@@ -18,7 +18,7 @@ class MainWindow;
 class ChannelMarker;
 class PluginGUI;
 
-class SDRANGELOVE_API PluginAPI : public QObject {
+class SDRANGEL_API PluginAPI : public QObject {
 	Q_OBJECT
 
 public:
diff --git a/include/plugin/plugingui.h b/include/plugin/plugingui.h
index 65f8180ff..75509faa4 100644
--- a/include/plugin/plugingui.h
+++ b/include/plugin/plugingui.h
@@ -6,7 +6,7 @@
 
 class Message;
 
-class SDRANGELOVE_API PluginGUI {
+class SDRANGEL_API PluginGUI {
 public:
 	PluginGUI() { };
 	virtual ~PluginGUI() { };
diff --git a/include/util/export.h b/include/util/export.h
index 2b5f36dbf..49e2b68e7 100644
--- a/include/util/export.h
+++ b/include/util/export.h
@@ -1,22 +1,21 @@
-/*
- * Copyright (C) 2012 by Hoernchen <la@tfc-server.de>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+///////////////////////////////////////////////////////////////////////////////////
+// Copyright (C) 2015 Edouard Griffiths, F4EXB.                                  //
+//                                                                               //
+// This program is free software; you can redistribute it and/or modify          //
+// it under the terms of the GNU General Public License as published by          //
+// the Free Software Foundation as version 3 of the License, or                  //
+//                                                                               //
+// This program is distributed in the hope that it will be useful,               //
+// but WITHOUT ANY WARRANTY; without even the implied warranty of                //
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the                  //
+// GNU General Public License V3 for more details.                               //
+//                                                                               //
+// You should have received a copy of the GNU General Public License             //
+// along with this program. If not, see <http://www.gnu.org/licenses/>.          //
+///////////////////////////////////////////////////////////////////////////////////
 
-#ifndef __SDRANGELOVE_EXPORT_H
-#define __SDRANGELOVE_EXPORT_H
+#ifndef __SDRANGEL_EXPORT_H
+#define __SDRANGEL_EXPORT_H
 
 #if defined __GNUC__
 #  if __GNUC__ >= 4
@@ -34,13 +33,13 @@
 #  define __SDR_IMPORT
 #endif
 
-#ifndef sdrangelove_STATIC
-#	ifdef sdrangelove_EXPORTS
-#	define SDRANGELOVE_API __SDR_EXPORT
+#ifndef sdrangel_STATIC
+#	ifdef sdrangel_EXPORTS
+#	define SDRANGEL_API __SDR_EXPORT
 #	else
-#	define SDRANGELOVE_API __SDR_IMPORT
+#	define SDRANGEL_API __SDR_IMPORT
 #	endif
 #else
-#define SDRANGELOVE_API
+#define SDRANGEL_API
 #endif
-#endif /* __SDRANGELOVE_EXPORT_H */
+#endif /* __SDRANGEL_EXPORT_H */
diff --git a/include/util/message.h b/include/util/message.h
index 4ea32b265..758368a68 100644
--- a/include/util/message.h
+++ b/include/util/message.h
@@ -21,7 +21,7 @@
 #include <stdlib.h>
 #include "util/export.h"
 
-class SDRANGELOVE_API Message {
+class SDRANGEL_API Message {
 public:
 	Message();
 	virtual ~Message();
diff --git a/include/util/messagequeue.h b/include/util/messagequeue.h
index 9de400d25..933786157 100644
--- a/include/util/messagequeue.h
+++ b/include/util/messagequeue.h
@@ -25,7 +25,7 @@
 
 class Message;
 
-class SDRANGELOVE_API MessageQueue : public QObject {
+class SDRANGEL_API MessageQueue : public QObject {
 	Q_OBJECT
 
 public:
diff --git a/include/util/simpleserializer.h b/include/util/simpleserializer.h
index 1388aa549..cc76c2006 100644
--- a/include/util/simpleserializer.h
+++ b/include/util/simpleserializer.h
@@ -6,7 +6,7 @@
 #include "dsp/dsptypes.h"
 #include "util/export.h"
 
-class SDRANGELOVE_API SimpleSerializer {
+class SDRANGEL_API SimpleSerializer {
 public:
 	SimpleSerializer(quint32 version);
 
@@ -48,7 +48,7 @@ protected:
 	bool writeTag(Type type, quint32 id, quint32 length);
 };
 
-class SDRANGELOVE_API SimpleDeserializer {
+class SDRANGEL_API SimpleDeserializer {
 public:
 	SimpleDeserializer(const QByteArray& data);
 
diff --git a/include/util/syncmessenger.h b/include/util/syncmessenger.h
index 196a45232..b6d1b737e 100644
--- a/include/util/syncmessenger.h
+++ b/include/util/syncmessenger.h
@@ -29,7 +29,7 @@ class Message;
 /**
  * This class is responsible of managing the synchronous processing of a message across threads
  */
-class SDRANGELOVE_API SyncMessenger : public QObject {
+class SDRANGEL_API SyncMessenger : public QObject {
 	Q_OBJECT
 
 public:
diff --git a/sdrbase/mainwindow.ui b/sdrbase/mainwindow.ui
index b7129d48a..e57c98e5d 100644
--- a/sdrbase/mainwindow.ui
+++ b/sdrbase/mainwindow.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>SDRangelove V2</string>
+   <string>SDRangel</string>
   </property>
   <property name="windowIcon">
    <iconset resource="resources/res.qrc">
@@ -446,7 +446,7 @@
   </action>
   <action name="action_About">
    <property name="text">
-    <string>&amp;About SDRangelove...</string>
+    <string>&amp;About SDRangel...</string>
    </property>
   </action>
   <action name="action_Preferences">