1 files changed, 9 insertions, 5 deletions
diff --git a/cast/common/channel/message_util.cc b/cast/common/channel/message_util.cc
index 77396abd..b4a7f9f6 100644
--- a/cast/common/channel/message_util.cc
+++ b/cast/common/channel/message_util.cc
@@ -4,10 +4,12 @@
 
 #include "cast/common/channel/message_util.h"
 
+namespace openscreen {
 namespace cast {
-namespace channel {
 namespace {
 
+using ::cast::channel::CastMessage;
+
 CastMessage MakeConnectionMessage(const std::string& source_id,
                                   const std::string& destination_id) {
   CastMessage connect_message;
@@ -25,7 +27,7 @@ CastMessage MakeSimpleUTF8Message(const std::string& namespace_,
   CastMessage message;
   message.set_protocol_version(kDefaultOutgoingMessageVersion);
   message.set_namespace_(namespace_);
-  message.set_payload_type(CastMessage_PayloadType_STRING);
+  message.set_payload_type(::cast::channel::CastMessage_PayloadType_STRING);
   message.set_payload_utf8(std::move(payload));
   return message;
 }
@@ -34,7 +36,8 @@ CastMessage MakeConnectMessage(const std::string& source_id,
                                const std::string& destination_id) {
   CastMessage connect_message =
       MakeConnectionMessage(source_id, destination_id);
-  connect_message.set_payload_type(CastMessage_PayloadType_STRING);
+  connect_message.set_payload_type(
+      ::cast::channel::CastMessage_PayloadType_STRING);
   connect_message.set_payload_utf8(R"!({"type": "CONNECT"})!");
   return connect_message;
 }
@@ -42,10 +45,11 @@ CastMessage MakeConnectMessage(const std::string& source_id,
 CastMessage MakeCloseMessage(const std::string& source_id,
                              const std::string& destination_id) {
   CastMessage close_message = MakeConnectionMessage(source_id, destination_id);
-  close_message.set_payload_type(CastMessage_PayloadType_STRING);
+  close_message.set_payload_type(
+      ::cast::channel::CastMessage_PayloadType_STRING);
   close_message.set_payload_utf8(R"!({"type": "CLOSE"})!");
   return close_message;
 }
 
-}  // namespace channel
 }  // namespace cast
+}  // namespace openscreen