diff --git a/Defines.h b/Defines.h
index a8484764..9939eca5 100644
--- a/Defines.h
+++ b/Defines.h
@@ -220,22 +220,22 @@ inline std::string __FLOAT_STR(const float& value) {
 /// <summary>Creates a read-only get property by reference.</summary>
 #define __READONLY_PROPERTY_BYREF(type, variableName, propName)                         \
         private: type m_##variableName;                                                 \
-		public: __forceinline type& get##propName(void) const { return m_##variableName; }
+        public: __forceinline type& get##propName(void) const { return m_##variableName; }
 
 /// <summary>Creates a get and set property.</summary>
 #define __PROPERTY(type, variableName, propName)                                        \
         private: type m_##variableName;                                                 \
-		public: __forceinline type get##propName(void) const { return m_##variableName; } \
-				__forceinline void set##propName(type val) { m_##variableName = val; }
+        public: __forceinline type get##propName(void) const { return m_##variableName; } \
+                __forceinline void set##propName(type val) { m_##variableName = val; }
 /// <summary>Creates a get and set property, does not use "get"/"set".</summary>
 #define __PROPERTY_PLAIN(type, variableName, propName)                                  \
         private: type m_##variableName;                                                 \
-		public: __forceinline type propName(void) const { return m_##variableName; }    \
-				__forceinline void propName(type val) { m_##variableName = val; }
+        public: __forceinline type propName(void) const { return m_##variableName; }    \
+                __forceinline void propName(type val) { m_##variableName = val; }
 /// <summary>Creates a get and set property by reference.</summary>
 #define __PROPERTY_BYREF(type, variableName, propName)                                  \
         private: type m_##variableName;                                                 \
-		public: __forceinline type& get##propName(void) const { return m_##variableName; } \
-		        __forceinline void set##propName(type& val) { m_##variableName = val; }
+        public: __forceinline type& get##propName(void) const { return m_##variableName; } \
+                __forceinline void set##propName(type& val) { m_##variableName = val; }
 
 #endif // __DEFINES_H__
diff --git a/Utils.cpp b/Utils.cpp
index 6a861953..e531ccb2 100644
--- a/Utils.cpp
+++ b/Utils.cpp
@@ -56,7 +56,7 @@ void getHostVersion()
 // ---------------------------------------------------------------------------
 /// <summary>
 ///
-/// <summary>
+/// </summary>
 /// <param name="title"></param>
 /// <param name="data"></param>
 /// <param name="length"></param>
@@ -69,7 +69,7 @@ void Utils::dump(const std::string& title, const uint8_t* data, uint32_t length)
 
 /// <summary>
 ///
-/// <summary>
+/// </summary>
 /// <param name="level"></param>
 /// <param name="title"></param>
 /// <param name="data"></param>
@@ -122,7 +122,7 @@ void Utils::dump(int level, const std::string& title, const uint8_t* data, uint3
 
 /// <summary>
 ///
-/// <summary>
+/// </summary>
 /// <param name="title"></param>
 /// <param name="bits"></param>
 /// <param name="length"></param>
@@ -135,7 +135,7 @@ void Utils::dump(const std::string& title, const bool* bits, uint32_t length)
 
 /// <summary>
 ///
-/// <summary>
+/// </summary>
 /// <param name="level"></param>
 /// <param name="title"></param>
 /// <param name="bits"></param>
@@ -154,7 +154,7 @@ void Utils::dump(int level, const std::string& title, const bool* bits, uint32_t
 
 /// <summary>
 ///
-/// <summary>
+/// </summary>
 /// <param name="byte"></param>
 /// <param name="bits"></param>
 void Utils::byteToBitsBE(uint8_t byte, bool* bits)
@@ -173,7 +173,7 @@ void Utils::byteToBitsBE(uint8_t byte, bool* bits)
 
 /// <summary>
 ///
-/// <summary>
+/// </summary>
 /// <param name="byte"></param>
 /// <param name="bits"></param>
 void Utils::byteToBitsLE(uint8_t byte, bool* bits)
@@ -192,7 +192,7 @@ void Utils::byteToBitsLE(uint8_t byte, bool* bits)
 
 /// <summary>
 ///
-/// <summary>
+/// </summary>
 /// <param name="bits"></param>
 /// <param name="byte"></param>
 void Utils::bitsToByteBE(const bool* bits, uint8_t& byte)
@@ -211,7 +211,7 @@ void Utils::bitsToByteBE(const bool* bits, uint8_t& byte)
 
 /// <summary>
 ///
-/// <summary>
+/// </summary>
 /// <param name="bits"></param>
 /// <param name="byte"></param>
 void Utils::bitsToByteLE(const bool* bits, uint8_t& byte)
diff --git a/dmr/VoicePacket.cpp b/dmr/VoicePacket.cpp
index a9aacd83..32b6eb0e 100644
--- a/dmr/VoicePacket.cpp
+++ b/dmr/VoicePacket.cpp
@@ -83,7 +83,7 @@ bool VoicePacket::process(uint8_t* data, uint32_t len)
             if (fid == FID_ETSI || fid == FID_DMRA) {
                 errors = m_fec.regenerateDMR(data + 2U);
                 if (m_verbose) {
-                    LogMessage(LOG_RF, "DMR Slot %u, DMR_SYNC_VOICE audio, sequence no = 0, errs = %u/141 (%.1f%%)",
+                    LogMessage(LOG_RF, "DMR Slot %u, DT_VOICE_SYNC audio, sequence no = 0, errs = %u/141 (%.1f%%)",
                         m_slot->m_slotNo, errors, float(errors) / 1.41F);
                 }
 
@@ -136,7 +136,7 @@ bool VoicePacket::process(uint8_t* data, uint32_t len)
             if (fid == FID_ETSI || fid == FID_DMRA) {
                 errors = m_fec.regenerateDMR(data + 2U);
                 if (m_verbose) {
-                    LogMessage(LOG_RF, "DMR Slot %u, DMR_SYNC_VOICE audio, sequence no = %u, errs = %u/141 (%.1f%%)",
+                    LogMessage(LOG_RF, "DMR Slot %u, DT_VOICE audio, sequence no = %u, errs = %u/141 (%.1f%%)",
                         m_slot->m_slotNo, m_rfN, errors, float(errors) / 1.41F);
                 }
 
@@ -287,7 +287,7 @@ bool VoicePacket::process(uint8_t* data, uint32_t len)
 
                 // validate the source RID
                 if (!acl::AccessControl::validateSrcId(srcId)) {
-                    LogWarning(LOG_RF, "DMR Slot %u, DMR_DATA_SYNC denial, RID rejection, srcId = %u", m_slot->m_slotNo, srcId);
+                    LogWarning(LOG_RF, "DMR Slot %u, DT_VOICE denial, RID rejection, srcId = %u", m_slot->m_slotNo, srcId);
                     delete lc;
                     return false;
                 }
@@ -295,7 +295,7 @@ bool VoicePacket::process(uint8_t* data, uint32_t len)
                 // validate the target ID, if the target is a talkgroup
                 if (flco == FLCO_GROUP) {
                     if (!acl::AccessControl::validateTGId(m_slot->m_slotNo, dstId)) {
-                        LogWarning(LOG_RF, "DMR Slot %u, DMR_DATA_SYNC denial, TGID rejection, srcId = %u, dstId = %u", m_slot->m_slotNo, srcId, dstId);
+                        LogWarning(LOG_RF, "DMR Slot %u, DT_VOICE denial, TGID rejection, srcId = %u, dstId = %u", m_slot->m_slotNo, srcId, dstId);
                         delete lc;
                         return false;
                     }
@@ -368,7 +368,7 @@ bool VoicePacket::process(uint8_t* data, uint32_t len)
                 if (fid == FID_ETSI || fid == FID_DMRA) {
                     errors = m_fec.regenerateDMR(data + 2U);
                     if (m_verbose) {
-                        LogMessage(LOG_RF, "DMR Slot %u, DMR_AUDIO_SYNC audio, sequence no = %u, errs = %u/141 (%.1f%%)",
+                        LogMessage(LOG_RF, "DMR Slot %u, DT_VOICE audio, sequence no = %u, errs = %u/141 (%.1f%%)",
                             m_slot->m_slotNo, m_rfN, errors, float(errors) / 1.41F);
                     }
 
@@ -490,7 +490,7 @@ void VoicePacket::processNetwork(const data::Data& dmrData)
             if (fid == FID_ETSI || fid == FID_DMRA) {
                 m_slot->m_netErrs += m_fec.regenerateDMR(data + 2U);
                 if (m_verbose) {
-                    LogMessage(LOG_NET, "DMR Slot %u, DMR_SYNC_VOICE audio, sequence no = %u, errs = %u/141 (%.1f%%)",
+                    LogMessage(LOG_NET, "DMR Slot %u, DT_VOICE_SYNC audio, sequence no = %u, errs = %u/141 (%.1f%%)",
                         m_slot->m_slotNo, m_netN, m_slot->m_netErrs, float(m_slot->m_netErrs) / 1.41F);
                 }
             }
@@ -535,7 +535,7 @@ void VoicePacket::processNetwork(const data::Data& dmrData)
         if (fid == FID_ETSI || fid == FID_DMRA) {
             m_slot->m_netErrs += m_fec.regenerateDMR(data + 2U);
             if (m_verbose) {
-                LogMessage(LOG_NET, "DMR Slot %u, DMR_SYNC_VOICE audio, sequence no = %u, errs = %u/141 (%.1f%%)",
+                LogMessage(LOG_NET, "DMR Slot %u, DT_VOICE audio, sequence no = %u, errs = %u/141 (%.1f%%)",
                     m_slot->m_slotNo, m_netN, m_slot->m_netErrs, float(m_slot->m_netErrs) / 1.41F);
             }
         }
diff --git a/network/BaseNetwork.h b/network/BaseNetwork.h
index cb4bc028..53bc4c04 100644
--- a/network/BaseNetwork.h
+++ b/network/BaseNetwork.h
@@ -218,7 +218,7 @@ namespace network
         /// <summary>Writes the local activity log to the network.</summary>
         virtual bool writeActLog(const char* message);
 
-        /// <summary>Writes the local activity log to the network.</summary>
+        /// <summary>Writes the local diagnostic logs to the network.</summary>
         virtual bool writeDiagLog(const char* message);
 
         /// <summary>Updates the timer by the passed number of milliseconds.</summary>