5 files changed, 16 insertions, 15 deletions
diff --git a/xfa/fxfa/cxfa_ffwidget.cpp b/xfa/fxfa/cxfa_ffwidget.cpp
index 6971d03df0..5cfa836aed 100644
--- a/xfa/fxfa/cxfa_ffwidget.cpp
+++ b/xfa/fxfa/cxfa_ffwidget.cpp
@@ -978,10 +978,11 @@ CXFA_WidgetAcc* CXFA_FFWidget::GetDataAcc() {
 }
 
 bool CXFA_FFWidget::GetToolTip(WideString& wsToolTip) {
-  if (CXFA_Assist assist = m_pDataAcc->GetAssist()) {
-    if (CXFA_ToolTip toolTip = assist.GetToolTip()) {
+  CXFA_AssistData assist = m_pDataAcc->GetAssistData();
+  if (assist) {
+    CXFA_ToolTip toolTip = assist.GetToolTip();
+    if (toolTip)
       return toolTip.GetTip(wsToolTip);
-    }
   }
   return GetCaptionText(wsToolTip);
 }
diff --git a/xfa/fxfa/parser/cxfa_assist.cpp b/xfa/fxfa/parser/cxfa_assistdata.cpp
index 7d353a56ec..e480d0ba68 100644
--- a/xfa/fxfa/parser/cxfa_assist.cpp
+++ b/xfa/fxfa/parser/cxfa_assistdata.cpp
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fxfa/parser/cxfa_assist.h"
+#include "xfa/fxfa/parser/cxfa_assistdata.h"
 
 #include "xfa/fxfa/parser/cxfa_node.h"
 
-CXFA_Assist::CXFA_Assist(CXFA_Node* pNode) : CXFA_Data(pNode) {}
+CXFA_AssistData::CXFA_AssistData(CXFA_Node* pNode) : CXFA_Data(pNode) {}
 
-CXFA_ToolTip CXFA_Assist::GetToolTip() {
+CXFA_ToolTip CXFA_AssistData::GetToolTip() {
   return CXFA_ToolTip(m_pNode->GetChild(0, XFA_Element::ToolTip, false));
 }
diff --git a/xfa/fxfa/parser/cxfa_assist.h b/xfa/fxfa/parser/cxfa_assistdata.h
index c583ff59d5..f77ffc4245 100644
--- a/xfa/fxfa/parser/cxfa_assist.h
+++ b/xfa/fxfa/parser/cxfa_assistdata.h
@@ -4,19 +4,19 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXFA_PARSER_CXFA_ASSIST_H_
-#define XFA_FXFA_PARSER_CXFA_ASSIST_H_
+#ifndef XFA_FXFA_PARSER_CXFA_ASSISTDATA_H_
+#define XFA_FXFA_PARSER_CXFA_ASSISTDATA_H_
 
 #include "xfa/fxfa/parser/cxfa_data.h"
 #include "xfa/fxfa/parser/cxfa_tooltip.h"
 
 class CXFA_Node;
 
-class CXFA_Assist : public CXFA_Data {
+class CXFA_AssistData : public CXFA_Data {
  public:
-  explicit CXFA_Assist(CXFA_Node* pNode);
+  explicit CXFA_AssistData(CXFA_Node* pNode);
 
   CXFA_ToolTip GetToolTip();
 };
 
-#endif  // XFA_FXFA_PARSER_CXFA_ASSIST_H_
+#endif  // XFA_FXFA_PARSER_CXFA_ASSISTDATA_H_
diff --git a/xfa/fxfa/parser/cxfa_widgetdata.cpp b/xfa/fxfa/parser/cxfa_widgetdata.cpp
index 963dc5e24e..e5734ef156 100644
--- a/xfa/fxfa/parser/cxfa_widgetdata.cpp
+++ b/xfa/fxfa/parser/cxfa_widgetdata.cpp
@@ -357,8 +357,8 @@ CXFA_Bind CXFA_WidgetData::GetBind() {
   return CXFA_Bind(m_pNode->JSNode()->GetProperty(0, XFA_Element::Bind, false));
 }
 
-CXFA_Assist CXFA_WidgetData::GetAssist() {
-  return CXFA_Assist(
+CXFA_AssistData CXFA_WidgetData::GetAssistData() {
+  return CXFA_AssistData(
       m_pNode->JSNode()->GetProperty(0, XFA_Element::Assist, false));
 }
 
diff --git a/xfa/fxfa/parser/cxfa_widgetdata.h b/xfa/fxfa/parser/cxfa_widgetdata.h
index 69f8d0d5a2..8f01e03c76 100644
--- a/xfa/fxfa/parser/cxfa_widgetdata.h
+++ b/xfa/fxfa/parser/cxfa_widgetdata.h
@@ -12,7 +12,7 @@
 #include "core/fxcrt/fx_coordinates.h"
 #include "core/fxcrt/fx_string.h"
 #include "core/fxcrt/fx_system.h"
-#include "xfa/fxfa/parser/cxfa_assist.h"
+#include "xfa/fxfa/parser/cxfa_assistdata.h"
 #include "xfa/fxfa/parser/cxfa_bind.h"
 #include "xfa/fxfa/parser/cxfa_border.h"
 #include "xfa/fxfa/parser/cxfa_calculate.h"
@@ -49,7 +49,7 @@ class CXFA_WidgetData : public CXFA_Data {
   int32_t GetAccess();
   int32_t GetRotate();
 
-  CXFA_Assist GetAssist();
+  CXFA_AssistData GetAssistData();
   CXFA_Border GetBorder(bool bModified);
   CXFA_Caption GetCaption();
   CXFA_Font GetFont(bool bModified);