3 files changed, 5 insertions, 5 deletions
diff --git a/testing/libfuzzer/pdf_fm2js_fuzzer.cc b/testing/libfuzzer/pdf_fm2js_fuzzer.cc
index c93804a92e..2541dfbcc8 100644
--- a/testing/libfuzzer/pdf_fm2js_fuzzer.cc
+++ b/testing/libfuzzer/pdf_fm2js_fuzzer.cc
@@ -8,7 +8,7 @@
 #include "core/fxcrt/cfx_widetextbuf.h"
 #include "core/fxcrt/fx_safe_types.h"
 #include "core/fxcrt/fx_string.h"
-#include "xfa/fxfa/fm2js/cxfa_fm2jscontext.h"
+#include "fxjs/cfxjse_formcalc_context.h"
 
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
   FX_SAFE_SIZE_T safe_size = size;
@@ -18,6 +18,6 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
   CFX_WideTextBuf js;
   WideString input =
       WideString::FromUTF8(ByteStringView(data, safe_size.ValueOrDie()));
-  CXFA_FM2JSContext::Translate(input.AsStringView(), &js);
+  CFXJSE_FormCalcContext::Translate(input.AsStringView(), &js);
   return 0;
 }
diff --git a/testing/xfa_js_embedder_test.cpp b/testing/xfa_js_embedder_test.cpp
index 3aee49c580..54ad15a892 100644
--- a/testing/xfa_js_embedder_test.cpp
+++ b/testing/xfa_js_embedder_test.cpp
@@ -8,9 +8,9 @@
 
 #include "fpdfsdk/fpdfxfa/cpdfxfa_context.h"
 #include "fpdfsdk/fsdk_define.h"
+#include "fxjs/cfxjse_engine.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/base/ptr_util.h"
-#include "xfa/fxfa/parser/cxfa_scriptcontext.h"
 
 XFAJSEmbedderTest::XFAJSEmbedderTest()
     : array_buffer_allocator_(pdfium::MakeUnique<FXJS_ArrayBufferAllocator>()) {
diff --git a/testing/xfa_js_embedder_test.h b/testing/xfa_js_embedder_test.h
index 362db471ce..73d7d576a7 100644
--- a/testing/xfa_js_embedder_test.h
+++ b/testing/xfa_js_embedder_test.h
@@ -15,7 +15,7 @@
 #include "xfa/fxfa/parser/cxfa_node.h"
 #include "xfa/fxfa/parser/cxfa_object.h"
 
-class CXFA_ScriptContext;
+class CFXJSE_Engine;
 
 class XFAJSEmbedderTest : public EmbedderTest {
  public:
@@ -41,7 +41,7 @@ class XFAJSEmbedderTest : public EmbedderTest {
   std::unique_ptr<FXJS_ArrayBufferAllocator> array_buffer_allocator_;
   std::unique_ptr<CFXJSE_Value> value_;
   v8::Isolate* isolate_;
-  CXFA_ScriptContext* script_context_;
+  CFXJSE_Engine* script_context_;
 
   bool ExecuteHelper(const ByteStringView& input);
 };