added changes fixed doc gen2HEADmaster

Signed-off-by: James Simon <jamsimox@amazon.com>
Change-Id: I9214b5eae0402e0de542227bda2aee2981c52eb5

4 files changed, 740 insertions, 577 deletions

diff --git a/build/generated/source/proto/main/cpp/messages/IntelligentDataCollector.pb.cc b/build/generated/source/proto/main/cpp/messages/VehicleIntelligentDataCollector.pb.cc
index 26d13ca..2027a14 100644
--- a/build/generated/source/proto/main/cpp/messages/IntelligentDataCollector.pb.cc
+++ b/build/generated/source/proto/main/cpp/messages/VehicleIntelligentDataCollector.pb.cc
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: messages/IntelligentDataCollector.proto
+// source: messages/VehicleIntelligentDataCollector.proto
 
-#include "messages/IntelligentDataCollector.pb.h"
+#include "messages/VehicleIntelligentDataCollector.pb.h"
 
 #include <algorithm>
 #include "google/protobuf/io/coded_stream.h"
@@ -22,6 +22,7 @@ namespace messages {
 PROTOBUF_CONSTEXPR PublishData::PublishData(
     ::_pbi::ConstantInitialized): _impl_{
     /*decltype(_impl_.datapayload_)*/{}
+  , /*decltype(_impl_.vehiclemessageheading_)*/nullptr
   , /*decltype(_impl_._cached_size_)*/{}} {}
 struct PublishDataDefaultTypeInternal {
   PROTOBUF_CONSTEXPR PublishDataDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
@@ -101,12 +102,12 @@ struct PublishVehicleModelMappingDefaultTypeInternal {
 PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
     PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 PublishVehicleModelMappingDefaultTypeInternal _PublishVehicleModelMapping_default_instance_;
 }  // namespace messages
-static ::_pb::Metadata file_level_metadata_messages_2fIntelligentDataCollector_2eproto[4];
+static ::_pb::Metadata file_level_metadata_messages_2fVehicleIntelligentDataCollector_2eproto[4];
 static constexpr const ::_pb::EnumDescriptor**
-    file_level_enum_descriptors_messages_2fIntelligentDataCollector_2eproto = nullptr;
+    file_level_enum_descriptors_messages_2fVehicleIntelligentDataCollector_2eproto = nullptr;
 static constexpr const ::_pb::ServiceDescriptor**
-    file_level_service_descriptors_messages_2fIntelligentDataCollector_2eproto = nullptr;
-const ::uint32_t TableStruct_messages_2fIntelligentDataCollector_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE(
+    file_level_service_descriptors_messages_2fVehicleIntelligentDataCollector_2eproto = nullptr;
+const ::uint32_t TableStruct_messages_2fVehicleIntelligentDataCollector_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE(
     protodesc_cold) = {
     ~0u,  // no _has_bits_
     PROTOBUF_FIELD_OFFSET(::messages::PublishData, _internal_metadata_),
@@ -116,6 +117,7 @@ const ::uint32_t TableStruct_messages_2fIntelligentDataCollector_2eproto::offset
     ~0u,  // no _inlined_string_donated_
     ~0u,  // no _split_
     ~0u,  // no sizeof(Split)
+    PROTOBUF_FIELD_OFFSET(::messages::PublishData, _impl_.vehiclemessageheading_),
     PROTOBUF_FIELD_OFFSET(::messages::PublishData, _impl_.datapayload_),
     ~0u,  // no _has_bits_
     PROTOBUF_FIELD_OFFSET(::messages::dataPayload, _internal_metadata_),
@@ -155,9 +157,9 @@ const ::uint32_t TableStruct_messages_2fIntelligentDataCollector_2eproto::offset
 static const ::_pbi::MigrationSchema
     schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
         { 0, -1, -1, sizeof(::messages::PublishData)},
-        { 9, -1, -1, sizeof(::messages::dataPayload)},
-        { 24, -1, -1, sizeof(::messages::PublishDataCollectionDescriptor)},
-        { 33, -1, -1, sizeof(::messages::PublishVehicleModelMapping)},
+        { 10, -1, -1, sizeof(::messages::dataPayload)},
+        { 25, -1, -1, sizeof(::messages::PublishDataCollectionDescriptor)},
+        { 34, -1, -1, sizeof(::messages::PublishVehicleModelMapping)},
 };
 
 static const ::_pb::Message* const file_default_instances[] = {
@@ -166,40 +168,42 @@ static const ::_pb::Message* const file_default_instances[] = {
     &::messages::_PublishDataCollectionDescriptor_default_instance_._instance,
     &::messages::_PublishVehicleModelMapping_default_instance_._instance,
 };
-const char descriptor_table_protodef_messages_2fIntelligentDataCollector_2eproto[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
-    "\n\'messages/IntelligentDataCollector.prot"
-    "o\022\010messages\032\037google/protobuf/timestamp.p"
-    "roto\"9\n\013PublishData\022*\n\013DataPayload\030\001 \003(\013"
-    "2\025.messages.dataPayload\"\230\001\n\013dataPayload\022"
-    "\013\n\003key\030\001 \001(\t\022\023\n\013stringValue\030\002 \001(\t\022\023\n\013dou"
-    "bleValue\030\003 \001(\001\022\025\n\rintShortValue\030\004 \001(\005\022\024\n"
-    "\014intLongValue\030\005 \001(\003\022\021\n\tboolValue\030\006 \001(\010\022\022"
-    "\n\nbytesValue\030\007 \001(\014\"\?\n\037PublishDataCollect"
-    "ionDescriptor\022\034\n\024dataCollectionScheme\030\001 "
-    "\001(\014\":\n\032PublishVehicleModelMapping\022\034\n\024dat"
-    "aCollectionScheme\030\001 \001(\014b\006proto3"
+const char descriptor_table_protodef_messages_2fVehicleIntelligentDataCollector_2eproto[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
+    "\n.messages/VehicleIntelligentDataCollect"
+    "or.proto\022\010messages\032#messages/VehicleMess"
+    "ageHeader.proto\"y\n\013PublishData\022>\n\025vehicl"
+    "eMessageHeading\030\001 \001(\0132\037.messages.Vehicle"
+    "MessageHeading\022*\n\013DataPayload\030\002 \003(\0132\025.me"
+    "ssages.dataPayload\"\230\001\n\013dataPayload\022\013\n\003ke"
+    "y\030\001 \001(\t\022\023\n\013stringValue\030\002 \001(\t\022\023\n\013doubleVa"
+    "lue\030\003 \001(\001\022\025\n\rintShortValue\030\004 \001(\005\022\024\n\014intL"
+    "ongValue\030\005 \001(\003\022\021\n\tboolValue\030\006 \001(\010\022\022\n\nbyt"
+    "esValue\030\007 \001(\014\"\?\n\037PublishDataCollectionDe"
+    "scriptor\022\034\n\024dataCollectionScheme\030\001 \001(\014\":"
+    "\n\032PublishVehicleModelMapping\022\034\n\024dataColl"
+    "ectionScheme\030\001 \001(\014b\006proto3"
 };
-static const ::_pbi::DescriptorTable* const descriptor_table_messages_2fIntelligentDataCollector_2eproto_deps[1] =
+static const ::_pbi::DescriptorTable* const descriptor_table_messages_2fVehicleIntelligentDataCollector_2eproto_deps[1] =
     {
-        &::descriptor_table_google_2fprotobuf_2ftimestamp_2eproto,
+        &::descriptor_table_messages_2fVehicleMessageHeader_2eproto,
 };
-static ::absl::once_flag descriptor_table_messages_2fIntelligentDataCollector_2eproto_once;
-const ::_pbi::DescriptorTable descriptor_table_messages_2fIntelligentDataCollector_2eproto = {
+static ::absl::once_flag descriptor_table_messages_2fVehicleIntelligentDataCollector_2eproto_once;
+const ::_pbi::DescriptorTable descriptor_table_messages_2fVehicleIntelligentDataCollector_2eproto = {
     false,
     false,
-    431,
-    descriptor_table_protodef_messages_2fIntelligentDataCollector_2eproto,
-    "messages/IntelligentDataCollector.proto",
-    &descriptor_table_messages_2fIntelligentDataCollector_2eproto_once,
-    descriptor_table_messages_2fIntelligentDataCollector_2eproto_deps,
+    506,
+    descriptor_table_protodef_messages_2fVehicleIntelligentDataCollector_2eproto,
+    "messages/VehicleIntelligentDataCollector.proto",
+    &descriptor_table_messages_2fVehicleIntelligentDataCollector_2eproto_once,
+    descriptor_table_messages_2fVehicleIntelligentDataCollector_2eproto_deps,
     1,
     4,
     schemas,
     file_default_instances,
-    TableStruct_messages_2fIntelligentDataCollector_2eproto::offsets,
-    file_level_metadata_messages_2fIntelligentDataCollector_2eproto,
-    file_level_enum_descriptors_messages_2fIntelligentDataCollector_2eproto,
-    file_level_service_descriptors_messages_2fIntelligentDataCollector_2eproto,
+    TableStruct_messages_2fVehicleIntelligentDataCollector_2eproto::offsets,
+    file_level_metadata_messages_2fVehicleIntelligentDataCollector_2eproto,
+    file_level_enum_descriptors_messages_2fVehicleIntelligentDataCollector_2eproto,
+    file_level_service_descriptors_messages_2fVehicleIntelligentDataCollector_2eproto,
 };
 
 // This function exists to be marked as weak.
@@ -213,19 +217,30 @@ const ::_pbi::DescriptorTable descriptor_table_messages_2fIntelligentDataCollect
 //   vtables -> GetMetadata
 // By adding a weak function here we break the connection from the
 // individual vtables back into the descriptor table.
-PROTOBUF_ATTRIBUTE_WEAK const ::_pbi::DescriptorTable* descriptor_table_messages_2fIntelligentDataCollector_2eproto_getter() {
-  return &descriptor_table_messages_2fIntelligentDataCollector_2eproto;
+PROTOBUF_ATTRIBUTE_WEAK const ::_pbi::DescriptorTable* descriptor_table_messages_2fVehicleIntelligentDataCollector_2eproto_getter() {
+  return &descriptor_table_messages_2fVehicleIntelligentDataCollector_2eproto;
 }
 // Force running AddDescriptors() at dynamic initialization time.
 PROTOBUF_ATTRIBUTE_INIT_PRIORITY2
-static ::_pbi::AddDescriptorsRunner dynamic_init_dummy_messages_2fIntelligentDataCollector_2eproto(&descriptor_table_messages_2fIntelligentDataCollector_2eproto);
+static ::_pbi::AddDescriptorsRunner dynamic_init_dummy_messages_2fVehicleIntelligentDataCollector_2eproto(&descriptor_table_messages_2fVehicleIntelligentDataCollector_2eproto);
 namespace messages {
 // ===================================================================
 
 class PublishData::_Internal {
  public:
+  static const ::messages::VehicleMessageHeading& vehiclemessageheading(const PublishData* msg);
 };
 
+const ::messages::VehicleMessageHeading&
+PublishData::_Internal::vehiclemessageheading(const PublishData* msg) {
+  return *msg->_impl_.vehiclemessageheading_;
+}
+void PublishData::clear_vehiclemessageheading() {
+  if (GetArenaForAllocation() == nullptr && _impl_.vehiclemessageheading_ != nullptr) {
+    delete _impl_.vehiclemessageheading_;
+  }
+  _impl_.vehiclemessageheading_ = nullptr;
+}
 PublishData::PublishData(::PROTOBUF_NAMESPACE_ID::Arena* arena)
   : ::PROTOBUF_NAMESPACE_ID::Message(arena) {
   SharedCtor(arena);
@@ -236,9 +251,13 @@ PublishData::PublishData(const PublishData& from)
   PublishData* const _this = this; (void)_this;
   new (&_impl_) Impl_{
       decltype(_impl_.datapayload_){from._impl_.datapayload_}
+    , decltype(_impl_.vehiclemessageheading_){nullptr}
     , /*decltype(_impl_._cached_size_)*/{}};
 
   _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
+  if (from._internal_has_vehiclemessageheading()) {
+    _this->_impl_.vehiclemessageheading_ = new ::messages::VehicleMessageHeading(*from._impl_.vehiclemessageheading_);
+  }
   // @@protoc_insertion_point(copy_constructor:messages.PublishData)
 }
 
@@ -246,6 +265,7 @@ inline void PublishData::SharedCtor(::_pb::Arena* arena) {
   (void)arena;
   new (&_impl_) Impl_{
       decltype(_impl_.datapayload_){arena}
+    , decltype(_impl_.vehiclemessageheading_){nullptr}
     , /*decltype(_impl_._cached_size_)*/{}
   };
 }
@@ -262,6 +282,7 @@ PublishData::~PublishData() {
 inline void PublishData::SharedDtor() {
   ABSL_DCHECK(GetArenaForAllocation() == nullptr);
   _impl_.datapayload_.~RepeatedPtrField();
+  if (this != internal_default_instance()) delete _impl_.vehiclemessageheading_;
 }
 
 void PublishData::SetCachedSize(int size) const {
@@ -275,6 +296,10 @@ void PublishData::Clear() {
   (void) cached_has_bits;
 
   _impl_.datapayload_.Clear();
+  if (GetArenaForAllocation() == nullptr && _impl_.vehiclemessageheading_ != nullptr) {
+    delete _impl_.vehiclemessageheading_;
+  }
+  _impl_.vehiclemessageheading_ = nullptr;
   _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
 }
 
@@ -284,16 +309,25 @@ const char* PublishData::_InternalParse(const char* ptr, ::_pbi::ParseContext* c
     ::uint32_t tag;
     ptr = ::_pbi::ReadTag(ptr, &tag);
     switch (tag >> 3) {
-      // repeated .messages.dataPayload DataPayload = 1;
+      // .messages.VehicleMessageHeading vehicleMessageHeading = 1;
       case 1:
         if (PROTOBUF_PREDICT_TRUE(static_cast<::uint8_t>(tag) == 10)) {
+          ptr = ctx->ParseMessage(_internal_mutable_vehiclemessageheading(), ptr);
+          CHK_(ptr);
+        } else {
+          goto handle_unusual;
+        }
+        continue;
+      // repeated .messages.dataPayload DataPayload = 2;
+      case 2:
+        if (PROTOBUF_PREDICT_TRUE(static_cast<::uint8_t>(tag) == 18)) {
           ptr -= 1;
           do {
             ptr += 1;
             ptr = ctx->ParseMessage(_internal_add_datapayload(), ptr);
             CHK_(ptr);
             if (!ctx->DataAvailable(ptr)) break;
-          } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<10>(ptr));
+          } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<18>(ptr));
         } else {
           goto handle_unusual;
         }
@@ -327,12 +361,19 @@ failure:
   ::uint32_t cached_has_bits = 0;
   (void) cached_has_bits;
 
-  // repeated .messages.dataPayload DataPayload = 1;
+  // .messages.VehicleMessageHeading vehicleMessageHeading = 1;
+  if (this->_internal_has_vehiclemessageheading()) {
+    target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
+      InternalWriteMessage(1, _Internal::vehiclemessageheading(this),
+        _Internal::vehiclemessageheading(this).GetCachedSize(), target, stream);
+  }
+
+  // repeated .messages.dataPayload DataPayload = 2;
   for (unsigned i = 0,
       n = static_cast<unsigned>(this->_internal_datapayload_size()); i < n; i++) {
     const auto& repfield = this->_internal_datapayload(i);
     target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
-        InternalWriteMessage(1, repfield, repfield.GetCachedSize(), target, stream);
+        InternalWriteMessage(2, repfield, repfield.GetCachedSize(), target, stream);
   }
 
   if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
@@ -351,13 +392,20 @@ failure:
   // Prevent compiler warnings about cached_has_bits being unused
   (void) cached_has_bits;
 
-  // repeated .messages.dataPayload DataPayload = 1;
+  // repeated .messages.dataPayload DataPayload = 2;
   total_size += 1UL * this->_internal_datapayload_size();
   for (const auto& msg : this->_impl_.datapayload_) {
     total_size +=
       ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(msg);
   }
 
+  // .messages.VehicleMessageHeading vehicleMessageHeading = 1;
+  if (this->_internal_has_vehiclemessageheading()) {
+    total_size += 1 +
+      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(
+        *_impl_.vehiclemessageheading_);
+  }
+
   return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
 }
 
@@ -377,6 +425,10 @@ void PublishData::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PR
   (void) cached_has_bits;
 
   _this->_impl_.datapayload_.MergeFrom(from._impl_.datapayload_);
+  if (from._internal_has_vehiclemessageheading()) {
+    _this->_internal_mutable_vehiclemessageheading()->::messages::VehicleMessageHeading::MergeFrom(
+        from._internal_vehiclemessageheading());
+  }
   _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
 }
 
@@ -395,12 +447,13 @@ void PublishData::InternalSwap(PublishData* other) {
   using std::swap;
   _internal_metadata_.InternalSwap(&other->_internal_metadata_);
   _impl_.datapayload_.InternalSwap(&other->_impl_.datapayload_);
+  swap(_impl_.vehiclemessageheading_, other->_impl_.vehiclemessageheading_);
 }
 
 ::PROTOBUF_NAMESPACE_ID::Metadata PublishData::GetMetadata() const {
   return ::_pbi::AssignDescriptors(
-      &descriptor_table_messages_2fIntelligentDataCollector_2eproto_getter, &descriptor_table_messages_2fIntelligentDataCollector_2eproto_once,
-      file_level_metadata_messages_2fIntelligentDataCollector_2eproto[0]);
+      &descriptor_table_messages_2fVehicleIntelligentDataCollector_2eproto_getter, &descriptor_table_messages_2fVehicleIntelligentDataCollector_2eproto_once,
+      file_level_metadata_messages_2fVehicleIntelligentDataCollector_2eproto[0]);
 }
 // ===================================================================
 
@@ -824,8 +877,8 @@ void dataPayload::InternalSwap(dataPayload* other) {
 
 ::PROTOBUF_NAMESPACE_ID::Metadata dataPayload::GetMetadata() const {
   return ::_pbi::AssignDescriptors(
-      &descriptor_table_messages_2fIntelligentDataCollector_2eproto_getter, &descriptor_table_messages_2fIntelligentDataCollector_2eproto_once,
-      file_level_metadata_messages_2fIntelligentDataCollector_2eproto[1]);
+      &descriptor_table_messages_2fVehicleIntelligentDataCollector_2eproto_getter, &descriptor_table_messages_2fVehicleIntelligentDataCollector_2eproto_once,
+      file_level_metadata_messages_2fVehicleIntelligentDataCollector_2eproto[1]);
 }
 // ===================================================================
 
@@ -1017,8 +1070,8 @@ void PublishDataCollectionDescriptor::InternalSwap(PublishDataCollectionDescript
 
 ::PROTOBUF_NAMESPACE_ID::Metadata PublishDataCollectionDescriptor::GetMetadata() const {
   return ::_pbi::AssignDescriptors(
-      &descriptor_table_messages_2fIntelligentDataCollector_2eproto_getter, &descriptor_table_messages_2fIntelligentDataCollector_2eproto_once,
-      file_level_metadata_messages_2fIntelligentDataCollector_2eproto[2]);
+      &descriptor_table_messages_2fVehicleIntelligentDataCollector_2eproto_getter, &descriptor_table_messages_2fVehicleIntelligentDataCollector_2eproto_once,
+      file_level_metadata_messages_2fVehicleIntelligentDataCollector_2eproto[2]);
 }
 // ===================================================================
 
@@ -1210,8 +1263,8 @@ void PublishVehicleModelMapping::InternalSwap(PublishVehicleModelMapping* other)
 
 ::PROTOBUF_NAMESPACE_ID::Metadata PublishVehicleModelMapping::GetMetadata() const {
   return ::_pbi::AssignDescriptors(
-      &descriptor_table_messages_2fIntelligentDataCollector_2eproto_getter, &descriptor_table_messages_2fIntelligentDataCollector_2eproto_once,
-      file_level_metadata_messages_2fIntelligentDataCollector_2eproto[3]);
+      &descriptor_table_messages_2fVehicleIntelligentDataCollector_2eproto_getter, &descriptor_table_messages_2fVehicleIntelligentDataCollector_2eproto_once,
+      file_level_metadata_messages_2fVehicleIntelligentDataCollector_2eproto[3]);
 }
 // @@protoc_insertion_point(namespace_scope)
 }  // namespace messages
diff --git a/build/generated/source/proto/main/cpp/messages/IntelligentDataCollector.pb.h b/build/generated/source/proto/main/cpp/messages/VehicleIntelligentDataCollector.pb.h
index 45ee5ab..f3844d9 100644
--- a/build/generated/source/proto/main/cpp/messages/IntelligentDataCollector.pb.h
+++ b/build/generated/source/proto/main/cpp/messages/VehicleIntelligentDataCollector.pb.h
@@ -1,8 +1,8 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: messages/IntelligentDataCollector.proto
+// source: messages/VehicleIntelligentDataCollector.proto
 
-#ifndef GOOGLE_PROTOBUF_INCLUDED_messages_2fIntelligentDataCollector_2eproto_2epb_2eh
-#define GOOGLE_PROTOBUF_INCLUDED_messages_2fIntelligentDataCollector_2eproto_2epb_2eh
+#ifndef GOOGLE_PROTOBUF_INCLUDED_messages_2fVehicleIntelligentDataCollector_2eproto_2epb_2eh
+#define GOOGLE_PROTOBUF_INCLUDED_messages_2fVehicleIntelligentDataCollector_2eproto_2epb_2eh
 
 #include <limits>
 #include <string>
@@ -31,13 +31,13 @@
 #include "google/protobuf/repeated_field.h"  // IWYU pragma: export
 #include "google/protobuf/extension_set.h"  // IWYU pragma: export
 #include "google/protobuf/unknown_field_set.h"
-#include "google/protobuf/timestamp.pb.h"
+#include "messages/VehicleMessageHeader.pb.h"
 // @@protoc_insertion_point(includes)
 
 // Must be included last.
 #include "google/protobuf/port_def.inc"
 
-#define PROTOBUF_INTERNAL_EXPORT_messages_2fIntelligentDataCollector_2eproto
+#define PROTOBUF_INTERNAL_EXPORT_messages_2fVehicleIntelligentDataCollector_2eproto
 
 PROTOBUF_NAMESPACE_OPEN
 namespace internal {
@@ -46,11 +46,11 @@ class AnyMetadata;
 PROTOBUF_NAMESPACE_CLOSE
 
 // Internal implementation detail -- do not use these members.
-struct TableStruct_messages_2fIntelligentDataCollector_2eproto {
+struct TableStruct_messages_2fVehicleIntelligentDataCollector_2eproto {
   static const ::uint32_t offsets[];
 };
 extern const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable
-    descriptor_table_messages_2fIntelligentDataCollector_2eproto;
+    descriptor_table_messages_2fVehicleIntelligentDataCollector_2eproto;
 namespace messages {
 class PublishData;
 struct PublishDataDefaultTypeInternal;
@@ -203,9 +203,10 @@ class PublishData final :
   // accessors -------------------------------------------------------
 
   enum : int {
-    kDataPayloadFieldNumber = 1,
+    kDataPayloadFieldNumber = 2,
+    kVehicleMessageHeadingFieldNumber = 1,
   };
-  // repeated .messages.dataPayload DataPayload = 1;
+  // repeated .messages.dataPayload DataPayload = 2;
   int datapayload_size() const;
   private:
   int _internal_datapayload_size() const;
@@ -223,6 +224,24 @@ class PublishData final :
   ::messages::dataPayload* add_datapayload();
   const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::messages::dataPayload >&
       datapayload() const;
+  // .messages.VehicleMessageHeading vehicleMessageHeading = 1;
+  bool has_vehiclemessageheading() const;
+  private:
+  bool _internal_has_vehiclemessageheading() const;
+
+  public:
+  void clear_vehiclemessageheading() ;
+  const ::messages::VehicleMessageHeading& vehiclemessageheading() const;
+  PROTOBUF_NODISCARD ::messages::VehicleMessageHeading* release_vehiclemessageheading();
+  ::messages::VehicleMessageHeading* mutable_vehiclemessageheading();
+  void set_allocated_vehiclemessageheading(::messages::VehicleMessageHeading* vehiclemessageheading);
+  private:
+  const ::messages::VehicleMessageHeading& _internal_vehiclemessageheading() const;
+  ::messages::VehicleMessageHeading* _internal_mutable_vehiclemessageheading();
+  public:
+  void unsafe_arena_set_allocated_vehiclemessageheading(
+      ::messages::VehicleMessageHeading* vehiclemessageheading);
+  ::messages::VehicleMessageHeading* unsafe_arena_release_vehiclemessageheading();
   // @@protoc_insertion_point(class_scope:messages.PublishData)
  private:
   class _Internal;
@@ -232,10 +251,11 @@ class PublishData final :
   typedef void DestructorSkippable_;
   struct Impl_ {
     ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::messages::dataPayload > datapayload_;
+    ::messages::VehicleMessageHeading* vehiclemessageheading_;
     mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
   };
   union { Impl_ _impl_; };
-  friend struct ::TableStruct_messages_2fIntelligentDataCollector_2eproto;
+  friend struct ::TableStruct_messages_2fVehicleIntelligentDataCollector_2eproto;
 };// -------------------------------------------------------------------
 
 class dataPayload final :
@@ -484,7 +504,7 @@ class dataPayload final :
     mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
   };
   union { Impl_ _impl_; };
-  friend struct ::TableStruct_messages_2fIntelligentDataCollector_2eproto;
+  friend struct ::TableStruct_messages_2fVehicleIntelligentDataCollector_2eproto;
 };// -------------------------------------------------------------------
 
 class PublishDataCollectionDescriptor final :
@@ -641,7 +661,7 @@ class PublishDataCollectionDescriptor final :
     mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
   };
   union { Impl_ _impl_; };
-  friend struct ::TableStruct_messages_2fIntelligentDataCollector_2eproto;
+  friend struct ::TableStruct_messages_2fVehicleIntelligentDataCollector_2eproto;
 };// -------------------------------------------------------------------
 
 class PublishVehicleModelMapping final :
@@ -798,7 +818,7 @@ class PublishVehicleModelMapping final :
     mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
   };
   union { Impl_ _impl_; };
-  friend struct ::TableStruct_messages_2fIntelligentDataCollector_2eproto;
+  friend struct ::TableStruct_messages_2fVehicleIntelligentDataCollector_2eproto;
 };
 
 // ===================================================================
