diff --git a/libwvdrmengine/src_hidl/WVCryptoFactory.cpp b/libwvdrmengine/src_hidl/WVCryptoFactory.cpp
index 1cb08b2a..a23977de 100644
--- a/libwvdrmengine/src_hidl/WVCryptoFactory.cpp
+++ b/libwvdrmengine/src_hidl/WVCryptoFactory.cpp
@@ -5,9 +5,9 @@
 //
 
 //#define LOG_NDEBUG 0
-#define LOG_TAG "WVCryptoFactory"
-#include <utils/Log.h>
+#define LOG_TAG "WVCdm"
 #include <hwbinder/IPCThreadState.h>
+#include <utils/Log.h>
 
 #include "WVCryptoFactory.h"
 
@@ -34,8 +34,8 @@ Return<void> WVCryptoFactory::createPlugin(
 
   const auto& self = android::hardware::IPCThreadState::self();
   const char* sid = self->getCallingSid();
-  sid = strstr(sid, "mediadrmserver") ? sid : (sid ? "app" : "nullptr");
-  ALOGI("%s: calling sid [%s]", __func__, sid);
+  sid = sid ? (strstr(sid, "mediadrmserver") ? sid : "app") : "nullptr";
+  ALOGI("[%s] calling %s", sid, __PRETTY_FUNCTION__);
 
   sp<ICryptoPlugin> plugin;
   if (!isCryptoSchemeSupported(uuid.data())) {
diff --git a/libwvdrmengine/src_hidl/WVDrmFactory.cpp b/libwvdrmengine/src_hidl/WVDrmFactory.cpp
index 2c89e47d..9efd4562 100644
--- a/libwvdrmengine/src_hidl/WVDrmFactory.cpp
+++ b/libwvdrmengine/src_hidl/WVDrmFactory.cpp
@@ -5,10 +5,9 @@
 //
 
 //#define LOG_NDEBUG 0
-#define LOG_TAG "WVDrmFactory"
-#include <cstring>
-#include <utils/Log.h>
+#define LOG_TAG "WVCdm"
 #include <hwbinder/IPCThreadState.h>
+#include <utils/Log.h>
 
 #include "WVDrmFactory.h"
 
@@ -67,8 +66,8 @@ Return<void> WVDrmFactory::createPlugin(
 
   const auto& self = android::hardware::IPCThreadState::self();
   const char* sid = self->getCallingSid();
-  sid = strstr(sid, "mediadrmserver") ? sid : (sid ? "app" : "nullptr");
-  ALOGI("%s: calling sid [%s]", __func__, sid);
+  sid = sid ? (strstr(sid, "mediadrmserver") ? sid : "app") : "nullptr";
+  ALOGI("[%s] calling %s", sid, __PRETTY_FUNCTION__);
 
   sp<IDrmPlugin> plugin;
   if (!isCryptoSchemeSupported(uuid.data())) {