diff --git a/libwvdrmengine/cdm/core/include/wv_cdm_constants.h b/libwvdrmengine/cdm/core/include/wv_cdm_constants.h
index ae3bd2dd..45587142 100644
--- a/libwvdrmengine/cdm/core/include/wv_cdm_constants.h
+++ b/libwvdrmengine/cdm/core/include/wv_cdm_constants.h
@@ -78,12 +78,14 @@ static const std::string QUERY_VALUE_SECURITY_LEVEL_L2 = "L2";
 static const std::string QUERY_VALUE_SECURITY_LEVEL_L3 = "L3";
 static const std::string QUERY_VALUE_SECURITY_LEVEL_UNKNOWN = "Unknown";
 static const std::string QUERY_VALUE_SECURITY_LEVEL_DEFAULT = "Default";
-static const std::string QUERY_VALUE_DISCONNECTED = "Disconnected";
-static const std::string QUERY_VALUE_UNPROTECTED = "Unprotected";
+static const std::string QUERY_VALUE_HDCP_NO_DIGITAL_OUTPUT =
+    "HDCP-NoDigitalOutput";
+static const std::string QUERY_VALUE_HDCP_NONE = "HDCP-None";
 static const std::string QUERY_VALUE_HDCP_V1 = "HDCP-1.x";
 static const std::string QUERY_VALUE_HDCP_V2_0 = "HDCP-2.0";
 static const std::string QUERY_VALUE_HDCP_V2_1 = "HDCP-2.1";
 static const std::string QUERY_VALUE_HDCP_V2_2 = "HDCP-2.2";
+static const std::string QUERY_VALUE_HDCP_LEVEL_UNKNOWN = "HDCP-LevelUnknown";
 
 static const std::string ISO_BMFF_VIDEO_MIME_TYPE = "video/mp4";
 static const std::string ISO_BMFF_AUDIO_MIME_TYPE = "audio/mp4";
diff --git a/libwvdrmengine/cdm/core/src/cdm_engine.cpp b/libwvdrmengine/cdm/core/src/cdm_engine.cpp
index a806dff6..ad4640d3 100644
--- a/libwvdrmengine/cdm/core/src/cdm_engine.cpp
+++ b/libwvdrmengine/cdm/core/src/cdm_engine.cpp
@@ -1621,7 +1621,7 @@ std::string CdmEngine::MapHdcpVersion(
     CryptoSession::HdcpCapability version) {
   switch (version) {
     case HDCP_NONE:
-      return QUERY_VALUE_UNPROTECTED;
+      return QUERY_VALUE_HDCP_NONE;
     case HDCP_V1:
       return QUERY_VALUE_HDCP_V1;
     case HDCP_V2:
@@ -1631,9 +1631,10 @@ std::string CdmEngine::MapHdcpVersion(
     case HDCP_V2_2:
       return QUERY_VALUE_HDCP_V2_2;
     case HDCP_NO_DIGITAL_OUTPUT:
-      return QUERY_VALUE_DISCONNECTED;
+      return QUERY_VALUE_HDCP_NO_DIGITAL_OUTPUT;
+    default:
+      return QUERY_VALUE_HDCP_LEVEL_UNKNOWN;
   }
-  return "";
 }
 
 void CdmEngine::CloseExpiredReleaseSessions() {
diff --git a/libwvdrmengine/cdm/test/request_license_test.cpp b/libwvdrmengine/cdm/test/request_license_test.cpp
index 3e4429f8..c0476af1 100644
--- a/libwvdrmengine/cdm/test/request_license_test.cpp
+++ b/libwvdrmengine/cdm/test/request_license_test.cpp
@@ -3152,17 +3152,19 @@ TEST_F(WvCdmRequestLicenseTest, QueryStatus) {
             decryptor_.QueryStatus(
                 kLevelDefault, wvcdm::QUERY_KEY_CURRENT_HDCP_LEVEL, &value));
   EXPECT_TRUE(
-      value == QUERY_VALUE_UNPROTECTED || value == QUERY_VALUE_HDCP_V1 ||
+      value == QUERY_VALUE_HDCP_NONE || value == QUERY_VALUE_HDCP_V1 ||
       value == QUERY_VALUE_HDCP_V2_0 || value == QUERY_VALUE_HDCP_V2_1 ||
-      value == QUERY_VALUE_HDCP_V2_2 || value == QUERY_VALUE_DISCONNECTED);
+      value == QUERY_VALUE_HDCP_V2_2 ||
+      value == QUERY_VALUE_HDCP_NO_DIGITAL_OUTPUT);
 
   EXPECT_EQ(wvcdm::NO_ERROR,
             decryptor_.QueryStatus(kLevelDefault,
                                    wvcdm::QUERY_KEY_MAX_HDCP_LEVEL, &value));
   EXPECT_TRUE(
-      value == QUERY_VALUE_UNPROTECTED || value == QUERY_VALUE_HDCP_V1 ||
+      value == QUERY_VALUE_HDCP_NONE || value == QUERY_VALUE_HDCP_V1 ||
       value == QUERY_VALUE_HDCP_V2_0 || value == QUERY_VALUE_HDCP_V2_1 ||
-      value == QUERY_VALUE_HDCP_V2_2 || value == QUERY_VALUE_DISCONNECTED);
+      value == QUERY_VALUE_HDCP_V2_2 ||
+      value == QUERY_VALUE_HDCP_NO_DIGITAL_OUTPUT);
 
   EXPECT_EQ(wvcdm::NO_ERROR,
             decryptor_.QueryStatus(kLevelDefault,
@@ -3252,17 +3254,19 @@ TEST_F(WvCdmRequestLicenseTest, QueryStatusL3) {
             decryptor_.QueryStatus(kLevel3, wvcdm::QUERY_KEY_CURRENT_HDCP_LEVEL,
                                    &value));
   EXPECT_TRUE(
-      value == QUERY_VALUE_UNPROTECTED || value == QUERY_VALUE_HDCP_V1 ||
+      value == QUERY_VALUE_HDCP_NONE || value == QUERY_VALUE_HDCP_V1 ||
       value == QUERY_VALUE_HDCP_V2_0 || value == QUERY_VALUE_HDCP_V2_1 ||
-      value == QUERY_VALUE_HDCP_V2_2 || value == QUERY_VALUE_DISCONNECTED);
+      value == QUERY_VALUE_HDCP_V2_2 ||
+      value == QUERY_VALUE_HDCP_NO_DIGITAL_OUTPUT);
 
   EXPECT_EQ(
       wvcdm::NO_ERROR,
       decryptor_.QueryStatus(kLevel3, wvcdm::QUERY_KEY_MAX_HDCP_LEVEL, &value));
   EXPECT_TRUE(
-      value == QUERY_VALUE_UNPROTECTED || value == QUERY_VALUE_HDCP_V1 ||
+      value == QUERY_VALUE_HDCP_NONE || value == QUERY_VALUE_HDCP_V1 ||
       value == QUERY_VALUE_HDCP_V2_0 || value == QUERY_VALUE_HDCP_V2_1 ||
-      value == QUERY_VALUE_HDCP_V2_2 || value == QUERY_VALUE_DISCONNECTED);
+      value == QUERY_VALUE_HDCP_V2_2 ||
+      value == QUERY_VALUE_HDCP_NO_DIGITAL_OUTPUT);
 
   EXPECT_EQ(
       wvcdm::NO_ERROR,