@@ -817,7 +837,87 @@ class PublishVehicleModelMapping final :
 
 // PublishData
 
-// repeated .messages.dataPayload DataPayload = 1;
+// .messages.VehicleMessageHeading vehicleMessageHeading = 1;
+inline bool PublishData::_internal_has_vehiclemessageheading() const {
+  return this != internal_default_instance() && _impl_.vehiclemessageheading_ != nullptr;
+}
+inline bool PublishData::has_vehiclemessageheading() const {
+  return _internal_has_vehiclemessageheading();
+}
+inline const ::messages::VehicleMessageHeading& PublishData::_internal_vehiclemessageheading() const {
+  const ::messages::VehicleMessageHeading* p = _impl_.vehiclemessageheading_;
+  return p != nullptr ? *p : reinterpret_cast<const ::messages::VehicleMessageHeading&>(
+      ::messages::_VehicleMessageHeading_default_instance_);
+}
+inline const ::messages::VehicleMessageHeading& PublishData::vehiclemessageheading() const {
+  // @@protoc_insertion_point(field_get:messages.PublishData.vehicleMessageHeading)
+  return _internal_vehiclemessageheading();
+}
+inline void PublishData::unsafe_arena_set_allocated_vehiclemessageheading(
+    ::messages::VehicleMessageHeading* vehiclemessageheading) {
+  if (GetArenaForAllocation() == nullptr) {
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.vehiclemessageheading_);
+  }
+  _impl_.vehiclemessageheading_ = vehiclemessageheading;
+  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:messages.PublishData.vehicleMessageHeading)
+}
+inline ::messages::VehicleMessageHeading* PublishData::release_vehiclemessageheading() {
+  
+  ::messages::VehicleMessageHeading* temp = _impl_.vehiclemessageheading_;
+  _impl_.vehiclemessageheading_ = nullptr;
+#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
+  auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
+  temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
+  if (GetArenaForAllocation() == nullptr) { delete old; }
+#else  // PROTOBUF_FORCE_COPY_IN_RELEASE
+  if (GetArenaForAllocation() != nullptr) {
+    temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
+  }
+#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
+  return temp;
+}
+inline ::messages::VehicleMessageHeading* PublishData::unsafe_arena_release_vehiclemessageheading() {
+  // @@protoc_insertion_point(field_release:messages.PublishData.vehicleMessageHeading)
+  
+  ::messages::VehicleMessageHeading* temp = _impl_.vehiclemessageheading_;
+  _impl_.vehiclemessageheading_ = nullptr;
+  return temp;
+}
+inline ::messages::VehicleMessageHeading* PublishData::_internal_mutable_vehiclemessageheading() {
+  
+  if (_impl_.vehiclemessageheading_ == nullptr) {
+    auto* p = CreateMaybeMessage<::messages::VehicleMessageHeading>(GetArenaForAllocation());
+    _impl_.vehiclemessageheading_ = p;
+  }
+  return _impl_.vehiclemessageheading_;
+}
+inline ::messages::VehicleMessageHeading* PublishData::mutable_vehiclemessageheading() {
+  ::messages::VehicleMessageHeading* _msg = _internal_mutable_vehiclemessageheading();
+  // @@protoc_insertion_point(field_mutable:messages.PublishData.vehicleMessageHeading)
+  return _msg;
+}
+inline void PublishData::set_allocated_vehiclemessageheading(::messages::VehicleMessageHeading* vehiclemessageheading) {
+  ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
+  if (message_arena == nullptr) {
+    delete reinterpret_cast< ::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.vehiclemessageheading_);
+  }
+  if (vehiclemessageheading) {
+    ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(
+                reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(vehiclemessageheading));
+    if (message_arena != submessage_arena) {
+      vehiclemessageheading = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
+          message_arena, vehiclemessageheading, submessage_arena);
+    }
+
+  } else {
+
+  }
+  _impl_.vehiclemessageheading_ = vehiclemessageheading;
+  // @@protoc_insertion_point(field_set_allocated:messages.PublishData.vehicleMessageHeading)
+}
+
+// repeated .messages.dataPayload DataPayload = 2;
 inline int PublishData::_internal_datapayload_size() const {
   return _impl_.datapayload_.size();
 }
@@ -1196,4 +1296,4 @@ inline void PublishVehicleModelMapping::set_allocated_datacollectionscheme(std::
 
 #include "google/protobuf/port_undef.inc"
 
-#endif  // GOOGLE_PROTOBUF_INCLUDED_messages_2fIntelligentDataCollector_2eproto_2epb_2eh
+#endif  // GOOGLE_PROTOBUF_INCLUDED_messages_2fVehicleIntelligentDataCollector_2eproto_2epb_2eh
diff --git a/build/generated/source/proto/main/cpp/messages/VehicleRemoteHvac.pb.cc b/build/generated/source/proto/main/cpp/messages/VehicleRemoteHvac.pb.cc
index c9baf6c..b5e6d96 100644
--- a/build/generated/source/proto/main/cpp/messages/VehicleRemoteHvac.pb.cc
+++ b/build/generated/source/proto/main/cpp/messages/VehicleRemoteHvac.pb.cc
@@ -18,6 +18,7 @@
 PROTOBUF_PRAGMA_INIT_SEG
 namespace _pb = ::PROTOBUF_NAMESPACE_ID;
 namespace _pbi = ::PROTOBUF_NAMESPACE_ID::internal;
+namespace messages {
 PROTOBUF_CONSTEXPR CabinConditionStatusPublish::CabinConditionStatusPublish(
     ::_pbi::ConstantInitialized): _impl_{
     /*decltype(_impl_.event_time_)*/nullptr
@@ -134,6 +135,7 @@ struct HVACStateDefaultTypeInternal {
 
 PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
     PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 HVACStateDefaultTypeInternal _HVACState_default_instance_;
+}  // namespace messages
 static ::_pb::Metadata file_level_metadata_messages_2fVehicleRemoteHvac_2eproto[7];
 static const ::_pb::EnumDescriptor* file_level_enum_descriptors_messages_2fVehicleRemoteHvac_2eproto[3];
 static constexpr const ::_pb::ServiceDescriptor**
@@ -141,122 +143,124 @@ static constexpr const ::_pb::ServiceDescriptor**
 const ::uint32_t TableStruct_messages_2fVehicleRemoteHvac_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE(
     protodesc_cold) = {
     ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::CabinConditionStatusPublish, _internal_metadata_),
+    PROTOBUF_FIELD_OFFSET(::messages::CabinConditionStatusPublish, _internal_metadata_),
     ~0u,  // no _extensions_
     ~0u,  // no _oneof_case_
     ~0u,  // no _weak_field_map_
     ~0u,  // no _inlined_string_donated_
     ~0u,  // no _split_
     ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::CabinConditionStatusPublish, _impl_.event_time_),
-    PROTOBUF_FIELD_OFFSET(::CabinConditionStatusPublish, _impl_.hvac_state_),
-    PROTOBUF_FIELD_OFFSET(::CabinConditionStatusPublish, _impl_.cabin_temperature_),
+    PROTOBUF_FIELD_OFFSET(::messages::CabinConditionStatusPublish, _impl_.event_time_),
+    PROTOBUF_FIELD_OFFSET(::messages::CabinConditionStatusPublish, _impl_.hvac_state_),
+    PROTOBUF_FIELD_OFFSET(::messages::CabinConditionStatusPublish, _impl_.cabin_temperature_),
     ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::PreconditionRequest, _internal_metadata_),
+    PROTOBUF_FIELD_OFFSET(::messages::PreconditionRequest, _internal_metadata_),
     ~0u,  // no _extensions_
     ~0u,  // no _oneof_case_
     ~0u,  // no _weak_field_map_
     ~0u,  // no _inlined_string_donated_
     ~0u,  // no _split_
     ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::PreconditionRequest, _impl_.hvac_zones_),
-    PROTOBUF_FIELD_OFFSET(::PreconditionRequest, _impl_.start_time_),
+    PROTOBUF_FIELD_OFFSET(::messages::PreconditionRequest, _impl_.hvac_zones_),
+    PROTOBUF_FIELD_OFFSET(::messages::PreconditionRequest, _impl_.start_time_),
     ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::PreconditionResponse, _internal_metadata_),
+    PROTOBUF_FIELD_OFFSET(::messages::PreconditionResponse, _internal_metadata_),
     ~0u,  // no _extensions_
     ~0u,  // no _oneof_case_
     ~0u,  // no _weak_field_map_
     ~0u,  // no _inlined_string_donated_
     ~0u,  // no _split_
     ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::PreconditionResponse, _impl_.status_),
-    PROTOBUF_FIELD_OFFSET(::PreconditionResponse, _impl_.message_),
+    PROTOBUF_FIELD_OFFSET(::messages::PreconditionResponse, _impl_.status_),
+    PROTOBUF_FIELD_OFFSET(::messages::PreconditionResponse, _impl_.message_),
     ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::CabinTemperature, _internal_metadata_),
+    PROTOBUF_FIELD_OFFSET(::messages::CabinTemperature, _internal_metadata_),
     ~0u,  // no _extensions_
     ~0u,  // no _oneof_case_
     ~0u,  // no _weak_field_map_
     ~0u,  // no _inlined_string_donated_
     ~0u,  // no _split_
     ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::CabinTemperature, _impl_.temperature_),
-    PROTOBUF_FIELD_OFFSET(::CabinTemperature, _impl_.zone_),
+    PROTOBUF_FIELD_OFFSET(::messages::CabinTemperature, _impl_.temperature_),
+    PROTOBUF_FIELD_OFFSET(::messages::CabinTemperature, _impl_.zone_),
     ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::Temperature, _internal_metadata_),
+    PROTOBUF_FIELD_OFFSET(::messages::Temperature, _internal_metadata_),
     ~0u,  // no _extensions_
     ~0u,  // no _oneof_case_
     ~0u,  // no _weak_field_map_
     ~0u,  // no _inlined_string_donated_
     ~0u,  // no _split_
     ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::Temperature, _impl_.value_),
-    PROTOBUF_FIELD_OFFSET(::Temperature, _impl_.unit_),
+    PROTOBUF_FIELD_OFFSET(::messages::Temperature, _impl_.value_),
+    PROTOBUF_FIELD_OFFSET(::messages::Temperature, _impl_.unit_),
     ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::HVACZone, _internal_metadata_),
+    PROTOBUF_FIELD_OFFSET(::messages::HVACZone, _internal_metadata_),
     ~0u,  // no _extensions_
     ~0u,  // no _oneof_case_
     ~0u,  // no _weak_field_map_
     ~0u,  // no _inlined_string_donated_
     ~0u,  // no _split_
     ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::HVACZone, _impl_.zone_),
-    PROTOBUF_FIELD_OFFSET(::HVACZone, _impl_.target_temperature_),
+    PROTOBUF_FIELD_OFFSET(::messages::HVACZone, _impl_.zone_),
+    PROTOBUF_FIELD_OFFSET(::messages::HVACZone, _impl_.target_temperature_),
     ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::HVACState, _internal_metadata_),
+    PROTOBUF_FIELD_OFFSET(::messages::HVACState, _internal_metadata_),
     ~0u,  // no _extensions_
     ~0u,  // no _oneof_case_
     ~0u,  // no _weak_field_map_
     ~0u,  // no _inlined_string_donated_
     ~0u,  // no _split_
     ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::HVACState, _impl_.state_),
-    PROTOBUF_FIELD_OFFSET(::HVACState, _impl_.current_zone_),
+    PROTOBUF_FIELD_OFFSET(::messages::HVACState, _impl_.state_),
+    PROTOBUF_FIELD_OFFSET(::messages::HVACState, _impl_.current_zone_),
 };
 
 static const ::_pbi::MigrationSchema
     schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
