diff --git a/Tools/message_id.py b/Tools/uorb_rtps_message_ids.py
similarity index 100%
rename from Tools/message_id.py
rename to Tools/uorb_rtps_message_ids.py
diff --git a/msg/templates/uorb/microRTPS_client.cpp.template b/msg/templates/uorb/microRTPS_client.cpp.template
index 5674a439af..e6551c4a55 100644
--- a/msg/templates/uorb/microRTPS_client.cpp.template
+++ b/msg/templates/uorb/microRTPS_client.cpp.template
@@ -14,7 +14,7 @@ import genmsg.msgs
 import gencpp
 from px_generate_uorb_topic_helper import * # this is in Tools/
 from px_generate_uorb_topic_files import MsgScope # this is in Tools/
-from message_id import * # this is in Tools/
+from uorb_rtps_message_ids import * # this is in Tools/
 
 topic_names = [single_spec.short_name for single_spec in spec]
 send_topics = [s.short_name for idx, s in enumerate(spec) if scope[idx] == MsgScope.SEND]
diff --git a/msg/templates/urtps/RtpsTopics.cpp.template b/msg/templates/urtps/RtpsTopics.cpp.template
index cf063b6bf9..6f031a10c3 100644
--- a/msg/templates/urtps/RtpsTopics.cpp.template
+++ b/msg/templates/urtps/RtpsTopics.cpp.template
@@ -13,7 +13,7 @@ import genmsg.msgs
 import gencpp
 from px_generate_uorb_topic_helper import * # this is in Tools/
 from px_generate_uorb_topic_files import MsgScope # this is in Tools/
-from message_id import * # this is in Tools/
+from uorb_rtps_message_ids import * # this is in Tools/
 
 topic_names = [single_spec.short_name for single_spec in spec]
 send_topics = [s.short_name for idx, s in enumerate(spec) if scope[idx] == MsgScope.SEND]
diff --git a/msg/templates/urtps/RtpsTopics.h.template b/msg/templates/urtps/RtpsTopics.h.template
index 8ab03874fc..07dce5e6f7 100644
--- a/msg/templates/urtps/RtpsTopics.h.template
+++ b/msg/templates/urtps/RtpsTopics.h.template
@@ -13,7 +13,7 @@ import genmsg.msgs
 import gencpp
 from px_generate_uorb_topic_helper import * # this is in Tools/
 from px_generate_uorb_topic_files import MsgScope # this is in Tools/
-from message_id import * # this is in Tools/
+from uorb_rtps_message_ids import * # this is in Tools/
 
 topic_names = [single_spec.short_name for single_spec in spec]
 send_topics = [s.short_name for idx, s in enumerate(spec) if scope[idx] == MsgScope.SEND]
diff --git a/msg/templates/urtps/microRTPS_agent.cpp.template b/msg/templates/urtps/microRTPS_agent.cpp.template
index d951988340..af3fd609f3 100644
--- a/msg/templates/urtps/microRTPS_agent.cpp.template
+++ b/msg/templates/urtps/microRTPS_agent.cpp.template
@@ -14,7 +14,7 @@ import genmsg.msgs
 import gencpp
 from px_generate_uorb_topic_helper import * # this is in Tools/
 from px_generate_uorb_topic_files import MsgScope # this is in Tools/
-from message_id import * # this is in Tools/
+from uorb_rtps_message_ids import * # this is in Tools/
 
 topic_names = [single_spec.short_name for single_spec in spec]
 send_topics = [s.short_name for idx, s in enumerate(spec) if scope[idx] == MsgScope.SEND]