diff --git a/src/engine/agent/Agent_AudioManager.cpp b/src/engine/agent/Agent_AudioManager.cpp
index 2fd50bd0..f7da74c9 100644
--- a/src/engine/agent/Agent_AudioManager.cpp
+++ b/src/engine/agent/Agent_AudioManager.cpp
@@ -12,7 +12,7 @@
 # include "../engine/audio/Audio_Android.h"
 #endif
 
-#define LOG_SUBSYSTEM "AudioManager"
+#define LOG_SUBSYSTEM "audio"
 
 
 AudioManager::AudioManager()
diff --git a/src/engine/agent/Agent_Impl.cpp b/src/engine/agent/Agent_Impl.cpp
index 0d185785..f569784a 100644
--- a/src/engine/agent/Agent_Impl.cpp
+++ b/src/engine/agent/Agent_Impl.cpp
@@ -18,7 +18,7 @@ const std::string Status_NoMediaAction = "no valid media action";
 const std::string Status_NoCommand = "no valid command";
 const std::string Status_NoAudioManager = "no audio manager";
 
-#define LOG_SUBSYSTEM "Agent"
+#define LOG_SUBSYSTEM "agent"
 
 AgentImpl::AgentImpl()
     :mShutdown(false), mEventListChangeCondVar()
diff --git a/src/engine/audio/Audio_AndroidOboe.cpp b/src/engine/audio/Audio_AndroidOboe.cpp
index 851c7a9e..9585300d 100644
--- a/src/engine/audio/Audio_AndroidOboe.cpp
+++ b/src/engine/audio/Audio_AndroidOboe.cpp
@@ -10,7 +10,7 @@
 
 #ifdef TARGET_ANDROID
 
-#define LOG_SUBSYSTEM "Audio"
+#define LOG_SUBSYSTEM "audio"
 
 using namespace Audio;
 
@@ -242,4 +242,4 @@ void AndroidOutputDevice::onErrorAfterClose(oboe::AudioStream *stream, oboe::Res
     // soundEngine.restart(); // please check oboe samples for soundEngine.restart(); call
   }
 }
-#endif // TARGET_ANDROID
\ No newline at end of file
+#endif // TARGET_ANDROID
diff --git a/src/engine/audio/Audio_CoreAudio.cpp b/src/engine/audio/Audio_CoreAudio.cpp
index 4d465e97..dfad4c5a 100644
--- a/src/engine/audio/Audio_CoreAudio.cpp
+++ b/src/engine/audio/Audio_CoreAudio.cpp
@@ -13,7 +13,7 @@
 
 using namespace Audio;
 
