6 files changed, 19 insertions, 19 deletions
diff --git a/xfa/fxfa/cxfa_widgetacc.cpp b/xfa/fxfa/cxfa_widgetacc.cpp
index 04733934a8..e9ccaaa218 100644
--- a/xfa/fxfa/cxfa_widgetacc.cpp
+++ b/xfa/fxfa/cxfa_widgetacc.cpp
@@ -505,8 +505,8 @@ WideString CXFA_WidgetAcc::GetValidateCaptionName(bool bVersionFlag) {
   if (!bVersionFlag) {
     if (CXFA_CaptionData captionData = GetCaptionData()) {
       if (CXFA_Value capValue = captionData.GetValue()) {
-        if (CXFA_Text capText = capValue.GetText())
-          capText.GetContent(wsCaptionName);
+        if (CXFA_TextData captionTextData = capValue.GetTextData())
+          captionTextData.GetContent(wsCaptionName);
       }
     }
   }
diff --git a/xfa/fxfa/parser/cxfa_calculatedata.cpp b/xfa/fxfa/parser/cxfa_calculatedata.cpp
index 599ffe3c8f..c839a34cef 100644
--- a/xfa/fxfa/parser/cxfa_calculatedata.cpp
+++ b/xfa/fxfa/parser/cxfa_calculatedata.cpp
@@ -7,7 +7,7 @@
 #include "xfa/fxfa/parser/cxfa_calculatedata.h"
 
 #include "xfa/fxfa/parser/cxfa_node.h"
-#include "xfa/fxfa/parser/cxfa_text.h"
+#include "xfa/fxfa/parser/cxfa_textdata.h"
 
 CXFA_CalculateData::CXFA_CalculateData(CXFA_Node* pNode) : CXFA_Data(pNode) {}
 
@@ -26,7 +26,7 @@ void CXFA_CalculateData::GetMessageText(WideString& wsMessage) {
   if (!pNode)
     return;
 
-  CXFA_Text text(pNode->GetChild(0, XFA_Element::Text, false));
-  if (text)
-    text.GetContent(wsMessage);
+  CXFA_TextData textData(pNode->GetChild(0, XFA_Element::Text, false));
+  if (textData)
+    textData.GetContent(wsMessage);
 }
diff --git a/xfa/fxfa/parser/cxfa_text.cpp b/xfa/fxfa/parser/cxfa_textdata.cpp
index 7abca0a92f..95e2c980dd 100644
--- a/xfa/fxfa/parser/cxfa_text.cpp
+++ b/xfa/fxfa/parser/cxfa_textdata.cpp
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fxfa/parser/cxfa_text.h"
+#include "xfa/fxfa/parser/cxfa_textdata.h"
 
 #include "xfa/fxfa/parser/cxfa_node.h"
 
-CXFA_Text::CXFA_Text(CXFA_Node* pNode) : CXFA_Data(pNode) {}
+CXFA_TextData::CXFA_TextData(CXFA_Node* pNode) : CXFA_Data(pNode) {}
 
-void CXFA_Text::GetContent(WideString& wsText) {
+void CXFA_TextData::GetContent(WideString& wsText) {
   m_pNode->JSNode()->TryContent(wsText, false, true);
 }
diff --git a/xfa/fxfa/parser/cxfa_text.h b/xfa/fxfa/parser/cxfa_textdata.h
index 18b5628482..9ebf1e08e4 100644
--- a/xfa/fxfa/parser/cxfa_text.h
+++ b/xfa/fxfa/parser/cxfa_textdata.h
@@ -4,19 +4,19 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXFA_PARSER_CXFA_TEXT_H_
-#define XFA_FXFA_PARSER_CXFA_TEXT_H_
+#ifndef XFA_FXFA_PARSER_CXFA_TEXTDATA_H_
+#define XFA_FXFA_PARSER_CXFA_TEXTDATA_H_
 
 #include "core/fxcrt/fx_string.h"
 #include "xfa/fxfa/parser/cxfa_data.h"
 
 class CXFA_Node;
 
-class CXFA_Text : public CXFA_Data {
+class CXFA_TextData : public CXFA_Data {
  public:
-  explicit CXFA_Text(CXFA_Node* pNode);
+  explicit CXFA_TextData(CXFA_Node* pNode);
 
   void GetContent(WideString& wsText);
 };
 
-#endif  // XFA_FXFA_PARSER_CXFA_TEXT_H_
+#endif  // XFA_FXFA_PARSER_CXFA_TEXTDATA_H_
diff --git a/xfa/fxfa/parser/cxfa_value.cpp b/xfa/fxfa/parser/cxfa_value.cpp
index fcfaf6b9ce..ca3f4fd680 100644
--- a/xfa/fxfa/parser/cxfa_value.cpp
+++ b/xfa/fxfa/parser/cxfa_value.cpp
@@ -39,9 +39,9 @@ CXFA_RectangleData CXFA_Value::GetRectangleData() {
       m_pNode ? m_pNode->GetNodeItem(XFA_NODEITEM_FirstChild) : nullptr);
 }
 
-CXFA_Text CXFA_Value::GetText() {
-  return CXFA_Text(m_pNode ? m_pNode->GetNodeItem(XFA_NODEITEM_FirstChild)
-                           : nullptr);
+CXFA_TextData CXFA_Value::GetTextData() {
+  return CXFA_TextData(m_pNode ? m_pNode->GetNodeItem(XFA_NODEITEM_FirstChild)
+                               : nullptr);
 }
 
 CXFA_ExData CXFA_Value::GetExData() {
diff --git a/xfa/fxfa/parser/cxfa_value.h b/xfa/fxfa/parser/cxfa_value.h
index c6683238f5..193cc09cb7 100644
--- a/xfa/fxfa/parser/cxfa_value.h
+++ b/xfa/fxfa/parser/cxfa_value.h
@@ -14,7 +14,7 @@
 #include "xfa/fxfa/parser/cxfa_imagedata.h"
 #include "xfa/fxfa/parser/cxfa_linedata.h"
 #include "xfa/fxfa/parser/cxfa_rectangledata.h"
-#include "xfa/fxfa/parser/cxfa_text.h"
+#include "xfa/fxfa/parser/cxfa_textdata.h"
 
 class CXFA_Node;
 
@@ -27,7 +27,7 @@ class CXFA_Value : public CXFA_Data {
   CXFA_ArcData GetArcData();
   CXFA_LineData GetLineData();
   CXFA_RectangleData GetRectangleData();
-  CXFA_Text GetText();
+  CXFA_TextData GetTextData();
   CXFA_ExData GetExData();
   CXFA_ImageData GetImageData();
 };