diff --git a/Common/APRSHandler.cpp b/Common/APRSHandler.cpp
index 50dd130..ab84f53 100644
--- a/Common/APRSHandler.cpp
+++ b/Common/APRSHandler.cpp
@@ -33,7 +33,7 @@
 #include "APRSFormater.h"
 #include "APRSUtils.h"
 
-CAPRSHandler::CAPRSHandler(IAPRSHandlerThread* thread) :
+CAPRSHandler::CAPRSHandler(IAPRSHandlerBackend* thread) :
 m_thread(thread),
 m_array(),
 m_idFrameProvider(nullptr)
diff --git a/Common/APRSHandler.h b/Common/APRSHandler.h
index 0958d0a..f4876e5 100644
--- a/Common/APRSHandler.h
+++ b/Common/APRSHandler.h
@@ -33,11 +33,11 @@
 #include "AMBEData.h"
 #include "Timer.h"
 #include "APRSIdFrameProvider.h"
-#include "IAPRSHandlerThread.h"
+#include "IAPRSHandlerBackend.h"
 
 class CAPRSHandler {
 public:
-	CAPRSHandler(IAPRSHandlerThread * thread);
+	CAPRSHandler(IAPRSHandlerBackend * thread);
 	~CAPRSHandler();
 
 	bool open();
@@ -61,7 +61,7 @@ public:
 	void addReadAPRSCallback(IReadAPRSFrameCallback* cb);
 
 private:
-	IAPRSHandlerThread*		m_thread;
+	IAPRSHandlerBackend*		m_thread;
 	std::unordered_map<std::string,CAPRSEntry *>	m_array;
 	CAPRSIdFrameProvider * m_idFrameProvider;
 
diff --git a/Common/APRSHandlerThread.h b/Common/APRSHandlerThread.h
index fdeef68..3cff8c5 100644
--- a/Common/APRSHandlerThread.h
+++ b/Common/APRSHandlerThread.h
@@ -25,11 +25,11 @@
 #include "RingBuffer.h"
 #include "Timer.h"
 #include "Thread.h"
-#include "IAPRSHandlerThread.h"
+#include "IAPRSHandlerBackend.h"
 #include "APRSFrame.h"
 
 
-class CAPRSHandlerThread : public CThread, IAPRSHandlerThread {
+class CAPRSHandlerThread : public CThread, IAPRSHandlerBackend {
 public:
 	CAPRSHandlerThread(const std::string& callsign, const std::string& password, const std::string& address, const std::string& hostname, unsigned int port);
 	CAPRSHandlerThread(const std::string& callsign, const std::string& password, const std::string& address, const std::string& hostname, unsigned int port, const std::string& filter);
diff --git a/Common/DummyAPRSHandlerThread.h b/Common/DummyAPRSHandlerThread.h
index 94ff2e1..9ae91f2 100644
--- a/Common/DummyAPRSHandlerThread.h
+++ b/Common/DummyAPRSHandlerThread.h
@@ -18,9 +18,9 @@
 
 #pragma once
 
-#include "IAPRSHandlerThread.h"
+#include "IAPRSHandlerBackend.h"
 
-class CDummyAPRSHandlerThread : public IAPRSHandlerThread
+class CDummyAPRSHandlerThread : public IAPRSHandlerBackend
 {
 public:
     CDummyAPRSHandlerThread();
diff --git a/Common/IAPRSHandlerThread.h b/Common/IAPRSHandlerBackend.h
similarity index 94%
rename from Common/IAPRSHandlerThread.h
rename to Common/IAPRSHandlerBackend.h
index 991f8f5..e06f10f 100644
--- a/Common/IAPRSHandlerThread.h
+++ b/Common/IAPRSHandlerBackend.h
@@ -21,10 +21,10 @@
 #include "APRSFrame.h"
 #include "ReadAPRSFrameCallback.h"
 
-class IAPRSHandlerThread
+class IAPRSHandlerBackend
 {
 public:
-    virtual ~IAPRSHandlerThread() { } ;
+    virtual ~IAPRSHandlerBackend() { } ;
 
     virtual bool start() = 0;
     virtual bool isConnected() const = 0;
diff --git a/DStarGateway/DStarGatewayApp.cpp b/DStarGateway/DStarGatewayApp.cpp
index 2efc783..0e8fd44 100644
--- a/DStarGateway/DStarGatewayApp.cpp
+++ b/DStarGateway/DStarGatewayApp.cpp
@@ -198,9 +198,9 @@ bool CDStarGatewayApp::createThread()
 	CAPRSHandler * incomingAprsWriter = nullptr;
 	if(aprsConfig.enabled && !aprsConfig.password.empty()) {
 		CAPRSHandlerThread* thread = new CAPRSHandlerThread(gatewayConfig.callsign, aprsConfig.password, gatewayConfig.address, aprsConfig.hostname, aprsConfig.port);
-		outgoingAprsWriter = new CAPRSHandler((IAPRSHandlerThread *)thread);
+		outgoingAprsWriter = new CAPRSHandler((IAPRSHandlerBackend *)thread);
 
-		incomingAprsWriter = new CAPRSHandler((IAPRSHandlerThread *)new CDummyAPRSHandlerThread());
+		incomingAprsWriter = new CAPRSHandler((IAPRSHandlerBackend *)new CDummyAPRSHandlerThread());
 
 		if(outgoingAprsWriter->open()) {
 #ifdef USE_GPSD