diff --git a/mapping_rules.yaml b/mapping_rules.yaml
index c0855264170f6400e3c57e370bf805cfb73e4337..c95330cbea0aae6a6383cb70d4ba413906ef5be5 100644
--- a/mapping_rules.yaml
+++ b/mapping_rules.yaml
@@ -3,6 +3,4 @@
 
 -
   ros1_package_name: 'lrs_msgs_tst'
-  ros1_message_name: 'TSTNodeStatus'
   ros2_package_name: 'lrs_msgs_tst'
-  ros2_message_name: 'TSTNodeStatus'
\ No newline at end of file
diff --git a/msg/TSTDistributeTreeInfo.msg b/msg/TSTDistributeTreeInfo.msg
index 733d43db1a0fde38fc5f2b8247e452438b3b40e0..e01364daad41feae8767a49bffed7ade5daee4b6 100644
--- a/msg/TSTDistributeTreeInfo.msg
+++ b/msg/TSTDistributeTreeInfo.msg
@@ -1,8 +1,7 @@
+string msg_uuid     # uuid for message receive confirmation, used by communication manager.
 string[] units      # List of units to distribute to.
                     # If empty distribute to everybody in possible units
 
-int32 id            # The id of the tree to distribute
-
 string confirm_uuid # Use this uuid for confirmation that the tree have been distributed
                     # If the string is empty no confirmation is sent.
 
diff --git a/msg/TSTUpdateNodeInfo.msg b/msg/TSTUpdateNodeInfo.msg
index 478521ece799ace87e00e9159bc2eb6502f99ccd..75de223781dc08a52f60c2a470dba984553524c8 100644
--- a/msg/TSTUpdateNodeInfo.msg
+++ b/msg/TSTUpdateNodeInfo.msg
@@ -5,6 +5,7 @@
 # Also used in service calls to tst factory.
 #
 
+string msg_uuid     # uuid for message receive confirmation, used by communication manager.
 string sender		# Namespace for the sender of the update
 string group
 string node_uuid	# uuid for the node. Used to find node to update.
diff --git a/package.xml b/package.xml
index 0c099ece348c2732e6db98672337143cf9a7bb22..02a9201d0706ae13fe479ba5308b837c102ca157 100644
--- a/package.xml
+++ b/package.xml
@@ -22,5 +22,6 @@
 
   <export>
     <build_type>ament_cmake</build_type>
+    <ros1_bridge mapping_rules="mapping_rules.yaml"/>
   </export>
 </package>