diff --git a/sendreceive/OBSW_CommandSenderReceiver.py b/sendreceive/OBSW_CommandSenderReceiver.py
index 0a203374fc336d1db8d21ae54812999591077d32..152f2f37ef469833034826d03e54a2f1fc8ce7d9 100644
--- a/sendreceive/OBSW_CommandSenderReceiver.py
+++ b/sendreceive/OBSW_CommandSenderReceiver.py
@@ -54,17 +54,17 @@ class CommandSenderReceiver:
             raise TypeError("Invalid TM Listener type!")
         self._replyReceived = False
         self._tmReady = False
+        self._queueEntryIsTelecommand = True
 
-        self.__start_time = 0
-        self.__elapsed_time = 0
-        self.__timeoutCounter = 0
+        self._start_time = 0
+        self._elapsed_time = 0
+        self._timeoutCounter = 0
 
-        self.__queueEntryIsTelecommand = True
         # needed to store last actual tc packet from queue
-        self.__lastTc = bytearray()
-        self.__lastTcInfo = dict()
+        self._lastTc = bytearray()
+        self._lastTcInfo = dict()
         # ignore periodic packets for timeout when checking a sequence
-        self.__isPacketToIgnore = False
+        self._isPacketToIgnore = False
 
     def _checkForFirstReply(self) -> None:
         """
@@ -83,7 +83,7 @@ class CommandSenderReceiver:
     # Check for special queue entries.
     def _checkQueueEntry(self, tcQueueEntry):
         (self.pusPacketInfo, self.pusPacket) = tcQueueEntry
-        self.__queueEntryIsTelecommand = False
+        self._queueEntryIsTelecommand = False
         if self.pusPacketInfo == "wait":
             waitTime = self.pusPacket
             self.tmTimeout = self.tmTimeout + waitTime
@@ -98,8 +98,8 @@ class CommandSenderReceiver:
         elif self.pusPacketInfo == "timeout":
             self.tmTimeout = self.pusPacket
         else:
-            self.__queueEntryIsTelecommand = True
-            self.__lastTc, self.__lastTcInfo = (self.pusPacket, self.pusPacketInfo)
+            self._queueEntryIsTelecommand = True
+            self._lastTc, self._lastTcInfo = (self.pusPacket, self.pusPacketInfo)
 
     def _checkForTimeout(self):
         """
@@ -107,16 +107,16 @@ class CommandSenderReceiver:
         If resending reached certain counter, exit the program.
         :return:
         """
-        if self.__timeoutCounter == 5:
+        if self._timeoutCounter == 5:
             print("Command Sender Receiver: No response from command !")
             exit()
-        if self.__start_time != 0:
-            self.__elapsed_time = time.time() - self.__start_time
-        if self.__elapsed_time > self.tmTimeout * self.tcSendTimeoutFactor:
+        if self._start_time != 0:
+            self._elapsed_time = time.time() - self._start_time
+        if self._elapsed_time > self.tmTimeout * self.tcSendTimeoutFactor:
             print("Command Sender Receiver: Timeout, sending TC again !")
-            self._comInterface.sendTelecommand(self.__lastTc, self.__lastTcInfo)
-            self.__timeoutCounter = self.__timeoutCounter + 1
-            self.__start_time = time.time()
+            self._comInterface.sendTelecommand(self._lastTc, self._lastTcInfo)
+            self._timeoutCounter = self._timeoutCounter + 1
+            self._start_time = time.time()
         time.sleep(0.5)
 
 
diff --git a/sendreceive/OBSW_SequentialSenderReceiver.py b/sendreceive/OBSW_SequentialSenderReceiver.py
index 7d1f4d7b53f72f098ed19ba9dd52a36792080cec..78ece60dca3f629820da590aee167bc8b97123a7 100644
--- a/sendreceive/OBSW_SequentialSenderReceiver.py
+++ b/sendreceive/OBSW_SequentialSenderReceiver.py
@@ -36,8 +36,6 @@ class SequentialCommandSenderReceiver(CommandSenderReceiver):
             comInterface=comInterface, tmtcPrinter=tmtcPrinter, tmListener=tmListener, tmTimeout=tmTimeout,
             tcSendTimeoutFactor=tcTimeoutFactor, doPrintToFile=doPrintToFile)
         self._tcQueue = tcQueue
-        self.__start_time = 0
-        self.__elapsed_time = 0
         self.__firstReplyReceived = False
         self.__allRepliesReceived = False
         self.__modeOpFinished = False
@@ -59,7 +57,7 @@ class SequentialCommandSenderReceiver(CommandSenderReceiver):
             while not self._tcQueue.__len__() == 0:
                 self.__performNextTcSend()
                 if self._tcQueue.__len__() == 0:
-                    self.__start_time = time.time()
+                    self._start_time = time.time()
             self._checkForTimeout()
             if not self.__modeOpFinished:
                 self._tmListener.modeOpFinished.set()
@@ -71,27 +69,27 @@ class SequentialCommandSenderReceiver(CommandSenderReceiver):
 
     def __performNextTcSend(self):
         if self._tmListener.replyEvent.is_set():
-            self.replyReceived = True
+            self._replyReceived = True
             self._tmListener.replyEvent.clear()
         # this flag is set in the separate receiver thread too
-        if self.replyReceived:
+        if self._replyReceived:
             self.__sendNextTelecommand()
-            self.replyReceived = False
+            self._replyReceived = False
         # just calculate elapsed time if start time has already been set (= command has been sent)
         else:
             self._checkForTimeout()
 
     def __sendAndReceiveFirstPacket(self):
         self._checkQueueEntry(self._tcQueue.pop())
-        if self.__queueEntryIsTelecommand:
+        if self._queueEntryIsTelecommand:
             self._comInterface.sendTelecommand(self.pusPacket, self.pusPacketInfo)
         else:
             self.__sendAndReceiveFirstPacket()
 
     def __sendNextTelecommand(self):
         self._checkQueueEntry(self._tcQueue.pop())
-        if self.__queueEntryIsTelecommand:
-            self.__start_time = time.time()
+        if self._queueEntryIsTelecommand:
+            self._start_time = time.time()
             self._comInterface.sendTelecommand(self.pusPacket, self.pusPacketInfo)
         elif self._tcQueue.__len__() == 0:
             # Special case: Last queue entry is not a Telecommand
diff --git a/sendreceive/OBSW_TmListener.py b/sendreceive/OBSW_TmListener.py
index bd8c4f85a52cb002939414b9c4a9729afbf672de..e018c8bec0e10c56bb47614b4b32456a16f7d763 100644
--- a/sendreceive/OBSW_TmListener.py
+++ b/sendreceive/OBSW_TmListener.py
@@ -68,7 +68,7 @@ class TmListener:
             while not self.modeOpFinished.is_set():
                 self.performModeOperation()
             self.modeOpFinished.clear()
-            print("Transitioning to listener mode")
+            print("Transitioning to listener mode.")
             self.modeId = g.ModeList.ListenerMode
 
     def performModeOperation(self):