diff --git a/libuavcan/include/uavcan/internal/transport/transfer.hpp b/libuavcan/include/uavcan/internal/transport/transfer.hpp
index faf5904326..39712ffac8 100644
--- a/libuavcan/include/uavcan/internal/transport/transfer.hpp
+++ b/libuavcan/include/uavcan/internal/transport/transfer.hpp
@@ -20,10 +20,10 @@ enum NodeIDConstants
 
 enum TransferType
 {
-    SERVICE_RESPONSE  = 0,
-    SERVICE_REQUEST   = 1,
-    MESSAGE_BROADCAST = 2,
-    MESSAGE_UNICAST   = 3,
+    TRANSFER_TYPE_SERVICE_RESPONSE  = 0,
+    TRANSFER_TYPE_SERVICE_REQUEST   = 1,
+    TRANSFER_TYPE_MESSAGE_BROADCAST = 2,
+    TRANSFER_TYPE_MESSAGE_UNICAST   = 3,
     NUM_TRANSFER_TYPES = 4
 };
 
diff --git a/libuavcan/test/transport/transfer.cpp b/libuavcan/test/transport/transfer.cpp
index 66db6aad25..b5fcb5a5c0 100644
--- a/libuavcan/test/transport/transfer.cpp
+++ b/libuavcan/test/transport/transfer.cpp
@@ -156,12 +156,12 @@ TEST(Transfer, RxFrameParse)
 
     Frame frame;
     frame.data_type_id = 456;
-    frame.transfer_type = uavcan::MESSAGE_BROADCAST;
+    frame.transfer_type = uavcan::TRANSFER_TYPE_MESSAGE_BROADCAST;
     *static_cast<CanFrame*>(&can_rx_frame) = frame.compile();
 
     ASSERT_TRUE(rx_frame.parse(can_rx_frame));
     ASSERT_EQ(123, rx_frame.timestamp);
     ASSERT_EQ(2, rx_frame.iface_index);
     ASSERT_EQ(456, rx_frame.data_type_id);
-    ASSERT_EQ(uavcan::MESSAGE_BROADCAST, rx_frame.transfer_type);
+    ASSERT_EQ(uavcan::TRANSFER_TYPE_MESSAGE_BROADCAST, rx_frame.transfer_type);
 }