-        { 0, -1, -1, sizeof(::CabinConditionStatusPublish)},
-        { 11, -1, -1, sizeof(::PreconditionRequest)},
-        { 21, -1, -1, sizeof(::PreconditionResponse)},
-        { 31, -1, -1, sizeof(::CabinTemperature)},
-        { 41, -1, -1, sizeof(::Temperature)},
-        { 51, -1, -1, sizeof(::HVACZone)},
-        { 61, -1, -1, sizeof(::HVACState)},
+        { 0, -1, -1, sizeof(::messages::CabinConditionStatusPublish)},
+        { 11, -1, -1, sizeof(::messages::PreconditionRequest)},
+        { 21, -1, -1, sizeof(::messages::PreconditionResponse)},
+        { 31, -1, -1, sizeof(::messages::CabinTemperature)},
+        { 41, -1, -1, sizeof(::messages::Temperature)},
+        { 51, -1, -1, sizeof(::messages::HVACZone)},
+        { 61, -1, -1, sizeof(::messages::HVACState)},
 };
 
 static const ::_pb::Message* const file_default_instances[] = {
-    &::_CabinConditionStatusPublish_default_instance_._instance,
-    &::_PreconditionRequest_default_instance_._instance,
-    &::_PreconditionResponse_default_instance_._instance,
-    &::_CabinTemperature_default_instance_._instance,
-    &::_Temperature_default_instance_._instance,
-    &::_HVACZone_default_instance_._instance,
-    &::_HVACState_default_instance_._instance,
+    &::messages::_CabinConditionStatusPublish_default_instance_._instance,
+    &::messages::_PreconditionRequest_default_instance_._instance,
+    &::messages::_PreconditionResponse_default_instance_._instance,
+    &::messages::_CabinTemperature_default_instance_._instance,
+    &::messages::_Temperature_default_instance_._instance,
+    &::messages::_HVACZone_default_instance_._instance,
+    &::messages::_HVACState_default_instance_._instance,
 };
 const char descriptor_table_protodef_messages_2fVehicleRemoteHvac_2eproto[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
-    "\n messages/VehicleRemoteHvac.proto\032\037goog"
-    "le/protobuf/timestamp.proto\"\233\001\n\033CabinCon"
-    "ditionStatusPublish\022.\n\nevent_time\030\001 \001(\0132"
-    "\032.google.protobuf.Timestamp\022\036\n\nhvac_stat"
-    "e\030\002 \001(\0132\n.HVACState\022,\n\021cabin_temperature"
-    "\030\003 \001(\0132\021.CabinTemperature\"d\n\023Preconditio"
-    "nRequest\022\035\n\nhvac_zones\030\001 \003(\0132\t.HVACZone\022"
-    ".\n\nstart_time\030\002 \001(\0132\032.google.protobuf.Ti"
-    "mestamp\"\206\001\n\024PreconditionResponse\022,\n\006stat"
-    "us\030\001 \001(\0162\034.PreconditionResponse.Status\022\017"
-    "\n\007message\030\002 \001(\t\"/\n\006Status\022\013\n\007SUCCESS\020\000\022\013"
-    "\n\007FAILURE\020\001\022\013\n\007PENDING\020\002\"N\n\020CabinTempera"
-    "ture\022!\n\013temperature\030\001 \001(\0132\014.Temperature\022"
-    "\027\n\004zone\030\002 \001(\0132\t.HVACZone\"*\n\013Temperature\022"
-    "\r\n\005value\030\001 \001(\002\022\014\n\004unit\030\002 \001(\t\"\224\001\n\010HVACZon"
-    "e\022\034\n\004zone\030\001 \001(\0162\016.HVACZone.Zone\022(\n\022targe"
-    "t_temperature\030\002 \001(\0132\014.Temperature\"@\n\004Zon"
-    "e\022\n\n\006DRIVER\020\000\022\r\n\tPASSENGER\020\001\022\r\n\tREAR_LEF"
-    "T\020\002\022\016\n\nREAR_RIGHT\020\003\"\203\001\n\tHVACState\022\037\n\005sta"
-    "te\030\001 \001(\0162\020.HVACState.State\022\037\n\014current_zo"
-    "ne\030\002 \001(\0132\t.HVACZone\"4\n\005State\022\007\n\003OFF\020\000\022\013\n"
-    "\007HEATING\020\001\022\013\n\007COOLING\020\002\022\010\n\004IDLE\020\003b\006proto"
-    "3"
+    "\n messages/VehicleRemoteHvac.proto\022\010mess"
+    "ages\032\037google/protobuf/timestamp.proto\"\255\001"
+    "\n\033CabinConditionStatusPublish\022.\n\nevent_t"
+    "ime\030\001 \001(\0132\032.google.protobuf.Timestamp\022\'\n"
+    "\nhvac_state\030\002 \001(\0132\023.messages.HVACState\0225"
+    "\n\021cabin_temperature\030\003 \001(\0132\032.messages.Cab"
+    "inTemperature\"m\n\023PreconditionRequest\022&\n\n"
+    "hvac_zones\030\001 \003(\0132\022.messages.HVACZone\022.\n\n"
+    "start_time\030\002 \001(\0132\032.google.protobuf.Times"
+    "tamp\"\217\001\n\024PreconditionResponse\0225\n\006status\030"
+    "\001 \001(\0162%.messages.PreconditionResponse.St"
+    "atus\022\017\n\007message\030\002 \001(\t\"/\n\006Status\022\013\n\007SUCCE"
+    "SS\020\000\022\013\n\007FAILURE\020\001\022\013\n\007PENDING\020\002\"`\n\020CabinT"
+    "emperature\022*\n\013temperature\030\001 \001(\0132\025.messag"
+    "es.Temperature\022 \n\004zone\030\002 \001(\0132\022.messages."
+    "HVACZone\"*\n\013Temperature\022\r\n\005value\030\001 \001(\002\022\014"
+    "\n\004unit\030\002 \001(\t\"\246\001\n\010HVACZone\022%\n\004zone\030\001 \001(\0162"
+    "\027.messages.HVACZone.Zone\0221\n\022target_tempe"
+    "rature\030\002 \001(\0132\025.messages.Temperature\"@\n\004Z"
+    "one\022\n\n\006DRIVER\020\000\022\r\n\tPASSENGER\020\001\022\r\n\tREAR_L"
+    "EFT\020\002\022\016\n\nREAR_RIGHT\020\003\"\225\001\n\tHVACState\022(\n\005s"
+    "tate\030\001 \001(\0162\031.messages.HVACState.State\022(\n"
+    "\014current_zone\030\002 \001(\0132\022.messages.HVACZone\""
+    "4\n\005State\022\007\n\003OFF\020\000\022\013\n\007HEATING\020\001\022\013\n\007COOLIN"
+    "G\020\002\022\010\n\004IDLE\020\003b\006proto3"
 };
 static const ::_pbi::DescriptorTable* const descriptor_table_messages_2fVehicleRemoteHvac_2eproto_deps[1] =
     {
@@ -266,7 +270,7 @@ static ::absl::once_flag descriptor_table_messages_2fVehicleRemoteHvac_2eproto_o
 const ::_pbi::DescriptorTable descriptor_table_messages_2fVehicleRemoteHvac_2eproto = {
     false,
     false,
-    881,
+    981,
     descriptor_table_protodef_messages_2fVehicleRemoteHvac_2eproto,
     "messages/VehicleRemoteHvac.proto",
     &descriptor_table_messages_2fVehicleRemoteHvac_2eproto_once,
@@ -298,6 +302,7 @@ PROTOBUF_ATTRIBUTE_WEAK const ::_pbi::DescriptorTable* descriptor_table_messages
 // Force running AddDescriptors() at dynamic initialization time.
 PROTOBUF_ATTRIBUTE_INIT_PRIORITY2
 static ::_pbi::AddDescriptorsRunner dynamic_init_dummy_messages_2fVehicleRemoteHvac_2eproto(&descriptor_table_messages_2fVehicleRemoteHvac_2eproto);
+namespace messages {
 const ::PROTOBUF_NAMESPACE_ID::EnumDescriptor* PreconditionResponse_Status_descriptor() {
   ::PROTOBUF_NAMESPACE_ID::internal::AssignDescriptors(&descriptor_table_messages_2fVehicleRemoteHvac_2eproto);
   return file_level_enum_descriptors_messages_2fVehicleRemoteHvac_2eproto[0];
@@ -385,19 +390,19 @@ constexpr int HVACState::State_ARRAYSIZE;
 class CabinConditionStatusPublish::_Internal {
  public:
   static const ::PROTOBUF_NAMESPACE_ID::Timestamp& event_time(const CabinConditionStatusPublish* msg);
-  static const ::HVACState& hvac_state(const CabinConditionStatusPublish* msg);
-  static const ::CabinTemperature& cabin_temperature(const CabinConditionStatusPublish* msg);
+  static const ::messages::HVACState& hvac_state(const CabinConditionStatusPublish* msg);
+  static const ::messages::CabinTemperature& cabin_temperature(const CabinConditionStatusPublish* msg);
 };
 
 const ::PROTOBUF_NAMESPACE_ID::Timestamp&
 CabinConditionStatusPublish::_Internal::event_time(const CabinConditionStatusPublish* msg) {
   return *msg->_impl_.event_time_;
 }
-const ::HVACState&
+const ::messages::HVACState&
 CabinConditionStatusPublish::_Internal::hvac_state(const CabinConditionStatusPublish* msg) {
   return *msg->_impl_.hvac_state_;
 }
-const ::CabinTemperature&
+const ::messages::CabinTemperature&
 CabinConditionStatusPublish::_Internal::cabin_temperature(const CabinConditionStatusPublish* msg) {
   return *msg->_impl_.cabin_temperature_;
 }
@@ -410,7 +415,7 @@ void CabinConditionStatusPublish::clear_event_time() {
 CabinConditionStatusPublish::CabinConditionStatusPublish(::PROTOBUF_NAMESPACE_ID::Arena* arena)
   : ::PROTOBUF_NAMESPACE_ID::Message(arena) {
   SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:CabinConditionStatusPublish)
+  // @@protoc_insertion_point(arena_constructor:messages.CabinConditionStatusPublish)
 }
 CabinConditionStatusPublish::CabinConditionStatusPublish(const CabinConditionStatusPublish& from)
   : ::PROTOBUF_NAMESPACE_ID::Message() {
@@ -426,12 +431,12 @@ CabinConditionStatusPublish::CabinConditionStatusPublish(const CabinConditionSta
     _this->_impl_.event_time_ = new ::PROTOBUF_NAMESPACE_ID::Timestamp(*from._impl_.event_time_);
   }
   if (from._internal_has_hvac_state()) {
-    _this->_impl_.hvac_state_ = new ::HVACState(*from._impl_.hvac_state_);
+    _this->_impl_.hvac_state_ = new ::messages::HVACState(*from._impl_.hvac_state_);
   }
   if (from._internal_has_cabin_temperature()) {
-    _this->_impl_.cabin_temperature_ = new ::CabinTemperature(*from._impl_.cabin_temperature_);
+    _this->_impl_.cabin_temperature_ = new ::messages::CabinTemperature(*from._impl_.cabin_temperature_);
   }
-  // @@protoc_insertion_point(copy_constructor:CabinConditionStatusPublish)
+  // @@protoc_insertion_point(copy_constructor:messages.CabinConditionStatusPublish)
 }
 
 inline void CabinConditionStatusPublish::SharedCtor(::_pb::Arena* arena) {
@@ -445,7 +450,7 @@ inline void CabinConditionStatusPublish::SharedCtor(::_pb::Arena* arena) {
 }
 
 CabinConditionStatusPublish::~CabinConditionStatusPublish() {
-  // @@protoc_insertion_point(destructor:CabinConditionStatusPublish)
+  // @@protoc_insertion_point(destructor:messages.CabinConditionStatusPublish)
   if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) {
   (void)arena;
     return;
@@ -465,7 +470,7 @@ void CabinConditionStatusPublish::SetCachedSize(int size) const {
 }
 
 void CabinConditionStatusPublish::Clear() {
-// @@protoc_insertion_point(message_clear_start:CabinConditionStatusPublish)
+// @@protoc_insertion_point(message_clear_start:messages.CabinConditionStatusPublish)
   ::uint32_t cached_has_bits = 0;
   // Prevent compiler warnings about cached_has_bits being unused
   (void) cached_has_bits;
@@ -500,7 +505,7 @@ const char* CabinConditionStatusPublish::_InternalParse(const char* ptr, ::_pbi:
           goto handle_unusual;
         }
         continue;
-      // .HVACState hvac_state = 2;
+      // .messages.HVACState hvac_state = 2;
       case 2:
         if (PROTOBUF_PREDICT_TRUE(static_cast<::uint8_t>(tag) == 18)) {
           ptr = ctx->ParseMessage(_internal_mutable_hvac_state(), ptr);
@@ -509,7 +514,7 @@ const char* CabinConditionStatusPublish::_InternalParse(const char* ptr, ::_pbi:
           goto handle_unusual;
         }
         continue;
-      // .CabinTemperature cabin_temperature = 3;
+      // .messages.CabinTemperature cabin_temperature = 3;
       case 3:
         if (PROTOBUF_PREDICT_TRUE(static_cast<::uint8_t>(tag) == 26)) {
           ptr = ctx->ParseMessage(_internal_mutable_cabin_temperature(), ptr);
@@ -543,7 +548,7 @@ failure:
 
 ::uint8_t* CabinConditionStatusPublish::_InternalSerialize(
     ::uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:CabinConditionStatusPublish)
+  // @@protoc_insertion_point(serialize_to_array_start:messages.CabinConditionStatusPublish)
   ::uint32_t cached_has_bits = 0;
   (void) cached_has_bits;
 
@@ -554,14 +559,14 @@ failure:
         _Internal::event_time(this).GetCachedSize(), target, stream);
   }
 
-  // .HVACState hvac_state = 2;
+  // .messages.HVACState hvac_state = 2;
   if (this->_internal_has_hvac_state()) {
     target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
       InternalWriteMessage(2, _Internal::hvac_state(this),
         _Internal::hvac_state(this).GetCachedSize(), target, stream);
   }
 
-  // .CabinTemperature cabin_temperature = 3;
+  // .messages.CabinTemperature cabin_temperature = 3;
   if (this->_internal_has_cabin_temperature()) {
     target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
       InternalWriteMessage(3, _Internal::cabin_temperature(this),
@@ -572,12 +577,12 @@ failure:
     target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
         _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream);
   }
-  // @@protoc_insertion_point(serialize_to_array_end:CabinConditionStatusPublish)
+  // @@protoc_insertion_point(serialize_to_array_end:messages.CabinConditionStatusPublish)
   return target;
 }
 
 ::size_t CabinConditionStatusPublish::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:CabinConditionStatusPublish)
+// @@protoc_insertion_point(message_byte_size_start:messages.CabinConditionStatusPublish)
   ::size_t total_size = 0;
 
   ::uint32_t cached_has_bits = 0;
@@ -591,14 +596,14 @@ failure:
         *_impl_.event_time_);
   }
 
-  // .HVACState hvac_state = 2;
+  // .messages.HVACState hvac_state = 2;
   if (this->_internal_has_hvac_state()) {
     total_size += 1 +
       ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(
         *_impl_.hvac_state_);
   }
 
-  // .CabinTemperature cabin_temperature = 3;
+  // .messages.CabinTemperature cabin_temperature = 3;
   if (this->_internal_has_cabin_temperature()) {
     total_size += 1 +
       ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(
@@ -618,7 +623,7 @@ const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*CabinConditionStatusPublish::G
 void CabinConditionStatusPublish::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) {
   auto* const _this = static_cast<CabinConditionStatusPublish*>(&to_msg);
   auto& from = static_cast<const CabinConditionStatusPublish&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:CabinConditionStatusPublish)
+  // @@protoc_insertion_point(class_specific_merge_from_start:messages.CabinConditionStatusPublish)
   ABSL_DCHECK_NE(&from, _this);
   ::uint32_t cached_has_bits = 0;
   (void) cached_has_bits;
@@ -628,18 +633,18 @@ void CabinConditionStatusPublish::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to
         from._internal_event_time());
   }
   if (from._internal_has_hvac_state()) {
-    _this->_internal_mutable_hvac_state()->::HVACState::MergeFrom(
+    _this->_internal_mutable_hvac_state()->::messages::HVACState::MergeFrom(
         from._internal_hvac_state());
   }
   if (from._internal_has_cabin_temperature()) {
-    _this->_internal_mutable_cabin_temperature()->::CabinTemperature::MergeFrom(
+    _this->_internal_mutable_cabin_temperature()->::messages::CabinTemperature::MergeFrom(
         from._internal_cabin_temperature());
   }
   _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
 }
 
 void CabinConditionStatusPublish::CopyFrom(const CabinConditionStatusPublish& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:CabinConditionStatusPublish)
+// @@protoc_insertion_point(class_specific_copy_from_start:messages.CabinConditionStatusPublish)
   if (&from == this) return;
   Clear();
   MergeFrom(from);
@@ -685,7 +690,7 @@ void PreconditionRequest::clear_start_time() {
 PreconditionRequest::PreconditionRequest(::PROTOBUF_NAMESPACE_ID::Arena* arena)
   : ::PROTOBUF_NAMESPACE_ID::Message(arena) {
   SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:PreconditionRequest)
+  // @@protoc_insertion_point(arena_constructor:messages.PreconditionRequest)
 }
 PreconditionRequest::PreconditionRequest(const PreconditionRequest& from)
   : ::PROTOBUF_NAMESPACE_ID::Message() {
@@ -699,7 +704,7 @@ PreconditionRequest::PreconditionRequest(const PreconditionRequest& from)
   if (from._internal_has_start_time()) {
     _this->_impl_.start_time_ = new ::PROTOBUF_NAMESPACE_ID::Timestamp(*from._impl_.start_time_);
   }
-  // @@protoc_insertion_point(copy_constructor:PreconditionRequest)
+  // @@protoc_insertion_point(copy_constructor:messages.PreconditionRequest)
 }
 
 inline void PreconditionRequest::SharedCtor(::_pb::Arena* arena) {
@@ -712,7 +717,7 @@ inline void PreconditionRequest::SharedCtor(::_pb::Arena* arena) {
 }
 
 PreconditionRequest::~PreconditionRequest() {
-  // @@protoc_insertion_point(destructor:PreconditionRequest)
+  // @@protoc_insertion_point(destructor:messages.PreconditionRequest)
   if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) {
   (void)arena;
     return;
@@ -731,7 +736,7 @@ void PreconditionRequest::SetCachedSize(int size) const {
 }
 
 void PreconditionRequest::Clear() {
-// @@protoc_insertion_point(message_clear_start:PreconditionRequest)
+// @@protoc_insertion_point(message_clear_start:messages.PreconditionRequest)
   ::uint32_t cached_has_bits = 0;
   // Prevent compiler warnings about cached_has_bits being unused
   (void) cached_has_bits;
@@ -750,7 +755,7 @@ const char* PreconditionRequest::_InternalParse(const char* ptr, ::_pbi::ParseCo
     ::uint32_t tag;
     ptr = ::_pbi::ReadTag(ptr, &tag);
     switch (tag >> 3) {
-      // repeated .HVACZone hvac_zones = 1;
+      // repeated .messages.HVACZone hvac_zones = 1;
       case 1:
         if (PROTOBUF_PREDICT_TRUE(static_cast<::uint8_t>(tag) == 10)) {
           ptr -= 1;
@@ -798,11 +803,11 @@ failure:
 
 ::uint8_t* PreconditionRequest::_InternalSerialize(
     ::uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:PreconditionRequest)
+  // @@protoc_insertion_point(serialize_to_array_start:messages.PreconditionRequest)
   ::uint32_t cached_has_bits = 0;
   (void) cached_has_bits;
 
-  // repeated .HVACZone hvac_zones = 1;
+  // repeated .messages.HVACZone hvac_zones = 1;
   for (unsigned i = 0,
       n = static_cast<unsigned>(this->_internal_hvac_zones_size()); i < n; i++) {
     const auto& repfield = this->_internal_hvac_zones(i);
@@ -821,19 +826,19 @@ failure:
     target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
         _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream);
   }
-  // @@protoc_insertion_point(serialize_to_array_end:PreconditionRequest)
+  // @@protoc_insertion_point(serialize_to_array_end:messages.PreconditionRequest)
   return target;
 }
 
 ::size_t PreconditionRequest::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:PreconditionRequest)
+// @@protoc_insertion_point(message_byte_size_start:messages.PreconditionRequest)
   ::size_t total_size = 0;
 
   ::uint32_t cached_has_bits = 0;
   // Prevent compiler warnings about cached_has_bits being unused
   (void) cached_has_bits;
 
-  // repeated .HVACZone hvac_zones = 1;
+  // repeated .messages.HVACZone hvac_zones = 1;
   total_size += 1UL * this->_internal_hvac_zones_size();
   for (const auto& msg : this->_impl_.hvac_zones_) {
     total_size +=
@@ -860,7 +865,7 @@ const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*PreconditionRequest::GetClassD
 void PreconditionRequest::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) {
   auto* const _this = static_cast<PreconditionRequest*>(&to_msg);
   auto& from = static_cast<const PreconditionRequest&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:PreconditionRequest)
+  // @@protoc_insertion_point(class_specific_merge_from_start:messages.PreconditionRequest)
   ABSL_DCHECK_NE(&from, _this);
   ::uint32_t cached_has_bits = 0;
   (void) cached_has_bits;
@@ -874,7 +879,7 @@ void PreconditionRequest::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, co
 }
 
 void PreconditionRequest::CopyFrom(const PreconditionRequest& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:PreconditionRequest)
+// @@protoc_insertion_point(class_specific_copy_from_start:messages.PreconditionRequest)
   if (&from == this) return;
   Clear();
   MergeFrom(from);
@@ -905,7 +910,7 @@ class PreconditionResponse::_Internal {
 PreconditionResponse::PreconditionResponse(::PROTOBUF_NAMESPACE_ID::Arena* arena)
   : ::PROTOBUF_NAMESPACE_ID::Message(arena) {
   SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:PreconditionResponse)
+  // @@protoc_insertion_point(arena_constructor:messages.PreconditionResponse)
 }
 PreconditionResponse::PreconditionResponse(const PreconditionResponse& from)
   : ::PROTOBUF_NAMESPACE_ID::Message() {
@@ -926,7 +931,7 @@ PreconditionResponse::PreconditionResponse(const PreconditionResponse& from)
     _this->_impl_.message_.Set(from._internal_message(), _this->GetArenaForAllocation());
   }
   _this->_impl_.status_ = from._impl_.status_;
-  // @@protoc_insertion_point(copy_constructor:PreconditionResponse)
+  // @@protoc_insertion_point(copy_constructor:messages.PreconditionResponse)
 }
 
 inline void PreconditionResponse::SharedCtor(::_pb::Arena* arena) {
@@ -945,7 +950,7 @@ inline void PreconditionResponse::SharedCtor(::_pb::Arena* arena) {
 }
 
 PreconditionResponse::~PreconditionResponse() {
-  // @@protoc_insertion_point(destructor:PreconditionResponse)
+  // @@protoc_insertion_point(destructor:messages.PreconditionResponse)
   if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) {
   (void)arena;
     return;
@@ -963,7 +968,7 @@ void PreconditionResponse::SetCachedSize(int size) const {
 }
 
 void PreconditionResponse::Clear() {
-// @@protoc_insertion_point(message_clear_start:PreconditionResponse)
+// @@protoc_insertion_point(message_clear_start:messages.PreconditionResponse)
   ::uint32_t cached_has_bits = 0;
   // Prevent compiler warnings about cached_has_bits being unused
   (void) cached_has_bits;
@@ -979,12 +984,12 @@ const char* PreconditionResponse::_InternalParse(const char* ptr, ::_pbi::ParseC
     ::uint32_t tag;
     ptr = ::_pbi::ReadTag(ptr, &tag);
     switch (tag >> 3) {
-      // .PreconditionResponse.Status status = 1;
+      // .messages.PreconditionResponse.Status status = 1;
       case 1:
         if (PROTOBUF_PREDICT_TRUE(static_cast<::uint8_t>(tag) == 8)) {
           ::uint32_t val = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr);
           CHK_(ptr);
-          _internal_set_status(static_cast<::PreconditionResponse_Status>(val));
+          _internal_set_status(static_cast<::messages::PreconditionResponse_Status>(val));
         } else {
           goto handle_unusual;
         }
@@ -995,7 +1000,7 @@ const char* PreconditionResponse::_InternalParse(const char* ptr, ::_pbi::ParseC
           auto str = _internal_mutable_message();
           ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx);
           CHK_(ptr);
-          CHK_(::_pbi::VerifyUTF8(str, "PreconditionResponse.message"));
+          CHK_(::_pbi::VerifyUTF8(str, "messages.PreconditionResponse.message"));
         } else {
           goto handle_unusual;
         }
@@ -1025,11 +1030,11 @@ failure:
 
 ::uint8_t* PreconditionResponse::_InternalSerialize(
     ::uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:PreconditionResponse)
+  // @@protoc_insertion_point(serialize_to_array_start:messages.PreconditionResponse)
   ::uint32_t cached_has_bits = 0;
   (void) cached_has_bits;
 
-  // .PreconditionResponse.Status status = 1;
+  // .messages.PreconditionResponse.Status status = 1;
   if (this->_internal_status() != 0) {
     target = stream->EnsureSpace(target);
     target = ::_pbi::WireFormatLite::WriteEnumToArray(
@@ -1040,7 +1045,7 @@ failure:
   if (!this->_internal_message().empty()) {
     const std::string& _s = this->_internal_message();
     ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, "PreconditionResponse.message");
+        _s.data(), static_cast<int>(_s.length()), ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, "messages.PreconditionResponse.message");
     target = stream->WriteStringMaybeAliased(2, _s, target);
   }
 
@@ -1048,12 +1053,12 @@ failure:
     target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
         _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream);
   }
-  // @@protoc_insertion_point(serialize_to_array_end:PreconditionResponse)
+  // @@protoc_insertion_point(serialize_to_array_end:messages.PreconditionResponse)
   return target;
 }
 
 ::size_t PreconditionResponse::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:PreconditionResponse)
+// @@protoc_insertion_point(message_byte_size_start:messages.PreconditionResponse)
   ::size_t total_size = 0;
 
   ::uint32_t cached_has_bits = 0;
@@ -1066,7 +1071,7 @@ failure:
                                     this->_internal_message());
   }
 
-  // .PreconditionResponse.Status status = 1;
+  // .messages.PreconditionResponse.Status status = 1;
   if (this->_internal_status() != 0) {
     total_size += 1 +
                   ::_pbi::WireFormatLite::EnumSize(this->_internal_status());
@@ -1085,7 +1090,7 @@ const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*PreconditionResponse::GetClass
 void PreconditionResponse::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) {
   auto* const _this = static_cast<PreconditionResponse*>(&to_msg);
   auto& from = static_cast<const PreconditionResponse&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:PreconditionResponse)
+  // @@protoc_insertion_point(class_specific_merge_from_start:messages.PreconditionResponse)
   ABSL_DCHECK_NE(&from, _this);
   ::uint32_t cached_has_bits = 0;
   (void) cached_has_bits;
@@ -1100,7 +1105,7 @@ void PreconditionResponse::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, c
 }
 
 void PreconditionResponse::CopyFrom(const PreconditionResponse& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:PreconditionResponse)
