Index: HemodialysisDevice.py
===================================================================
diff -u -r227fad421dde9339458aa8e5826be4807599038a -rf2b88894a458d9e03a9cb005af02ef16fd5e6f32
--- HemodialysisDevice.py	(.../HemodialysisDevice.py)	(revision 227fad421dde9339458aa8e5826be4807599038a)
+++ HemodialysisDevice.py	(.../HemodialysisDevice.py)	(revision f2b88894a458d9e03a9cb005af02ef16fd5e6f32)
@@ -14,8 +14,8 @@
 #
 ############################################################################
 
-from DialityCoreCanProtocol import DialityCanMessenger
-from DialityCoreCanProtocol import DialityPacket
+from DialityCoreCanProtocol import DialinCanMessenger
+from DialityCoreCanProtocol import DialinMessage
 from time import sleep
 from binascii import unhexlify
 import struct
@@ -43,7 +43,7 @@
                 hd_object = HD('can0')
         """
         # Create listener
-        self.can_interface = DialityCanMessenger(can_interface=can__interface)
+        self.can_interface = DialinCanMessenger(can_interface=can__interface)
         self.can_interface.start()
         # Create command groups
         self._Basics = HD.HD__Basics(self)
@@ -86,7 +86,7 @@
             request_id = 0x8000
             cargo = b'123'
 
-            message = DialityPacket.buildPacket(request_id=request_id, cargo=cargo)
+            message = DialinMessage.buildMessage(message_id=request_id, payload=cargo)
 
             print("login")
 
@@ -117,7 +117,7 @@
             request_id = 0x8001
             cargo = msg
 
-            message = DialityPacket.buildPacket(request_id=request_id, cargo=cargo)
+            message = DialinMessage.buildMessage(message_id=request_id, payload=cargo)
 
             print("insert HD message")
 
@@ -172,7 +172,7 @@
             sta = self.outer_instance.integer2ByteArray(state)
             cargo = rst + sta
 
-            message = DialityPacket.buildPacket(request_id=request_id, cargo=cargo)
+            message = DialinMessage.buildMessage(message_id=request_id, payload=cargo)
 
             print("override off button")
 
@@ -211,7 +211,7 @@
             sta = self.outer_instance.integer2ByteArray(state)
             cargo = rst + sta
 
-            message = DialityPacket.buildPacket(request_id=request_id, cargo=cargo)
+            message = DialinMessage.buildMessage(message_id=request_id, payload=cargo)
 
             print("override stop button")
 
@@ -270,7 +270,7 @@
             tsk = self.outer_instance.integer2ByteArray(task)
             cargo = rst + sta + tsk
 
-            message = DialityPacket.buildPacket(request_id=request_id, cargo=cargo)
+            message = DialinMessage.buildMessage(message_id=request_id, payload=cargo)
 
             print("override watchdog task check-in state")
 
@@ -327,7 +327,7 @@
             alm = self.outer_instance.integer2ByteArray(alarm)
             cargo = rst + sta + alm
 
-            message = DialityPacket.buildPacket(request_id=request_id, cargo=cargo)
+            message = DialinMessage.buildMessage(message_id=request_id, payload=cargo)
 
             print("override alarm state")
 
@@ -368,7 +368,7 @@
             alm = self.outer_instance.integer2ByteArray(alarm)
             cargo = rst + ms + alm
 
-            message = DialityPacket.buildPacket(request_id=request_id, cargo=cargo)
+            message = DialinMessage.buildMessage(message_id=request_id, payload=cargo)
 
             print("override alarm time since activated")
 
@@ -416,7 +416,7 @@
             pat = self.__integer2ByteArray(pattern)
             cargo = rst + pat
 
-            message = DialityPacket.buildPacket(request_id=request_id, cargo=cargo)
+            message = DialinMessage.buildMessage(message_id=request_id, payload=cargo)
 
             print("override alarm lamp pattern")
 
@@ -465,7 +465,7 @@
             if can_interface is not None:
                 channel_id = 0x40
                 msg_id = 0x0005
-                can_interface.registerSyncFunction( channel_id, msg_id, self.handlerBloodFlowSyncFunction)
+                can_interface.registerReceivingPublicationFunction(channel_id, msg_id, self.handlerBloodFlowSyncFunction)
 
             self.TargetBloodFlowRate = 0
             self.MeasuredBloodFlowRate = 0.0
@@ -505,7 +505,7 @@
             flo = self.outer_instance.integer2ByteArray(flow)
             cargo = rst + flo
 
-            message = DialityPacket.buildPacket(request_id=request_id, cargo=cargo)
+            message = DialinMessage.buildMessage(message_id=request_id, payload=cargo)
 
             print("override blood flow set point")
 
@@ -544,7 +544,7 @@
             flo = self.outer_instance.integer2ByteArray(flow)
             cargo = rst + flo
 
-            message = DialityPacket.buildPacket(request_id=request_id, cargo=cargo)
+            message = DialinMessage.buildMessage(message_id=request_id, payload=cargo)
 
             print("override measured blood flow")
 
@@ -587,7 +587,7 @@
             spd = self.outer_instance.integer2ByteArray(speed)
             cargo = rst + spd
 
-            message = DialityPacket.buildPacket(request_id=request_id, cargo=cargo)
+            message = DialinMessage.buildMessage(message_id=request_id, payload=cargo)
 
             print("override measured blood pump speed")
 
@@ -626,7 +626,7 @@
             cur = self.outer_instance.integer2ByteArray(curr)
             cargo = rst + cur
 
-            message = DialityPacket.buildPacket(request_id=request_id, cargo=cargo)
+            message = DialinMessage.buildMessage(message_id=request_id, payload=cargo)
 
             print("override measured blood pump motor current")
 
@@ -665,7 +665,7 @@
             mis = self.outer_instance.integer2ByteArray(ms)
             cargo = rst + mis
 
-            message = DialityPacket.buildPacket(request_id=request_id, cargo=cargo)
+            message = DialinMessage.buildMessage(message_id=request_id, payload=cargo)
 
             print("override blood flow broadcast interval")