8 files changed, 22 insertions, 22 deletions
diff --git a/xfa/fxfa/parser/cxfa_calculatedata.cpp b/xfa/fxfa/parser/cxfa_calculatedata.cpp
index 1db5779486..599ffe3c8f 100644
--- a/xfa/fxfa/parser/cxfa_calculatedata.cpp
+++ b/xfa/fxfa/parser/cxfa_calculatedata.cpp
@@ -17,8 +17,8 @@ int32_t CXFA_CalculateData::GetOverride() {
   return eAtt;
 }
 
-CXFA_Script CXFA_CalculateData::GetScript() {
-  return CXFA_Script(m_pNode->GetChild(0, XFA_Element::Script, false));
+CXFA_ScriptData CXFA_CalculateData::GetScriptData() {
+  return CXFA_ScriptData(m_pNode->GetChild(0, XFA_Element::Script, false));
 }
 
 void CXFA_CalculateData::GetMessageText(WideString& wsMessage) {
diff --git a/xfa/fxfa/parser/cxfa_calculatedata.h b/xfa/fxfa/parser/cxfa_calculatedata.h
index 0c1a8220c1..d610e1bbce 100644
--- a/xfa/fxfa/parser/cxfa_calculatedata.h
+++ b/xfa/fxfa/parser/cxfa_calculatedata.h
@@ -9,7 +9,7 @@
 
 #include "core/fxcrt/fx_string.h"
 #include "xfa/fxfa/parser/cxfa_data.h"
-#include "xfa/fxfa/parser/cxfa_script.h"
+#include "xfa/fxfa/parser/cxfa_scriptdata.h"
 
 class CXFA_Node;
 
@@ -18,7 +18,7 @@ class CXFA_CalculateData : public CXFA_Data {
   explicit CXFA_CalculateData(CXFA_Node* pNode);
 
   int32_t GetOverride();
-  CXFA_Script GetScript();
+  CXFA_ScriptData GetScriptData();
   void GetMessageText(WideString& wsMessage);
 };
 
diff --git a/xfa/fxfa/parser/cxfa_eventdata.cpp b/xfa/fxfa/parser/cxfa_eventdata.cpp
index 5b48df6d88..22943216c4 100644
--- a/xfa/fxfa/parser/cxfa_eventdata.cpp
+++ b/xfa/fxfa/parser/cxfa_eventdata.cpp
@@ -30,8 +30,8 @@ void CXFA_EventData::GetRef(WideStringView& wsRef) {
   m_pNode->JSNode()->TryCData(XFA_ATTRIBUTE_Ref, wsRef, true);
 }
 
-CXFA_Script CXFA_EventData::GetScript() const {
-  return CXFA_Script(m_pNode->GetChild(0, XFA_Element::Script, false));
+CXFA_ScriptData CXFA_EventData::GetScriptData() const {
+  return CXFA_ScriptData(m_pNode->GetChild(0, XFA_Element::Script, false));
 }
 
 CXFA_Submit CXFA_EventData::GetSubmit() const {
diff --git a/xfa/fxfa/parser/cxfa_eventdata.h b/xfa/fxfa/parser/cxfa_eventdata.h
index b6fdc48e99..e9a79f008f 100644
--- a/xfa/fxfa/parser/cxfa_eventdata.h
+++ b/xfa/fxfa/parser/cxfa_eventdata.h
@@ -11,7 +11,7 @@
 
 #include "core/fxcrt/fx_string.h"
 #include "xfa/fxfa/parser/cxfa_data.h"
-#include "xfa/fxfa/parser/cxfa_script.h"
+#include "xfa/fxfa/parser/cxfa_scriptdata.h"
 #include "xfa/fxfa/parser/cxfa_submit.h"
 
 class CXFA_Node;
@@ -22,7 +22,7 @@ class CXFA_EventData : public CXFA_Data {
 
   int32_t GetActivity();
   XFA_Element GetEventType() const;
-  CXFA_Script GetScript() const;
+  CXFA_ScriptData GetScriptData() const;
   CXFA_Submit GetSubmit() const;
   void GetRef(WideStringView& wsRef);
   void GetSignDataTarget(WideString& wsTarget);
diff --git a/xfa/fxfa/parser/cxfa_script.cpp b/xfa/fxfa/parser/cxfa_scriptdata.cpp
index fcb0f95af1..4f17a8394a 100644
--- a/xfa/fxfa/parser/cxfa_script.cpp
+++ b/xfa/fxfa/parser/cxfa_scriptdata.cpp
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fxfa/parser/cxfa_script.h"
+#include "xfa/fxfa/parser/cxfa_scriptdata.h"
 
 #include "xfa/fxfa/parser/cxfa_node.h"
 
-CXFA_Script::CXFA_Script(CXFA_Node* pNode) : CXFA_Data(pNode) {}
+CXFA_ScriptData::CXFA_ScriptData(CXFA_Node* pNode) : CXFA_Data(pNode) {}
 
-XFA_SCRIPTTYPE CXFA_Script::GetContentType() {
+XFA_SCRIPTTYPE CXFA_ScriptData::GetContentType() {
   WideStringView cData;
   if (m_pNode->JSNode()->TryCData(XFA_ATTRIBUTE_ContentType, cData, false)) {
     if (cData == L"application/x-javascript")
@@ -22,10 +22,10 @@ XFA_SCRIPTTYPE CXFA_Script::GetContentType() {
   return XFA_SCRIPTTYPE_Formcalc;
 }
 
-int32_t CXFA_Script::GetRunAt() {
+int32_t CXFA_ScriptData::GetRunAt() {
   return m_pNode->JSNode()->GetEnum(XFA_ATTRIBUTE_RunAt);
 }
 
-void CXFA_Script::GetExpression(WideString& wsExpression) {
+void CXFA_ScriptData::GetExpression(WideString& wsExpression) {
   m_pNode->JSNode()->TryContent(wsExpression, false, true);
 }
diff --git a/xfa/fxfa/parser/cxfa_script.h b/xfa/fxfa/parser/cxfa_scriptdata.h
index bb98f58abc..f7b8d741fc 100644
--- a/xfa/fxfa/parser/cxfa_script.h
+++ b/xfa/fxfa/parser/cxfa_scriptdata.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXFA_PARSER_CXFA_SCRIPT_H_
-#define XFA_FXFA_PARSER_CXFA_SCRIPT_H_
+#ifndef XFA_FXFA_PARSER_CXFA_SCRIPTDATA_H_
+#define XFA_FXFA_PARSER_CXFA_SCRIPTDATA_H_
 
 #include <stdint.h>
 
@@ -20,13 +20,13 @@ enum XFA_SCRIPTTYPE {
 
 class CXFA_Node;
 
-class CXFA_Script : public CXFA_Data {
+class CXFA_ScriptData : public CXFA_Data {
  public:
-  explicit CXFA_Script(CXFA_Node* pNode);
+  explicit CXFA_ScriptData(CXFA_Node* pNode);
 
   XFA_SCRIPTTYPE GetContentType();
   int32_t GetRunAt();
   void GetExpression(WideString& wsExpression);
 };
 
-#endif  // XFA_FXFA_PARSER_CXFA_SCRIPT_H_
+#endif  // XFA_FXFA_PARSER_CXFA_SCRIPTDATA_H_
diff --git a/xfa/fxfa/parser/cxfa_validate.cpp b/xfa/fxfa/parser/cxfa_validate.cpp
index 2f97a02a51..2f38d82290 100644
--- a/xfa/fxfa/parser/cxfa_validate.cpp
+++ b/xfa/fxfa/parser/cxfa_validate.cpp
@@ -110,6 +110,6 @@ void CXFA_Validate::GetPicture(WideString& wsPicture) {
     pNode->JSNode()->TryContent(wsPicture, false, true);
 }
 
-CXFA_Script CXFA_Validate::GetScript() {
-  return CXFA_Script(m_pNode->GetChild(0, XFA_Element::Script, false));
+CXFA_ScriptData CXFA_Validate::GetScriptData() {
+  return CXFA_ScriptData(m_pNode->GetChild(0, XFA_Element::Script, false));
 }
diff --git a/xfa/fxfa/parser/cxfa_validate.h b/xfa/fxfa/parser/cxfa_validate.h
index ebe3eaee56..bf6b807b7e 100644
--- a/xfa/fxfa/parser/cxfa_validate.h
+++ b/xfa/fxfa/parser/cxfa_validate.h
@@ -10,7 +10,7 @@
 #include "core/fxcrt/fx_string.h"
 #include "core/fxcrt/fx_system.h"
 #include "xfa/fxfa/parser/cxfa_data.h"
-#include "xfa/fxfa/parser/cxfa_script.h"
+#include "xfa/fxfa/parser/cxfa_scriptdata.h"
 
 class CXFA_Node;
 
@@ -29,7 +29,7 @@ class CXFA_Validate : public CXFA_Data {
   void GetScriptMessageText(WideString& wsMessage);
   void SetScriptMessageText(WideString wsMessage);
   void GetPicture(WideString& wsPicture);
-  CXFA_Script GetScript();
+  CXFA_ScriptData GetScriptData();
 
  private:
   void GetMessageText(WideString& wsMessage, const WideString& wsMessageType);