diff -r 2f415213299e -r cce1a27d4325 src/cpu/testers/traffic_gen/generators.cc
--- a/src/cpu/testers/traffic_gen/generators.cc	Thu Aug 28 12:58:26 2014 -0500
+++ b/src/cpu/testers/traffic_gen/generators.cc	Thu Aug 28 13:03:37 2014 -0500
@@ -301,7 +301,7 @@
 TraceGen::InputStream::init()
 {
     // Create a protobuf message for the header and read it from the stream
-    Message::PacketHeader header_msg;
+    ProtoMessage::PacketHeader header_msg;
     if (!trace.read(header_msg)) {
         panic("Failed to read packet header from trace\n");
 
@@ -322,7 +322,7 @@
 bool
 TraceGen::InputStream::read(TraceElement& element)
 {
-    Message::Packet pkt_msg;
+    ProtoMessage::Packet pkt_msg;
     if (trace.read(pkt_msg)) {
         element.cmd = pkt_msg.cmd();
         element.addr = pkt_msg.addr();
diff -r 2f415213299e -r cce1a27d4325 src/mem/comm_monitor.cc
--- a/src/mem/comm_monitor.cc	Thu Aug 28 12:58:26 2014 -0500
+++ b/src/mem/comm_monitor.cc	Thu Aug 28 13:03:37 2014 -0500
@@ -84,7 +84,7 @@
 
         // Create a protobuf message for the header and write it to
         // the stream
-        Message::PacketHeader header_msg;
+        ProtoMessage::PacketHeader header_msg;
         header_msg.set_obj_id(name());
         header_msg.set_tick_freq(SimClock::Frequency);
         traceStream->write(header_msg);
@@ -214,7 +214,7 @@
         // Create a protobuf message representing the
         // packet. Currently we do not preserve the flags in the
         // trace.
-        Message::Packet pkt_msg;
+        ProtoMessage::Packet pkt_msg;
         pkt_msg.set_tick(curTick());
         pkt_msg.set_cmd(cmd);
         pkt_msg.set_flags(req_flags);
diff -r 2f415213299e -r cce1a27d4325 src/proto/packet.proto
--- a/src/proto/packet.proto	Thu Aug 28 12:58:26 2014 -0500
+++ b/src/proto/packet.proto	Thu Aug 28 13:03:37 2014 -0500
@@ -36,7 +36,7 @@
 // Authors: Andreas Hansson
 
 // Put all the generated messages in a namespace
-package Message;
+package ProtoMessage;
 
 // Packet header with the identifier describing what object captured
 // the trace, the version of this file format, and the tick frequency