diff --git a/example/wv_cas_ecm_example.cc b/example/wv_cas_ecm_example.cc
index f9506cd..ff088e1 100644
--- a/example/wv_cas_ecm_example.cc
+++ b/example/wv_cas_ecm_example.cc
@@ -30,7 +30,7 @@ int main(int argc, char **argv) {
   widevine::cas::WvCasEcm wv_cas_ecm;
   widevine::cas::WvCasStatus status =
       wv_cas_ecm.Initialize(/* content_iv_size= */ 8, kKeyRotationEnabled,
-                            widevine::cas::CryptoMode::kDvbCsa);
+                            widevine::cas::CryptoMode::kDvbCsa2);
   if (status != widevine::cas::OK) {
     std::cerr << "Failed to initialize WV CAS ECM, error: "
               << widevine::cas::GetWvCasStatusMessage(status)
diff --git a/media_cas_packager_sdk/public/wv_cas_ecm.cc b/media_cas_packager_sdk/public/wv_cas_ecm.cc
index 86d1404..08c48a1 100644
--- a/media_cas_packager_sdk/public/wv_cas_ecm.cc
+++ b/media_cas_packager_sdk/public/wv_cas_ecm.cc
@@ -78,7 +78,7 @@ WvCasStatus WvCasEcm::GenerateEcm(const std::string& even_key,
                                   const std::string& entitlement_key,
                                   std::string* ecm) const {
   DCHECK(ecm);
-  if (crypto_mode_ == CryptoMode::kDvbCsa &&
+  if (crypto_mode_ == CryptoMode::kDvbCsa2 &&
       even_key.length() == kCsaContentKeySizeBytes &&
       odd_key.length() == kCsaContentKeySizeBytes) {
     return GenerateEcm(absl::StrCat(even_key, even_key), even_content_iv,
@@ -169,7 +169,7 @@ WvCasStatus WvCasEcm::GenerateSingleKeyEcm(const std::string& even_key,
                                            const std::string& entitlement_key,
                                            std::string* ecm) const {
   DCHECK(ecm);
-  if (crypto_mode_ == CryptoMode::kDvbCsa &&
+  if (crypto_mode_ == CryptoMode::kDvbCsa2 &&
       even_key.length() == kCsaContentKeySizeBytes) {
     return GenerateSingleKeyEcm(absl::StrCat(even_key, even_key),
                                 even_content_iv, entitlement_key_id,
diff --git a/media_cas_packager_sdk/public/wv_cas_ecm_test.cc b/media_cas_packager_sdk/public/wv_cas_ecm_test.cc
index f7c5cc7..74a3a2a 100644
--- a/media_cas_packager_sdk/public/wv_cas_ecm_test.cc
+++ b/media_cas_packager_sdk/public/wv_cas_ecm_test.cc
@@ -259,7 +259,7 @@ TEST_F(WvCasEcmTest, GenerateSingleKeyEcm16BytesContentIvCbcSuccess) {
 TEST_F(WvCasEcmTest, GenerateEcm8BytesContentIvCsaSuccess) {
   EXPECT_EQ(OK, wv_cas_ecm_.Initialize(/* content_iv_size= */ 8,
                                        /* key_rotation_enabled= */ true,
-                                       CryptoMode::kDvbCsa));
+                                       CryptoMode::kDvbCsa2));
 
   std::string actual_ecm;
   EXPECT_EQ(OK, wv_cas_ecm_.GenerateEcm(
@@ -284,7 +284,7 @@ TEST_F(WvCasEcmTest, GenerateEcm8BytesContentIvCsaSuccess) {
 TEST_F(WvCasEcmTest, GenerateSingleKeyEcm8BytesContentIvCsaSuccess) {
   EXPECT_EQ(OK, wv_cas_ecm_.Initialize(/* content_iv_size= */ 8,
                                        /* key_rotation_enabled= */ false,
-                                       CryptoMode::kDvbCsa));
+                                       CryptoMode::kDvbCsa2));
 
   std::string actual_ecm;
   EXPECT_EQ(OK, wv_cas_ecm_.GenerateSingleKeyEcm(
diff --git a/media_cas_packager_sdk/public/wv_cas_types.cc b/media_cas_packager_sdk/public/wv_cas_types.cc
index 503e7f1..d2bad18 100644
--- a/media_cas_packager_sdk/public/wv_cas_types.cc
+++ b/media_cas_packager_sdk/public/wv_cas_types.cc
@@ -45,8 +45,8 @@ std::string CryptoModeToString(CryptoMode mode) {
     case CryptoMode::kAesCbc: {
       return "kAesCbc";
     }
-    case CryptoMode::kDvbCsa: {
-      return "kDvbCsa";
+    case CryptoMode::kDvbCsa2: {
+      return "kDvbCsa2";
     }
     default: {
       return "kCryptoModeUnspecified";
@@ -61,8 +61,8 @@ CryptoMode StringToCryptoMode(std::string str) {
   if (str == "kAesCbc") {
     return CryptoMode::kAesCbc;
   }
-  if (str == "kDvbCsa") {
-    return CryptoMode::kDvbCsa;
+  if (str == "kDvbCsa2") {
+    return CryptoMode::kDvbCsa2;
   }
   return CryptoMode::kCryptoModeUnspecified;
 }
diff --git a/media_cas_packager_sdk/public/wv_cas_types.h b/media_cas_packager_sdk/public/wv_cas_types.h
index 63977c9..64024e2 100644
--- a/media_cas_packager_sdk/public/wv_cas_types.h
+++ b/media_cas_packager_sdk/public/wv_cas_types.h
@@ -55,7 +55,7 @@ enum class CryptoMode : int {
   kCryptoModeUnspecified = 0,
   kAesCtr = 1,
   kAesCbc = 2,
-  kDvbCsa = 3
+  kDvbCsa2 = 3
 };
 
 std::string CryptoModeToString(CryptoMode mode);
diff --git a/media_cas_packager_sdk/public/wv_cas_types_test.cc b/media_cas_packager_sdk/public/wv_cas_types_test.cc
index 61fd383..dfe14cf 100644
--- a/media_cas_packager_sdk/public/wv_cas_types_test.cc
+++ b/media_cas_packager_sdk/public/wv_cas_types_test.cc
@@ -27,7 +27,7 @@ TEST(WvCasTypesTest, GetWvCasStatusMessage) {
 TEST(WvCasTypesTest, CryptoModeToString) {
   EXPECT_EQ("kAesCtr", CryptoModeToString(CryptoMode::kAesCtr));
   EXPECT_EQ("kAesCbc", CryptoModeToString(CryptoMode::kAesCbc));
-  EXPECT_EQ("kDvbCsa", CryptoModeToString(CryptoMode::kDvbCsa));
+  EXPECT_EQ("kDvbCsa2", CryptoModeToString(CryptoMode::kDvbCsa2));
   EXPECT_EQ("kCryptoModeUnspecified",
             CryptoModeToString(CryptoMode::kCryptoModeUnspecified));
 }
@@ -35,7 +35,7 @@ TEST(WvCasTypesTest, CryptoModeToString) {
 TEST(WvCasTypesTest, StringToCryptoMode) {
   EXPECT_EQ(CryptoMode::kAesCtr, StringToCryptoMode("kAesCtr"));
   EXPECT_EQ(CryptoMode::kAesCbc, StringToCryptoMode("kAesCbc"));
-  EXPECT_EQ(CryptoMode::kDvbCsa, StringToCryptoMode("kDvbCsa"));
+  EXPECT_EQ(CryptoMode::kDvbCsa2, StringToCryptoMode("kDvbCsa2"));
   EXPECT_EQ(CryptoMode::kCryptoModeUnspecified,
             StringToCryptoMode("wrong crypto mode"));
 }