diff --git a/xfa/fxfa/cxfa_ffbarcode.cpp b/xfa/fxfa/cxfa_ffbarcode.cpp
index 1f442f0..e8f4742 100644
--- a/xfa/fxfa/cxfa_ffbarcode.cpp
+++ b/xfa/fxfa/cxfa_ffbarcode.cpp
@@ -23,79 +23,68 @@
 namespace {
 
 const BarCodeInfo kBarCodeData[] = {
-    {0x7fb4a18, "ean13", BarcodeType::ean13, BC_TYPE::kEAN13},
-    {0x8d13a3d, "code11", BarcodeType::code11, BC_TYPE::kUnknown},
-    {0x8d149a8, "code49", BarcodeType::code49, BC_TYPE::kUnknown},
-    {0x8d16347, "code93", BarcodeType::code93, BC_TYPE::kUnknown},
-    {0x91a92e2, "upsMaxicode", BarcodeType::upsMaxicode, BC_TYPE::kUnknown},
-    {0xa7d48dc, "fim", BarcodeType::fim, BC_TYPE::kUnknown},
-    {0xb359fe9, "msi", BarcodeType::msi, BC_TYPE::kUnknown},
-    {0x121f738c, "code2Of5Matrix", BarcodeType::code2Of5Matrix,
-     BC_TYPE::kUnknown},
-    {0x15358616, "ucc128", BarcodeType::ucc128, BC_TYPE::kUnknown},
-    {0x1f4bfa05, "rfid", BarcodeType::rfid, BC_TYPE::kUnknown},
-    {0x1fda71bc, "rss14Stacked", BarcodeType::rss14Stacked, BC_TYPE::kUnknown},
-    {0x22065087, "ean8add2", BarcodeType::ean8add2, BC_TYPE::kUnknown},
-    {0x2206508a, "ean8add5", BarcodeType::ean8add5, BC_TYPE::kUnknown},
-    {0x2278366c, "codabar", BarcodeType::codabar, BC_TYPE::kCodabar},
-    {0x2a039a8d, "telepen", BarcodeType::telepen, BC_TYPE::kUnknown},
-    {0x323ed337, "upcApwcd", BarcodeType::upcApwcd, BC_TYPE::kUnknown},
-    {0x347a1846, "postUSIMB", BarcodeType::postUSIMB, BC_TYPE::kUnknown},
-    {0x391bb836, "code128", BarcodeType::code128, BC_TYPE::kCode128},
-    {0x398eddaf, "dataMatrix", BarcodeType::dataMatrix, BC_TYPE::kDataMatrix},
-    {0x3cff60a8, "upcEadd2", BarcodeType::upcEadd2, BC_TYPE::kUnknown},
-    {0x3cff60ab, "upcEadd5", BarcodeType::upcEadd5, BC_TYPE::kUnknown},
-    {0x402cb188, "code2Of5Standard", BarcodeType::code2Of5Standard,
-     BC_TYPE::kUnknown},
-    {0x411764f7, "aztec", BarcodeType::aztec, BC_TYPE::kUnknown},
-    {0x44d4e84c, "ean8", BarcodeType::ean8, BC_TYPE::kEAN8},
-    {0x48468902, "ucc128sscc", BarcodeType::ucc128sscc, BC_TYPE::kUnknown},
-    {0x4880aea4, "upcAadd2", BarcodeType::upcAadd2, BC_TYPE::kUnknown},
-    {0x4880aea7, "upcAadd5", BarcodeType::upcAadd5, BC_TYPE::kUnknown},
-    {0x54f18256, "code2Of5Industrial", BarcodeType::code2Of5Industrial,
-     BC_TYPE::kUnknown},
-    {0x58e15f25, "rss14Limited", BarcodeType::rss14Limited, BC_TYPE::kUnknown},
-    {0x5c08d1b9, "postAUSReplyPaid", BarcodeType::postAUSReplyPaid,
-     BC_TYPE::kUnknown},
-    {0x5fa700bd, "rss14", BarcodeType::rss14, BC_TYPE::kUnknown},
-    {0x631a7e35, "logmars", BarcodeType::logmars, BC_TYPE::kUnknown},
-    {0x6a236236, "pdf417", BarcodeType::pdf417, BC_TYPE::kPDF417},
-    {0x6d098ece, "upcean2", BarcodeType::upcean2, BC_TYPE::kUnknown},
-    {0x6d098ed1, "upcean5", BarcodeType::upcean5, BC_TYPE::kUnknown},
-    {0x76b04eed, "code3Of9extended", BarcodeType::code3Of9extended,
-     BC_TYPE::kUnknown},
-    {0x7c7db84a, "maxicode", BarcodeType::maxicode, BC_TYPE::kUnknown},
-    {0x8266f7f7, "ucc128random", BarcodeType::ucc128random, BC_TYPE::kUnknown},
-    {0x83eca147, "postUSDPBC", BarcodeType::postUSDPBC, BC_TYPE::kUnknown},
-    {0x8dd71de0, "postAUSStandard", BarcodeType::postAUSStandard,
-     BC_TYPE::kUnknown},
-    {0x98adad85, "plessey", BarcodeType::plessey, BC_TYPE::kUnknown},
-    {0x9f84cce6, "ean13pwcd", BarcodeType::ean13pwcd, BC_TYPE::kUnknown},
-    {0xb514fbe9, "upcA", BarcodeType::upcA, BC_TYPE::kUPCA},
-    {0xb514fbed, "upcE", BarcodeType::upcE, BC_TYPE::kUnknown},
-    {0xb5c6a853, "ean13add2", BarcodeType::ean13add2, BC_TYPE::kUnknown},
-    {0xb5c6a856, "ean13add5", BarcodeType::ean13add5, BC_TYPE::kUnknown},
-    {0xb81fc512, "postUKRM4SCC", BarcodeType::postUKRM4SCC, BC_TYPE::kUnknown},
-    {0xbad34b22, "code128SSCC", BarcodeType::code128SSCC, BC_TYPE::kUnknown},
-    {0xbfbe0cf6, "postUS5Zip", BarcodeType::postUS5Zip, BC_TYPE::kUnknown},
-    {0xc56618e8, "pdf417macro", BarcodeType::pdf417macro, BC_TYPE::kUnknown},
-    {0xca730f8a, "code2Of5Interleaved", BarcodeType::code2Of5Interleaved,
-     BC_TYPE::kUnknown},
-    {0xd0097ac6, "rss14Expanded", BarcodeType::rss14Expanded,
-     BC_TYPE::kUnknown},
-    {0xd25a0240, "postAUSCust2", BarcodeType::postAUSCust2, BC_TYPE::kUnknown},
-    {0xd25a0241, "postAUSCust3", BarcodeType::postAUSCust3, BC_TYPE::kUnknown},
-    {0xd53ed3e7, "rss14Truncated", BarcodeType::rss14Truncated,
-     BC_TYPE::kUnknown},
-    {0xe72bcd57, "code128A", BarcodeType::code128A, BC_TYPE::kUnknown},
-    {0xe72bcd58, "code128B", BarcodeType::code128B, BC_TYPE::kCode128B},
-    {0xe72bcd59, "code128C", BarcodeType::code128C, BC_TYPE::kCode128C},
-    {0xee83c50f, "rss14StackedOmni", BarcodeType::rss14StackedOmni,
-     BC_TYPE::kUnknown},
-    {0xf2a18f7e, "QRCode", BarcodeType::QRCode, BC_TYPE::kQRCode},
-    {0xfaeaf37f, "postUSStandard", BarcodeType::postUSStandard,
-     BC_TYPE::kUnknown},
-    {0xfb48155c, "code3Of9", BarcodeType::code3Of9, BC_TYPE::kCode39},
+    {0x7fb4a18, "ean13", BC_TYPE::kEAN13},
+    {0x8d13a3d, "code11", BC_TYPE::kUnknown},
+    {0x8d149a8, "code49", BC_TYPE::kUnknown},
+    {0x8d16347, "code93", BC_TYPE::kUnknown},
+    {0x91a92e2, "upsMaxicode", BC_TYPE::kUnknown},
+    {0xa7d48dc, "fim", BC_TYPE::kUnknown},
+    {0xb359fe9, "msi", BC_TYPE::kUnknown},
+    {0x121f738c, "code2Of5Matrix", BC_TYPE::kUnknown},
+    {0x15358616, "ucc128", BC_TYPE::kUnknown},
+    {0x1f4bfa05, "rfid", BC_TYPE::kUnknown},
+    {0x1fda71bc, "rss14Stacked", BC_TYPE::kUnknown},
+    {0x22065087, "ean8add2", BC_TYPE::kUnknown},
+    {0x2206508a, "ean8add5", BC_TYPE::kUnknown},
+    {0x2278366c, "codabar", BC_TYPE::kCodabar},
+    {0x2a039a8d, "telepen", BC_TYPE::kUnknown},
+    {0x323ed337, "upcApwcd", BC_TYPE::kUnknown},
+    {0x347a1846, "postUSIMB", BC_TYPE::kUnknown},
+    {0x391bb836, "code128", BC_TYPE::kCode128},
+    {0x398eddaf, "dataMatrix", BC_TYPE::kDataMatrix},
+    {0x3cff60a8, "upcEadd2", BC_TYPE::kUnknown},
+    {0x3cff60ab, "upcEadd5", BC_TYPE::kUnknown},
+    {0x402cb188, "code2Of5Standard", BC_TYPE::kUnknown},
+    {0x411764f7, "aztec", BC_TYPE::kUnknown},
+    {0x44d4e84c, "ean8", BC_TYPE::kEAN8},
+    {0x48468902, "ucc128sscc", BC_TYPE::kUnknown},
+    {0x4880aea4, "upcAadd2", BC_TYPE::kUnknown},
+    {0x4880aea7, "upcAadd5", BC_TYPE::kUnknown},
+    {0x54f18256, "code2Of5Industrial", BC_TYPE::kUnknown},
+    {0x58e15f25, "rss14Limited", BC_TYPE::kUnknown},
+    {0x5c08d1b9, "postAUSReplyPaid", BC_TYPE::kUnknown},
+    {0x5fa700bd, "rss14", BC_TYPE::kUnknown},
+    {0x631a7e35, "logmars", BC_TYPE::kUnknown},
+    {0x6a236236, "pdf417", BC_TYPE::kPDF417},
+    {0x6d098ece, "upcean2", BC_TYPE::kUnknown},
+    {0x6d098ed1, "upcean5", BC_TYPE::kUnknown},
+    {0x76b04eed, "code3Of9extended", BC_TYPE::kUnknown},
+    {0x7c7db84a, "maxicode", BC_TYPE::kUnknown},
+    {0x8266f7f7, "ucc128random", BC_TYPE::kUnknown},
+    {0x83eca147, "postUSDPBC", BC_TYPE::kUnknown},
+    {0x8dd71de0, "postAUSStandard", BC_TYPE::kUnknown},
+    {0x98adad85, "plessey", BC_TYPE::kUnknown},
+    {0x9f84cce6, "ean13pwcd", BC_TYPE::kUnknown},
+    {0xb514fbe9, "upcA", BC_TYPE::kUPCA},
+    {0xb514fbed, "upcE", BC_TYPE::kUnknown},
+    {0xb5c6a853, "ean13add2", BC_TYPE::kUnknown},
+    {0xb5c6a856, "ean13add5", BC_TYPE::kUnknown},
+    {0xb81fc512, "postUKRM4SCC", BC_TYPE::kUnknown},
+    {0xbad34b22, "code128SSCC", BC_TYPE::kUnknown},
+    {0xbfbe0cf6, "postUS5Zip", BC_TYPE::kUnknown},
+    {0xc56618e8, "pdf417macro", BC_TYPE::kUnknown},
+    {0xca730f8a, "code2Of5Interleaved", BC_TYPE::kUnknown},
+    {0xd0097ac6, "rss14Expanded", BC_TYPE::kUnknown},
+    {0xd25a0240, "postAUSCust2", BC_TYPE::kUnknown},
+    {0xd25a0241, "postAUSCust3", BC_TYPE::kUnknown},
+    {0xd53ed3e7, "rss14Truncated", BC_TYPE::kUnknown},
+    {0xe72bcd57, "code128A", BC_TYPE::kUnknown},
+    {0xe72bcd58, "code128B", BC_TYPE::kCode128B},
+    {0xe72bcd59, "code128C", BC_TYPE::kCode128C},
+    {0xee83c50f, "rss14StackedOmni", BC_TYPE::kUnknown},
+    {0xf2a18f7e, "QRCode", BC_TYPE::kQRCode},
+    {0xfaeaf37f, "postUSStandard", BC_TYPE::kUnknown},
+    {0xfb48155c, "code3Of9", BC_TYPE::kCode39},
 };
 
 Optional<BC_CHAR_ENCODING> CharEncodingFromString(const WideString& value) {
@@ -256,9 +245,8 @@
   if (ratio.has_value())
     pBarCodeWidget->SetWideNarrowRatio(ratio.value());
 
-  if (info->eName == BarcodeType::code3Of9 ||
-      info->eName == BarcodeType::ean8 || info->eName == BarcodeType::ean13 ||
-      info->eName == BarcodeType::upcA) {
+  if (info->eBCType == BC_TYPE::kCode39 || info->eBCType == BC_TYPE::kEAN8 ||
+      info->eBCType == BC_TYPE::kEAN13 || info->eBCType == BC_TYPE::kUPCA) {
     pBarCodeWidget->SetPrintChecksum(true);
   }
 }
diff --git a/xfa/fxfa/cxfa_ffbarcode.h b/xfa/fxfa/cxfa_ffbarcode.h
index f7ca50c..4f3c0e1 100644
--- a/xfa/fxfa/cxfa_ffbarcode.h
+++ b/xfa/fxfa/cxfa_ffbarcode.h
@@ -13,77 +13,11 @@
 #include "xfa/fxfa/cxfa_ffpageview.h"
 #include "xfa/fxfa/cxfa_fftextedit.h"
 
-enum class BarcodeType {
-  aztec,
-  codabar,
-  code11,
-  code128,
-  code128A,
-  code128B,
-  code128C,
-  code128SSCC,
-  code2Of5Industrial,
-  code2Of5Interleaved,
-  code2Of5Matrix,
-  code2Of5Standard,
-  code3Of9,
-  code3Of9extended,
-  code49,
-  code93,
-  dataMatrix,
-  ean13,
-  ean13add2,
-  ean13add5,
-  ean13pwcd,
-  ean8,
-  ean8add2,
-  ean8add5,
-  fim,
-  logmars,
-  maxicode,
-  msi,
-  pdf417,
-  pdf417macro,
-  plessey,
-  postAUSCust2,
-  postAUSCust3,
-  postAUSReplyPaid,
-  postAUSStandard,
-  postUKRM4SCC,
-  postUS5Zip,
-  postUSDPBC,
-  postUSIMB,
-  postUSStandard,
-  QRCode,
-  rfid,
-  rss14,
-  rss14Expanded,
-  rss14Limited,
-  rss14Stacked,
-  rss14StackedOmni,
-  rss14Truncated,
-  telepen,
-  ucc128,
-  ucc128random,
-  ucc128sscc,
-  upcA,
-  upcAadd2,
-  upcAadd5,
-  upcApwcd,
-  upcE,
-  upcEadd2,
-  upcEadd5,
-  upcean2,
-  upcean5,
-  upsMaxicode
-};
-
 struct BarCodeInfo {
   // |pName| hashed as if wide string.
   uint32_t uHash;
   // Inline string data reduces size for small strings.
   const char pName[20];
-  BarcodeType eName;
   BC_TYPE eBCType;
 };
 
diff --git a/xfa/fxfa/cxfa_ffbarcode_unittest.cpp b/xfa/fxfa/cxfa_ffbarcode_unittest.cpp
index 6236b10..30f1e9a 100644
--- a/xfa/fxfa/cxfa_ffbarcode_unittest.cpp
+++ b/xfa/fxfa/cxfa_ffbarcode_unittest.cpp
@@ -12,13 +12,13 @@
 
   auto* data = CXFA_FFBarcode::GetBarcodeTypeByName(L"ean13");
   ASSERT_NE(nullptr, data);
-  EXPECT_EQ(BarcodeType::ean13, data->eName);
+  EXPECT_EQ(BC_TYPE::kEAN13, data->eBCType);
 
   data = CXFA_FFBarcode::GetBarcodeTypeByName(L"pdf417");
   ASSERT_NE(nullptr, data);
-  EXPECT_EQ(BarcodeType::pdf417, data->eName);
+  EXPECT_EQ(BC_TYPE::kPDF417, data->eBCType);
 
   data = CXFA_FFBarcode::GetBarcodeTypeByName(L"code3Of9");
   ASSERT_NE(nullptr, data);
-  EXPECT_EQ(BarcodeType::code3Of9, data->eName);
+  EXPECT_EQ(BC_TYPE::kCode39, data->eBCType);
 }