Fix package name of generated protobuf objects.

6 files changed, 167 insertions, 160 deletions

diff --git a/gen/cpp/openxc.pb b/gen/cpp/openxc.pb
index 27548ab6..d4356e1c 100644
--- a/gen/cpp/openxc.pb
+++ b/gen/cpp/openxc.pb
@@ -1,5 +1,5 @@
 
-Â
+à
 openxc.protoopenxc"¼

 VehicleMessage)
 type
 
(2.openxc.VehicleMessage.Type'
@@ -22,4 +22,6 @@ message_id 
(

 
boolean_value 
(
 string_event 
(	
 numerical_event 
(

-
boolean_event 
(
\ No newline at end of file
+
boolean_event 
(B
+
+com.openxcBBinaryMessages
\ No newline at end of file
diff --git a/gen/cpp/openxc.pb.c b/gen/cpp/openxc.pb.c
index 5fb7d1cb..91667bf3 100644
--- a/gen/cpp/openxc.pb.c
+++ b/gen/cpp/openxc.pb.c
@@ -1,5 +1,5 @@
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.2.4-dev at Sat Oct  5 16:25:23 2013. */
+/* Generated by nanopb-0.2.4-dev at Wed Oct  9 14:26:13 2013. */
 
 #include "openxc.pb.h"
 
diff --git a/gen/cpp/openxc.pb.h b/gen/cpp/openxc.pb.h
index f4ec09c5..d278c681 100644
--- a/gen/cpp/openxc.pb.h
+++ b/gen/cpp/openxc.pb.h
@@ -1,5 +1,5 @@
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.2.4-dev at Sat Oct  5 16:25:23 2013. */
+/* Generated by nanopb-0.2.4-dev at Wed Oct  9 14:26:13 2013. */
 
 #ifndef _PB_OPENXC_PB_H_
 #define _PB_OPENXC_PB_H_
diff --git a/gen/java/openxc/Openxc.java b/gen/java/com/openxc/BinaryMessages.java
index 3e1ceba7..7410c63e 100644
--- a/gen/java/openxc/Openxc.java
+++ b/gen/java/com/openxc/BinaryMessages.java
@@ -1,10 +1,10 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: openxc.proto
 
-package openxc;
+package com.openxc;
 
-public final class Openxc {
-  private Openxc() {}
+public final class BinaryMessages {
+  private BinaryMessages() {}
   public static void registerAllExtensions(
       com.google.protobuf.ExtensionRegistry registry) {
   }
@@ -19,7 +19,7 @@ public final class Openxc {
     /**
      * <code>optional .openxc.VehicleMessage.Type type = 1;</code>
      */
-    openxc.Openxc.VehicleMessage.Type getType();
+    com.openxc.BinaryMessages.VehicleMessage.Type getType();
 
     // optional .openxc.RawMessage raw_message = 2;
     /**
@@ -29,11 +29,11 @@ public final class Openxc {
     /**
      * <code>optional .openxc.RawMessage raw_message = 2;</code>
      */
-    openxc.Openxc.RawMessage getRawMessage();
+    com.openxc.BinaryMessages.RawMessage getRawMessage();
     /**
      * <code>optional .openxc.RawMessage raw_message = 2;</code>
      */
-    openxc.Openxc.RawMessageOrBuilder getRawMessageOrBuilder();
+    com.openxc.BinaryMessages.RawMessageOrBuilder getRawMessageOrBuilder();
 
     // optional .openxc.TranslatedMessage translated_message = 3;
     /**
@@ -43,11 +43,11 @@ public final class Openxc {
     /**
      * <code>optional .openxc.TranslatedMessage translated_message = 3;</code>
      */
-    openxc.Openxc.TranslatedMessage getTranslatedMessage();
+    com.openxc.BinaryMessages.TranslatedMessage getTranslatedMessage();
     /**
      * <code>optional .openxc.TranslatedMessage translated_message = 3;</code>
      */
-    openxc.Openxc.TranslatedMessageOrBuilder getTranslatedMessageOrBuilder();
+    com.openxc.BinaryMessages.TranslatedMessageOrBuilder getTranslatedMessageOrBuilder();
   }
   /**
    * Protobuf type {@code openxc.VehicleMessage}
@@ -102,7 +102,7 @@ public final class Openxc {
             }
             case 8: {
               int rawValue = input.readEnum();
-              openxc.Openxc.VehicleMessage.Type value = openxc.Openxc.VehicleMessage.Type.valueOf(rawValue);
+              com.openxc.BinaryMessages.VehicleMessage.Type value = com.openxc.BinaryMessages.VehicleMessage.Type.valueOf(rawValue);
               if (value == null) {
                 unknownFields.mergeVarintField(1, rawValue);
               } else {
@@ -112,11 +112,11 @@ public final class Openxc {
               break;
             }
             case 18: {
-              openxc.Openxc.RawMessage.Builder subBuilder = null;
+              com.openxc.BinaryMessages.RawMessage.Builder subBuilder = null;
               if (((bitField0_ & 0x00000002) == 0x00000002)) {
                 subBuilder = rawMessage_.toBuilder();
               }
-              rawMessage_ = input.readMessage(openxc.Openxc.RawMessage.PARSER, extensionRegistry);
+              rawMessage_ = input.readMessage(com.openxc.BinaryMessages.RawMessage.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(rawMessage_);
                 rawMessage_ = subBuilder.buildPartial();
@@ -125,11 +125,11 @@ public final class Openxc {
               break;
             }
             case 26: {
-              openxc.Openxc.TranslatedMessage.Builder subBuilder = null;
+              com.openxc.BinaryMessages.TranslatedMessage.Builder subBuilder = null;
               if (((bitField0_ & 0x00000004) == 0x00000004)) {
                 subBuilder = translatedMessage_.toBuilder();
               }
-              translatedMessage_ = input.readMessage(openxc.Openxc.TranslatedMessage.PARSER, extensionRegistry);
+              translatedMessage_ = input.readMessage(com.openxc.BinaryMessages.TranslatedMessage.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(translatedMessage_);
                 translatedMessage_ = subBuilder.buildPartial();
@@ -151,14 +151,14 @@ public final class Openxc {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return openxc.Openxc.internal_static_openxc_VehicleMessage_descriptor;
+      return com.openxc.BinaryMessages.internal_static_openxc_VehicleMessage_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return openxc.Openxc.internal_static_openxc_VehicleMessage_fieldAccessorTable
+      return com.openxc.BinaryMessages.internal_static_openxc_VehicleMessage_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              openxc.Openxc.VehicleMessage.class, openxc.Openxc.VehicleMessage.Builder.class);
+              com.openxc.BinaryMessages.VehicleMessage.class, com.openxc.BinaryMessages.VehicleMessage.Builder.class);
     }
 
     public static com.google.protobuf.Parser<VehicleMessage> PARSER =
@@ -233,7 +233,7 @@ public final class Openxc {
       }
       public static final com.google.protobuf.Descriptors.EnumDescriptor
           getDescriptor() {
-        return openxc.Openxc.VehicleMessage.getDescriptor().getEnumTypes().get(0);
+        return com.openxc.BinaryMessages.VehicleMessage.getDescriptor().getEnumTypes().get(0);
       }
 
       private static final Type[] VALUES = values();
@@ -261,7 +261,7 @@ public final class Openxc {
     private int bitField0_;
     // optional .openxc.VehicleMessage.Type type = 1;
     public static final int TYPE_FIELD_NUMBER = 1;
-    private openxc.Openxc.VehicleMessage.Type type_;
+    private com.openxc.BinaryMessages.VehicleMessage.Type type_;
     /**
      * <code>optional .openxc.VehicleMessage.Type type = 1;</code>
      */
@@ -271,13 +271,13 @@ public final class Openxc {
     /**
      * <code>optional .openxc.VehicleMessage.Type type = 1;</code>
      */
-    public openxc.Openxc.VehicleMessage.Type getType() {
+    public com.openxc.BinaryMessages.VehicleMessage.Type getType() {
       return type_;
     }
 
     // optional .openxc.RawMessage raw_message = 2;
     public static final int RAW_MESSAGE_FIELD_NUMBER = 2;
-    private openxc.Openxc.RawMessage rawMessage_;
+    private com.openxc.BinaryMessages.RawMessage rawMessage_;
     /**
      * <code>optional .openxc.RawMessage raw_message = 2;</code>
      */
@@ -287,19 +287,19 @@ public final class Openxc {
     /**
      * <code>optional .openxc.RawMessage raw_message = 2;</code>
      */
-    public openxc.Openxc.RawMessage getRawMessage() {
+    public com.openxc.BinaryMessages.RawMessage getRawMessage() {
       return rawMessage_;
     }
     /**
      * <code>optional .openxc.RawMessage raw_message = 2;</code>
      */
-    public openxc.Openxc.RawMessageOrBuilder getRawMessageOrBuilder() {
+    public com.openxc.BinaryMessages.RawMessageOrBuilder getRawMessageOrBuilder() {
       return rawMessage_;
     }
 
     // optional .openxc.TranslatedMessage translated_message = 3;
     public static final int TRANSLATED_MESSAGE_FIELD_NUMBER = 3;
-    private openxc.Openxc.TranslatedMessage translatedMessage_;
+    private com.openxc.BinaryMessages.TranslatedMessage translatedMessage_;
     /**
      * <code>optional .openxc.TranslatedMessage translated_message = 3;</code>
      */
@@ -309,20 +309,20 @@ public final class Openxc {
     /**
      * <code>optional .openxc.TranslatedMessage translated_message = 3;</code>
      */
-    public openxc.Openxc.TranslatedMessage getTranslatedMessage() {
+    public com.openxc.BinaryMessages.TranslatedMessage getTranslatedMessage() {
       return translatedMessage_;
     }
     /**
      * <code>optional .openxc.TranslatedMessage translated_message = 3;</code>
      */
-    public openxc.Openxc.TranslatedMessageOrBuilder getTranslatedMessageOrBuilder() {
+    public com.openxc.BinaryMessages.TranslatedMessageOrBuilder getTranslatedMessageOrBuilder() {
       return translatedMessage_;
     }
 
     private void initFields() {
-      type_ = openxc.Openxc.VehicleMessage.Type.RAW;
-      rawMessage_ = openxc.Openxc.RawMessage.getDefaultInstance();
-      translatedMessage_ = openxc.Openxc.TranslatedMessage.getDefaultInstance();
+      type_ = com.openxc.BinaryMessages.VehicleMessage.Type.RAW;
+      rawMessage_ = com.openxc.BinaryMessages.RawMessage.getDefaultInstance();
+      translatedMessage_ = com.openxc.BinaryMessages.TranslatedMessage.getDefaultInstance();
     }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
@@ -378,53 +378,53 @@ public final class Openxc {
       return super.writeReplace();
     }
 
-    public static openxc.Openxc.VehicleMessage parseFrom(
+    public static com.openxc.BinaryMessages.VehicleMessage parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static openxc.Openxc.VehicleMessage parseFrom(
+    public static com.openxc.BinaryMessages.VehicleMessage parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static openxc.Openxc.VehicleMessage parseFrom(byte[] data)
+    public static com.openxc.BinaryMessages.VehicleMessage parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static openxc.Openxc.VehicleMessage parseFrom(
+    public static com.openxc.BinaryMessages.VehicleMessage parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static openxc.Openxc.VehicleMessage parseFrom(java.io.InputStream input)
+    public static com.openxc.BinaryMessages.VehicleMessage parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static openxc.Openxc.VehicleMessage parseFrom(
+    public static com.openxc.BinaryMessages.VehicleMessage parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
-    public static openxc.Openxc.VehicleMessage parseDelimitedFrom(java.io.InputStream input)
+    public static com.openxc.BinaryMessages.VehicleMessage parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static openxc.Openxc.VehicleMessage parseDelimitedFrom(
+    public static com.openxc.BinaryMessages.VehicleMessage parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
-    public static openxc.Openxc.VehicleMessage parseFrom(
+    public static com.openxc.BinaryMessages.VehicleMessage parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static openxc.Openxc.VehicleMessage parseFrom(
+    public static com.openxc.BinaryMessages.VehicleMessage parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -433,7 +433,7 @@ public final class Openxc {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(openxc.Openxc.VehicleMessage prototype) {
+    public static Builder newBuilder(com.openxc.BinaryMessages.VehicleMessage prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
@@ -449,20 +449,20 @@ public final class Openxc {
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder>
-       implements openxc.Openxc.VehicleMessageOrBuilder {
+       implements com.openxc.BinaryMessages.VehicleMessageOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return openxc.Openxc.internal_static_openxc_VehicleMessage_descriptor;
+        return com.openxc.BinaryMessages.internal_static_openxc_VehicleMessage_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return openxc.Openxc.internal_static_openxc_VehicleMessage_fieldAccessorTable
+        return com.openxc.BinaryMessages.internal_static_openxc_VehicleMessage_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                openxc.Openxc.VehicleMessage.class, openxc.Openxc.VehicleMessage.Builder.class);
+                com.openxc.BinaryMessages.VehicleMessage.class, com.openxc.BinaryMessages.VehicleMessage.Builder.class);
       }
 
-      // Construct using openxc.Openxc.VehicleMessage.newBuilder()
+      // Construct using com.openxc.BinaryMessages.VehicleMessage.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -484,16 +484,16 @@ public final class Openxc {
 
       public Builder clear() {
         super.clear();
-        type_ = openxc.Openxc.VehicleMessage.Type.RAW;
+        type_ = com.openxc.BinaryMessages.VehicleMessage.Type.RAW;
         bitField0_ = (bitField0_ & ~0x00000001);
         if (rawMessageBuilder_ == null) {
-          rawMessage_ = openxc.Openxc.RawMessage.getDefaultInstance();
+          rawMessage_ = com.openxc.BinaryMessages.RawMessage.getDefaultInstance();
         } else {
           rawMessageBuilder_.clear();
         }
         bitField0_ = (bitField0_ & ~0x00000002);
         if (translatedMessageBuilder_ == null) {
-          translatedMessage_ = openxc.Openxc.TranslatedMessage.getDefaultInstance();
+          translatedMessage_ = com.openxc.BinaryMessages.TranslatedMessage.getDefaultInstance();
         } else {
           translatedMessageBuilder_.clear();
         }
@@ -507,23 +507,23 @@ public final class Openxc {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return openxc.Openxc.internal_static_openxc_VehicleMessage_descriptor;
+        return com.openxc.BinaryMessages.internal_static_openxc_VehicleMessage_descriptor;
       }
 
-      public openxc.Openxc.VehicleMessage getDefaultInstanceForType() {
-        return openxc.Openxc.VehicleMessage.getDefaultInstance();
+      public com.openxc.BinaryMessages.VehicleMessage getDefaultInstanceForType() {
+        return com.openxc.BinaryMessages.VehicleMessage.getDefaultInstance();
       }
 
-      public openxc.Openxc.VehicleMessage build() {
-        openxc.Openxc.VehicleMessage result = buildPartial();
+      public com.openxc.BinaryMessages.VehicleMessage build() {
+        com.openxc.BinaryMessages.VehicleMessage result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public openxc.Openxc.VehicleMessage buildPartial() {
-        openxc.Openxc.VehicleMessage result = new openxc.Openxc.VehicleMessage(this);
+      public com.openxc.BinaryMessages.VehicleMessage buildPartial() {
+        com.openxc.BinaryMessages.VehicleMessage result = new com.openxc.BinaryMessages.VehicleMessage(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -552,16 +552,16 @@ public final class Openxc {
       }
 
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof openxc.Openxc.VehicleMessage) {
-          return mergeFrom((openxc.Openxc.VehicleMessage)other);
+        if (other instanceof com.openxc.BinaryMessages.VehicleMessage) {
+          return mergeFrom((com.openxc.BinaryMessages.VehicleMessage)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(openxc.Openxc.VehicleMessage other) {
-        if (other == openxc.Openxc.VehicleMessage.getDefaultInstance()) return this;
+      public Builder mergeFrom(com.openxc.BinaryMessages.VehicleMessage other) {
+        if (other == com.openxc.BinaryMessages.VehicleMessage.getDefaultInstance()) return this;
         if (other.hasType()) {
           setType(other.getType());
         }
@@ -583,11 +583,11 @@ public final class Openxc {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        openxc.Openxc.VehicleMessage parsedMessage = null;
+        com.openxc.BinaryMessages.VehicleMessage parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (openxc.Openxc.VehicleMessage) e.getUnfinishedMessage();
+          parsedMessage = (com.openxc.BinaryMessages.VehicleMessage) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -599,7 +599,7 @@ public final class Openxc {
       private int bitField0_;
 
       // optional .openxc.VehicleMessage.Type type = 1;
-      private openxc.Openxc.VehicleMessage.Type type_ = openxc.Openxc.VehicleMessage.Type.RAW;
+      private com.openxc.BinaryMessages.VehicleMessage.Type type_ = com.openxc.BinaryMessages.VehicleMessage.Type.RAW;
       /**
        * <code>optional .openxc.VehicleMessage.Type type = 1;</code>
        */
@@ -609,13 +609,13 @@ public final class Openxc {
       /**
        * <code>optional .openxc.VehicleMessage.Type type = 1;</code>
        */
-      public openxc.Openxc.VehicleMessage.Type getType() {
+      public com.openxc.BinaryMessages.VehicleMessage.Type getType() {
         return type_;
       }
       /**
        * <code>optional .openxc.VehicleMessage.Type type = 1;</code>
        */
-      public Builder setType(openxc.Openxc.VehicleMessage.Type value) {
+      public Builder setType(com.openxc.BinaryMessages.VehicleMessage.Type value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -629,15 +629,15 @@ public final class Openxc {
        */
       public Builder clearType() {
         bitField0_ = (bitField0_ & ~0x00000001);
-        type_ = openxc.Openxc.VehicleMessage.Type.RAW;
+        type_ = com.openxc.BinaryMessages.VehicleMessage.Type.RAW;
         onChanged();
         return this;
       }
 
       // optional .openxc.RawMessage raw_message = 2;
-      private openxc.Openxc.RawMessage rawMessage_ = openxc.Openxc.RawMessage.getDefaultInstance();
+      private com.openxc.BinaryMessages.RawMessage rawMessage_ = com.openxc.BinaryMessages.RawMessage.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
-          openxc.Openxc.RawMessage, openxc.Openxc.RawMessage.Builder, openxc.Openxc.RawMessageOrBuilder> rawMessageBuilder_;
+          com.openxc.BinaryMessages.RawMessage, com.openxc.BinaryMessages.RawMessage.Builder, com.openxc.BinaryMessages.RawMessageOrBuilder> rawMessageBuilder_;
       /**
        * <code>optional .openxc.RawMessage raw_message = 2;</code>
        */
@@ -647,7 +647,7 @@ public final class Openxc {
       /**
        * <code>optional .openxc.RawMessage raw_message = 2;</code>
        */
-      public openxc.Openxc.RawMessage getRawMessage() {
+      public com.openxc.BinaryMessages.RawMessage getRawMessage() {
         if (rawMessageBuilder_ == null) {
           return rawMessage_;
         } else {
@@ -657,7 +657,7 @@ public final class Openxc {
       /**
        * <code>optional .openxc.RawMessage raw_message = 2;</code>
        */
-      public Builder setRawMessage(openxc.Openxc.RawMessage value) {
+      public Builder setRawMessage(com.openxc.BinaryMessages.RawMessage value) {
         if (rawMessageBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -674,7 +674,7 @@ public final class Openxc {
        * <code>optional .openxc.RawMessage raw_message = 2;</code>
        */
       public Builder setRawMessage(
-          openxc.Openxc.RawMessage.Builder builderForValue) {
+          com.openxc.BinaryMessages.RawMessage.Builder builderForValue) {
         if (rawMessageBuilder_ == null) {
           rawMessage_ = builderForValue.build();
           onChanged();
@@ -687,12 +687,12 @@ public final class Openxc {
       /**
        * <code>optional .openxc.RawMessage raw_message = 2;</code>
        */
-      public Builder mergeRawMessage(openxc.Openxc.RawMessage value) {
+      public Builder mergeRawMessage(com.openxc.BinaryMessages.RawMessage value) {
         if (rawMessageBuilder_ == null) {
           if (((bitField0_ & 0x00000002) == 0x00000002) &&
-              rawMessage_ != openxc.Openxc.RawMessage.getDefaultInstance()) {
+              rawMessage_ != com.openxc.BinaryMessages.RawMessage.getDefaultInstance()) {
             rawMessage_ =
-              openxc.Openxc.RawMessage.newBuilder(rawMessage_).mergeFrom(value).buildPartial();
+              com.openxc.BinaryMessages.RawMessage.newBuilder(rawMessage_).mergeFrom(value).buildPartial();
           } else {
             rawMessage_ = value;
           }
@@ -708,7 +708,7 @@ public final class Openxc {
        */
       public Builder clearRawMessage() {
         if (rawMessageBuilder_ == null) {
-          rawMessage_ = openxc.Openxc.RawMessage.getDefaultInstance();
+          rawMessage_ = com.openxc.BinaryMessages.RawMessage.getDefaultInstance();
           onChanged();
         } else {
           rawMessageBuilder_.clear();
@@ -719,7 +719,7 @@ public final class Openxc {
       /**
        * <code>optional .openxc.RawMessage raw_message = 2;</code>
        */
-      public openxc.Openxc.RawMessage.Builder getRawMessageBuilder() {
+      public com.openxc.BinaryMessages.RawMessage.Builder getRawMessageBuilder() {
         bitField0_ |= 0x00000002;
         onChanged();
         return getRawMessageFieldBuilder().getBuilder();
@@ -727,7 +727,7 @@ public final class Openxc {
       /**
        * <code>optional .openxc.RawMessage raw_message = 2;</code>
        */
-      public openxc.Openxc.RawMessageOrBuilder getRawMessageOrBuilder() {
+      public com.openxc.BinaryMessages.RawMessageOrBuilder getRawMessageOrBuilder() {
         if (rawMessageBuilder_ != null) {
           return rawMessageBuilder_.getMessageOrBuilder();
         } else {
@@ -738,11 +738,11 @@ public final class Openxc {
        * <code>optional .openxc.RawMessage raw_message = 2;</code>
        */
       private com.google.protobuf.SingleFieldBuilder<
-          openxc.Openxc.RawMessage, openxc.Openxc.RawMessage.Builder, openxc.Openxc.RawMessageOrBuilder> 
+          com.openxc.BinaryMessages.RawMessage, com.openxc.BinaryMessages.RawMessage.Builder, com.openxc.BinaryMessages.RawMessageOrBuilder> 
           getRawMessageFieldBuilder() {
         if (rawMessageBuilder_ == null) {
           rawMessageBuilder_ = new com.google.protobuf.SingleFieldBuilder<
-              openxc.Openxc.RawMessage, openxc.Openxc.RawMessage.Builder, openxc.Openxc.RawMessageOrBuilder>(
+              com.openxc.BinaryMessages.RawMessage, com.openxc.BinaryMessages.RawMessage.Builder, com.openxc.BinaryMessages.RawMessageOrBuilder>(
                   rawMessage_,
                   getParentForChildren(),
                   isClean());
@@ -752,9 +752,9 @@ public final class Openxc {
       }
 
       // optional .openxc.TranslatedMessage translated_message = 3;
-      private openxc.Openxc.TranslatedMessage translatedMessage_ = openxc.Openxc.TranslatedMessage.getDefaultInstance();
+      private com.openxc.BinaryMessages.TranslatedMessage translatedMessage_ = com.openxc.BinaryMessages.TranslatedMessage.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
-          openxc.Openxc.TranslatedMessage, openxc.Openxc.TranslatedMessage.Builder, openxc.Openxc.TranslatedMessageOrBuilder> translatedMessageBuilder_;
+          com.openxc.BinaryMessages.TranslatedMessage, com.openxc.BinaryMessages.TranslatedMessage.Builder, com.openxc.BinaryMessages.TranslatedMessageOrBuilder> translatedMessageBuilder_;
       /**
        * <code>optional .openxc.TranslatedMessage translated_message = 3;</code>
        */
@@ -764,7 +764,7 @@ public final class Openxc {
       /**
        * <code>optional .openxc.TranslatedMessage translated_message = 3;</code>
        */
-      public openxc.Openxc.TranslatedMessage getTranslatedMessage() {
+      public com.openxc.BinaryMessages.TranslatedMessage getTranslatedMessage() {
         if (translatedMessageBuilder_ == null) {
           return translatedMessage_;
         } else {
@@ -774,7 +774,7 @@ public final class Openxc {
       /**
        * <code>optional .openxc.TranslatedMessage translated_message = 3;</code>
        */
-      public Builder setTranslatedMessage(openxc.Openxc.TranslatedMessage value) {
+      public Builder setTranslatedMessage(com.openxc.BinaryMessages.TranslatedMessage value) {
         if (translatedMessageBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -791,7 +791,7 @@ public final class Openxc {
        * <code>optional .openxc.TranslatedMessage translated_message = 3;</code>
        */
       public Builder setTranslatedMessage(
-          openxc.Openxc.TranslatedMessage.Builder builderForValue) {
+          com.openxc.BinaryMessages.TranslatedMessage.Builder builderForValue) {
         if (translatedMessageBuilder_ == null) {
           translatedMessage_ = builderForValue.build();
           onChanged();
@@ -804,12 +804,12 @@ public final class Openxc {
       /**
        * <code>optional .openxc.TranslatedMessage translated_message = 3;</code>
        */
-      public Builder mergeTranslatedMessage(openxc.Openxc.TranslatedMessage value) {
+      public Builder mergeTranslatedMessage(com.openxc.BinaryMessages.TranslatedMessage value) {
         if (translatedMessageBuilder_ == null) {
           if (((bitField0_ & 0x00000004) == 0x00000004) &&
-              translatedMessage_ != openxc.Openxc.TranslatedMessage.getDefaultInstance()) {
+              translatedMessage_ != com.openxc.BinaryMessages.TranslatedMessage.getDefaultInstance()) {
             translatedMessage_ =
-              openxc.Openxc.TranslatedMessage.newBuilder(translatedMessage_).mergeFrom(value).buildPartial();
+              com.openxc.BinaryMessages.TranslatedMessage.newBuilder(translatedMessage_).mergeFrom(value).buildPartial();
           } else {
             translatedMessage_ = value;
           }
@@ -825,7 +825,7 @@ public final class Openxc {
        */
       public Builder clearTranslatedMessage() {
         if (translatedMessageBuilder_ == null) {
-          translatedMessage_ = openxc.Openxc.TranslatedMessage.getDefaultInstance();
+          translatedMessage_ = com.openxc.BinaryMessages.TranslatedMessage.getDefaultInstance();
           onChanged();
         } else {
           translatedMessageBuilder_.clear();
@@ -836,7 +836,7 @@ public final class Openxc {
       /**
        * <code>optional .openxc.TranslatedMessage translated_message = 3;</code>
        */
-      public openxc.Openxc.TranslatedMessage.Builder getTranslatedMessageBuilder() {
+      public com.openxc.BinaryMessages.TranslatedMessage.Builder getTranslatedMessageBuilder() {
         bitField0_ |= 0x00000004;
         onChanged();
         return getTranslatedMessageFieldBuilder().getBuilder();
@@ -844,7 +844,7 @@ public final class Openxc {
       /**
        * <code>optional .openxc.TranslatedMessage translated_message = 3;</code>
        */
-      public openxc.Openxc.TranslatedMessageOrBuilder getTranslatedMessageOrBuilder() {
+      public com.openxc.BinaryMessages.TranslatedMessageOrBuilder getTranslatedMessageOrBuilder() {
         if (translatedMessageBuilder_ != null) {
           return translatedMessageBuilder_.getMessageOrBuilder();
         } else {
@@ -855,11 +855,11 @@ public final class Openxc {
        * <code>optional .openxc.TranslatedMessage translated_message = 3;</code>
        */
       private com.google.protobuf.SingleFieldBuilder<
-          openxc.Openxc.TranslatedMessage, openxc.Openxc.TranslatedMessage.Builder, openxc.Openxc.TranslatedMessageOrBuilder> 
+          com.openxc.BinaryMessages.TranslatedMessage, com.openxc.BinaryMessages.TranslatedMessage.Builder, com.openxc.BinaryMessages.TranslatedMessageOrBuilder> 
           getTranslatedMessageFieldBuilder() {
         if (translatedMessageBuilder_ == null) {
           translatedMessageBuilder_ = new com.google.protobuf.SingleFieldBuilder<
-              openxc.Openxc.TranslatedMessage, openxc.Openxc.TranslatedMessage.Builder, openxc.Openxc.TranslatedMessageOrBuilder>(
+              com.openxc.BinaryMessages.TranslatedMessage, com.openxc.BinaryMessages.TranslatedMessage.Builder, com.openxc.BinaryMessages.TranslatedMessageOrBuilder>(
                   translatedMessage_,
                   getParentForChildren(),
                   isClean());
@@ -992,14 +992,14 @@ public final class Openxc {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return openxc.Openxc.internal_static_openxc_RawMessage_descriptor;
+      return com.openxc.BinaryMessages.internal_static_openxc_RawMessage_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return openxc.Openxc.internal_static_openxc_RawMessage_fieldAccessorTable
+      return com.openxc.BinaryMessages.internal_static_openxc_RawMessage_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              openxc.Openxc.RawMessage.class, openxc.Openxc.RawMessage.Builder.class);
+              com.openxc.BinaryMessages.RawMessage.class, com.openxc.BinaryMessages.RawMessage.Builder.class);
     }
 
     public static com.google.protobuf.Parser<RawMessage> PARSER =
@@ -1125,53 +1125,53 @@ public final class Openxc {
       return super.writeReplace();
     }
 
-    public static openxc.Openxc.RawMessage parseFrom(
+    public static com.openxc.BinaryMessages.RawMessage parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static openxc.Openxc.RawMessage parseFrom(
+    public static com.openxc.BinaryMessages.RawMessage parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static openxc.Openxc.RawMessage parseFrom(byte[] data)
+    public static com.openxc.BinaryMessages.RawMessage parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static openxc.Openxc.RawMessage parseFrom(
+    public static com.openxc.BinaryMessages.RawMessage parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static openxc.Openxc.RawMessage parseFrom(java.io.InputStream input)
+    public static com.openxc.BinaryMessages.RawMessage parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static openxc.Openxc.RawMessage parseFrom(
+    public static com.openxc.BinaryMessages.RawMessage parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
-    public static openxc.Openxc.RawMessage parseDelimitedFrom(java.io.InputStream input)
+    public static com.openxc.BinaryMessages.RawMessage parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static openxc.Openxc.RawMessage parseDelimitedFrom(
+    public static com.openxc.BinaryMessages.RawMessage parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
-    public static openxc.Openxc.RawMessage parseFrom(
+    public static com.openxc.BinaryMessages.RawMessage parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static openxc.Openxc.RawMessage parseFrom(
+    public static com.openxc.BinaryMessages.RawMessage parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -1180,7 +1180,7 @@ public final class Openxc {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(openxc.Openxc.RawMessage prototype) {
+    public static Builder newBuilder(com.openxc.BinaryMessages.RawMessage prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
@@ -1196,20 +1196,20 @@ public final class Openxc {
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder>
-       implements openxc.Openxc.RawMessageOrBuilder {
+       implements com.openxc.BinaryMessages.RawMessageOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return openxc.Openxc.internal_static_openxc_RawMessage_descriptor;
+        return com.openxc.BinaryMessages.internal_static_openxc_RawMessage_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return openxc.Openxc.internal_static_openxc_RawMessage_fieldAccessorTable
+        return com.openxc.BinaryMessages.internal_static_openxc_RawMessage_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                openxc.Openxc.RawMessage.class, openxc.Openxc.RawMessage.Builder.class);
+                com.openxc.BinaryMessages.RawMessage.class, com.openxc.BinaryMessages.RawMessage.Builder.class);
       }
 
-      // Construct using openxc.Openxc.RawMessage.newBuilder()
+      // Construct using com.openxc.BinaryMessages.RawMessage.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -1244,23 +1244,23 @@ public final class Openxc {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return openxc.Openxc.internal_static_openxc_RawMessage_descriptor;
+        return com.openxc.BinaryMessages.internal_static_openxc_RawMessage_descriptor;
       }
 
-      public openxc.Openxc.RawMessage getDefaultInstanceForType() {
-        return openxc.Openxc.RawMessage.getDefaultInstance();
+      public com.openxc.BinaryMessages.RawMessage getDefaultInstanceForType() {
+        return com.openxc.BinaryMessages.RawMessage.getDefaultInstance();
       }
 
-      public openxc.Openxc.RawMessage build() {
-        openxc.Openxc.RawMessage result = buildPartial();
+      public com.openxc.BinaryMessages.RawMessage build() {
+        com.openxc.BinaryMessages.RawMessage result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public openxc.Openxc.RawMessage buildPartial() {
-        openxc.Openxc.RawMessage result = new openxc.Openxc.RawMessage(this);
+      public com.openxc.BinaryMessages.RawMessage buildPartial() {
+        com.openxc.BinaryMessages.RawMessage result = new com.openxc.BinaryMessages.RawMessage(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -1281,16 +1281,16 @@ public final class Openxc {
       }
 
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof openxc.Openxc.RawMessage) {
-          return mergeFrom((openxc.Openxc.RawMessage)other);
+        if (other instanceof com.openxc.BinaryMessages.RawMessage) {
+          return mergeFrom((com.openxc.BinaryMessages.RawMessage)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(openxc.Openxc.RawMessage other) {
-        if (other == openxc.Openxc.RawMessage.getDefaultInstance()) return this;
+      public Builder mergeFrom(com.openxc.BinaryMessages.RawMessage other) {
+        if (other == com.openxc.BinaryMessages.RawMessage.getDefaultInstance()) return this;
         if (other.hasBus()) {
           setBus(other.getBus());
         }
@@ -1312,11 +1312,11 @@ public final class Openxc {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        openxc.Openxc.RawMessage parsedMessage = null;
+        com.openxc.BinaryMessages.RawMessage parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (openxc.Openxc.RawMessage) e.getUnfinishedMessage();
+          parsedMessage = (com.openxc.BinaryMessages.RawMessage) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -1625,14 +1625,14 @@ public final class Openxc {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return openxc.Openxc.internal_static_openxc_TranslatedMessage_descriptor;
+      return com.openxc.BinaryMessages.internal_static_openxc_TranslatedMessage_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return openxc.Openxc.internal_static_openxc_TranslatedMessage_fieldAccessorTable
+      return com.openxc.BinaryMessages.internal_static_openxc_TranslatedMessage_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              openxc.Openxc.TranslatedMessage.class, openxc.Openxc.TranslatedMessage.Builder.class);
+              com.openxc.BinaryMessages.TranslatedMessage.class, com.openxc.BinaryMessages.TranslatedMessage.Builder.class);
     }
 
     public static com.google.protobuf.Parser<TranslatedMessage> PARSER =
@@ -1935,53 +1935,53 @@ public final class Openxc {
       return super.writeReplace();
     }
 
-    public static openxc.Openxc.TranslatedMessage parseFrom(
+    public static com.openxc.BinaryMessages.TranslatedMessage parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static openxc.Openxc.TranslatedMessage parseFrom(
+    public static com.openxc.BinaryMessages.TranslatedMessage parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static openxc.Openxc.TranslatedMessage parseFrom(byte[] data)
+    public static com.openxc.BinaryMessages.TranslatedMessage parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static openxc.Openxc.TranslatedMessage parseFrom(
+    public static com.openxc.BinaryMessages.TranslatedMessage parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static openxc.Openxc.TranslatedMessage parseFrom(java.io.InputStream input)
+    public static com.openxc.BinaryMessages.TranslatedMessage parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static openxc.Openxc.TranslatedMessage parseFrom(
+    public static com.openxc.BinaryMessages.TranslatedMessage parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
-    public static openxc.Openxc.TranslatedMessage parseDelimitedFrom(java.io.InputStream input)
+    public static com.openxc.BinaryMessages.TranslatedMessage parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static openxc.Openxc.TranslatedMessage parseDelimitedFrom(
+    public static com.openxc.BinaryMessages.TranslatedMessage parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
-    public static openxc.Openxc.TranslatedMessage parseFrom(
+    public static com.openxc.BinaryMessages.TranslatedMessage parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static openxc.Openxc.TranslatedMessage parseFrom(
+    public static com.openxc.BinaryMessages.TranslatedMessage parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -1990,7 +1990,7 @@ public final class Openxc {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(openxc.Openxc.TranslatedMessage prototype) {
+    public static Builder newBuilder(com.openxc.BinaryMessages.TranslatedMessage prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
@@ -2006,20 +2006,20 @@ public final class Openxc {
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder>
-       implements openxc.Openxc.TranslatedMessageOrBuilder {
+       implements com.openxc.BinaryMessages.TranslatedMessageOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return openxc.Openxc.internal_static_openxc_TranslatedMessage_descriptor;
+        return com.openxc.BinaryMessages.internal_static_openxc_TranslatedMessage_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return openxc.Openxc.internal_static_openxc_TranslatedMessage_fieldAccessorTable
+        return com.openxc.BinaryMessages.internal_static_openxc_TranslatedMessage_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                openxc.Openxc.TranslatedMessage.class, openxc.Openxc.TranslatedMessage.Builder.class);
+                com.openxc.BinaryMessages.TranslatedMessage.class, com.openxc.BinaryMessages.TranslatedMessage.Builder.class);
       }
 
-      // Construct using openxc.Openxc.TranslatedMessage.newBuilder()
+      // Construct using com.openxc.BinaryMessages.TranslatedMessage.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -2062,23 +2062,23 @@ public final class Openxc {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return openxc.Openxc.internal_static_openxc_TranslatedMessage_descriptor;
+        return com.openxc.BinaryMessages.internal_static_openxc_TranslatedMessage_descriptor;
       }
 
-      public openxc.Openxc.TranslatedMessage getDefaultInstanceForType() {
-        return openxc.Openxc.TranslatedMessage.getDefaultInstance();
+      public com.openxc.BinaryMessages.TranslatedMessage getDefaultInstanceForType() {
+        return com.openxc.BinaryMessages.TranslatedMessage.getDefaultInstance();
       }
 
-      public openxc.Openxc.TranslatedMessage build() {
-        openxc.Openxc.TranslatedMessage result = buildPartial();
+      public com.openxc.BinaryMessages.TranslatedMessage build() {
+        com.openxc.BinaryMessages.TranslatedMessage result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public openxc.Openxc.TranslatedMessage buildPartial() {
-        openxc.Openxc.TranslatedMessage result = new openxc.Openxc.TranslatedMessage(this);
+      public com.openxc.BinaryMessages.TranslatedMessage buildPartial() {
+        com.openxc.BinaryMessages.TranslatedMessage result = new com.openxc.BinaryMessages.TranslatedMessage(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -2115,16 +2115,16 @@ public final class Openxc {
       }
 
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof openxc.Openxc.TranslatedMessage) {
-          return mergeFrom((openxc.Openxc.TranslatedMessage)other);
+        if (other instanceof com.openxc.BinaryMessages.TranslatedMessage) {
+          return mergeFrom((com.openxc.BinaryMessages.TranslatedMessage)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(openxc.Openxc.TranslatedMessage other) {
-        if (other == openxc.Openxc.TranslatedMessage.getDefaultInstance()) return this;
+      public Builder mergeFrom(com.openxc.BinaryMessages.TranslatedMessage other) {
+        if (other == com.openxc.BinaryMessages.TranslatedMessage.getDefaultInstance()) return this;
         if (other.hasName()) {
           bitField0_ |= 0x00000001;
           name_ = other.name_;
@@ -2164,11 +2164,11 @@ public final class Openxc {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        openxc.Openxc.TranslatedMessage parsedMessage = null;
+        com.openxc.BinaryMessages.TranslatedMessage parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (openxc.Openxc.TranslatedMessage) e.getUnfinishedMessage();
+          parsedMessage = (com.openxc.BinaryMessages.TranslatedMessage) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -2579,7 +2579,7 @@ public final class Openxc {
       "_value\030\002 \001(\t\022\027\n\017numerical_value\030\003 \001(\001\022\025\n" +
       "\rboolean_value\030\004 \001(\010\022\024\n\014string_event\030\005 \001",
       "(\t\022\027\n\017numerical_event\030\006 \001(\001\022\025\n\rboolean_e" +
-      "vent\030\007 \001(\010"
+      "vent\030\007 \001(\010B\034\n\ncom.openxcB\016BinaryMessages"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
diff --git a/gen/python/openxc_pb2.py b/gen/python/openxc_pb2.py
index 63edf332..5b311a2e 100644
--- a/gen/python/openxc_pb2.py
+++ b/gen/python/openxc_pb2.py
@@ -13,7 +13,7 @@ from google.protobuf import descriptor_pb2
 DESCRIPTOR = _descriptor.FileDescriptor(
   name='openxc.proto',
   package='openxc',
-  serialized_pb='\n\x0copenxc.proto\x12\x06openxc\"\xbc\x01\n\x0eVehicleMessage\x12)\n\x04type\x18\x01 \x01(\x0e\x32\x1b.openxc.VehicleMessage.Type\x12\'\n\x0braw_message\x18\x02 \x01(\x0b\x32\x12.openxc.RawMessage\x12\x35\n\x12translated_message\x18\x03 \x01(\x0b\x32\x19.openxc.TranslatedMessage\"\x1f\n\x04Type\x12\x07\n\x03RAW\x10\x01\x12\x0e\n\nTRANSLATED\x10\x02\";\n\nRawMessage\x12\x0b\n\x03\x62us\x18\x01 \x01(\x05\x12\x12\n\nmessage_id\x18\x02 \x01(\r\x12\x0c\n\x04\x64\x61ta\x18\x03 \x01(\x04\"\xad\x01\n\x11TranslatedMessage\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x14\n\x0cstring_value\x18\x02 \x01(\t\x12\x17\n\x0fnumerical_value\x18\x03 \x01(\x01\x12\x15\n\rboolean_value\x18\x04 \x01(\x08\x12\x14\n\x0cstring_event\x18\x05 \x01(\t\x12\x17\n\x0fnumerical_event\x18\x06 \x01(\x01\x12\x15\n\rboolean_event\x18\x07 \x01(\x08')
+  serialized_pb='\n\x0copenxc.proto\x12\x06openxc\"\xbc\x01\n\x0eVehicleMessage\x12)\n\x04type\x18\x01 \x01(\x0e\x32\x1b.openxc.VehicleMessage.Type\x12\'\n\x0braw_message\x18\x02 \x01(\x0b\x32\x12.openxc.RawMessage\x12\x35\n\x12translated_message\x18\x03 \x01(\x0b\x32\x19.openxc.TranslatedMessage\"\x1f\n\x04Type\x12\x07\n\x03RAW\x10\x01\x12\x0e\n\nTRANSLATED\x10\x02\";\n\nRawMessage\x12\x0b\n\x03\x62us\x18\x01 \x01(\x05\x12\x12\n\nmessage_id\x18\x02 \x01(\r\x12\x0c\n\x04\x64\x61ta\x18\x03 \x01(\x04\"\xad\x01\n\x11TranslatedMessage\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x14\n\x0cstring_value\x18\x02 \x01(\t\x12\x17\n\x0fnumerical_value\x18\x03 \x01(\x01\x12\x15\n\rboolean_value\x18\x04 \x01(\x08\x12\x14\n\x0cstring_event\x18\x05 \x01(\t\x12\x17\n\x0fnumerical_event\x18\x06 \x01(\x01\x12\x15\n\rboolean_event\x18\x07 \x01(\x08\x42\x1c\n\ncom.openxcB\x0e\x42inaryMessages')
 
 
 
@@ -220,4 +220,6 @@ class TranslatedMessage(_message.Message):
   # @@protoc_insertion_point(class_scope:openxc.TranslatedMessage)
 
 
+DESCRIPTOR.has_options = True
+DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), '\n\ncom.openxcB\016BinaryMessages')
 # @@protoc_insertion_point(module_scope)
diff --git a/openxc.proto b/openxc.proto
index b3dd3bad..9f9046eb 100644
--- a/openxc.proto
+++ b/openxc.proto
@@ -1,5 +1,8 @@
 package openxc;
 
+option java_package = "com.openxc";
+option java_outer_classname = "BinaryMessages";
+
 message VehicleMessage {
     enum Type { RAW = 1; TRANSLATED = 2; }