diff --git a/device.c b/device.c
index 4282c72..11f9453 100644
--- a/device.c
+++ b/device.c
@@ -26,9 +26,9 @@ cSatipDevice::cSatipDevice(unsigned int indexP)
 {
   unsigned int bufsize = (unsigned int)SATIP_BUFFER_SIZE;
   bufsize -= (bufsize % TS_SIZE);
-  info("Creating SAT>IP CardIndex=%d [device %u]", CardIndex(), deviceIndexM);
+  info("Creating SATIP device CardIndex=%d [device %u]", CardIndex(), deviceIndexM);
   tsBufferM = new cRingBufferLinear(bufsize + 1, TS_SIZE, false,
-                                   *cString::sprintf("SAT>IP TS %d", deviceIndexM));
+                                   *cString::sprintf("SATIP %d TS", deviceIndexM));
   if (tsBufferM) {
      tsBufferM->SetTimeouts(10, 10);
      tsBufferM->SetIoThrottle();
@@ -317,7 +317,7 @@ bool cSatipDevice::SetChannelDevice(const cChannel *channelP, bool liveViewP)
      cDvbTransponderParameters dtp(channelP->Parameters());
      cString params = GetTransponderUrlParameters(channelP);
      if (isempty(params)) {
-        error("Unrecognized SAT>IP channel parameters: %s", channelP->Parameters());
+        error("Unrecognized SATIP channel parameters: %s", channelP->Parameters());
         return false;
         }
      cString address;
diff --git a/discover.c b/discover.c
index 47fe1bb..654e515 100644
--- a/discover.c
+++ b/discover.c
@@ -118,7 +118,7 @@ int cSatipDiscover::DebugCallback(CURL *handleP, curl_infotype typeP, char *data
 }
 
 cSatipDiscover::cSatipDiscover()
-: cThread("SAT>IP discover"),
+: cThread("SATIP discover"),
   mutexM(),
   msearchM(*this),
   probeUrlListM(),
diff --git a/poller.c b/poller.c
index fb79af9..5f2b24c 100644
--- a/poller.c
+++ b/poller.c
@@ -39,7 +39,7 @@ void cSatipPoller::Destroy(void)
 }
 
 cSatipPoller::cSatipPoller()
-: cThread("SAT>IP poller"),
+: cThread("SATIP poller"),
   mutexM(),
   fdM(epoll_create(eMaxFileDescriptors))
 {
diff --git a/sectionfilter.c b/sectionfilter.c
index 88c8d4c..022326e 100644
--- a/sectionfilter.c
+++ b/sectionfilter.c
@@ -232,8 +232,8 @@ bool cSatipSectionFilter::Send(void)
 
 
 cSatipSectionFilterHandler::cSatipSectionFilterHandler(int deviceIndexP, unsigned int bufferLenP)
-: cThread(cString::sprintf("SAT>IP %d section handler", deviceIndexP)),
-  ringBufferM(new cRingBufferLinear(bufferLenP, TS_SIZE, false, *cString::sprintf("SAT>IP SECTION HANDLER %d", deviceIndexP))),
+: cThread(cString::sprintf("SATIP %d section handler", deviceIndexP)),
+  ringBufferM(new cRingBufferLinear(bufferLenP, TS_SIZE, false, *cString::sprintf("SATIP %d section handler", deviceIndexP))),
   mutexM(),
   deviceIndexM(deviceIndexP)
 {
diff --git a/tuner.c b/tuner.c
index 16749fa..dd14eda 100644
--- a/tuner.c
+++ b/tuner.c
@@ -13,7 +13,7 @@
 #include "tuner.h"
 
 cSatipTuner::cSatipTuner(cSatipDeviceIf &deviceP, unsigned int packetLenP)
-: cThread(cString::sprintf("SAT>IP %d tuner", deviceP.GetId())),
+: cThread(cString::sprintf("SATIP %d tuner", deviceP.GetId())),
   sleepM(),
   deviceM(&deviceP),
   deviceIdM(deviceP.GetId()),