4 files changed, 15 insertions, 15 deletions
diff --git a/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp b/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp
index 7e5ddb9aec..9de77cb0b9 100644
--- a/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp
+++ b/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp
@@ -7072,7 +7072,7 @@ void CXFA_FM2JSContext::ValueToUTF8String(CFXJSE_Value* arg,
     FXJSE_Value_ToUTF8String(arg, szOutputString);
   }
 }
-static FXJSE_FUNCTION formcalc_fm2js_functions[] = {
+static FXJSE_FUNCTION_DESCRIPTOR formcalc_fm2js_functions[] = {
     {"Abs", CXFA_FM2JSContext::Abs},
     {"Avg", CXFA_FM2JSContext::Avg},
     {"Ceil", CXFA_FM2JSContext::Ceil},
@@ -7167,7 +7167,7 @@ static FXJSE_FUNCTION formcalc_fm2js_functions[] = {
 };
 CXFA_FM2JSContext::CXFA_FM2JSContext()
     : m_pFMClass(nullptr), m_pDocument(nullptr) {
-  FXSYS_memset(&m_fmClass, 0, sizeof(FXJSE_CLASS));
+  FXSYS_memset(&m_ClassDescriptor, 0, sizeof(FXJSE_CLASS_DESCRIPTOR));
 }
 
 CXFA_FM2JSContext::~CXFA_FM2JSContext() {
@@ -7180,14 +7180,14 @@ void CXFA_FM2JSContext::Initialize(v8::Isolate* pScriptIsolate,
                                    CXFA_Document* pDoc) {
   m_pDocument = pDoc;
   m_pIsolate = pScriptIsolate;
-  m_fmClass.name = "XFA_FM2JS_FormCalcClass";
-  m_fmClass.constructor = NULL;
-  m_fmClass.properties = NULL;
-  m_fmClass.methods = formcalc_fm2js_functions;
-  m_fmClass.propNum = 0;
-  m_fmClass.methNum =
+  m_ClassDescriptor.name = "XFA_FM2JS_FormCalcClass";
+  m_ClassDescriptor.constructor = NULL;
+  m_ClassDescriptor.properties = NULL;
+  m_ClassDescriptor.methods = formcalc_fm2js_functions;
+  m_ClassDescriptor.propNum = 0;
+  m_ClassDescriptor.methNum =
       sizeof(formcalc_fm2js_functions) / sizeof(formcalc_fm2js_functions[0]);
-  m_pFMClass = FXJSE_DefineClass(pScriptContext, &m_fmClass);
+  m_pFMClass = FXJSE_DefineClass(pScriptContext, &m_ClassDescriptor);
   m_pValue = FXJSE_Value_Create(pScriptIsolate);
   FXJSE_Value_SetNull(m_pValue);
   FXJSE_Value_SetObject(m_pValue, this, m_pFMClass);
diff --git a/xfa/fxfa/fm2js/xfa_fm2jscontext.h b/xfa/fxfa/fm2js/xfa_fm2jscontext.h
index fc1a111a80..fa0c2c31e3 100644
--- a/xfa/fxfa/fm2js/xfa_fm2jscontext.h
+++ b/xfa/fxfa/fm2js/xfa_fm2jscontext.h
@@ -447,7 +447,7 @@ class CXFA_FM2JSContext {
 
  private:
   v8::Isolate* m_pIsolate;
-  FXJSE_CLASS m_fmClass;
+  FXJSE_CLASS_DESCRIPTOR m_ClassDescriptor;
   CFXJSE_Class* m_pFMClass;
   CFXJSE_Value* m_pValue;
   CXFA_Document* m_pDocument;
diff --git a/xfa/fxfa/parser/xfa_script_imp.cpp b/xfa/fxfa/parser/xfa_script_imp.cpp
index 743719ca55..7a0d6ff20f 100644
--- a/xfa/fxfa/parser/xfa_script_imp.cpp
+++ b/xfa/fxfa/parser/xfa_script_imp.cpp
@@ -33,8 +33,8 @@ CXFA_ScriptContext::CXFA_ScriptContext(CXFA_Document* pDocument)
       m_pThisObject(nullptr),
       m_dwBuiltInInFlags(0),
       m_eRunAtType(XFA_ATTRIBUTEENUM_Client) {
-  FXSYS_memset(&m_JsGlobalClass, 0, sizeof(FXJSE_CLASS));
-  FXSYS_memset(&m_JsNormalClass, 0, sizeof(FXJSE_CLASS));
+  FXSYS_memset(&m_JsGlobalClass, 0, sizeof(FXJSE_CLASS_DESCRIPTOR));
+  FXSYS_memset(&m_JsNormalClass, 0, sizeof(FXJSE_CLASS_DESCRIPTOR));
 }
 CXFA_ScriptContext::~CXFA_ScriptContext() {
   FX_POSITION ps = m_mapXFAToValue.GetStartPosition();
diff --git a/xfa/fxfa/parser/xfa_script_imp.h b/xfa/fxfa/parser/xfa_script_imp.h
index 1060911e88..e69f8c1e70 100644
--- a/xfa/fxfa/parser/xfa_script_imp.h
+++ b/xfa/fxfa/parser/xfa_script_imp.h
@@ -105,10 +105,10 @@ class CXFA_ScriptContext {
   v8::Isolate* m_pIsolate;
   CFXJSE_Class* m_pJsClass;
   XFA_SCRIPTLANGTYPE m_eScriptType;
-  FXJSE_CLASS m_JsGlobalClass;
-  FXJSE_CLASS m_JsNormalClass;
+  FXJSE_CLASS_DESCRIPTOR m_JsGlobalClass;
+  FXJSE_CLASS_DESCRIPTOR m_JsNormalClass;
   CFX_MapPtrTemplate<CXFA_Object*, CFXJSE_Value*> m_mapXFAToValue;
-  FXJSE_CLASS m_JsGlobalVariablesClass;
+  FXJSE_CLASS_DESCRIPTOR m_JsGlobalVariablesClass;
   CFX_MapPtrTemplate<CXFA_Object*, CFXJSE_Context*> m_mapVariableToContext;
   CXFA_EventParam m_eventParam;
   CXFA_NodeArray m_upObjectArray;