3 files changed, 11 insertions, 8 deletions
diff --git a/fpdfsdk/include/cpdfsdk_baannothandler.h b/fpdfsdk/include/cpdfsdk_baannothandler.h
index 1e04bc15c2..112f8125f1 100644
--- a/fpdfsdk/include/cpdfsdk_baannothandler.h
+++ b/fpdfsdk/include/cpdfsdk_baannothandler.h
@@ -11,7 +11,7 @@
 #include "core/fxcrt/include/fx_coordinates.h"
 #include "fpdfsdk/include/ipdfsdk_annothandler.h"
 
-class CFFL_IFormFiller;
+class CFFL_InteractiveFormFiller;
 class CFX_Matrix;
 class CFX_RenderDevice;
 class CPDF_Annot;
diff --git a/fpdfsdk/include/cpdfsdk_environment.h b/fpdfsdk/include/cpdfsdk_environment.h
index 59b260859a..338d70f33b 100644
--- a/fpdfsdk/include/cpdfsdk_environment.h
+++ b/fpdfsdk/include/cpdfsdk_environment.h
@@ -18,7 +18,7 @@
 #include "public/fpdf_formfill.h"
 #include "public/fpdf_fwlevent.h"
 
-class CFFL_IFormFiller;
+class CFFL_InteractiveFormFiller;
 class CFX_SystemHandler;
 class CPDFSDK_ActionHandler;
 class CPDFSDK_AnnotHandlerMgr;
@@ -400,7 +400,8 @@ class CPDFSDK_Environment final {
   CFX_SystemHandler* GetSysHandler() const { return m_pSysHandler.get(); }
   FPDF_FORMFILLINFO* GetFormFillInfo() const { return m_pInfo; }
 
-  CFFL_IFormFiller* GetIFormFiller();             // Creates if not present.
+  // Creates if not present.
+  CFFL_InteractiveFormFiller* GetInteractiveFormFiller();
   CPDFSDK_AnnotHandlerMgr* GetAnnotHandlerMgr();  // Creates if not present.
   IJS_Runtime* GetJSRuntime();                    // Creates if not present.
   CPDFSDK_ActionHandler* GetActionHander();       // Creates if not present.
@@ -412,7 +413,7 @@ class CPDFSDK_Environment final {
   FPDF_FORMFILLINFO* const m_pInfo;
   CPDFSDK_Document* m_pSDKDoc;
   UnderlyingDocumentType* const m_pUnderlyingDoc;
-  std::unique_ptr<CFFL_IFormFiller> m_pIFormFiller;
+  std::unique_ptr<CFFL_InteractiveFormFiller> m_pFormFiller;
   std::unique_ptr<CFX_SystemHandler> m_pSysHandler;
 };
 
diff --git a/fpdfsdk/include/cpdfsdk_widgethandler.h b/fpdfsdk/include/cpdfsdk_widgethandler.h
index 432a90bc24..c5efd21e84 100644
--- a/fpdfsdk/include/cpdfsdk_widgethandler.h
+++ b/fpdfsdk/include/cpdfsdk_widgethandler.h
@@ -11,7 +11,7 @@
 #include "core/fxcrt/include/fx_coordinates.h"
 #include "fpdfsdk/include/ipdfsdk_annothandler.h"
 
-class CFFL_IFormFiller;
+class CFFL_InteractiveFormFiller;
 class CFX_Matrix;
 class CFX_RenderDevice;
 class CPDF_Annot;
@@ -103,12 +103,14 @@ class CPDFSDK_WidgetHandler : public IPDFSDK_AnnotHandler {
                             CPDFSDK_Annot* pNewAnnot) override;
 #endif  // PDF_ENABLE_XFA
 
-  void SetFormFiller(CFFL_IFormFiller* pFiller) { m_pFormFiller = pFiller; }
-  CFFL_IFormFiller* GetFormFiller() { return m_pFormFiller; }
+  void SetFormFiller(CFFL_InteractiveFormFiller* pFiller) {
+    m_pFormFiller = pFiller;
+  }
+  CFFL_InteractiveFormFiller* GetFormFiller() { return m_pFormFiller; }
 
  private:
   CPDFSDK_Environment* m_pApp;
-  CFFL_IFormFiller* m_pFormFiller;
+  CFFL_InteractiveFormFiller* m_pFormFiller;
 };
 
 #endif  // FPDFSDK_INCLUDE_CPDFSDK_WIDGETHANDLER_H_