diff --git a/llarp/CMakeLists.txt b/llarp/CMakeLists.txt
index 4d92f19f9..71ec659aa 100644
--- a/llarp/CMakeLists.txt
+++ b/llarp/CMakeLists.txt
@@ -204,10 +204,10 @@ set(LIB_SRC
   routing/handler.cpp
   routing/message_parser.cpp
   routing/message.cpp
-  routing/path_confirm.cpp
-  routing/path_latency.cpp
-  routing/path_transfer.cpp
-  routing/transfer_traffic.cpp
+  routing/path_confirm_message.cpp
+  routing/path_latency_message.cpp
+  routing/path_transfer_message.cpp
+  routing/transfer_traffic_message.cpp
   rpc/rpc.cpp
   service/address.cpp
   service/async_key_exchange.cpp
diff --git a/llarp/exit/session.hpp b/llarp/exit/session.hpp
index c974e468c..058484d00 100644
--- a/llarp/exit/session.hpp
+++ b/llarp/exit/session.hpp
@@ -4,7 +4,7 @@
 #include <exit/exit_messages.hpp>
 #include <net/ip.hpp>
 #include <path/pathbuilder.hpp>
-#include <routing/transfer_traffic.hpp>
+#include <routing/transfer_traffic_message.hpp>
 
 #include <deque>
 #include <queue>
diff --git a/llarp/messages/relay_commit.cpp b/llarp/messages/relay_commit.cpp
index 320fbb50e..1feb99c12 100644
--- a/llarp/messages/relay_commit.cpp
+++ b/llarp/messages/relay_commit.cpp
@@ -5,7 +5,7 @@
 #include <path/path_context.hpp>
 #include <path/transit_hop.hpp>
 #include <router/abstractrouter.hpp>
-#include <routing/path_confirm.hpp>
+#include <routing/path_confirm_message.hpp>
 #include <util/bencode.hpp>
 #include <util/buffer.hpp>
 #include <util/logger.hpp>
diff --git a/llarp/path/path.cpp b/llarp/path/path.cpp
index 91abfaa24..4f93c6577 100644
--- a/llarp/path/path.cpp
+++ b/llarp/path/path.cpp
@@ -8,8 +8,8 @@
 #include <profiling.hpp>
 #include <router/abstractrouter.hpp>
 #include <routing/dht_message.hpp>
-#include <routing/path_latency.hpp>
-#include <routing/transfer_traffic.hpp>
+#include <routing/path_latency_message.hpp>
+#include <routing/transfer_traffic_message.hpp>
 #include <util/buffer.hpp>
 #include <util/endian.hpp>
 
diff --git a/llarp/path/transit_hop.cpp b/llarp/path/transit_hop.cpp
index bed3973ca..8a8a82ff3 100644
--- a/llarp/path/transit_hop.cpp
+++ b/llarp/path/transit_hop.cpp
@@ -8,8 +8,8 @@
 #include <path/path_context.hpp>
 #include <path/transit_hop.hpp>
 #include <router/abstractrouter.hpp>
-#include <routing/path_latency.hpp>
-#include <routing/path_transfer.hpp>
+#include <routing/path_latency_message.hpp>
+#include <routing/path_transfer_message.hpp>
 #include <routing/handler.hpp>
 #include <util/buffer.hpp>
 #include <util/endian.hpp>
diff --git a/llarp/routing/message_parser.cpp b/llarp/routing/message_parser.cpp
index 47aa38045..8825f14c5 100644
--- a/llarp/routing/message_parser.cpp
+++ b/llarp/routing/message_parser.cpp
@@ -4,10 +4,10 @@
 #include <messages/discard.hpp>
 #include <path/path_types.hpp>
 #include <routing/dht_message.hpp>
-#include <routing/path_confirm.hpp>
-#include <routing/path_latency.hpp>
-#include <routing/path_transfer.hpp>
-#include <routing/transfer_traffic.hpp>
+#include <routing/path_confirm_message.hpp>
+#include <routing/path_latency_message.hpp>
+#include <routing/path_transfer_message.hpp>
+#include <routing/transfer_traffic_message.hpp>
 #include <util/mem.hpp>
 
 namespace llarp
diff --git a/llarp/routing/path_confirm.cpp b/llarp/routing/path_confirm_message.cpp
similarity index 97%
rename from llarp/routing/path_confirm.cpp
rename to llarp/routing/path_confirm_message.cpp
index b020f061a..8d824b1cb 100644
--- a/llarp/routing/path_confirm.cpp
+++ b/llarp/routing/path_confirm_message.cpp
@@ -1,4 +1,4 @@
-#include <routing/path_confirm.hpp>
+#include <routing/path_confirm_message.hpp>
 
 #include <routing/handler.hpp>
 #include <util/bencode.hpp>
diff --git a/llarp/routing/path_confirm.hpp b/llarp/routing/path_confirm_message.hpp
similarity index 100%
rename from llarp/routing/path_confirm.hpp
rename to llarp/routing/path_confirm_message.hpp
diff --git a/llarp/routing/path_latency.cpp b/llarp/routing/path_latency_message.cpp
similarity index 96%
rename from llarp/routing/path_latency.cpp
rename to llarp/routing/path_latency_message.cpp
index 54975e1c5..5d8d51a08 100644
--- a/llarp/routing/path_latency.cpp
+++ b/llarp/routing/path_latency_message.cpp
@@ -1,4 +1,4 @@
-#include <routing/path_latency.hpp>
+#include <routing/path_latency_message.hpp>
 
 #include <routing/handler.hpp>
 #include <util/bencode.hpp>
diff --git a/llarp/routing/path_latency.hpp b/llarp/routing/path_latency_message.hpp
similarity index 100%
rename from llarp/routing/path_latency.hpp
rename to llarp/routing/path_latency_message.hpp
diff --git a/llarp/routing/path_transfer.cpp b/llarp/routing/path_transfer_message.cpp
similarity index 97%
rename from llarp/routing/path_transfer.cpp
rename to llarp/routing/path_transfer_message.cpp
index ff718f4c5..3d131c24b 100644
--- a/llarp/routing/path_transfer.cpp
+++ b/llarp/routing/path_transfer_message.cpp
@@ -1,4 +1,4 @@
-#include <routing/path_transfer.hpp>
+#include <routing/path_transfer_message.hpp>
 
 #include <routing/handler.hpp>
 #include <util/buffer.hpp>
diff --git a/llarp/routing/path_transfer.hpp b/llarp/routing/path_transfer_message.hpp
similarity index 100%
rename from llarp/routing/path_transfer.hpp
rename to llarp/routing/path_transfer_message.hpp
diff --git a/llarp/routing/transfer_traffic.cpp b/llarp/routing/transfer_traffic_message.cpp
similarity index 97%
rename from llarp/routing/transfer_traffic.cpp
rename to llarp/routing/transfer_traffic_message.cpp
index 7d29f85ad..a7a26cf99 100644
--- a/llarp/routing/transfer_traffic.cpp
+++ b/llarp/routing/transfer_traffic_message.cpp
@@ -1,4 +1,4 @@
-#include <routing/transfer_traffic.hpp>
+#include <routing/transfer_traffic_message.hpp>
 
 #include <routing/handler.hpp>
 #include <util/bencode.hpp>
diff --git a/llarp/routing/transfer_traffic.hpp b/llarp/routing/transfer_traffic_message.hpp
similarity index 100%
rename from llarp/routing/transfer_traffic.hpp
rename to llarp/routing/transfer_traffic_message.hpp
diff --git a/llarp/service/endpoint.cpp b/llarp/service/endpoint.cpp
index 059dd5974..d16090fdc 100644
--- a/llarp/service/endpoint.cpp
+++ b/llarp/service/endpoint.cpp
@@ -9,7 +9,7 @@
 #include <profiling.hpp>
 #include <router/abstractrouter.hpp>
 #include <routing/dht_message.hpp>
-#include <routing/path_transfer.hpp>
+#include <routing/path_transfer_message.hpp>
 #include <service/endpoint_util.hpp>
 #include <service/hidden_service_address_lookup.hpp>
 #include <service/outbound_context.hpp>
@@ -1160,18 +1160,18 @@ namespace llarp
       }
       m_PendingTraffic[remote].emplace_back(data, t);
       // no converstation