+// @@protoc_insertion_point(class_specific_copy_from_start:messages.PreconditionResponse)
   if (&from == this) return;
   Clear();
   MergeFrom(from);
@@ -1129,22 +1134,22 @@ void PreconditionResponse::InternalSwap(PreconditionResponse* other) {
 
 class CabinTemperature::_Internal {
  public:
-  static const ::Temperature& temperature(const CabinTemperature* msg);
-  static const ::HVACZone& zone(const CabinTemperature* msg);
+  static const ::messages::Temperature& temperature(const CabinTemperature* msg);
+  static const ::messages::HVACZone& zone(const CabinTemperature* msg);
 };
 
-const ::Temperature&
+const ::messages::Temperature&
 CabinTemperature::_Internal::temperature(const CabinTemperature* msg) {
   return *msg->_impl_.temperature_;
 }
-const ::HVACZone&
+const ::messages::HVACZone&
 CabinTemperature::_Internal::zone(const CabinTemperature* msg) {
   return *msg->_impl_.zone_;
 }
 CabinTemperature::CabinTemperature(::PROTOBUF_NAMESPACE_ID::Arena* arena)
   : ::PROTOBUF_NAMESPACE_ID::Message(arena) {
   SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:CabinTemperature)
+  // @@protoc_insertion_point(arena_constructor:messages.CabinTemperature)
 }
 CabinTemperature::CabinTemperature(const CabinTemperature& from)
   : ::PROTOBUF_NAMESPACE_ID::Message() {
@@ -1156,12 +1161,12 @@ CabinTemperature::CabinTemperature(const CabinTemperature& from)
 
   _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
   if (from._internal_has_temperature()) {
-    _this->_impl_.temperature_ = new ::Temperature(*from._impl_.temperature_);
+    _this->_impl_.temperature_ = new ::messages::Temperature(*from._impl_.temperature_);
   }
   if (from._internal_has_zone()) {
-    _this->_impl_.zone_ = new ::HVACZone(*from._impl_.zone_);
+    _this->_impl_.zone_ = new ::messages::HVACZone(*from._impl_.zone_);
   }
-  // @@protoc_insertion_point(copy_constructor:CabinTemperature)
+  // @@protoc_insertion_point(copy_constructor:messages.CabinTemperature)
 }
 
 inline void CabinTemperature::SharedCtor(::_pb::Arena* arena) {
@@ -1174,7 +1179,7 @@ inline void CabinTemperature::SharedCtor(::_pb::Arena* arena) {
 }
 
 CabinTemperature::~CabinTemperature() {
-  // @@protoc_insertion_point(destructor:CabinTemperature)
+  // @@protoc_insertion_point(destructor:messages.CabinTemperature)
   if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) {
   (void)arena;
     return;
@@ -1193,7 +1198,7 @@ void CabinTemperature::SetCachedSize(int size) const {
 }
 
 void CabinTemperature::Clear() {
-// @@protoc_insertion_point(message_clear_start:CabinTemperature)
+// @@protoc_insertion_point(message_clear_start:messages.CabinTemperature)
   ::uint32_t cached_has_bits = 0;
   // Prevent compiler warnings about cached_has_bits being unused
   (void) cached_has_bits;
@@ -1215,7 +1220,7 @@ const char* CabinTemperature::_InternalParse(const char* ptr, ::_pbi::ParseConte
     ::uint32_t tag;
     ptr = ::_pbi::ReadTag(ptr, &tag);
     switch (tag >> 3) {
-      // .Temperature temperature = 1;
+      // .messages.Temperature temperature = 1;
       case 1:
         if (PROTOBUF_PREDICT_TRUE(static_cast<::uint8_t>(tag) == 10)) {
           ptr = ctx->ParseMessage(_internal_mutable_temperature(), ptr);
@@ -1224,7 +1229,7 @@ const char* CabinTemperature::_InternalParse(const char* ptr, ::_pbi::ParseConte
           goto handle_unusual;
         }
         continue;
-      // .HVACZone zone = 2;
+      // .messages.HVACZone zone = 2;
       case 2:
         if (PROTOBUF_PREDICT_TRUE(static_cast<::uint8_t>(tag) == 18)) {
           ptr = ctx->ParseMessage(_internal_mutable_zone(), ptr);
@@ -1258,18 +1263,18 @@ failure:
 
 ::uint8_t* CabinTemperature::_InternalSerialize(
     ::uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:CabinTemperature)
+  // @@protoc_insertion_point(serialize_to_array_start:messages.CabinTemperature)
   ::uint32_t cached_has_bits = 0;
   (void) cached_has_bits;
 
-  // .Temperature temperature = 1;
+  // .messages.Temperature temperature = 1;
   if (this->_internal_has_temperature()) {
     target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
       InternalWriteMessage(1, _Internal::temperature(this),
         _Internal::temperature(this).GetCachedSize(), target, stream);
   }
 
-  // .HVACZone zone = 2;
+  // .messages.HVACZone zone = 2;
   if (this->_internal_has_zone()) {
     target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
       InternalWriteMessage(2, _Internal::zone(this),
@@ -1280,26 +1285,26 @@ failure:
     target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
         _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream);
   }
-  // @@protoc_insertion_point(serialize_to_array_end:CabinTemperature)
+  // @@protoc_insertion_point(serialize_to_array_end:messages.CabinTemperature)
   return target;
 }
 
 ::size_t CabinTemperature::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:CabinTemperature)
+// @@protoc_insertion_point(message_byte_size_start:messages.CabinTemperature)
   ::size_t total_size = 0;
 
   ::uint32_t cached_has_bits = 0;
   // Prevent compiler warnings about cached_has_bits being unused
   (void) cached_has_bits;
 
-  // .Temperature temperature = 1;
+  // .messages.Temperature temperature = 1;
   if (this->_internal_has_temperature()) {
     total_size += 1 +
       ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(
         *_impl_.temperature_);
   }
 
-  // .HVACZone zone = 2;
+  // .messages.HVACZone zone = 2;
   if (this->_internal_has_zone()) {
     total_size += 1 +
       ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(
@@ -1319,24 +1324,24 @@ const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*CabinTemperature::GetClassData
 void CabinTemperature::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) {
   auto* const _this = static_cast<CabinTemperature*>(&to_msg);
   auto& from = static_cast<const CabinTemperature&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:CabinTemperature)
+  // @@protoc_insertion_point(class_specific_merge_from_start:messages.CabinTemperature)
   ABSL_DCHECK_NE(&from, _this);
   ::uint32_t cached_has_bits = 0;
   (void) cached_has_bits;
 
   if (from._internal_has_temperature()) {
-    _this->_internal_mutable_temperature()->::Temperature::MergeFrom(
+    _this->_internal_mutable_temperature()->::messages::Temperature::MergeFrom(
         from._internal_temperature());
   }
   if (from._internal_has_zone()) {
-    _this->_internal_mutable_zone()->::HVACZone::MergeFrom(
+    _this->_internal_mutable_zone()->::messages::HVACZone::MergeFrom(
         from._internal_zone());
   }
   _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
 }
 
 void CabinTemperature::CopyFrom(const CabinTemperature& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:CabinTemperature)
+// @@protoc_insertion_point(class_specific_copy_from_start:messages.CabinTemperature)
   if (&from == this) return;
   Clear();
   MergeFrom(from);
@@ -1371,7 +1376,7 @@ class Temperature::_Internal {
 Temperature::Temperature(::PROTOBUF_NAMESPACE_ID::Arena* arena)
   : ::PROTOBUF_NAMESPACE_ID::Message(arena) {
   SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:Temperature)
+  // @@protoc_insertion_point(arena_constructor:messages.Temperature)
 }
 Temperature::Temperature(const Temperature& from)
   : ::PROTOBUF_NAMESPACE_ID::Message() {
@@ -1392,7 +1397,7 @@ Temperature::Temperature(const Temperature& from)
     _this->_impl_.unit_.Set(from._internal_unit(), _this->GetArenaForAllocation());
   }
   _this->_impl_.value_ = from._impl_.value_;
-  // @@protoc_insertion_point(copy_constructor:Temperature)
+  // @@protoc_insertion_point(copy_constructor:messages.Temperature)
 }
 
 inline void Temperature::SharedCtor(::_pb::Arena* arena) {
@@ -1411,7 +1416,7 @@ inline void Temperature::SharedCtor(::_pb::Arena* arena) {
 }
 
 Temperature::~Temperature() {
-  // @@protoc_insertion_point(destructor:Temperature)
+  // @@protoc_insertion_point(destructor:messages.Temperature)
   if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) {
   (void)arena;
     return;
@@ -1429,7 +1434,7 @@ void Temperature::SetCachedSize(int size) const {
 }
 
 void Temperature::Clear() {
-// @@protoc_insertion_point(message_clear_start:Temperature)
+// @@protoc_insertion_point(message_clear_start:messages.Temperature)
   ::uint32_t cached_has_bits = 0;
   // Prevent compiler warnings about cached_has_bits being unused
   (void) cached_has_bits;
@@ -1460,7 +1465,7 @@ const char* Temperature::_InternalParse(const char* ptr, ::_pbi::ParseContext* c
           auto str = _internal_mutable_unit();
           ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx);
           CHK_(ptr);
-          CHK_(::_pbi::VerifyUTF8(str, "Temperature.unit"));
+          CHK_(::_pbi::VerifyUTF8(str, "messages.Temperature.unit"));
         } else {
           goto handle_unusual;
         }
@@ -1490,7 +1495,7 @@ failure:
 
 ::uint8_t* Temperature::_InternalSerialize(
     ::uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:Temperature)
+  // @@protoc_insertion_point(serialize_to_array_start:messages.Temperature)
   ::uint32_t cached_has_bits = 0;
   (void) cached_has_bits;
 
@@ -1509,7 +1514,7 @@ failure:
   if (!this->_internal_unit().empty()) {
     const std::string& _s = this->_internal_unit();
     ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, "Temperature.unit");
+        _s.data(), static_cast<int>(_s.length()), ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, "messages.Temperature.unit");
     target = stream->WriteStringMaybeAliased(2, _s, target);
   }
 
@@ -1517,12 +1522,12 @@ failure:
     target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
         _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream);
   }
-  // @@protoc_insertion_point(serialize_to_array_end:Temperature)
+  // @@protoc_insertion_point(serialize_to_array_end:messages.Temperature)
   return target;
 }
 
 ::size_t Temperature::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:Temperature)
+// @@protoc_insertion_point(message_byte_size_start:messages.Temperature)
   ::size_t total_size = 0;
 
   ::uint32_t cached_has_bits = 0;
@@ -1557,7 +1562,7 @@ const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*Temperature::GetClassData() co
 void Temperature::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) {
   auto* const _this = static_cast<Temperature*>(&to_msg);
   auto& from = static_cast<const Temperature&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:Temperature)
+  // @@protoc_insertion_point(class_specific_merge_from_start:messages.Temperature)
   ABSL_DCHECK_NE(&from, _this);
   ::uint32_t cached_has_bits = 0;
   (void) cached_has_bits;
@@ -1576,7 +1581,7 @@ void Temperature::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PR
 }
 
 void Temperature::CopyFrom(const Temperature& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:Temperature)
+// @@protoc_insertion_point(class_specific_copy_from_start:messages.Temperature)
   if (&from == this) return;
   Clear();
   MergeFrom(from);
