4 files changed, 14 insertions, 14 deletions
diff --git a/xfa/fxfa/parser/cxfa_calculate.cpp b/xfa/fxfa/parser/cxfa_calculatedata.cpp
index 6f5c8a664a..1db5779486 100644
--- a/xfa/fxfa/parser/cxfa_calculate.cpp
+++ b/xfa/fxfa/parser/cxfa_calculatedata.cpp
@@ -4,24 +4,24 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fxfa/parser/cxfa_calculate.h"
+#include "xfa/fxfa/parser/cxfa_calculatedata.h"
 
 #include "xfa/fxfa/parser/cxfa_node.h"
 #include "xfa/fxfa/parser/cxfa_text.h"
 
-CXFA_Calculate::CXFA_Calculate(CXFA_Node* pNode) : CXFA_Data(pNode) {}
+CXFA_CalculateData::CXFA_CalculateData(CXFA_Node* pNode) : CXFA_Data(pNode) {}
 
-int32_t CXFA_Calculate::GetOverride() {
+int32_t CXFA_CalculateData::GetOverride() {
   XFA_ATTRIBUTEENUM eAtt = XFA_ATTRIBUTEENUM_Error;
   m_pNode->JSNode()->TryEnum(XFA_ATTRIBUTE_Override, eAtt, false);
   return eAtt;
 }
 
-CXFA_Script CXFA_Calculate::GetScript() {
+CXFA_Script CXFA_CalculateData::GetScript() {
   return CXFA_Script(m_pNode->GetChild(0, XFA_Element::Script, false));
 }
 
-void CXFA_Calculate::GetMessageText(WideString& wsMessage) {
+void CXFA_CalculateData::GetMessageText(WideString& wsMessage) {
   CXFA_Node* pNode = m_pNode->GetChild(0, XFA_Element::Message, false);
   if (!pNode)
     return;
diff --git a/xfa/fxfa/parser/cxfa_calculate.h b/xfa/fxfa/parser/cxfa_calculatedata.h
index b3a6ef2eaa..0c1a8220c1 100644
--- a/xfa/fxfa/parser/cxfa_calculate.h
+++ b/xfa/fxfa/parser/cxfa_calculatedata.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXFA_PARSER_CXFA_CALCULATE_H_
-#define XFA_FXFA_PARSER_CXFA_CALCULATE_H_
+#ifndef XFA_FXFA_PARSER_CXFA_CALCULATEDATA_H_
+#define XFA_FXFA_PARSER_CXFA_CALCULATEDATA_H_
 
 #include "core/fxcrt/fx_string.h"
 #include "xfa/fxfa/parser/cxfa_data.h"
@@ -13,13 +13,13 @@
 
 class CXFA_Node;
 
-class CXFA_Calculate : public CXFA_Data {
+class CXFA_CalculateData : public CXFA_Data {
  public:
-  explicit CXFA_Calculate(CXFA_Node* pNode);
+  explicit CXFA_CalculateData(CXFA_Node* pNode);
 
   int32_t GetOverride();
   CXFA_Script GetScript();
   void GetMessageText(WideString& wsMessage);
 };
 
-#endif  // XFA_FXFA_PARSER_CXFA_CALCULATE_H_
+#endif  // XFA_FXFA_PARSER_CXFA_CALCULATEDATA_H_
diff --git a/xfa/fxfa/parser/cxfa_widgetdata.cpp b/xfa/fxfa/parser/cxfa_widgetdata.cpp
index ae857cb9c5..d8d5cfcc1d 100644
--- a/xfa/fxfa/parser/cxfa_widgetdata.cpp
+++ b/xfa/fxfa/parser/cxfa_widgetdata.cpp
@@ -343,8 +343,8 @@ CXFA_Value CXFA_WidgetData::GetFormValue() {
       m_pNode->JSNode()->GetProperty(0, XFA_Element::Value, false));
 }
 
-CXFA_Calculate CXFA_WidgetData::GetCalculate() {
-  return CXFA_Calculate(
+CXFA_CalculateData CXFA_WidgetData::GetCalculateData() {
+  return CXFA_CalculateData(
       m_pNode->JSNode()->GetProperty(0, XFA_Element::Calculate, false));
 }
 
diff --git a/xfa/fxfa/parser/cxfa_widgetdata.h b/xfa/fxfa/parser/cxfa_widgetdata.h
index f741a33858..4689878e9f 100644
--- a/xfa/fxfa/parser/cxfa_widgetdata.h
+++ b/xfa/fxfa/parser/cxfa_widgetdata.h
@@ -15,7 +15,7 @@
 #include "xfa/fxfa/parser/cxfa_assistdata.h"
 #include "xfa/fxfa/parser/cxfa_binddata.h"
 #include "xfa/fxfa/parser/cxfa_borderdata.h"
-#include "xfa/fxfa/parser/cxfa_calculate.h"
+#include "xfa/fxfa/parser/cxfa_calculatedata.h"
 #include "xfa/fxfa/parser/cxfa_caption.h"
 #include "xfa/fxfa/parser/cxfa_data.h"
 #include "xfa/fxfa/parser/cxfa_font.h"
@@ -60,7 +60,7 @@ class CXFA_WidgetData : public CXFA_Data {
                                              bool bIsFormReady);
   CXFA_Value GetDefaultValue();
   CXFA_Value GetFormValue();
-  CXFA_Calculate GetCalculate();
+  CXFA_CalculateData GetCalculateData();
   CXFA_Validate GetValidate(bool bModified);
 
   bool GetWidth(float& fWidth);