-      return EnsurePathToService(remote,
-                                 [&](Address r, OutboundContext* c) {
-                                   if(c)
-                                   {
-                                     c->UpdateIntroSet(true);
-                                     for(auto& pending : m_PendingTraffic[r])
-                                       c->AsyncEncryptAndSendTo(
-                                           pending.Buffer(), pending.protocol);
-                                   }
-                                   m_PendingTraffic.erase(r);
-                                 },
-                                 5000, true);
+      return EnsurePathToService(
+          remote,
+          [&](Address r, OutboundContext* c) {
+            if(c)
+            {
+              c->UpdateIntroSet(true);
+              for(auto& pending : m_PendingTraffic[r])
+                c->AsyncEncryptAndSendTo(pending.Buffer(), pending.protocol);
+            }
+            m_PendingTraffic.erase(r);
+          },
+          5000, true);
     }
 
     void
diff --git a/llarp/service/sendcontext.cpp b/llarp/service/sendcontext.cpp
index fe1134d98..f717d187a 100644
--- a/llarp/service/sendcontext.cpp
+++ b/llarp/service/sendcontext.cpp
@@ -1,7 +1,7 @@
 #include <service/sendcontext.hpp>
 
 #include <router/abstractrouter.hpp>
-#include <routing/path_transfer.hpp>
+#include <routing/path_transfer_message.hpp>
 #include <service/endpoint.hpp>
 #include <util/logic.hpp>
 
diff --git a/llarp/service/sendcontext.hpp b/llarp/service/sendcontext.hpp
index 3d87e0c14..d289c5640 100644
--- a/llarp/service/sendcontext.hpp
+++ b/llarp/service/sendcontext.hpp
@@ -2,7 +2,7 @@
 #define LLARP_SERVICE_SENDCONTEXT_HPP
 
 #include <path/pathset.hpp>
-#include <routing/path_transfer.hpp>
+#include <routing/path_transfer_message.hpp>
 #include <service/intro.hpp>
 #include <service/protocol.hpp>
 #include <util/buffer.hpp>
diff --git a/test/routing/llarp_routing_transfer_traffic.cpp b/test/routing/llarp_routing_transfer_traffic.cpp
index 5a9bd97da..3e70494a0 100644
--- a/test/routing/llarp_routing_transfer_traffic.cpp
+++ b/test/routing/llarp_routing_transfer_traffic.cpp
@@ -1,5 +1,5 @@
 #include <gtest/gtest.h>
-#include <routing/transfer_traffic.hpp>
+#include <routing/transfer_traffic_message.hpp>
 
 using TransferTrafficMessage = llarp::routing::TransferTrafficMessage;