@@ -1606,17 +1611,17 @@ void Temperature::InternalSwap(Temperature* other) {
 
 class HVACZone::_Internal {
  public:
-  static const ::Temperature& target_temperature(const HVACZone* msg);
+  static const ::messages::Temperature& target_temperature(const HVACZone* msg);
 };
 
-const ::Temperature&
+const ::messages::Temperature&
 HVACZone::_Internal::target_temperature(const HVACZone* msg) {
   return *msg->_impl_.target_temperature_;
 }
 HVACZone::HVACZone(::PROTOBUF_NAMESPACE_ID::Arena* arena)
   : ::PROTOBUF_NAMESPACE_ID::Message(arena) {
   SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:HVACZone)
+  // @@protoc_insertion_point(arena_constructor:messages.HVACZone)
 }
 HVACZone::HVACZone(const HVACZone& from)
   : ::PROTOBUF_NAMESPACE_ID::Message() {
@@ -1629,10 +1634,10 @@ HVACZone::HVACZone(const HVACZone& from)
 
   _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
   if (from._internal_has_target_temperature()) {
-    _this->_impl_.target_temperature_ = new ::Temperature(*from._impl_.target_temperature_);
+    _this->_impl_.target_temperature_ = new ::messages::Temperature(*from._impl_.target_temperature_);
   }
   _this->_impl_.zone_ = from._impl_.zone_;
-  // @@protoc_insertion_point(copy_constructor:HVACZone)
+  // @@protoc_insertion_point(copy_constructor:messages.HVACZone)
 }
 
 inline void HVACZone::SharedCtor(::_pb::Arena* arena) {
@@ -1646,7 +1651,7 @@ inline void HVACZone::SharedCtor(::_pb::Arena* arena) {
 }
 
 HVACZone::~HVACZone() {
-  // @@protoc_insertion_point(destructor:HVACZone)
+  // @@protoc_insertion_point(destructor:messages.HVACZone)
   if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) {
   (void)arena;
     return;
@@ -1664,7 +1669,7 @@ void HVACZone::SetCachedSize(int size) const {
 }
 
 void HVACZone::Clear() {
-// @@protoc_insertion_point(message_clear_start:HVACZone)
+// @@protoc_insertion_point(message_clear_start:messages.HVACZone)
   ::uint32_t cached_has_bits = 0;
   // Prevent compiler warnings about cached_has_bits being unused
   (void) cached_has_bits;
@@ -1683,17 +1688,17 @@ const char* HVACZone::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx)
     ::uint32_t tag;
     ptr = ::_pbi::ReadTag(ptr, &tag);
     switch (tag >> 3) {
-      // .HVACZone.Zone zone = 1;
+      // .messages.HVACZone.Zone zone = 1;
       case 1:
         if (PROTOBUF_PREDICT_TRUE(static_cast<::uint8_t>(tag) == 8)) {
           ::uint32_t val = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr);
           CHK_(ptr);
-          _internal_set_zone(static_cast<::HVACZone_Zone>(val));
+          _internal_set_zone(static_cast<::messages::HVACZone_Zone>(val));
         } else {
           goto handle_unusual;
         }
         continue;
-      // .Temperature target_temperature = 2;
+      // .messages.Temperature target_temperature = 2;
       case 2:
         if (PROTOBUF_PREDICT_TRUE(static_cast<::uint8_t>(tag) == 18)) {
           ptr = ctx->ParseMessage(_internal_mutable_target_temperature(), ptr);
@@ -1727,18 +1732,18 @@ failure:
 
 ::uint8_t* HVACZone::_InternalSerialize(
     ::uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:HVACZone)
+  // @@protoc_insertion_point(serialize_to_array_start:messages.HVACZone)
   ::uint32_t cached_has_bits = 0;
   (void) cached_has_bits;
 
-  // .HVACZone.Zone zone = 1;
+  // .messages.HVACZone.Zone zone = 1;
   if (this->_internal_zone() != 0) {
     target = stream->EnsureSpace(target);
     target = ::_pbi::WireFormatLite::WriteEnumToArray(
         1, this->_internal_zone(), target);
   }
 
-  // .Temperature target_temperature = 2;
+  // .messages.Temperature target_temperature = 2;
   if (this->_internal_has_target_temperature()) {
     target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
       InternalWriteMessage(2, _Internal::target_temperature(this),
@@ -1749,26 +1754,26 @@ failure:
     target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
         _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream);
   }
-  // @@protoc_insertion_point(serialize_to_array_end:HVACZone)
+  // @@protoc_insertion_point(serialize_to_array_end:messages.HVACZone)
   return target;
 }
 
 ::size_t HVACZone::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:HVACZone)
+// @@protoc_insertion_point(message_byte_size_start:messages.HVACZone)
   ::size_t total_size = 0;
 
   ::uint32_t cached_has_bits = 0;
   // Prevent compiler warnings about cached_has_bits being unused
   (void) cached_has_bits;
 
-  // .Temperature target_temperature = 2;
+  // .messages.Temperature target_temperature = 2;
   if (this->_internal_has_target_temperature()) {
     total_size += 1 +
       ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(
         *_impl_.target_temperature_);
   }
 
-  // .HVACZone.Zone zone = 1;
+  // .messages.HVACZone.Zone zone = 1;
   if (this->_internal_zone() != 0) {
     total_size += 1 +
                   ::_pbi::WireFormatLite::EnumSize(this->_internal_zone());
@@ -1787,13 +1792,13 @@ const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*HVACZone::GetClassData() const
 void HVACZone::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) {
   auto* const _this = static_cast<HVACZone*>(&to_msg);
   auto& from = static_cast<const HVACZone&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:HVACZone)
+  // @@protoc_insertion_point(class_specific_merge_from_start:messages.HVACZone)
   ABSL_DCHECK_NE(&from, _this);
   ::uint32_t cached_has_bits = 0;
   (void) cached_has_bits;
 
   if (from._internal_has_target_temperature()) {
-    _this->_internal_mutable_target_temperature()->::Temperature::MergeFrom(
+    _this->_internal_mutable_target_temperature()->::messages::Temperature::MergeFrom(
         from._internal_target_temperature());
   }
   if (from._internal_zone() != 0) {
@@ -1803,7 +1808,7 @@ void HVACZone::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTO
 }
 
 void HVACZone::CopyFrom(const HVACZone& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:HVACZone)
+// @@protoc_insertion_point(class_specific_copy_from_start:messages.HVACZone)
   if (&from == this) return;
   Clear();
   MergeFrom(from);
@@ -1833,17 +1838,17 @@ void HVACZone::InternalSwap(HVACZone* other) {
 
 class HVACState::_Internal {
  public:
-  static const ::HVACZone& current_zone(const HVACState* msg);
+  static const ::messages::HVACZone& current_zone(const HVACState* msg);
 };
 
-const ::HVACZone&
+const ::messages::HVACZone&
 HVACState::_Internal::current_zone(const HVACState* msg) {
   return *msg->_impl_.current_zone_;
 }
 HVACState::HVACState(::PROTOBUF_NAMESPACE_ID::Arena* arena)
   : ::PROTOBUF_NAMESPACE_ID::Message(arena) {
   SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:HVACState)
+  // @@protoc_insertion_point(arena_constructor:messages.HVACState)
 }
 HVACState::HVACState(const HVACState& from)
   : ::PROTOBUF_NAMESPACE_ID::Message() {
@@ -1856,10 +1861,10 @@ HVACState::HVACState(const HVACState& from)
 
   _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
   if (from._internal_has_current_zone()) {
-    _this->_impl_.current_zone_ = new ::HVACZone(*from._impl_.current_zone_);
+    _this->_impl_.current_zone_ = new ::messages::HVACZone(*from._impl_.current_zone_);
   }
   _this->_impl_.state_ = from._impl_.state_;
-  // @@protoc_insertion_point(copy_constructor:HVACState)
+  // @@protoc_insertion_point(copy_constructor:messages.HVACState)
 }
 
 inline void HVACState::SharedCtor(::_pb::Arena* arena) {
@@ -1873,7 +1878,7 @@ inline void HVACState::SharedCtor(::_pb::Arena* arena) {
 }
 
 HVACState::~HVACState() {
-  // @@protoc_insertion_point(destructor:HVACState)
+  // @@protoc_insertion_point(destructor:messages.HVACState)
   if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) {
   (void)arena;
     return;
@@ -1891,7 +1896,7 @@ void HVACState::SetCachedSize(int size) const {
 }
 
 void HVACState::Clear() {
-// @@protoc_insertion_point(message_clear_start:HVACState)
+// @@protoc_insertion_point(message_clear_start:messages.HVACState)
   ::uint32_t cached_has_bits = 0;
   // Prevent compiler warnings about cached_has_bits being unused
   (void) cached_has_bits;
@@ -1910,17 +1915,17 @@ const char* HVACState::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx
     ::uint32_t tag;
     ptr = ::_pbi::ReadTag(ptr, &tag);
     switch (tag >> 3) {
-      // .HVACState.State state = 1;
+      // .messages.HVACState.State state = 1;
       case 1:
         if (PROTOBUF_PREDICT_TRUE(static_cast<::uint8_t>(tag) == 8)) {
           ::uint32_t val = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr);
           CHK_(ptr);
-          _internal_set_state(static_cast<::HVACState_State>(val));
+          _internal_set_state(static_cast<::messages::HVACState_State>(val));
         } else {
           goto handle_unusual;
         }
         continue;
-      // .HVACZone current_zone = 2;
+      // .messages.HVACZone current_zone = 2;
       case 2:
         if (PROTOBUF_PREDICT_TRUE(static_cast<::uint8_t>(tag) == 18)) {
           ptr = ctx->ParseMessage(_internal_mutable_current_zone(), ptr);
@@ -1954,18 +1959,18 @@ failure:
 
 ::uint8_t* HVACState::_InternalSerialize(
     ::uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:HVACState)
+  // @@protoc_insertion_point(serialize_to_array_start:messages.HVACState)
   ::uint32_t cached_has_bits = 0;
   (void) cached_has_bits;
 
-  // .HVACState.State state = 1;
+  // .messages.HVACState.State state = 1;
   if (this->_internal_state() != 0) {
     target = stream->EnsureSpace(target);
     target = ::_pbi::WireFormatLite::WriteEnumToArray(
         1, this->_internal_state(), target);
   }
 
-  // .HVACZone current_zone = 2;
+  // .messages.HVACZone current_zone = 2;
   if (this->_internal_has_current_zone()) {
     target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
       InternalWriteMessage(2, _Internal::current_zone(this),
@@ -1976,26 +1981,26 @@ failure:
     target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
         _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream);
   }
-  // @@protoc_insertion_point(serialize_to_array_end:HVACState)
+  // @@protoc_insertion_point(serialize_to_array_end:messages.HVACState)
   return target;
 }
 
 ::size_t HVACState::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:HVACState)
+// @@protoc_insertion_point(message_byte_size_start:messages.HVACState)
   ::size_t total_size = 0;
 
   ::uint32_t cached_has_bits = 0;
   // Prevent compiler warnings about cached_has_bits being unused
   (void) cached_has_bits;
 
-  // .HVACZone current_zone = 2;
+  // .messages.HVACZone current_zone = 2;
   if (this->_internal_has_current_zone()) {
     total_size += 1 +
       ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(
         *_impl_.current_zone_);
   }
 
-  // .HVACState.State state = 1;
+  // .messages.HVACState.State state = 1;
   if (this->_internal_state() != 0) {
     total_size += 1 +
                   ::_pbi::WireFormatLite::EnumSize(this->_internal_state());
@@ -2014,13 +2019,13 @@ const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*HVACState::GetClassData() cons
 void HVACState::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) {
   auto* const _this = static_cast<HVACState*>(&to_msg);
   auto& from = static_cast<const HVACState&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:HVACState)
+  // @@protoc_insertion_point(class_specific_merge_from_start:messages.HVACState)
   ABSL_DCHECK_NE(&from, _this);
   ::uint32_t cached_has_bits = 0;
   (void) cached_has_bits;
 
   if (from._internal_has_current_zone()) {
-    _this->_internal_mutable_current_zone()->::HVACZone::MergeFrom(
+    _this->_internal_mutable_current_zone()->::messages::HVACZone::MergeFrom(
         from._internal_current_zone());
   }
   if (from._internal_state() != 0) {
@@ -2030,7 +2035,7 @@ void HVACState::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROT
 }
 
 void HVACState::CopyFrom(const HVACState& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:HVACState)
+// @@protoc_insertion_point(class_specific_copy_from_start:messages.HVACState)
   if (&from == this) return;
   Clear();
   MergeFrom(from);
@@ -2057,34 +2062,35 @@ void HVACState::InternalSwap(HVACState* other) {
       file_level_metadata_messages_2fVehicleRemoteHvac_2eproto[6]);
 }
 // @@protoc_insertion_point(namespace_scope)
+}  // namespace messages
 PROTOBUF_NAMESPACE_OPEN
-template<> PROTOBUF_NOINLINE ::CabinConditionStatusPublish*
-Arena::CreateMaybeMessage< ::CabinConditionStatusPublish >(Arena* arena) {
-  return Arena::CreateMessageInternal< ::CabinConditionStatusPublish >(arena);
+template<> PROTOBUF_NOINLINE ::messages::CabinConditionStatusPublish*
+Arena::CreateMaybeMessage< ::messages::CabinConditionStatusPublish >(Arena* arena) {
+  return Arena::CreateMessageInternal< ::messages::CabinConditionStatusPublish >(arena);
 }
-template<> PROTOBUF_NOINLINE ::PreconditionRequest*
-Arena::CreateMaybeMessage< ::PreconditionRequest >(Arena* arena) {
-  return Arena::CreateMessageInternal< ::PreconditionRequest >(arena);
+template<> PROTOBUF_NOINLINE ::messages::PreconditionRequest*
+Arena::CreateMaybeMessage< ::messages::PreconditionRequest >(Arena* arena) {
+  return Arena::CreateMessageInternal< ::messages::PreconditionRequest >(arena);
 }
-template<> PROTOBUF_NOINLINE ::PreconditionResponse*
-Arena::CreateMaybeMessage< ::PreconditionResponse >(Arena* arena) {
-  return Arena::CreateMessageInternal< ::PreconditionResponse >(arena);
+template<> PROTOBUF_NOINLINE ::messages::PreconditionResponse*
+Arena::CreateMaybeMessage< ::messages::PreconditionResponse >(Arena* arena) {
+  return Arena::CreateMessageInternal< ::messages::PreconditionResponse >(arena);
 }
-template<> PROTOBUF_NOINLINE ::CabinTemperature*
-Arena::CreateMaybeMessage< ::CabinTemperature >(Arena* arena) {
-  return Arena::CreateMessageInternal< ::CabinTemperature >(arena);
+template<> PROTOBUF_NOINLINE ::messages::CabinTemperature*
+Arena::CreateMaybeMessage< ::messages::CabinTemperature >(Arena* arena) {
+  return Arena::CreateMessageInternal< ::messages::CabinTemperature >(arena);
 }
-template<> PROTOBUF_NOINLINE ::Temperature*
-Arena::CreateMaybeMessage< ::Temperature >(Arena* arena) {
-  return Arena::CreateMessageInternal< ::Temperature >(arena);
+template<> PROTOBUF_NOINLINE ::messages::Temperature*
+Arena::CreateMaybeMessage< ::messages::Temperature >(Arena* arena) {
+  return Arena::CreateMessageInternal< ::messages::Temperature >(arena);
 }
-template<> PROTOBUF_NOINLINE ::HVACZone*
-Arena::CreateMaybeMessage< ::HVACZone >(Arena* arena) {
-  return Arena::CreateMessageInternal< ::HVACZone >(arena);
+template<> PROTOBUF_NOINLINE ::messages::HVACZone*
+Arena::CreateMaybeMessage< ::messages::HVACZone >(Arena* arena) {
+  return Arena::CreateMessageInternal< ::messages::HVACZone >(arena);
 }
-template<> PROTOBUF_NOINLINE ::HVACState*
-Arena::CreateMaybeMessage< ::HVACState >(Arena* arena) {
-  return Arena::CreateMessageInternal< ::HVACState >(arena);
+template<> PROTOBUF_NOINLINE ::messages::HVACState*
+Arena::CreateMaybeMessage< ::messages::HVACState >(Arena* arena) {
+  return Arena::CreateMessageInternal< ::messages::HVACState >(arena);
 }
 PROTOBUF_NAMESPACE_CLOSE
 // @@protoc_insertion_point(global_scope)
diff --git a/build/generated/source/proto/main/cpp/messages/VehicleRemoteHvac.pb.h b/build/generated/source/proto/main/cpp/messages/VehicleRemoteHvac.pb.h
index 91eeb47..e43bc55 100644
--- a/build/generated/source/proto/main/cpp/messages/VehicleRemoteHvac.pb.h
+++ b/build/generated/source/proto/main/cpp/messages/VehicleRemoteHvac.pb.h
@@ -52,6 +52,7 @@ struct TableStruct_messages_2fVehicleRemoteHvac_2eproto {
 };
 extern const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable
     descriptor_table_messages_2fVehicleRemoteHvac_2eproto;
+namespace messages {
 class CabinConditionStatusPublish;
 struct CabinConditionStatusPublishDefaultTypeInternal;
 extern CabinConditionStatusPublishDefaultTypeInternal _CabinConditionStatusPublish_default_instance_;
@@ -73,23 +74,25 @@ extern PreconditionResponseDefaultTypeInternal _PreconditionResponse_default_ins
 class Temperature;
 struct TemperatureDefaultTypeInternal;
 extern TemperatureDefaultTypeInternal _Temperature_default_instance_;
+}  // namespace messages
 PROTOBUF_NAMESPACE_OPEN
 template <>
-::CabinConditionStatusPublish* Arena::CreateMaybeMessage<::CabinConditionStatusPublish>(Arena*);
+::messages::CabinConditionStatusPublish* Arena::CreateMaybeMessage<::messages::CabinConditionStatusPublish>(Arena*);
 template <>
-::CabinTemperature* Arena::CreateMaybeMessage<::CabinTemperature>(Arena*);
+::messages::CabinTemperature* Arena::CreateMaybeMessage<::messages::CabinTemperature>(Arena*);
 template <>
-::HVACState* Arena::CreateMaybeMessage<::HVACState>(Arena*);
+::messages::HVACState* Arena::CreateMaybeMessage<::messages::HVACState>(Arena*);
 template <>
-::HVACZone* Arena::CreateMaybeMessage<::HVACZone>(Arena*);
+::messages::HVACZone* Arena::CreateMaybeMessage<::messages::HVACZone>(Arena*);
 template <>
-::PreconditionRequest* Arena::CreateMaybeMessage<::PreconditionRequest>(Arena*);
+::messages::PreconditionRequest* Arena::CreateMaybeMessage<::messages::PreconditionRequest>(Arena*);
 template <>
-::PreconditionResponse* Arena::CreateMaybeMessage<::PreconditionResponse>(Arena*);
+::messages::PreconditionResponse* Arena::CreateMaybeMessage<::messages::PreconditionResponse>(Arena*);
 template <>
-::Temperature* Arena::CreateMaybeMessage<::Temperature>(Arena*);
+::messages::Temperature* Arena::CreateMaybeMessage<::messages::Temperature>(Arena*);
 PROTOBUF_NAMESPACE_CLOSE
 
+namespace messages {
 enum PreconditionResponse_Status : int {
   PreconditionResponse_Status_SUCCESS = 0,
   PreconditionResponse_Status_FAILURE = 1,
@@ -198,7 +201,7 @@ inline bool HVACState_State_Parse(absl::string_view name, HVACState_State* value
 // -------------------------------------------------------------------
 
 class CabinConditionStatusPublish final :
-    public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:CabinConditionStatusPublish) */ {
+    public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:messages.CabinConditionStatusPublish) */ {
  public:
   inline CabinConditionStatusPublish() : CabinConditionStatusPublish(nullptr) {}
   ~CabinConditionStatusPublish() override;
@@ -301,7 +304,7 @@ class CabinConditionStatusPublish final :
   private:
   friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
   static ::absl::string_view FullMessageName() {
-    return "CabinConditionStatusPublish";
+    return "messages.CabinConditionStatusPublish";
   }
   protected:
   explicit CabinConditionStatusPublish(::PROTOBUF_NAMESPACE_ID::Arena* arena);
@@ -339,43 +342,43 @@ class CabinConditionStatusPublish final :
   void unsafe_arena_set_allocated_event_time(
       ::PROTOBUF_NAMESPACE_ID::Timestamp* event_time);
   ::PROTOBUF_NAMESPACE_ID::Timestamp* unsafe_arena_release_event_time();
-  // .HVACState hvac_state = 2;
+  // .messages.HVACState hvac_state = 2;
   bool has_hvac_state() const;
   private:
   bool _internal_has_hvac_state() const;
 
   public:
   void clear_hvac_state() ;
-  const ::HVACState& hvac_state() const;
-  PROTOBUF_NODISCARD ::HVACState* release_hvac_state();
-  ::HVACState* mutable_hvac_state();
-  void set_allocated_hvac_state(::HVACState* hvac_state);
+  const ::messages::HVACState& hvac_state() const;
+  PROTOBUF_NODISCARD ::messages::HVACState* release_hvac_state();
+  ::messages::HVACState* mutable_hvac_state();
+  void set_allocated_hvac_state(::messages::HVACState* hvac_state);
   private:
-  const ::HVACState& _internal_hvac_state() const;
-  ::HVACState* _internal_mutable_hvac_state();
+  const ::messages::HVACState& _internal_hvac_state() const;
+  ::messages::HVACState* _internal_mutable_hvac_state();
   public:
   void unsafe_arena_set_allocated_hvac_state(
-      ::HVACState* hvac_state);
-  ::HVACState* unsafe_arena_release_hvac_state();
-  // .CabinTemperature cabin_temperature = 3;
+      ::messages::HVACState* hvac_state);
+  ::messages::HVACState* unsafe_arena_release_hvac_state();
+  // .messages.CabinTemperature cabin_temperature = 3;
   bool has_cabin_temperature() const;
   private:
   bool _internal_has_cabin_temperature() const;
 
   public:
   void clear_cabin_temperature() ;
-  const ::CabinTemperature& cabin_temperature() const;
-  PROTOBUF_NODISCARD ::CabinTemperature* release_cabin_temperature();
-  ::CabinTemperature* mutable_cabin_temperature();
-  void set_allocated_cabin_temperature(::CabinTemperature* cabin_temperature);
+  const ::messages::CabinTemperature& cabin_temperature() const;
+  PROTOBUF_NODISCARD ::messages::CabinTemperature* release_cabin_temperature();
+  ::messages::CabinTemperature* mutable_cabin_temperature();
+  void set_allocated_cabin_temperature(::messages::CabinTemperature* cabin_temperature);
   private:
-  const ::CabinTemperature& _internal_cabin_temperature() const;
-  ::CabinTemperature* _internal_mutable_cabin_temperature();
+  const ::messages::CabinTemperature& _internal_cabin_temperature() const;
+  ::messages::CabinTemperature* _internal_mutable_cabin_temperature();
   public:
   void unsafe_arena_set_allocated_cabin_temperature(
-      ::CabinTemperature* cabin_temperature);
-  ::CabinTemperature* unsafe_arena_release_cabin_temperature();
-  // @@protoc_insertion_point(class_scope:CabinConditionStatusPublish)
+      ::messages::CabinTemperature* cabin_temperature);
+  ::messages::CabinTemperature* unsafe_arena_release_cabin_temperature();
+  // @@protoc_insertion_point(class_scope:messages.CabinConditionStatusPublish)
  private:
   class _Internal;
 
@@ -384,8 +387,8 @@ class CabinConditionStatusPublish final :
   typedef void DestructorSkippable_;
   struct Impl_ {
     ::PROTOBUF_NAMESPACE_ID::Timestamp* event_time_;
-    ::HVACState* hvac_state_;
-    ::CabinTemperature* cabin_temperature_;
+    ::messages::HVACState* hvac_state_;
+    ::messages::CabinTemperature* cabin_temperature_;
     mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
   };
   union { Impl_ _impl_; };
@@ -393,7 +396,7 @@ class CabinConditionStatusPublish final :
 };// -------------------------------------------------------------------
 
 class PreconditionRequest final :
-    public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:PreconditionRequest) */ {
+    public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:messages.PreconditionRequest) */ {
  public:
   inline PreconditionRequest() : PreconditionRequest(nullptr) {}
   ~PreconditionRequest() override;
@@ -496,7 +499,7 @@ class PreconditionRequest final :
   private:
   friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
   static ::absl::string_view FullMessageName() {
-    return "PreconditionRequest";
+    return "messages.PreconditionRequest";
   }
   protected:
   explicit PreconditionRequest(::PROTOBUF_NAMESPACE_ID::Arena* arena);
@@ -515,23 +518,23 @@ class PreconditionRequest final :
     kHvacZonesFieldNumber = 1,
     kStartTimeFieldNumber = 2,
   };
-  // repeated .HVACZone hvac_zones = 1;
+  // repeated .messages.HVACZone hvac_zones = 1;
   int hvac_zones_size() const;
   private:
   int _internal_hvac_zones_size() const;
 
   public:
   void clear_hvac_zones() ;
-  ::HVACZone* mutable_hvac_zones(int index);
-  ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::HVACZone >*
+  ::messages::HVACZone* mutable_hvac_zones(int index);
+  ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::messages::HVACZone >*
       mutable_hvac_zones();
   private:
-  const ::HVACZone& _internal_hvac_zones(int index) const;
-  ::HVACZone* _internal_add_hvac_zones();
+  const ::messages::HVACZone& _internal_hvac_zones(int index) const;
+  ::messages::HVACZone* _internal_add_hvac_zones();
   public:
-  const ::HVACZone& hvac_zones(int index) const;
-  ::HVACZone* add_hvac_zones();
-  const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::HVACZone >&
+  const ::messages::HVACZone& hvac_zones(int index) const;
+  ::messages::HVACZone* add_hvac_zones();
+  const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::messages::HVACZone >&
       hvac_zones() const;
   // .google.protobuf.Timestamp start_time = 2;
   bool has_start_time() const;
@@ -551,7 +554,7 @@ class PreconditionRequest final :
   void unsafe_arena_set_allocated_start_time(
       ::PROTOBUF_NAMESPACE_ID::Timestamp* start_time);
   ::PROTOBUF_NAMESPACE_ID::Timestamp* unsafe_arena_release_start_time();
-  // @@protoc_insertion_point(class_scope:PreconditionRequest)
+  // @@protoc_insertion_point(class_scope:messages.PreconditionRequest)
  private:
   class _Internal;
 
@@ -559,7 +562,7 @@ class PreconditionRequest final :
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
   struct Impl_ {
-    ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::HVACZone > hvac_zones_;
+    ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::messages::HVACZone > hvac_zones_;
     ::PROTOBUF_NAMESPACE_ID::Timestamp* start_time_;
     mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
   };
@@ -568,7 +571,7 @@ class PreconditionRequest final :
 };// -------------------------------------------------------------------
 
 class PreconditionResponse final :
-    public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:PreconditionResponse) */ {
+    public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:messages.PreconditionResponse) */ {
  public:
   inline PreconditionResponse() : PreconditionResponse(nullptr) {}
   ~PreconditionResponse() override;
@@ -671,7 +674,7 @@ class PreconditionResponse final :
   private:
   friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
   static ::absl::string_view FullMessageName() {
-    return "PreconditionResponse";
+    return "messages.PreconditionResponse";
   }
   protected:
   explicit PreconditionResponse(::PROTOBUF_NAMESPACE_ID::Arena* arena);
@@ -731,17 +734,17 @@ class PreconditionResponse final :
   std::string* _internal_mutable_message();
 
   public:
-  // .PreconditionResponse.Status status = 1;
+  // .messages.PreconditionResponse.Status status = 1;
   void clear_status() ;
-  ::PreconditionResponse_Status status() const;
-  void set_status(::PreconditionResponse_Status value);
+  ::messages::PreconditionResponse_Status status() const;
+  void set_status(::messages::PreconditionResponse_Status value);
 
   private:
-  ::PreconditionResponse_Status _internal_status() const;
-  void _internal_set_status(::PreconditionResponse_Status value);
+  ::messages::PreconditionResponse_Status _internal_status() const;
+  void _internal_set_status(::messages::PreconditionResponse_Status value);
 
   public:
-  // @@protoc_insertion_point(class_scope:PreconditionResponse)
+  // @@protoc_insertion_point(class_scope:messages.PreconditionResponse)
  private:
   class _Internal;
 
@@ -758,7 +761,7 @@ class PreconditionResponse final :
 };// -------------------------------------------------------------------
 
 class CabinTemperature final :
-    public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:CabinTemperature) */ {
+    public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:messages.CabinTemperature) */ {
  public:
   inline CabinTemperature() : CabinTemperature(nullptr) {}
   ~CabinTemperature() override;
@@ -861,7 +864,7 @@ class CabinTemperature final :
   private:
   friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
   static ::absl::string_view FullMessageName() {
-    return "CabinTemperature";
+    return "messages.CabinTemperature";
   }
   protected:
   explicit CabinTemperature(::PROTOBUF_NAMESPACE_ID::Arena* arena);
@@ -880,43 +883,43 @@ class CabinTemperature final :
     kTemperatureFieldNumber = 1,
     kZoneFieldNumber = 2,
   };
-  // .Temperature temperature = 1;
+  // .messages.Temperature temperature = 1;
   bool has_temperature() const;
   private:
   bool _internal_has_temperature() const;
 
   public:
   void clear_temperature() ;
-  const ::Temperature& temperature() const;
-  PROTOBUF_NODISCARD ::Temperature* release_temperature();
-  ::Temperature* mutable_temperature();
-  void set_allocated_temperature(::Temperature* temperature);
+  const ::messages::Temperature& temperature() const;
+  PROTOBUF_NODISCARD ::messages::Temperature* release_temperature();
+  ::messages::Temperature* mutable_temperature();
+  void set_allocated_temperature(::messages::Temperature* temperature);
   private:
-  const ::Temperature& _internal_temperature() const;
-  ::Temperature* _internal_mutable_temperature();
+  const ::messages::Temperature& _internal_temperature() const;
+  ::messages::Temperature* _internal_mutable_temperature();
   public:
   void unsafe_arena_set_allocated_temperature(
-      ::Temperature* temperature);
-  ::Temperature* unsafe_arena_release_temperature();
-  // .HVACZone zone = 2;
+      ::messages::Temperature* temperature);
+  ::messages::Temperature* unsafe_arena_release_temperature();
+  // .messages.HVACZone zone = 2;
   bool has_zone() const;
   private:
   bool _internal_has_zone() const;
 
   public:
   void clear_zone() ;
-  const ::HVACZone& zone() const;
-  PROTOBUF_NODISCARD ::HVACZone* release_zone();
-  ::HVACZone* mutable_zone();
-  void set_allocated_zone(::HVACZone* zone);
+  const ::messages::HVACZone& zone() const;
+  PROTOBUF_NODISCARD ::messages::HVACZone* release_zone();
+  ::messages::HVACZone* mutable_zone();
+  void set_allocated_zone(::messages::HVACZone* zone);
   private:
-  const ::HVACZone& _internal_zone() const;
-  ::HVACZone* _internal_mutable_zone();
+  const ::messages::HVACZone& _internal_zone() const;
+  ::messages::HVACZone* _internal_mutable_zone();
   public:
   void unsafe_arena_set_allocated_zone(
-      ::HVACZone* zone);
-  ::HVACZone* unsafe_arena_release_zone();
-  // @@protoc_insertion_point(class_scope:CabinTemperature)
+      ::messages::HVACZone* zone);
+  ::messages::HVACZone* unsafe_arena_release_zone();
+  // @@protoc_insertion_point(class_scope:messages.CabinTemperature)
  private:
   class _Internal;
 
@@ -924,8 +927,8 @@ class CabinTemperature final :
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
   struct Impl_ {
-    ::Temperature* temperature_;
-    ::HVACZone* zone_;
+    ::messages::Temperature* temperature_;
+    ::messages::HVACZone* zone_;
     mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
   };
   union { Impl_ _impl_; };
@@ -933,7 +936,7 @@ class CabinTemperature final :
 };// -------------------------------------------------------------------
 
 class Temperature final :
-    public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:Temperature) */ {
+    public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:messages.Temperature) */ {
  public:
   inline Temperature() : Temperature(nullptr) {}
   ~Temperature() override;
@@ -1036,7 +1039,7 @@ class Temperature final :
   private:
   friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
   static ::absl::string_view FullMessageName() {
-    return "Temperature";
+    return "messages.Temperature";
   }
   protected:
   explicit Temperature(::PROTOBUF_NAMESPACE_ID::Arena* arena);
@@ -1085,7 +1088,7 @@ class Temperature final :
   void _internal_set_value(float value);
 
   public:
-  // @@protoc_insertion_point(class_scope:Temperature)
+  // @@protoc_insertion_point(class_scope:messages.Temperature)
  private:
   class _Internal;
 
@@ -1102,7 +1105,7 @@ class Temperature final :
 };// -------------------------------------------------------------------
 
 class HVACZone final :
-    public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:HVACZone) */ {
+    public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:messages.HVACZone) */ {
  public:
   inline HVACZone() : HVACZone(nullptr) {}
   ~HVACZone() override;
@@ -1205,7 +1208,7 @@ class HVACZone final :
   private:
   friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
   static ::absl::string_view FullMessageName() {
-    return "HVACZone";
+    return "messages.HVACZone";
   }
   protected:
   explicit HVACZone(::PROTOBUF_NAMESPACE_ID::Arena* arena);
@@ -1246,35 +1249,35 @@ class HVACZone final :
     kTargetTemperatureFieldNumber = 2,
     kZoneFieldNumber = 1,
   };
-  // .Temperature target_temperature = 2;
+  // .messages.Temperature target_temperature = 2;
   bool has_target_temperature() const;
   private:
   bool _internal_has_target_temperature() const;
 
   public:
   void clear_target_temperature() ;
-  const ::Temperature& target_temperature() const;
-  PROTOBUF_NODISCARD ::Temperature* release_target_temperature();
-  ::Temperature* mutable_target_temperature();
-  void set_allocated_target_temperature(::Temperature* target_temperature);
+  const ::messages::Temperature& target_temperature() const;
+  PROTOBUF_NODISCARD ::messages::Temperature* release_target_temperature();
+  ::messages::Temperature* mutable_target_temperature();
+  void set_allocated_target_temperature(::messages::Temperature* target_temperature);
   private:
-  const ::Temperature& _internal_target_temperature() const;
-  ::Temperature* _internal_mutable_target_temperature();
+  const ::messages::Temperature& _internal_target_temperature() const;
+  ::messages::Temperature* _internal_mutable_target_temperature();
   public:
   void unsafe_arena_set_allocated_target_temperature(
-      ::Temperature* target_temperature);
-  ::Temperature* unsafe_arena_release_target_temperature();
-  // .HVACZone.Zone zone = 1;
+      ::messages::Temperature* target_temperature);
+  ::messages::Temperature* unsafe_arena_release_target_temperature();
+  // .messages.HVACZone.Zone zone = 1;
   void clear_zone() ;
