diff --git a/BUILD.gn b/BUILD.gn
index 359e064..7dda81d 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1463,8 +1463,8 @@
       "xfa/fxfa/parser/xfa_localevalue.h",
       "xfa/fxfa/parser/xfa_object.h",
       "xfa/fxfa/parser/xfa_resolvenode_rs.h",
+      "xfa/fxfa/parser/xfa_utils.cpp",
       "xfa/fxfa/parser/xfa_utils.h",
-      "xfa/fxfa/parser/xfa_utils_imp.cpp",
       "xfa/fxgraphics/cagg_graphics.cpp",
       "xfa/fxgraphics/cagg_graphics.h",
       "xfa/fxgraphics/cfx_color.cpp",
@@ -1530,7 +1530,7 @@
       "xfa/fde/xml/fde_xml_imp_unittest.cpp",
       "xfa/fxbarcode/pdf417/BC_PDF417HighLevelEncoder_unittest.cpp",
       "xfa/fxfa/app/xfa_textlayout_unittest.cpp",
-      "xfa/fxfa/parser/xfa_utils_imp_unittest.cpp",
+      "xfa/fxfa/parser/xfa_utils_unittest.cpp",
     ]
   }
   if (pdf_use_skia) {
diff --git a/pdfium.gyp b/pdfium.gyp
index ecef4a7..05972f2 100644
--- a/pdfium.gyp
+++ b/pdfium.gyp
@@ -902,7 +902,7 @@
             'xfa/fde/xml/fde_xml_imp_unittest.cpp',
             'xfa/fxbarcode/pdf417/BC_PDF417HighLevelEncoder_unittest.cpp',
             'xfa/fxfa/app/xfa_textlayout_unittest.cpp',
-            'xfa/fxfa/parser/xfa_utils_imp_unittest.cpp',
+            'xfa/fxfa/parser/xfa_utils_unittest.cpp',
           ],
         }],
         ['pdf_use_skia==1', {
diff --git a/xfa.gyp b/xfa.gyp
index 44f28d3..b311458 100644
--- a/xfa.gyp
+++ b/xfa.gyp
@@ -568,8 +568,8 @@
         "xfa/fxfa/parser/xfa_localevalue.h",
         "xfa/fxfa/parser/xfa_object.h",
         "xfa/fxfa/parser/xfa_resolvenode_rs.h",
+        "xfa/fxfa/parser/xfa_utils.cpp",
         "xfa/fxfa/parser/xfa_utils.h",
-        "xfa/fxfa/parser/xfa_utils_imp.cpp",
         "xfa/fxgraphics/cagg_graphics.cpp",
         "xfa/fxgraphics/cagg_graphics.h",
         "xfa/fxgraphics/cfx_color.cpp",
diff --git a/xfa/fxfa/parser/xfa_utils_imp.cpp b/xfa/fxfa/parser/xfa_utils.cpp
similarity index 100%
rename from xfa/fxfa/parser/xfa_utils_imp.cpp
rename to xfa/fxfa/parser/xfa_utils.cpp
diff --git a/xfa/fxfa/parser/xfa_utils_imp_unittest.cpp b/xfa/fxfa/parser/xfa_utils_unittest.cpp
similarity index 100%
rename from xfa/fxfa/parser/xfa_utils_imp_unittest.cpp
rename to xfa/fxfa/parser/xfa_utils_unittest.cpp