4 files changed, 16 insertions, 14 deletions
diff --git a/xfa/fxfa/parser/cxfa_bind.cpp b/xfa/fxfa/parser/cxfa_binddata.cpp
index 1cdeba9a6d..074a3fc797 100644
--- a/xfa/fxfa/parser/cxfa_bind.cpp
+++ b/xfa/fxfa/parser/cxfa_binddata.cpp
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fxfa/parser/cxfa_bind.h"
+#include "xfa/fxfa/parser/cxfa_binddata.h"
 
 #include "xfa/fxfa/parser/cxfa_node.h"
 
-CXFA_Bind::CXFA_Bind(CXFA_Node* pNode) : CXFA_Data(pNode) {}
+CXFA_BindData::CXFA_BindData(CXFA_Node* pNode) : CXFA_Data(pNode) {}
 
-void CXFA_Bind::GetPicture(WideString& wsPicture) {
+void CXFA_BindData::GetPicture(WideString& wsPicture) {
   if (CXFA_Node* pPicture = m_pNode->GetChild(0, XFA_Element::Picture, false))
     pPicture->JSNode()->TryContent(wsPicture, false, true);
 }
diff --git a/xfa/fxfa/parser/cxfa_bind.h b/xfa/fxfa/parser/cxfa_binddata.h
index b24e6f8769..93e9439428 100644
--- a/xfa/fxfa/parser/cxfa_bind.h
+++ b/xfa/fxfa/parser/cxfa_binddata.h
@@ -4,19 +4,19 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXFA_PARSER_CXFA_BIND_H_
-#define XFA_FXFA_PARSER_CXFA_BIND_H_
+#ifndef XFA_FXFA_PARSER_CXFA_BINDDATA_H_
+#define XFA_FXFA_PARSER_CXFA_BINDDATA_H_
 
 #include "core/fxcrt/fx_string.h"
 #include "xfa/fxfa/parser/cxfa_data.h"
 
 class CXFA_Node;
 
-class CXFA_Bind : public CXFA_Data {
+class CXFA_BindData : public CXFA_Data {
  public:
-  explicit CXFA_Bind(CXFA_Node* pNode);
+  explicit CXFA_BindData(CXFA_Node* pNode);
 
   void GetPicture(WideString& wsPicture);
 };
 
-#endif  // XFA_FXFA_PARSER_CXFA_BIND_H_
+#endif  // XFA_FXFA_PARSER_CXFA_BINDDATA_H_
diff --git a/xfa/fxfa/parser/cxfa_widgetdata.cpp b/xfa/fxfa/parser/cxfa_widgetdata.cpp
index e5734ef156..75de937944 100644
--- a/xfa/fxfa/parser/cxfa_widgetdata.cpp
+++ b/xfa/fxfa/parser/cxfa_widgetdata.cpp
@@ -353,8 +353,9 @@ CXFA_Validate CXFA_WidgetData::GetValidate(bool bModified) {
       m_pNode->JSNode()->GetProperty(0, XFA_Element::Validate, bModified));
 }
 
-CXFA_Bind CXFA_WidgetData::GetBind() {
-  return CXFA_Bind(m_pNode->JSNode()->GetProperty(0, XFA_Element::Bind, false));
+CXFA_BindData CXFA_WidgetData::GetBindData() {
+  return CXFA_BindData(
+      m_pNode->JSNode()->GetProperty(0, XFA_Element::Bind, false));
 }
 
 CXFA_AssistData CXFA_WidgetData::GetAssistData() {
@@ -1577,8 +1578,9 @@ bool CXFA_WidgetData::GetPictureContent(WideString& wsPicture,
       return true;
     }
     case XFA_VALUEPICTURE_DataBind: {
-      if (CXFA_Bind bind = GetBind()) {
-        bind.GetPicture(wsPicture);
+      CXFA_BindData bindData = GetBindData();
+      if (bindData) {
+        bindData.GetPicture(wsPicture);
         return true;
       }
       break;
diff --git a/xfa/fxfa/parser/cxfa_widgetdata.h b/xfa/fxfa/parser/cxfa_widgetdata.h
index 8f01e03c76..deeb51d9ce 100644
--- a/xfa/fxfa/parser/cxfa_widgetdata.h
+++ b/xfa/fxfa/parser/cxfa_widgetdata.h
@@ -13,7 +13,7 @@
 #include "core/fxcrt/fx_string.h"
 #include "core/fxcrt/fx_system.h"
 #include "xfa/fxfa/parser/cxfa_assistdata.h"
-#include "xfa/fxfa/parser/cxfa_bind.h"
+#include "xfa/fxfa/parser/cxfa_binddata.h"
 #include "xfa/fxfa/parser/cxfa_border.h"
 #include "xfa/fxfa/parser/cxfa_calculate.h"
 #include "xfa/fxfa/parser/cxfa_caption.h"
@@ -160,7 +160,7 @@ class CXFA_WidgetData : public CXFA_Data {
   bool m_bPreNull;
 
  private:
-  CXFA_Bind GetBind();
+  CXFA_BindData GetBindData();
   void SyncValue(const WideString& wsValue, bool bNotify);
   void InsertListTextItem(CXFA_Node* pItems,
                           const WideString& wsText,