-  ::HVACZone_Zone zone() const;
-  void set_zone(::HVACZone_Zone value);
+  ::messages::HVACZone_Zone zone() const;
+  void set_zone(::messages::HVACZone_Zone value);
 
   private:
-  ::HVACZone_Zone _internal_zone() const;
-  void _internal_set_zone(::HVACZone_Zone value);
+  ::messages::HVACZone_Zone _internal_zone() const;
+  void _internal_set_zone(::messages::HVACZone_Zone value);
 
   public:
-  // @@protoc_insertion_point(class_scope:HVACZone)
+  // @@protoc_insertion_point(class_scope:messages.HVACZone)
  private:
   class _Internal;
 
@@ -1282,7 +1285,7 @@ class HVACZone final :
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
   struct Impl_ {
-    ::Temperature* target_temperature_;
+    ::messages::Temperature* target_temperature_;
     int zone_;
     mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
   };
@@ -1291,7 +1294,7 @@ class HVACZone final :
 };// -------------------------------------------------------------------
 
 class HVACState final :
-    public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:HVACState) */ {
+    public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:messages.HVACState) */ {
  public:
   inline HVACState() : HVACState(nullptr) {}
   ~HVACState() override;
@@ -1394,7 +1397,7 @@ class HVACState final :
   private:
   friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
   static ::absl::string_view FullMessageName() {
-    return "HVACState";
+    return "messages.HVACState";
   }
   protected:
   explicit HVACState(::PROTOBUF_NAMESPACE_ID::Arena* arena);
@@ -1435,35 +1438,35 @@ class HVACState final :
     kCurrentZoneFieldNumber = 2,
     kStateFieldNumber = 1,
   };
-  // .HVACZone current_zone = 2;
+  // .messages.HVACZone current_zone = 2;
   bool has_current_zone() const;
   private:
   bool _internal_has_current_zone() const;
 
   public:
   void clear_current_zone() ;
-  const ::HVACZone& current_zone() const;
-  PROTOBUF_NODISCARD ::HVACZone* release_current_zone();
-  ::HVACZone* mutable_current_zone();
-  void set_allocated_current_zone(::HVACZone* current_zone);
+  const ::messages::HVACZone& current_zone() const;
+  PROTOBUF_NODISCARD ::messages::HVACZone* release_current_zone();
+  ::messages::HVACZone* mutable_current_zone();
+  void set_allocated_current_zone(::messages::HVACZone* current_zone);
   private:
-  const ::HVACZone& _internal_current_zone() const;
-  ::HVACZone* _internal_mutable_current_zone();
+  const ::messages::HVACZone& _internal_current_zone() const;
+  ::messages::HVACZone* _internal_mutable_current_zone();
   public:
   void unsafe_arena_set_allocated_current_zone(
-      ::HVACZone* current_zone);
-  ::HVACZone* unsafe_arena_release_current_zone();
-  // .HVACState.State state = 1;
+      ::messages::HVACZone* current_zone);
+  ::messages::HVACZone* unsafe_arena_release_current_zone();
+  // .messages.HVACState.State state = 1;
   void clear_state() ;
-  ::HVACState_State state() const;
-  void set_state(::HVACState_State value);
+  ::messages::HVACState_State state() const;
+  void set_state(::messages::HVACState_State value);
 
   private:
-  ::HVACState_State _internal_state() const;
-  void _internal_set_state(::HVACState_State value);
+  ::messages::HVACState_State _internal_state() const;
+  void _internal_set_state(::messages::HVACState_State value);
 
   public:
-  // @@protoc_insertion_point(class_scope:HVACState)
+  // @@protoc_insertion_point(class_scope:messages.HVACState)
  private:
   class _Internal;
 
@@ -1471,7 +1474,7 @@ class HVACState final :
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
   struct Impl_ {
-    ::HVACZone* current_zone_;
+    ::messages::HVACZone* current_zone_;
     int state_;
     mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
   };
@@ -1508,7 +1511,7 @@ inline const ::PROTOBUF_NAMESPACE_ID::Timestamp& CabinConditionStatusPublish::_i
       ::PROTOBUF_NAMESPACE_ID::_Timestamp_default_instance_);
 }
 inline const ::PROTOBUF_NAMESPACE_ID::Timestamp& CabinConditionStatusPublish::event_time() const {
-  // @@protoc_insertion_point(field_get:CabinConditionStatusPublish.event_time)
+  // @@protoc_insertion_point(field_get:messages.CabinConditionStatusPublish.event_time)
   return _internal_event_time();
 }
 inline void CabinConditionStatusPublish::unsafe_arena_set_allocated_event_time(
@@ -1517,7 +1520,7 @@ inline void CabinConditionStatusPublish::unsafe_arena_set_allocated_event_time(
     delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.event_time_);
   }
   _impl_.event_time_ = event_time;
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:CabinConditionStatusPublish.event_time)
+  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:messages.CabinConditionStatusPublish.event_time)
 }
 inline ::PROTOBUF_NAMESPACE_ID::Timestamp* CabinConditionStatusPublish::release_event_time() {
   
@@ -1535,7 +1538,7 @@ inline ::PROTOBUF_NAMESPACE_ID::Timestamp* CabinConditionStatusPublish::release_
   return temp;
 }
 inline ::PROTOBUF_NAMESPACE_ID::Timestamp* CabinConditionStatusPublish::unsafe_arena_release_event_time() {
-  // @@protoc_insertion_point(field_release:CabinConditionStatusPublish.event_time)
+  // @@protoc_insertion_point(field_release:messages.CabinConditionStatusPublish.event_time)
   
   ::PROTOBUF_NAMESPACE_ID::Timestamp* temp = _impl_.event_time_;
   _impl_.event_time_ = nullptr;
@@ -1551,7 +1554,7 @@ inline ::PROTOBUF_NAMESPACE_ID::Timestamp* CabinConditionStatusPublish::_interna
 }
 inline ::PROTOBUF_NAMESPACE_ID::Timestamp* CabinConditionStatusPublish::mutable_event_time() {
   ::PROTOBUF_NAMESPACE_ID::Timestamp* _msg = _internal_mutable_event_time();
-  // @@protoc_insertion_point(field_mutable:CabinConditionStatusPublish.event_time)
+  // @@protoc_insertion_point(field_mutable:messages.CabinConditionStatusPublish.event_time)
   return _msg;
 }
 inline void CabinConditionStatusPublish::set_allocated_event_time(::PROTOBUF_NAMESPACE_ID::Timestamp* event_time) {
@@ -1572,10 +1575,10 @@ inline void CabinConditionStatusPublish::set_allocated_event_time(::PROTOBUF_NAM
 
   }
   _impl_.event_time_ = event_time;
-  // @@protoc_insertion_point(field_set_allocated:CabinConditionStatusPublish.event_time)
+  // @@protoc_insertion_point(field_set_allocated:messages.CabinConditionStatusPublish.event_time)
 }
 
-// .HVACState hvac_state = 2;
+// .messages.HVACState hvac_state = 2;
 inline bool CabinConditionStatusPublish::_internal_has_hvac_state() const {
   return this != internal_default_instance() && _impl_.hvac_state_ != nullptr;
 }
@@ -1588,26 +1591,26 @@ inline void CabinConditionStatusPublish::clear_hvac_state() {
   }
   _impl_.hvac_state_ = nullptr;
 }
-inline const ::HVACState& CabinConditionStatusPublish::_internal_hvac_state() const {
-  const ::HVACState* p = _impl_.hvac_state_;
-  return p != nullptr ? *p : reinterpret_cast<const ::HVACState&>(
-      ::_HVACState_default_instance_);
+inline const ::messages::HVACState& CabinConditionStatusPublish::_internal_hvac_state() const {
+  const ::messages::HVACState* p = _impl_.hvac_state_;
+  return p != nullptr ? *p : reinterpret_cast<const ::messages::HVACState&>(
+      ::messages::_HVACState_default_instance_);
 }
-inline const ::HVACState& CabinConditionStatusPublish::hvac_state() const {
-  // @@protoc_insertion_point(field_get:CabinConditionStatusPublish.hvac_state)
+inline const ::messages::HVACState& CabinConditionStatusPublish::hvac_state() const {
+  // @@protoc_insertion_point(field_get:messages.CabinConditionStatusPublish.hvac_state)
   return _internal_hvac_state();
 }
 inline void CabinConditionStatusPublish::unsafe_arena_set_allocated_hvac_state(
-    ::HVACState* hvac_state) {
+    ::messages::HVACState* hvac_state) {
   if (GetArenaForAllocation() == nullptr) {
     delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.hvac_state_);
   }
   _impl_.hvac_state_ = hvac_state;
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:CabinConditionStatusPublish.hvac_state)
+  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:messages.CabinConditionStatusPublish.hvac_state)
 }
