1 files changed, 5 insertions, 5 deletions

diff --git a/openxc.proto b/openxc.proto
index 3c0a51d4..3becaa5c 100644
--- a/openxc.proto
+++ b/openxc.proto
@@ -4,18 +4,18 @@ option java_package = "com.openxc";
 option java_outer_classname = "BinaryMessages";
 
 message VehicleMessage {
-    enum Type { RAW = 1; TRANSLATED = 2; DIAGNOSTIC = 3; CONTROL_COMMAND = 4;
+    enum Type { CAN = 1; SIMPLE = 2; DIAGNOSTIC = 3; CONTROL_COMMAND = 4;
             COMMAND_RESPONSE = 5; }
 
     optional Type type = 1;
-    optional RawMessage raw_message = 2;
-    optional TranslatedMessage translated_message = 3;
+    optional CanMessage can_message = 2;
+    optional SimpleMessage simple_message = 3;
     optional DiagnosticResponse diagnostic_response = 4;
     optional ControlCommand control_command = 5;
     optional CommandResponse command_response = 6;
 }
 
-message RawMessage {
+message CanMessage {
     enum FrameFormat {
         STANDARD = 1;
         EXTENDED = 2;
@@ -119,7 +119,7 @@ message DynamicField {
     optional bool boolean_value = 4;
 }
 
-message TranslatedMessage {
+message SimpleMessage {
     enum Type { STRING = 1; NUM = 2; BOOL = 3;
         EVENTED_STRING = 4; EVENTED_NUM = 5; EVENTED_BOOL = 6;}