-#define LOG_SUBSYSTEM "CoreAudio"
+#define LOG_SUBSYSTEM "audio"
 
 enum
 {
diff --git a/src/engine/audio/Audio_DevicePair.cpp b/src/engine/audio/Audio_DevicePair.cpp
index fd66bd3b..53f54071 100644
--- a/src/engine/audio/Audio_DevicePair.cpp
+++ b/src/engine/audio/Audio_DevicePair.cpp
@@ -7,7 +7,7 @@
 #include <algorithm>
 #include <assert.h>
 
-#define LOG_SUBSYSTEM "Audio"
+#define LOG_SUBSYSTEM "audio"
 
 using namespace Audio;
 
diff --git a/src/engine/audio/Audio_DirectSound.cpp b/src/engine/audio/Audio_DirectSound.cpp
index 62291c9f..5fc88b89 100644
--- a/src/engine/audio/Audio_DirectSound.cpp
+++ b/src/engine/audio/Audio_DirectSound.cpp
@@ -22,7 +22,7 @@
 #define DRV_QUERYFUNCTIONINSTANCEID  (DRV_RESERVED + 17)
 #define DRV_QUERYFUNCTIONINSTANCEIDSIZE (DRV_RESERVED + 18)
 
-#define LOG_SUBSYSTEM "DirectSound"
+#define LOG_SUBSYSTEM "audio"
 
 using namespace Audio;
 
diff --git a/src/engine/audio/Audio_Mixer.cpp b/src/engine/audio/Audio_Mixer.cpp
index 46a437ed..5cade70c 100644
--- a/src/engine/audio/Audio_Mixer.cpp
+++ b/src/engine/audio/Audio_Mixer.cpp
@@ -12,7 +12,7 @@
 
 #include "Audio_Mixer.h"
 
-#define LOG_SUBSYSTEM "Mixer"
+#define LOG_SUBSYSTEM "audio"
 using namespace Audio;
 
 Mixer::Stream::Stream()
diff --git a/src/engine/audio/Audio_Null.cpp b/src/engine/audio/Audio_Null.cpp
index 9b69cb54..5121e9a9 100644
--- a/src/engine/audio/Audio_Null.cpp
+++ b/src/engine/audio/Audio_Null.cpp
@@ -2,7 +2,7 @@
 #include "helper/HL_Log.h"
 #include <assert.h>
 #include <chrono>
-#define LOG_SUBSYSTEM "NULL audio"
+#define LOG_SUBSYSTEM "audio"
 
 using namespace Audio;
 
diff --git a/src/engine/audio/Audio_Player.cpp b/src/engine/audio/Audio_Player.cpp
index 7aaa22ee..7ad14ef0 100644
--- a/src/engine/audio/Audio_Player.cpp
+++ b/src/engine/audio/Audio_Player.cpp
@@ -7,7 +7,7 @@
 
 #include "../helper/HL_Log.h"
 
-#define LOG_SUBSYSTEM "Player"
+#define LOG_SUBSYSTEM "audio"
 
 using namespace Audio;
 // -------------- Player -----------
diff --git a/src/engine/audio/Audio_WavFile.cpp b/src/engine/audio/Audio_WavFile.cpp
index 54d6f840..f286fa52 100644
--- a/src/engine/audio/Audio_WavFile.cpp
+++ b/src/engine/audio/Audio_WavFile.cpp
@@ -32,7 +32,7 @@ WaveFormatEx;
 
 #define WAVE_FORMAT_PCM 1
 
-#define LOG_SUBSYSTEM "WavFileReader"
+#define LOG_SUBSYSTEM "audio"
 
 #define LOCK std::unique_lock<std::recursive_mutex> lock(mFileMtx);
 
diff --git a/src/engine/endpoint/EP_Account.cpp b/src/engine/endpoint/EP_Account.cpp
index bf622277..eb916f4a 100644
--- a/src/engine/endpoint/EP_Account.cpp
+++ b/src/engine/endpoint/EP_Account.cpp
@@ -10,7 +10,7 @@
 #include <resip/stack/Pidf.hxx>
 #include <resip/stack/PlainContents.hxx>
 
-#define LOG_SUBSYSTEM "Account"
+#define LOG_SUBSYSTEM "engine"
 
 #define CONFIG(X) mConfig->at(X)
 #define CONFIG_EXISTS(X) mConfig->exists(X)
diff --git a/src/engine/endpoint/EP_AudioProvider.cpp b/src/engine/endpoint/EP_AudioProvider.cpp
index ed6c4278..43d1023d 100644
--- a/src/engine/endpoint/EP_AudioProvider.cpp
+++ b/src/engine/endpoint/EP_AudioProvider.cpp
@@ -14,7 +14,7 @@
 #include "../helper/HL_Log.h"
 #include "../helper/HL_String.h"
 
-#define LOG_SUBSYSTEM "AudioProvider"
+#define LOG_SUBSYSTEM "engine"
 
 AudioProvider::AudioProvider(UserAgent& agent, MT::Terminal& terminal)
     :mUserAgent(agent), mTerminal(terminal), mState(0),
diff --git a/src/engine/endpoint/EP_Engine.cpp b/src/engine/endpoint/EP_Engine.cpp
index a2111f9d..dbe54379 100644
--- a/src/engine/endpoint/EP_Engine.cpp
+++ b/src/engine/endpoint/EP_Engine.cpp
@@ -37,7 +37,7 @@
 # include "resip/stack/ssl/WinSecurity.hxx"
 #endif
 
-#define LOG_SUBSYSTEM "[Engine]"
+#define LOG_SUBSYSTEM "engine"
 #define LOCK Lock l(mGuard)
 #define CAST2RESIPSESSION(x) (x.isValid() ? (x->getAppDialogSet().isValid() ? dynamic_cast<ResipSession*>(x->getAppDialogSet().get()) : NULL) : NULL)
 
diff --git a/src/engine/endpoint/EP_Session.cpp b/src/engine/endpoint/EP_Session.cpp
index 5d6a0e3a..74c6c885 100644
--- a/src/engine/endpoint/EP_Session.cpp
+++ b/src/engine/endpoint/EP_Session.cpp
@@ -11,7 +11,7 @@
 #include "../helper/HL_Sync.h"
 #include "../helper/HL_String.h"
 
-#define LOG_SUBSYSTEM "[Engine]"
+#define LOG_SUBSYSTEM "engine"
 
 typedef resip::SdpContents::Session::Medium Medium;
 typedef resip::SdpContents::Session::MediumContainer MediumContainer;
diff --git a/src/engine/helper/HL_Rtp.cpp b/src/engine/helper/HL_Rtp.cpp
index 0a9cce6e..b78c95c8 100644
--- a/src/engine/helper/HL_Rtp.cpp
+++ b/src/engine/helper/HL_Rtp.cpp
@@ -25,7 +25,7 @@
 #include <cstdio>
 #include <chrono>
 
-#define LOG_SUBSYSTEM "RtpDump"
+#define LOG_SUBSYSTEM "network"
 
 static constexpr size_t MAX_RTP_PACKET_SIZE = 65535;
 static const char RTPDUMP_SHEBANG[] = "#!rtpplay1.0";
diff --git a/src/engine/helper/HL_SocketHeap.cpp b/src/engine/helper/HL_SocketHeap.cpp
index c14b6847..deb2df56 100644
--- a/src/engine/helper/HL_SocketHeap.cpp
+++ b/src/engine/helper/HL_SocketHeap.cpp
@@ -20,7 +20,7 @@
 #include "HL_Sync.h"
 #include "HL_Exception.h"
 
-#define LOG_SUBSYSTEM "[SocketHeap]"
+#define LOG_SUBSYSTEM "network"
 
 #ifndef WIN32
 #define WSAGetLastError(X) errno
diff --git a/src/engine/media/MT_AmrCodec.cpp b/src/engine/media/MT_AmrCodec.cpp
index 735ff7a1..fb521496 100644
--- a/src/engine/media/MT_AmrCodec.cpp
+++ b/src/engine/media/MT_AmrCodec.cpp
@@ -6,7 +6,7 @@
 #include "../helper/HL_IuUP.h"
 #include "../helper/HL_Log.h"
 
-#define LOG_SUBSYSTEM "AmrCodec"
+#define LOG_SUBSYSTEM "media"
 using namespace MT;
 
 
diff --git a/src/engine/media/MT_AudioCodec.cpp b/src/engine/media/MT_AudioCodec.cpp
index f855614d..9cae22ad 100644
--- a/src/engine/media/MT_AudioCodec.cpp
+++ b/src/engine/media/MT_AudioCodec.cpp
@@ -25,7 +25,7 @@
 #include <string.h>
 #include <algorithm>
 
-#define LOG_SUBSYSTEM "Codec"
+#define LOG_SUBSYSTEM "media"
 
 #ifdef TARGET_LINUX
 # define stricmp strcasecmp
diff --git a/src/engine/media/MT_AudioReceiver.cpp b/src/engine/media/MT_AudioReceiver.cpp
index 1ff2805f..245038b7 100644
--- a/src/engine/media/MT_AudioReceiver.cpp
+++ b/src/engine/media/MT_AudioReceiver.cpp
@@ -21,9 +21,7 @@
 
 #include <algorithm>
 
-#define LOG_SUBSYSTEM "AudioReceiver"
-
-//#define DUMP_DECODED
+#define LOG_SUBSYSTEM "media"
 
 using namespace MT;
 
@@ -564,7 +562,7 @@ void AudioReceiver::produceCNG(std::chrono::milliseconds length, Audio::DataWind
 
 AudioReceiver::DecodeResult AudioReceiver::decodeGapTo(Audio::DataWindow& output, DecodeOptions options)
 {
-    ICELogDebug(<< "Gap detected.");
+    ICELogMedia(<< "Gap detected.");
 
     mDecodedLength = mResampledLength = 0;
     if (mCngPacket && mCodec)
diff --git a/src/engine/media/MT_AudioStream.cpp b/src/engine/media/MT_AudioStream.cpp
index 1d65dc95..96606af5 100644
--- a/src/engine/media/MT_AudioStream.cpp
+++ b/src/engine/media/MT_AudioStream.cpp
@@ -16,7 +16,7 @@
 #include "jrtplib/src/rtptransmitter.h"
 #include "jrtplib/src/rtpsessionparams.h"
 
-#define LOG_SUBSYSTEM "AudioStream"
+#define LOG_SUBSYSTEM "media"
 
 //#define DUMP_SENDING_AUDIO
 
diff --git a/src/engine/media/MT_Box.cpp b/src/engine/media/MT_Box.cpp
index 79361b27..6e4930af 100644
--- a/src/engine/media/MT_Box.cpp
+++ b/src/engine/media/MT_Box.cpp
@@ -12,7 +12,7 @@
 #include "../helper/HL_StreamState.h"
 #include "../helper/HL_Log.h"
 
-#define LOG_SUBSYSTEM "MT::Box"
+#define LOG_SUBSYSTEM "media"
 
 using namespace MT;
 
diff --git a/src/engine/media/MT_NativeRtpSender.cpp b/src/engine/media/MT_NativeRtpSender.cpp
index c2f05f58..a48b5438 100644
--- a/src/engine/media/MT_NativeRtpSender.cpp
+++ b/src/engine/media/MT_NativeRtpSender.cpp
@@ -7,7 +7,7 @@
 #include "ICELog.h"
 #include <assert.h>
 
-#define LOG_SUBSYSTEM "MT"
+#define LOG_SUBSYSTEM "media"
 using namespace MT;
 
 NativeRtpSender::NativeRtpSender(Statistics& stat)
diff --git a/src/engine/media/MT_SingleAudioStream.cpp b/src/engine/media/MT_SingleAudioStream.cpp
index 1c3c737a..0ed17385 100644
--- a/src/engine/media/MT_SingleAudioStream.cpp
+++ b/src/engine/media/MT_SingleAudioStream.cpp
@@ -8,7 +8,7 @@
 //#include "resip/stack/SdpContents.hxx"
 #include "../engine/helper/HL_Log.h"
 
-#define LOG_SUBSYSTEM "SingleAudioStream"
+#define LOG_SUBSYSTEM "media"
 
 using namespace MT;
 
diff --git a/src/engine/media/MT_Statistics.cpp b/src/engine/media/MT_Statistics.cpp
index ac3583c7..f9f9ee90 100644
--- a/src/engine/media/MT_Statistics.cpp
+++ b/src/engine/media/MT_Statistics.cpp
@@ -2,7 +2,7 @@
 #include <iostream>
 
 #include "MT_Statistics.h"
-#define LOG_SUBSYSTEM "Statistics"
+#define LOG_SUBSYSTEM "media"
 
 using namespace MT;
 
diff --git a/src/engine/media/MT_Stream.cpp b/src/engine/media/MT_Stream.cpp
index c09fbcb3..a5008470 100644
--- a/src/engine/media/MT_Stream.cpp
+++ b/src/engine/media/MT_Stream.cpp
@@ -8,7 +8,7 @@
 #include "../helper/HL_Log.h"
 #include <math.h>
 
-#define LOG_SUBSYSTEM "[Media]"
+#define LOG_SUBSYSTEM "media"
 
 using namespace MT;
 
diff --git a/src/libs/ice/ICEAuthTransaction.cpp b/src/libs/ice/ICEAuthTransaction.cpp
index d5778e90..a6c84e96 100644
--- a/src/libs/ice/ICEAuthTransaction.cpp
+++ b/src/libs/ice/ICEAuthTransaction.cpp
@@ -10,7 +10,7 @@
 
 using namespace ice;
 
-#define LOG_SUBSYSTEM "ICE"
+#define LOG_SUBSYSTEM "ice"
 
 AuthTransaction::AuthTransaction()
 :Transaction(), mActive(false), mComposed(false), mConformsToKeepaliveSchedule(true),
diff --git a/src/libs/ice/ICEBinding.cpp b/src/libs/ice/ICEBinding.cpp
index 141904d8..c84a12cb 100644
--- a/src/libs/ice/ICEBinding.cpp
+++ b/src/libs/ice/ICEBinding.cpp
@@ -10,7 +10,7 @@
 #include <memory>
 
 using namespace ice;
-#define LOG_SUBSYSTEM "ICE"
+#define LOG_SUBSYSTEM "ice"
 
 //----------------------- AuthClientBinding -----------------
 
diff --git a/src/libs/ice/ICEBoxImpl.cpp b/src/libs/ice/ICEBoxImpl.cpp
index cc546c41..689c1705 100644
--- a/src/libs/ice/ICEBoxImpl.cpp
+++ b/src/libs/ice/ICEBoxImpl.cpp
@@ -8,7 +8,7 @@
 
 #include <assert.h>
 
-#define LOG_SUBSYSTEM "ICE"
+#define LOG_SUBSYSTEM "ice"
 
 using namespace ice;
 
diff --git a/src/libs/ice/ICECandidate.cpp b/src/libs/ice/ICECandidate.cpp
index 41a70e3e..272ba453 100644
--- a/src/libs/ice/ICECandidate.cpp
+++ b/src/libs/ice/ICECandidate.cpp
@@ -9,7 +9,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#define LOG_SUBSYSTEM "ICE"
+#define LOG_SUBSYSTEM "ice"
 
 using namespace ice;
 
diff --git a/src/libs/ice/ICECandidatePair.cpp b/src/libs/ice/ICECandidatePair.cpp
index a1f32d58..033b81ae 100644
--- a/src/libs/ice/ICECandidatePair.cpp
+++ b/src/libs/ice/ICECandidatePair.cpp
@@ -11,7 +11,7 @@
 #include <stdio.h>
 
 using namespace ice;
-#define LOG_SUBSYSTEM "ICE"
+#define LOG_SUBSYSTEM "ice"
 CandidatePair::CandidatePair()
 :mPriority(0), mState(CandidatePair::Frozen), mControlledIndex(0), mControllingIndex(1),
 mNomination(Nomination_None), mRole(Regular), mTransaction(NULL)
diff --git a/src/libs/ice/ICECheckList.cpp b/src/libs/ice/ICECheckList.cpp
index e1849eaf..68dbee00 100644
--- a/src/libs/ice/ICECheckList.cpp
+++ b/src/libs/ice/ICECheckList.cpp
@@ -13,7 +13,7 @@
 #include <sstream>
 
 using namespace ice;
-#define LOG_SUBSYSTEM "ICE"
+#define LOG_SUBSYSTEM "ice"
 
 const char* CheckList::stateToString(int state)
 {
diff --git a/src/libs/ice/ICENetworkHelper.cpp b/src/libs/ice/ICENetworkHelper.cpp
index e276b4e2..7599efb3 100644
--- a/src/libs/ice/ICENetworkHelper.cpp
+++ b/src/libs/ice/ICENetworkHelper.cpp
@@ -38,7 +38,7 @@
 #include "ICEError.h"
 using namespace ice;
 
-#define LOG_SUBSYSTEM "ICE"
+#define LOG_SUBSYSTEM "ice"
 
 #if defined(TARGET_WIN) && !defined(WINDOWS_RT)
 class IPHlpApi
diff --git a/src/libs/ice/ICERelaying.cpp b/src/libs/ice/ICERelaying.cpp
index 0e6612c3..ac5b8c5a 100644
--- a/src/libs/ice/ICERelaying.cpp
+++ b/src/libs/ice/ICERelaying.cpp
@@ -14,7 +14,7 @@
 
 using namespace ice;
 
-#define LOG_SUBSYSTEM "ICE"
+#define LOG_SUBSYSTEM "ice"
 // ------------------ ClientAllocate -----------------
 
 ClientAllocate::ClientAllocate(unsigned int lifetime)
diff --git a/src/libs/ice/ICESession.cpp b/src/libs/ice/ICESession.cpp
index 7b6ca3d4..595f021e 100644
--- a/src/libs/ice/ICESession.cpp
+++ b/src/libs/ice/ICESession.cpp
@@ -28,7 +28,7 @@
 using namespace ice;
 
 
-#define LOG_SUBSYSTEM "ICE"
+#define LOG_SUBSYSTEM "ice"
 
 
 Session::Session()
diff --git a/src/libs/ice/ICEStream.cpp b/src/libs/ice/ICEStream.cpp
index 17e1678c..33139c81 100644
--- a/src/libs/ice/ICEStream.cpp
+++ b/src/libs/ice/ICEStream.cpp
@@ -18,7 +18,7 @@
 
 using namespace ice;
 
-#define LOG_SUBSYSTEM "ICE"
+#define LOG_SUBSYSTEM "ice"
 
 const char* ice::RunningStateToString(RunningState state)
 {
diff --git a/src/libs/ice/ICEStunMessage.cpp b/src/libs/ice/ICEStunMessage.cpp
index 92e94185..76d0d729 100644
--- a/src/libs/ice/ICEStunMessage.cpp
+++ b/src/libs/ice/ICEStunMessage.cpp
@@ -24,7 +24,7 @@
 
 #define STUN_HEADER_SIZE 20
 #define HMAC_DIGEST_SIZE 20
-#define LOG_SUBSYSTEM "ICE"
+#define LOG_SUBSYSTEM "ice"
 
 using namespace ice;
 
diff --git a/src/libs/ice/ICEStunTransaction.cpp b/src/libs/ice/ICEStunTransaction.cpp
index f498d640..3ff943b3 100644
--- a/src/libs/ice/ICEStunTransaction.cpp
+++ b/src/libs/ice/ICEStunTransaction.cpp
@@ -17,7 +17,7 @@
 #include <assert.h>
 
 using namespace ice;
-#define LOG_SUBSYSTEM "ICE"
+#define LOG_SUBSYSTEM "ice"
 
 const char* Transaction::stateToString(State state)
 {
diff --git a/src/libs/ice/ICETransactionList.cpp b/src/libs/ice/ICETransactionList.cpp
index c89da54b..5d02aa95 100644
--- a/src/libs/ice/ICETransactionList.cpp
+++ b/src/libs/ice/ICETransactionList.cpp
@@ -9,7 +9,7 @@
 
 using namespace ice;
 
-#define LOG_SUBSYSTEM "ICE"
+#define LOG_SUBSYSTEM "ice"
 
 TransactionList::TransactionList()
 :mRegularIndex(0), mPrioritizedIndex(0)