-inline ::HVACState* CabinConditionStatusPublish::release_hvac_state() {
+inline ::messages::HVACState* CabinConditionStatusPublish::release_hvac_state() {
   
-  ::HVACState* temp = _impl_.hvac_state_;
+  ::messages::HVACState* temp = _impl_.hvac_state_;
   _impl_.hvac_state_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
@@ -1620,27 +1623,27 @@ inline ::HVACState* CabinConditionStatusPublish::release_hvac_state() {
 #endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
   return temp;
 }
-inline ::HVACState* CabinConditionStatusPublish::unsafe_arena_release_hvac_state() {
-  // @@protoc_insertion_point(field_release:CabinConditionStatusPublish.hvac_state)
+inline ::messages::HVACState* CabinConditionStatusPublish::unsafe_arena_release_hvac_state() {
+  // @@protoc_insertion_point(field_release:messages.CabinConditionStatusPublish.hvac_state)
   
-  ::HVACState* temp = _impl_.hvac_state_;
+  ::messages::HVACState* temp = _impl_.hvac_state_;
   _impl_.hvac_state_ = nullptr;
   return temp;
 }
-inline ::HVACState* CabinConditionStatusPublish::_internal_mutable_hvac_state() {
+inline ::messages::HVACState* CabinConditionStatusPublish::_internal_mutable_hvac_state() {
   
   if (_impl_.hvac_state_ == nullptr) {
-    auto* p = CreateMaybeMessage<::HVACState>(GetArenaForAllocation());
+    auto* p = CreateMaybeMessage<::messages::HVACState>(GetArenaForAllocation());
     _impl_.hvac_state_ = p;
   }
   return _impl_.hvac_state_;
 }
-inline ::HVACState* CabinConditionStatusPublish::mutable_hvac_state() {
-  ::HVACState* _msg = _internal_mutable_hvac_state();
-  // @@protoc_insertion_point(field_mutable:CabinConditionStatusPublish.hvac_state)
+inline ::messages::HVACState* CabinConditionStatusPublish::mutable_hvac_state() {
+  ::messages::HVACState* _msg = _internal_mutable_hvac_state();
+  // @@protoc_insertion_point(field_mutable:messages.CabinConditionStatusPublish.hvac_state)
   return _msg;
 }
-inline void CabinConditionStatusPublish::set_allocated_hvac_state(::HVACState* hvac_state) {
+inline void CabinConditionStatusPublish::set_allocated_hvac_state(::messages::HVACState* hvac_state) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
     delete _impl_.hvac_state_;
@@ -1657,10 +1660,10 @@ inline void CabinConditionStatusPublish::set_allocated_hvac_state(::HVACState* h
 
   }
   _impl_.hvac_state_ = hvac_state;
-  // @@protoc_insertion_point(field_set_allocated:CabinConditionStatusPublish.hvac_state)
+  // @@protoc_insertion_point(field_set_allocated:messages.CabinConditionStatusPublish.hvac_state)
 }
 
-// .CabinTemperature cabin_temperature = 3;
+// .messages.CabinTemperature cabin_temperature = 3;
 inline bool CabinConditionStatusPublish::_internal_has_cabin_temperature() const {
   return this != internal_default_instance() && _impl_.cabin_temperature_ != nullptr;
 }
@@ -1673,26 +1676,26 @@ inline void CabinConditionStatusPublish::clear_cabin_temperature() {
   }
   _impl_.cabin_temperature_ = nullptr;
 }
-inline const ::CabinTemperature& CabinConditionStatusPublish::_internal_cabin_temperature() const {
-  const ::CabinTemperature* p = _impl_.cabin_temperature_;
-  return p != nullptr ? *p : reinterpret_cast<const ::CabinTemperature&>(
-      ::_CabinTemperature_default_instance_);
+inline const ::messages::CabinTemperature& CabinConditionStatusPublish::_internal_cabin_temperature() const {
+  const ::messages::CabinTemperature* p = _impl_.cabin_temperature_;
+  return p != nullptr ? *p : reinterpret_cast<const ::messages::CabinTemperature&>(
+      ::messages::_CabinTemperature_default_instance_);
 }
-inline const ::CabinTemperature& CabinConditionStatusPublish::cabin_temperature() const {
-  // @@protoc_insertion_point(field_get:CabinConditionStatusPublish.cabin_temperature)
+inline const ::messages::CabinTemperature& CabinConditionStatusPublish::cabin_temperature() const {
+  // @@protoc_insertion_point(field_get:messages.CabinConditionStatusPublish.cabin_temperature)
   return _internal_cabin_temperature();
 }
 inline void CabinConditionStatusPublish::unsafe_arena_set_allocated_cabin_temperature(
-    ::CabinTemperature* cabin_temperature) {
+    ::messages::CabinTemperature* cabin_temperature) {
   if (GetArenaForAllocation() == nullptr) {
     delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.cabin_temperature_);
   }
   _impl_.cabin_temperature_ = cabin_temperature;
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:CabinConditionStatusPublish.cabin_temperature)
+  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:messages.CabinConditionStatusPublish.cabin_temperature)
 }
-inline ::CabinTemperature* CabinConditionStatusPublish::release_cabin_temperature() {
+inline ::messages::CabinTemperature* CabinConditionStatusPublish::release_cabin_temperature() {
   
-  ::CabinTemperature* temp = _impl_.cabin_temperature_;
+  ::messages::CabinTemperature* temp = _impl_.cabin_temperature_;
   _impl_.cabin_temperature_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
@@ -1705,27 +1708,27 @@ inline ::CabinTemperature* CabinConditionStatusPublish::release_cabin_temperatur
 #endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
   return temp;
 }
-inline ::CabinTemperature* CabinConditionStatusPublish::unsafe_arena_release_cabin_temperature() {
-  // @@protoc_insertion_point(field_release:CabinConditionStatusPublish.cabin_temperature)
+inline ::messages::CabinTemperature* CabinConditionStatusPublish::unsafe_arena_release_cabin_temperature() {
+  // @@protoc_insertion_point(field_release:messages.CabinConditionStatusPublish.cabin_temperature)
   
-  ::CabinTemperature* temp = _impl_.cabin_temperature_;
+  ::messages::CabinTemperature* temp = _impl_.cabin_temperature_;
   _impl_.cabin_temperature_ = nullptr;
   return temp;
 }
-inline ::CabinTemperature* CabinConditionStatusPublish::_internal_mutable_cabin_temperature() {
+inline ::messages::CabinTemperature* CabinConditionStatusPublish::_internal_mutable_cabin_temperature() {
   
   if (_impl_.cabin_temperature_ == nullptr) {
-    auto* p = CreateMaybeMessage<::CabinTemperature>(GetArenaForAllocation());
+    auto* p = CreateMaybeMessage<::messages::CabinTemperature>(GetArenaForAllocation());
     _impl_.cabin_temperature_ = p;
   }
   return _impl_.cabin_temperature_;
 }
-inline ::CabinTemperature* CabinConditionStatusPublish::mutable_cabin_temperature() {
-  ::CabinTemperature* _msg = _internal_mutable_cabin_temperature();
-  // @@protoc_insertion_point(field_mutable:CabinConditionStatusPublish.cabin_temperature)
+inline ::messages::CabinTemperature* CabinConditionStatusPublish::mutable_cabin_temperature() {
+  ::messages::CabinTemperature* _msg = _internal_mutable_cabin_temperature();
+  // @@protoc_insertion_point(field_mutable:messages.CabinConditionStatusPublish.cabin_temperature)
   return _msg;
 }
-inline void CabinConditionStatusPublish::set_allocated_cabin_temperature(::CabinTemperature* cabin_temperature) {
+inline void CabinConditionStatusPublish::set_allocated_cabin_temperature(::messages::CabinTemperature* cabin_temperature) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
     delete _impl_.cabin_temperature_;
@@ -1742,14 +1745,14 @@ inline void CabinConditionStatusPublish::set_allocated_cabin_temperature(::Cabin
 
   }
   _impl_.cabin_temperature_ = cabin_temperature;
-  // @@protoc_insertion_point(field_set_allocated:CabinConditionStatusPublish.cabin_temperature)
+  // @@protoc_insertion_point(field_set_allocated:messages.CabinConditionStatusPublish.cabin_temperature)
 }
 
 // -------------------------------------------------------------------
 
 // PreconditionRequest
 
-// repeated .HVACZone hvac_zones = 1;
+// repeated .messages.HVACZone hvac_zones = 1;
 inline int PreconditionRequest::_internal_hvac_zones_size() const {
   return _impl_.hvac_zones_.size();
 }
@@ -1759,33 +1762,33 @@ inline int PreconditionRequest::hvac_zones_size() const {
 inline void PreconditionRequest::clear_hvac_zones() {
   _impl_.hvac_zones_.Clear();
 }
-inline ::HVACZone* PreconditionRequest::mutable_hvac_zones(int index) {
-  // @@protoc_insertion_point(field_mutable:PreconditionRequest.hvac_zones)
+inline ::messages::HVACZone* PreconditionRequest::mutable_hvac_zones(int index) {
+  // @@protoc_insertion_point(field_mutable:messages.PreconditionRequest.hvac_zones)
   return _impl_.hvac_zones_.Mutable(index);
 }
-inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::HVACZone >*
+inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::messages::HVACZone >*
 PreconditionRequest::mutable_hvac_zones() {
-  // @@protoc_insertion_point(field_mutable_list:PreconditionRequest.hvac_zones)
+  // @@protoc_insertion_point(field_mutable_list:messages.PreconditionRequest.hvac_zones)
   return &_impl_.hvac_zones_;
 }
-inline const ::HVACZone& PreconditionRequest::_internal_hvac_zones(int index) const {
+inline const ::messages::HVACZone& PreconditionRequest::_internal_hvac_zones(int index) const {
   return _impl_.hvac_zones_.Get(index);
 }
-inline const ::HVACZone& PreconditionRequest::hvac_zones(int index) const {
-  // @@protoc_insertion_point(field_get:PreconditionRequest.hvac_zones)
+inline const ::messages::HVACZone& PreconditionRequest::hvac_zones(int index) const {
+  // @@protoc_insertion_point(field_get:messages.PreconditionRequest.hvac_zones)
   return _internal_hvac_zones(index);
 }
-inline ::HVACZone* PreconditionRequest::_internal_add_hvac_zones() {
+inline ::messages::HVACZone* PreconditionRequest::_internal_add_hvac_zones() {
   return _impl_.hvac_zones_.Add();
 }
-inline ::HVACZone* PreconditionRequest::add_hvac_zones() {
-  ::HVACZone* _add = _internal_add_hvac_zones();
-  // @@protoc_insertion_point(field_add:PreconditionRequest.hvac_zones)
+inline ::messages::HVACZone* PreconditionRequest::add_hvac_zones() {
+  ::messages::HVACZone* _add = _internal_add_hvac_zones();
+  // @@protoc_insertion_point(field_add:messages.PreconditionRequest.hvac_zones)
   return _add;
 }
-inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::HVACZone >&
+inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::messages::HVACZone >&
 PreconditionRequest::hvac_zones() const {
-  // @@protoc_insertion_point(field_list:PreconditionRequest.hvac_zones)
+  // @@protoc_insertion_point(field_list:messages.PreconditionRequest.hvac_zones)
   return _impl_.hvac_zones_;
 }
 
@@ -1802,7 +1805,7 @@ inline const ::PROTOBUF_NAMESPACE_ID::Timestamp& PreconditionRequest::_internal_
       ::PROTOBUF_NAMESPACE_ID::_Timestamp_default_instance_);
 }
 inline const ::PROTOBUF_NAMESPACE_ID::Timestamp& PreconditionRequest::start_time() const {
-  // @@protoc_insertion_point(field_get:PreconditionRequest.start_time)
+  // @@protoc_insertion_point(field_get:messages.PreconditionRequest.start_time)
   return _internal_start_time();
 }
 inline void PreconditionRequest::unsafe_arena_set_allocated_start_time(
@@ -1811,7 +1814,7 @@ inline void PreconditionRequest::unsafe_arena_set_allocated_start_time(
     delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.start_time_);
   }
   _impl_.start_time_ = start_time;
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:PreconditionRequest.start_time)
+  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:messages.PreconditionRequest.start_time)
 }
 inline ::PROTOBUF_NAMESPACE_ID::Timestamp* PreconditionRequest::release_start_time() {
   
@@ -1829,7 +1832,7 @@ inline ::PROTOBUF_NAMESPACE_ID::Timestamp* PreconditionRequest::release_start_ti
   return temp;
 }
 inline ::PROTOBUF_NAMESPACE_ID::Timestamp* PreconditionRequest::unsafe_arena_release_start_time() {
-  // @@protoc_insertion_point(field_release:PreconditionRequest.start_time)
+  // @@protoc_insertion_point(field_release:messages.PreconditionRequest.start_time)
   
   ::PROTOBUF_NAMESPACE_ID::Timestamp* temp = _impl_.start_time_;
   _impl_.start_time_ = nullptr;
@@ -1845,7 +1848,7 @@ inline ::PROTOBUF_NAMESPACE_ID::Timestamp* PreconditionRequest::_internal_mutabl
 }
 inline ::PROTOBUF_NAMESPACE_ID::Timestamp* PreconditionRequest::mutable_start_time() {
   ::PROTOBUF_NAMESPACE_ID::Timestamp* _msg = _internal_mutable_start_time();
-  // @@protoc_insertion_point(field_mutable:PreconditionRequest.start_time)
+  // @@protoc_insertion_point(field_mutable:messages.PreconditionRequest.start_time)
   return _msg;
 }
 inline void PreconditionRequest::set_allocated_start_time(::PROTOBUF_NAMESPACE_ID::Timestamp* start_time) {
@@ -1866,29 +1869,29 @@ inline void PreconditionRequest::set_allocated_start_time(::PROTOBUF_NAMESPACE_I
 
   }
   _impl_.start_time_ = start_time;
-  // @@protoc_insertion_point(field_set_allocated:PreconditionRequest.start_time)
+  // @@protoc_insertion_point(field_set_allocated:messages.PreconditionRequest.start_time)
 }
 
 // -------------------------------------------------------------------
 
 // PreconditionResponse
 
-// .PreconditionResponse.Status status = 1;
+// .messages.PreconditionResponse.Status status = 1;
 inline void PreconditionResponse::clear_status() {
   _impl_.status_ = 0;
 }
-inline ::PreconditionResponse_Status PreconditionResponse::status() const {
-  // @@protoc_insertion_point(field_get:PreconditionResponse.status)
+inline ::messages::PreconditionResponse_Status PreconditionResponse::status() const {
+  // @@protoc_insertion_point(field_get:messages.PreconditionResponse.status)
   return _internal_status();
 }
-inline void PreconditionResponse::set_status(::PreconditionResponse_Status value) {
+inline void PreconditionResponse::set_status(::messages::PreconditionResponse_Status value) {
    _internal_set_status(value);
-  // @@protoc_insertion_point(field_set:PreconditionResponse.status)
+  // @@protoc_insertion_point(field_set:messages.PreconditionResponse.status)
 }
-inline ::PreconditionResponse_Status PreconditionResponse::_internal_status() const {
-  return static_cast<::PreconditionResponse_Status>(_impl_.status_);
+inline ::messages::PreconditionResponse_Status PreconditionResponse::_internal_status() const {
+  return static_cast<::messages::PreconditionResponse_Status>(_impl_.status_);
 }
-inline void PreconditionResponse::_internal_set_status(::PreconditionResponse_Status value) {
+inline void PreconditionResponse::_internal_set_status(::messages::PreconditionResponse_Status value) {
   ;
   _impl_.status_ = value;
 }
@@ -1898,7 +1901,7 @@ inline void PreconditionResponse::clear_message() {
   _impl_.message_.ClearToEmpty();
 }
 inline const std::string& PreconditionResponse::message() const {
-  // @@protoc_insertion_point(field_get:PreconditionResponse.message)
+  // @@protoc_insertion_point(field_get:messages.PreconditionResponse.message)
   return _internal_message();
 }
 template <typename Arg_, typename... Args_>
@@ -1906,11 +1909,11 @@ inline PROTOBUF_ALWAYS_INLINE void PreconditionResponse::set_message(Arg_&& arg,
                                                      Args_... args) {
   ;
   _impl_.message_.Set(static_cast<Arg_&&>(arg), args..., GetArenaForAllocation());
-  // @@protoc_insertion_point(field_set:PreconditionResponse.message)
+  // @@protoc_insertion_point(field_set:messages.PreconditionResponse.message)
 }
 inline std::string* PreconditionResponse::mutable_message() {
   std::string* _s = _internal_mutable_message();
-  // @@protoc_insertion_point(field_mutable:PreconditionResponse.message)
+  // @@protoc_insertion_point(field_mutable:messages.PreconditionResponse.message)
   return _s;
 }
 inline const std::string& PreconditionResponse::_internal_message() const {
@@ -1927,7 +1930,7 @@ inline std::string* PreconditionResponse::_internal_mutable_message() {
   return _impl_.message_.Mutable( GetArenaForAllocation());
 }
 inline std::string* PreconditionResponse::release_message() {
-  // @@protoc_insertion_point(field_release:PreconditionResponse.message)
+  // @@protoc_insertion_point(field_release:messages.PreconditionResponse.message)
   return _impl_.message_.Release();
 }
 inline void PreconditionResponse::set_allocated_message(std::string* value) {
@@ -1937,14 +1940,14 @@ inline void PreconditionResponse::set_allocated_message(std::string* value) {
           _impl_.message_.Set("", GetArenaForAllocation());
         }
   #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:PreconditionResponse.message)
+  // @@protoc_insertion_point(field_set_allocated:messages.PreconditionResponse.message)
 }
 
 // -------------------------------------------------------------------
 
 // CabinTemperature
 
-// .Temperature temperature = 1;
+// .messages.Temperature temperature = 1;
 inline bool CabinTemperature::_internal_has_temperature() const {
   return this != internal_default_instance() && _impl_.temperature_ != nullptr;
 }
@@ -1957,26 +1960,26 @@ inline void CabinTemperature::clear_temperature() {
   }
   _impl_.temperature_ = nullptr;
 }
-inline const ::Temperature& CabinTemperature::_internal_temperature() const {
-  const ::Temperature* p = _impl_.temperature_;
-  return p != nullptr ? *p : reinterpret_cast<const ::Temperature&>(
-      ::_Temperature_default_instance_);
+inline const ::messages::Temperature& CabinTemperature::_internal_temperature() const {
+  const ::messages::Temperature* p = _impl_.temperature_;
+  return p != nullptr ? *p : reinterpret_cast<const ::messages::Temperature&>(
+      ::messages::_Temperature_default_instance_);
 }
-inline const ::Temperature& CabinTemperature::temperature() const {
-  // @@protoc_insertion_point(field_get:CabinTemperature.temperature)
+inline const ::messages::Temperature& CabinTemperature::temperature() const {
+  // @@protoc_insertion_point(field_get:messages.CabinTemperature.temperature)
   return _internal_temperature();
 }
 inline void CabinTemperature::unsafe_arena_set_allocated_temperature(
-    ::Temperature* temperature) {
+    ::messages::Temperature* temperature) {
   if (GetArenaForAllocation() == nullptr) {
     delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.temperature_);
   }
   _impl_.temperature_ = temperature;
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:CabinTemperature.temperature)
+  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:messages.CabinTemperature.temperature)
 }
-inline ::Temperature* CabinTemperature::release_temperature() {
+inline ::messages::Temperature* CabinTemperature::release_temperature() {
   
-  ::Temperature* temp = _impl_.temperature_;
+  ::messages::Temperature* temp = _impl_.temperature_;
   _impl_.temperature_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
@@ -1989,27 +1992,27 @@ inline ::Temperature* CabinTemperature::release_temperature() {
 #endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
   return temp;
 }
-inline ::Temperature* CabinTemperature::unsafe_arena_release_temperature() {
-  // @@protoc_insertion_point(field_release:CabinTemperature.temperature)
+inline ::messages::Temperature* CabinTemperature::unsafe_arena_release_temperature() {
+  // @@protoc_insertion_point(field_release:messages.CabinTemperature.temperature)
   
-  ::Temperature* temp = _impl_.temperature_;
+  ::messages::Temperature* temp = _impl_.temperature_;
   _impl_.temperature_ = nullptr;
   return temp;
 }
-inline ::Temperature* CabinTemperature::_internal_mutable_temperature() {
+inline ::messages::Temperature* CabinTemperature::_internal_mutable_temperature() {
   
   if (_impl_.temperature_ == nullptr) {
-    auto* p = CreateMaybeMessage<::Temperature>(GetArenaForAllocation());
+    auto* p = CreateMaybeMessage<::messages::Temperature>(GetArenaForAllocation());
     _impl_.temperature_ = p;
   }
   return _impl_.temperature_;
 }
-inline ::Temperature* CabinTemperature::mutable_temperature() {
-  ::Temperature* _msg = _internal_mutable_temperature();
-  // @@protoc_insertion_point(field_mutable:CabinTemperature.temperature)
+inline ::messages::Temperature* CabinTemperature::mutable_temperature() {
+  ::messages::Temperature* _msg = _internal_mutable_temperature();
+  // @@protoc_insertion_point(field_mutable:messages.CabinTemperature.temperature)
   return _msg;
 }
-inline void CabinTemperature::set_allocated_temperature(::Temperature* temperature) {
+inline void CabinTemperature::set_allocated_temperature(::messages::Temperature* temperature) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
     delete _impl_.temperature_;
@@ -2026,10 +2029,10 @@ inline void CabinTemperature::set_allocated_temperature(::Temperature* temperatu
 
   }
   _impl_.temperature_ = temperature;
-  // @@protoc_insertion_point(field_set_allocated:CabinTemperature.temperature)
+  // @@protoc_insertion_point(field_set_allocated:messages.CabinTemperature.temperature)
 }
 
-// .HVACZone zone = 2;
+// .messages.HVACZone zone = 2;
 inline bool CabinTemperature::_internal_has_zone() const {
   return this != internal_default_instance() && _impl_.zone_ != nullptr;
 }
@@ -2042,26 +2045,26 @@ inline void CabinTemperature::clear_zone() {
   }
   _impl_.zone_ = nullptr;
 }
-inline const ::HVACZone& CabinTemperature::_internal_zone() const {
-  const ::HVACZone* p = _impl_.zone_;
-  return p != nullptr ? *p : reinterpret_cast<const ::HVACZone&>(
-      ::_HVACZone_default_instance_);
+inline const ::messages::HVACZone& CabinTemperature::_internal_zone() const {
+  const ::messages::HVACZone* p = _impl_.zone_;
+  return p != nullptr ? *p : reinterpret_cast<const ::messages::HVACZone&>(
+      ::messages::_HVACZone_default_instance_);
 }
-inline const ::HVACZone& CabinTemperature::zone() const {
-  // @@protoc_insertion_point(field_get:CabinTemperature.zone)
+inline const ::messages::HVACZone& CabinTemperature::zone() const {
+  // @@protoc_insertion_point(field_get:messages.CabinTemperature.zone)
   return _internal_zone();
 }
 inline void CabinTemperature::unsafe_arena_set_allocated_zone(
-    ::HVACZone* zone) {
+    ::messages::HVACZone* zone) {
   if (GetArenaForAllocation() == nullptr) {
     delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.zone_);
   }
   _impl_.zone_ = zone;
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:CabinTemperature.zone)
+  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:messages.CabinTemperature.zone)
 }
-inline ::HVACZone* CabinTemperature::release_zone() {
+inline ::messages::HVACZone* CabinTemperature::release_zone() {
   
-  ::HVACZone* temp = _impl_.zone_;
+  ::messages::HVACZone* temp = _impl_.zone_;
   _impl_.zone_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
@@ -2074,27 +2077,27 @@ inline ::HVACZone* CabinTemperature::release_zone() {
 #endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
   return temp;
 }
-inline ::HVACZone* CabinTemperature::unsafe_arena_release_zone() {
-  // @@protoc_insertion_point(field_release:CabinTemperature.zone)
+inline ::messages::HVACZone* CabinTemperature::unsafe_arena_release_zone() {
+  // @@protoc_insertion_point(field_release:messages.CabinTemperature.zone)
   
-  ::HVACZone* temp = _impl_.zone_;
+  ::messages::HVACZone* temp = _impl_.zone_;
   _impl_.zone_ = nullptr;
   return temp;
 }
-inline ::HVACZone* CabinTemperature::_internal_mutable_zone() {
+inline ::messages::HVACZone* CabinTemperature::_internal_mutable_zone() {
   
   if (_impl_.zone_ == nullptr) {
-    auto* p = CreateMaybeMessage<::HVACZone>(GetArenaForAllocation());
+    auto* p = CreateMaybeMessage<::messages::HVACZone>(GetArenaForAllocation());
     _impl_.zone_ = p;
   }
   return _impl_.zone_;
 }
-inline ::HVACZone* CabinTemperature::mutable_zone() {
-  ::HVACZone* _msg = _internal_mutable_zone();
-  // @@protoc_insertion_point(field_mutable:CabinTemperature.zone)
+inline ::messages::HVACZone* CabinTemperature::mutable_zone() {
+  ::messages::HVACZone* _msg = _internal_mutable_zone();
+  // @@protoc_insertion_point(field_mutable:messages.CabinTemperature.zone)
   return _msg;
 }
-inline void CabinTemperature::set_allocated_zone(::HVACZone* zone) {
+inline void CabinTemperature::set_allocated_zone(::messages::HVACZone* zone) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
     delete _impl_.zone_;
@@ -2111,7 +2114,7 @@ inline void CabinTemperature::set_allocated_zone(::HVACZone* zone) {
 
   }
   _impl_.zone_ = zone;
-  // @@protoc_insertion_point(field_set_allocated:CabinTemperature.zone)
+  // @@protoc_insertion_point(field_set_allocated:messages.CabinTemperature.zone)
 }
 
 // -------------------------------------------------------------------
@@ -2123,12 +2126,12 @@ inline void Temperature::clear_value() {
   _impl_.value_ = 0;
 }
 inline float Temperature::value() const {
-  // @@protoc_insertion_point(field_get:Temperature.value)
+  // @@protoc_insertion_point(field_get:messages.Temperature.value)
   return _internal_value();
 }
 inline void Temperature::set_value(float value) {
   _internal_set_value(value);
-  // @@protoc_insertion_point(field_set:Temperature.value)
+  // @@protoc_insertion_point(field_set:messages.Temperature.value)
 }
 inline float Temperature::_internal_value() const {
   return _impl_.value_;
@@ -2143,7 +2146,7 @@ inline void Temperature::clear_unit() {
   _impl_.unit_.ClearToEmpty();
 }
 inline const std::string& Temperature::unit() const {
-  // @@protoc_insertion_point(field_get:Temperature.unit)
+  // @@protoc_insertion_point(field_get:messages.Temperature.unit)
   return _internal_unit();
 }
 template <typename Arg_, typename... Args_>
@@ -2151,11 +2154,11 @@ inline PROTOBUF_ALWAYS_INLINE void Temperature::set_unit(Arg_&& arg,
                                                      Args_... args) {
   ;
   _impl_.unit_.Set(static_cast<Arg_&&>(arg), args..., GetArenaForAllocation());
-  // @@protoc_insertion_point(field_set:Temperature.unit)
+  // @@protoc_insertion_point(field_set:messages.Temperature.unit)
 }
 inline std::string* Temperature::mutable_unit() {
   std::string* _s = _internal_mutable_unit();
-  // @@protoc_insertion_point(field_mutable:Temperature.unit)
+  // @@protoc_insertion_point(field_mutable:messages.Temperature.unit)
   return _s;
 }
 inline const std::string& Temperature::_internal_unit() const {
@@ -2172,7 +2175,7 @@ inline std::string* Temperature::_internal_mutable_unit() {
   return _impl_.unit_.Mutable( GetArenaForAllocation());
 }
 inline std::string* Temperature::release_unit() {
-  // @@protoc_insertion_point(field_release:Temperature.unit)
+  // @@protoc_insertion_point(field_release:messages.Temperature.unit)
   return _impl_.unit_.Release();
 }
 inline void Temperature::set_allocated_unit(std::string* value) {
@@ -2182,34 +2185,34 @@ inline void Temperature::set_allocated_unit(std::string* value) {
           _impl_.unit_.Set("", GetArenaForAllocation());
         }
   #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:Temperature.unit)
+  // @@protoc_insertion_point(field_set_allocated:messages.Temperature.unit)
 }
 
 // -------------------------------------------------------------------
 
 // HVACZone
 
-// .HVACZone.Zone zone = 1;
+// .messages.HVACZone.Zone zone = 1;
 inline void HVACZone::clear_zone() {
   _impl_.zone_ = 0;
 }
-inline ::HVACZone_Zone HVACZone::zone() const {
-  // @@protoc_insertion_point(field_get:HVACZone.zone)
+inline ::messages::HVACZone_Zone HVACZone::zone() const {
+  // @@protoc_insertion_point(field_get:messages.HVACZone.zone)
   return _internal_zone();
 }
-inline void HVACZone::set_zone(::HVACZone_Zone value) {
+inline void HVACZone::set_zone(::messages::HVACZone_Zone value) {
    _internal_set_zone(value);
-  // @@protoc_insertion_point(field_set:HVACZone.zone)
+  // @@protoc_insertion_point(field_set:messages.HVACZone.zone)
 }
-inline ::HVACZone_Zone HVACZone::_internal_zone() const {
-  return static_cast<::HVACZone_Zone>(_impl_.zone_);
+inline ::messages::HVACZone_Zone HVACZone::_internal_zone() const {
+  return static_cast<::messages::HVACZone_Zone>(_impl_.zone_);
 }
-inline void HVACZone::_internal_set_zone(::HVACZone_Zone value) {
+inline void HVACZone::_internal_set_zone(::messages::HVACZone_Zone value) {
   ;
   _impl_.zone_ = value;
 }
 
-// .Temperature target_temperature = 2;
+// .messages.Temperature target_temperature = 2;
 inline bool HVACZone::_internal_has_target_temperature() const {
   return this != internal_default_instance() && _impl_.target_temperature_ != nullptr;
 }
@@ -2222,26 +2225,26 @@ inline void HVACZone::clear_target_temperature() {
   }
   _impl_.target_temperature_ = nullptr;
 }
-inline const ::Temperature& HVACZone::_internal_target_temperature() const {
-  const ::Temperature* p = _impl_.target_temperature_;
-  return p != nullptr ? *p : reinterpret_cast<const ::Temperature&>(
-      ::_Temperature_default_instance_);
+inline const ::messages::Temperature& HVACZone::_internal_target_temperature() const {
+  const ::messages::Temperature* p = _impl_.target_temperature_;
+  return p != nullptr ? *p : reinterpret_cast<const ::messages::Temperature&>(
+      ::messages::_Temperature_default_instance_);
 }
-inline const ::Temperature& HVACZone::target_temperature() const {
-  // @@protoc_insertion_point(field_get:HVACZone.target_temperature)
+inline const ::messages::Temperature& HVACZone::target_temperature() const {
+  // @@protoc_insertion_point(field_get:messages.HVACZone.target_temperature)
   return _internal_target_temperature();
 }
 inline void HVACZone::unsafe_arena_set_allocated_target_temperature(
-    ::Temperature* target_temperature) {
+    ::messages::Temperature* target_temperature) {
   if (GetArenaForAllocation() == nullptr) {
     delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.target_temperature_);
   }
   _impl_.target_temperature_ = target_temperature;
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:HVACZone.target_temperature)
+  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:messages.HVACZone.target_temperature)
 }
-inline ::Temperature* HVACZone::release_target_temperature() {
+inline ::messages::Temperature* HVACZone::release_target_temperature() {
   
-  ::Temperature* temp = _impl_.target_temperature_;
+  ::messages::Temperature* temp = _impl_.target_temperature_;
   _impl_.target_temperature_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
@@ -2254,27 +2257,27 @@ inline ::Temperature* HVACZone::release_target_temperature() {
 #endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
   return temp;
 }
-inline ::Temperature* HVACZone::unsafe_arena_release_target_temperature() {
-  // @@protoc_insertion_point(field_release:HVACZone.target_temperature)
+inline ::messages::Temperature* HVACZone::unsafe_arena_release_target_temperature() {
+  // @@protoc_insertion_point(field_release:messages.HVACZone.target_temperature)
   
-  ::Temperature* temp = _impl_.target_temperature_;
+  ::messages::Temperature* temp = _impl_.target_temperature_;
   _impl_.target_temperature_ = nullptr;
   return temp;
 }
-inline ::Temperature* HVACZone::_internal_mutable_target_temperature() {
+inline ::messages::Temperature* HVACZone::_internal_mutable_target_temperature() {
   
   if (_impl_.target_temperature_ == nullptr) {
-    auto* p = CreateMaybeMessage<::Temperature>(GetArenaForAllocation());
+    auto* p = CreateMaybeMessage<::messages::Temperature>(GetArenaForAllocation());
     _impl_.target_temperature_ = p;
   }
   return _impl_.target_temperature_;
 }
-inline ::Temperature* HVACZone::mutable_target_temperature() {
-  ::Temperature* _msg = _internal_mutable_target_temperature();
-  // @@protoc_insertion_point(field_mutable:HVACZone.target_temperature)
+inline ::messages::Temperature* HVACZone::mutable_target_temperature() {
+  ::messages::Temperature* _msg = _internal_mutable_target_temperature();
+  // @@protoc_insertion_point(field_mutable:messages.HVACZone.target_temperature)
   return _msg;
 }
-inline void HVACZone::set_allocated_target_temperature(::Temperature* target_temperature) {
+inline void HVACZone::set_allocated_target_temperature(::messages::Temperature* target_temperature) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
     delete _impl_.target_temperature_;
@@ -2291,34 +2294,34 @@ inline void HVACZone::set_allocated_target_temperature(::Temperature* target_tem
 
   }
   _impl_.target_temperature_ = target_temperature;
-  // @@protoc_insertion_point(field_set_allocated:HVACZone.target_temperature)
+  // @@protoc_insertion_point(field_set_allocated:messages.HVACZone.target_temperature)
 }
 
 // -------------------------------------------------------------------
 
 // HVACState
 
-// .HVACState.State state = 1;
+// .messages.HVACState.State state = 1;
 inline void HVACState::clear_state() {
   _impl_.state_ = 0;
 }
-inline ::HVACState_State HVACState::state() const {
-  // @@protoc_insertion_point(field_get:HVACState.state)
+inline ::messages::HVACState_State HVACState::state() const {
+  // @@protoc_insertion_point(field_get:messages.HVACState.state)
   return _internal_state();
 }
-inline void HVACState::set_state(::HVACState_State value) {
+inline void HVACState::set_state(::messages::HVACState_State value) {
    _internal_set_state(value);
-  // @@protoc_insertion_point(field_set:HVACState.state)
+  // @@protoc_insertion_point(field_set:messages.HVACState.state)
 }
-inline ::HVACState_State HVACState::_internal_state() const {
-  return static_cast<::HVACState_State>(_impl_.state_);
+inline ::messages::HVACState_State HVACState::_internal_state() const {
+  return static_cast<::messages::HVACState_State>(_impl_.state_);
 }
-inline void HVACState::_internal_set_state(::HVACState_State value) {
+inline void HVACState::_internal_set_state(::messages::HVACState_State value) {
   ;
   _impl_.state_ = value;
 }
 
-// .HVACZone current_zone = 2;
+// .messages.HVACZone current_zone = 2;
 inline bool HVACState::_internal_has_current_zone() const {
   return this != internal_default_instance() && _impl_.current_zone_ != nullptr;
 }
@@ -2331,26 +2334,26 @@ inline void HVACState::clear_current_zone() {
   }
   _impl_.current_zone_ = nullptr;
 }
-inline const ::HVACZone& HVACState::_internal_current_zone() const {
-  const ::HVACZone* p = _impl_.current_zone_;
-  return p != nullptr ? *p : reinterpret_cast<const ::HVACZone&>(
-      ::_HVACZone_default_instance_);
+inline const ::messages::HVACZone& HVACState::_internal_current_zone() const {
+  const ::messages::HVACZone* p = _impl_.current_zone_;
+  return p != nullptr ? *p : reinterpret_cast<const ::messages::HVACZone&>(
+      ::messages::_HVACZone_default_instance_);
 }
-inline const ::HVACZone& HVACState::current_zone() const {
-  // @@protoc_insertion_point(field_get:HVACState.current_zone)
+inline const ::messages::HVACZone& HVACState::current_zone() const {
+  // @@protoc_insertion_point(field_get:messages.HVACState.current_zone)
   return _internal_current_zone();
 }
 inline void HVACState::unsafe_arena_set_allocated_current_zone(
-    ::HVACZone* current_zone) {
+    ::messages::HVACZone* current_zone) {
   if (GetArenaForAllocation() == nullptr) {
     delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.current_zone_);
   }
   _impl_.current_zone_ = current_zone;
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:HVACState.current_zone)
+  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:messages.HVACState.current_zone)
 }
-inline ::HVACZone* HVACState::release_current_zone() {
+inline ::messages::HVACZone* HVACState::release_current_zone() {
   
-  ::HVACZone* temp = _impl_.current_zone_;
+  ::messages::HVACZone* temp = _impl_.current_zone_;
   _impl_.current_zone_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
@@ -2363,27 +2366,27 @@ inline ::HVACZone* HVACState::release_current_zone() {
 #endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
   return temp;
 }
-inline ::HVACZone* HVACState::unsafe_arena_release_current_zone() {
-  // @@protoc_insertion_point(field_release:HVACState.current_zone)
+inline ::messages::HVACZone* HVACState::unsafe_arena_release_current_zone() {
+  // @@protoc_insertion_point(field_release:messages.HVACState.current_zone)
   
-  ::HVACZone* temp = _impl_.current_zone_;
+  ::messages::HVACZone* temp = _impl_.current_zone_;
   _impl_.current_zone_ = nullptr;
   return temp;
 }
-inline ::HVACZone* HVACState::_internal_mutable_current_zone() {
+inline ::messages::HVACZone* HVACState::_internal_mutable_current_zone() {
   
   if (_impl_.current_zone_ == nullptr) {
-    auto* p = CreateMaybeMessage<::HVACZone>(GetArenaForAllocation());
+    auto* p = CreateMaybeMessage<::messages::HVACZone>(GetArenaForAllocation());
     _impl_.current_zone_ = p;
   }
   return _impl_.current_zone_;
 }
-inline ::HVACZone* HVACState::mutable_current_zone() {
-  ::HVACZone* _msg = _internal_mutable_current_zone();
-  // @@protoc_insertion_point(field_mutable:HVACState.current_zone)
+inline ::messages::HVACZone* HVACState::mutable_current_zone() {
+  ::messages::HVACZone* _msg = _internal_mutable_current_zone();
+  // @@protoc_insertion_point(field_mutable:messages.HVACState.current_zone)
   return _msg;
 }
-inline void HVACState::set_allocated_current_zone(::HVACZone* current_zone) {
+inline void HVACState::set_allocated_current_zone(::messages::HVACZone* current_zone) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
     delete _impl_.current_zone_;
@@ -2400,7 +2403,7 @@ inline void HVACState::set_allocated_current_zone(::HVACZone* current_zone) {
 
   }
   _impl_.current_zone_ = current_zone;
-  // @@protoc_insertion_point(field_set_allocated:HVACState.current_zone)
+  // @@protoc_insertion_point(field_set_allocated:messages.HVACState.current_zone)
 }
 
 #ifdef __GNUC__
@@ -2408,27 +2411,28 @@ inline void HVACState::set_allocated_current_zone(::HVACZone* current_zone) {
 #endif  // __GNUC__
 
 // @@protoc_insertion_point(namespace_scope)
+}  // namespace messages
 
 
 PROTOBUF_NAMESPACE_OPEN
 
 template <>
-struct is_proto_enum<::PreconditionResponse_Status> : std::true_type {};
+struct is_proto_enum<::messages::PreconditionResponse_Status> : std::true_type {};
 template <>
-inline const EnumDescriptor* GetEnumDescriptor<::PreconditionResponse_Status>() {
-  return ::PreconditionResponse_Status_descriptor();
+inline const EnumDescriptor* GetEnumDescriptor<::messages::PreconditionResponse_Status>() {
+  return ::messages::PreconditionResponse_Status_descriptor();
 }
 template <>
-struct is_proto_enum<::HVACZone_Zone> : std::true_type {};
+struct is_proto_enum<::messages::HVACZone_Zone> : std::true_type {};
 template <>
-inline const EnumDescriptor* GetEnumDescriptor<::HVACZone_Zone>() {
-  return ::HVACZone_Zone_descriptor();
+inline const EnumDescriptor* GetEnumDescriptor<::messages::HVACZone_Zone>() {
+  return ::messages::HVACZone_Zone_descriptor();
 }
 template <>
-struct is_proto_enum<::HVACState_State> : std::true_type {};
+struct is_proto_enum<::messages::HVACState_State> : std::true_type {};
 template <>
-inline const EnumDescriptor* GetEnumDescriptor<::HVACState_State>() {
-  return ::HVACState_State_descriptor();
+inline const EnumDescriptor* GetEnumDescriptor<::messages::HVACState_State>() {
+  return ::messages::HVACState_State_descriptor();
 }
 
 PROTOBUF_NAMESPACE_CLOSE