Rename IFWL classes which do not have CFWL equivalents

This CL moves the IFWL classes that do not have CFWL class buddies to have the
CFWL name. This CL leaves the tree in a weird state of having CFWL be two
hierarchies, one of which is intertwined with the IFWL hierarchy. This should
be commited just before the CL to move the rest of IFWL to CFWL.

Review-Url: https://codereview.chromium.org/2525083002

32 files changed, 338 insertions, 338 deletions

diff --git a/xfa/fwl/core/ifwl_caret.cpp b/xfa/fwl/core/cfwl_caret.cpp
index 1c228242bd..97cf1e9682 100644
--- a/xfa/fwl/core/ifwl_caret.cpp
+++ b/xfa/fwl/core/cfwl_caret.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fwl/core/ifwl_caret.h"
+#include "xfa/fwl/core/cfwl_caret.h"
 
 #include <utility>
 
@@ -21,29 +21,29 @@ const uint32_t kFrequency = 400;
 
 }  // namespace
 
-IFWL_Caret::IFWL_Caret(const CFWL_App* app,
+CFWL_Caret::CFWL_Caret(const CFWL_App* app,
                        std::unique_ptr<CFWL_WidgetProperties> properties,
                        IFWL_Widget* pOuter)
     : IFWL_Widget(app, std::move(properties), pOuter),
-      m_pTimer(new IFWL_Caret::Timer(this)),
+      m_pTimer(new CFWL_Caret::Timer(this)),
       m_pTimerInfo(nullptr) {
   SetStates(FWL_STATE_CAT_HightLight);
 }
 
-IFWL_Caret::~IFWL_Caret() {
+CFWL_Caret::~CFWL_Caret() {
   if (m_pTimerInfo) {
     m_pTimerInfo->StopTimer();
     m_pTimerInfo = nullptr;
   }
 }
 
-FWL_Type IFWL_Caret::GetClassID() const {
+FWL_Type CFWL_Caret::GetClassID() const {
   return FWL_Type::Caret;
 }
 
-void IFWL_Caret::Update() {}
+void CFWL_Caret::Update() {}
 
-void IFWL_Caret::DrawWidget(CFX_Graphics* pGraphics,
+void CFWL_Caret::DrawWidget(CFX_Graphics* pGraphics,
                             const CFX_Matrix* pMatrix) {
   if (!pGraphics)
     return;
@@ -55,7 +55,7 @@ void IFWL_Caret::DrawWidget(CFX_Graphics* pGraphics,
   DrawCaretBK(pGraphics, m_pProperties->m_pThemeProvider, pMatrix);
 }
 
-void IFWL_Caret::ShowCaret(bool bFlag) {
+void CFWL_Caret::ShowCaret(bool bFlag) {
   if (m_pTimerInfo) {
     m_pTimerInfo->StopTimer();
     m_pTimerInfo = nullptr;
@@ -66,7 +66,7 @@ void IFWL_Caret::ShowCaret(bool bFlag) {
   SetStates(FWL_WGTSTATE_Invisible, !bFlag);
 }
 
-void IFWL_Caret::DrawCaretBK(CFX_Graphics* pGraphics,
+void CFWL_Caret::DrawCaretBK(CFX_Graphics* pGraphics,
                              IFWL_ThemeProvider* pTheme,
                              const CFX_Matrix* pMatrix) {
   if (!(m_pProperties->m_dwStates & FWL_STATE_CAT_HightLight))
@@ -87,17 +87,17 @@ void IFWL_Caret::DrawCaretBK(CFX_Graphics* pGraphics,
   pTheme->DrawBackground(&param);
 }
 
-void IFWL_Caret::OnProcessMessage(CFWL_Message* pMessage) {}
+void CFWL_Caret::OnProcessMessage(CFWL_Message* pMessage) {}
 
-void IFWL_Caret::OnDrawWidget(CFX_Graphics* pGraphics,
+void CFWL_Caret::OnDrawWidget(CFX_Graphics* pGraphics,
                               const CFX_Matrix* pMatrix) {
   DrawWidget(pGraphics, pMatrix);
 }
 
-IFWL_Caret::Timer::Timer(IFWL_Caret* pCaret) : CFWL_Timer(pCaret) {}
+CFWL_Caret::Timer::Timer(CFWL_Caret* pCaret) : CFWL_Timer(pCaret) {}
 
-void IFWL_Caret::Timer::Run(CFWL_TimerInfo* pTimerInfo) {
-  IFWL_Caret* pCaret = static_cast<IFWL_Caret*>(m_pWidget);
+void CFWL_Caret::Timer::Run(CFWL_TimerInfo* pTimerInfo) {
+  CFWL_Caret* pCaret = static_cast<CFWL_Caret*>(m_pWidget);
   pCaret->SetStates(FWL_STATE_CAT_HightLight,
                     !(pCaret->GetStates() & FWL_STATE_CAT_HightLight));
 
diff --git a/xfa/fwl/core/ifwl_caret.h b/xfa/fwl/core/cfwl_caret.h
index 51a80911d5..9e68cdf09d 100644
--- a/xfa/fwl/core/ifwl_caret.h
+++ b/xfa/fwl/core/cfwl_caret.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FWL_CORE_IFWL_CARET_H_
-#define XFA_FWL_CORE_IFWL_CARET_H_
+#ifndef XFA_FWL_CORE_CFWL_CARET_H_
+#define XFA_FWL_CORE_CFWL_CARET_H_
 
 #include <memory>
 
@@ -18,12 +18,12 @@ class IFWL_Widget;
 
 #define FWL_STATE_CAT_HightLight 1
 
-class IFWL_Caret : public IFWL_Widget {
+class CFWL_Caret : public IFWL_Widget {
  public:
-  IFWL_Caret(const CFWL_App* app,
+  CFWL_Caret(const CFWL_App* app,
              std::unique_ptr<CFWL_WidgetProperties> properties,
              IFWL_Widget* pOuter);
-  ~IFWL_Caret() override;
+  ~CFWL_Caret() override;
 
   // IFWL_Widget
   FWL_Type GetClassID() const override;
@@ -39,19 +39,19 @@ class IFWL_Caret : public IFWL_Widget {
  private:
   class Timer : public CFWL_Timer {
    public:
-    explicit Timer(IFWL_Caret* pCaret);
+    explicit Timer(CFWL_Caret* pCaret);
     ~Timer() override {}
 
     void Run(CFWL_TimerInfo* hTimer) override;
   };
-  friend class IFWL_Caret::Timer;
+  friend class CFWL_Caret::Timer;
 
   void DrawCaretBK(CFX_Graphics* pGraphics,
                    IFWL_ThemeProvider* pTheme,
                    const CFX_Matrix* pMatrix);
 
-  std::unique_ptr<IFWL_Caret::Timer> m_pTimer;
+  std::unique_ptr<CFWL_Caret::Timer> m_pTimer;
   CFWL_TimerInfo* m_pTimerInfo;  // not owned.
 };
 
-#endif  // XFA_FWL_CORE_IFWL_CARET_H_
+#endif  // XFA_FWL_CORE_CFWL_CARET_H_
diff --git a/xfa/fwl/core/ifwl_comboboxproxy.cpp b/xfa/fwl/core/cfwl_comboboxproxy.cpp
index 35c8a0e025..c367eefb9c 100644
--- a/xfa/fwl/core/ifwl_comboboxproxy.cpp
+++ b/xfa/fwl/core/cfwl_comboboxproxy.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fwl/core/ifwl_comboboxproxy.h"
+#include "xfa/fwl/core/cfwl_comboboxproxy.h"
 
 #include <memory>
 #include <utility>
@@ -15,19 +15,19 @@
 #include "xfa/fwl/core/cfwl_notedriver.h"
 #include "xfa/fwl/core/ifwl_combobox.h"
 
-IFWL_ComboBoxProxy::IFWL_ComboBoxProxy(
+CFWL_ComboBoxProxy::CFWL_ComboBoxProxy(
     IFWL_ComboBox* pComboBox,
     const CFWL_App* app,
     std::unique_ptr<CFWL_WidgetProperties> properties,
     IFWL_Widget* pOuter)
-    : IFWL_FormProxy(app, std::move(properties), pOuter),
+    : CFWL_FormProxy(app, std::move(properties), pOuter),
       m_bLButtonDown(false),
       m_bLButtonUpSelf(false),
       m_pComboBox(pComboBox) {}
 
-IFWL_ComboBoxProxy::~IFWL_ComboBoxProxy() {}
+CFWL_ComboBoxProxy::~CFWL_ComboBoxProxy() {}
 
-void IFWL_ComboBoxProxy::OnProcessMessage(CFWL_Message* pMessage) {
+void CFWL_ComboBoxProxy::OnProcessMessage(CFWL_Message* pMessage) {
   if (!pMessage)
     return;
 
@@ -58,12 +58,12 @@ void IFWL_ComboBoxProxy::OnProcessMessage(CFWL_Message* pMessage) {
   IFWL_Widget::OnProcessMessage(pMessage);
 }
 
-void IFWL_ComboBoxProxy::OnDrawWidget(CFX_Graphics* pGraphics,
+void CFWL_ComboBoxProxy::OnDrawWidget(CFX_Graphics* pGraphics,
                                       const CFX_Matrix* pMatrix) {
   m_pComboBox->DrawStretchHandler(pGraphics, pMatrix);
 }
 
-void IFWL_ComboBoxProxy::OnLButtonDown(CFWL_Message* pMessage) {
+void CFWL_ComboBoxProxy::OnLButtonDown(CFWL_Message* pMessage) {
   const CFWL_App* pApp = GetOwnerApp();
   if (!pApp)
     return;
@@ -85,7 +85,7 @@ void IFWL_ComboBoxProxy::OnLButtonDown(CFWL_Message* pMessage) {
   }
 }
 
-void IFWL_ComboBoxProxy::OnLButtonUp(CFWL_Message* pMessage) {
+void CFWL_ComboBoxProxy::OnLButtonUp(CFWL_Message* pMessage) {
   m_bLButtonDown = false;
   const CFWL_App* pApp = GetOwnerApp();
   if (!pApp)
@@ -109,7 +109,7 @@ void IFWL_ComboBoxProxy::OnLButtonUp(CFWL_Message* pMessage) {
   }
 }
 
-void IFWL_ComboBoxProxy::OnFocusChanged(CFWL_Message* pMessage, bool bSet) {
+void CFWL_ComboBoxProxy::OnFocusChanged(CFWL_Message* pMessage, bool bSet) {
   if (bSet)
     return;
 
diff --git a/xfa/fwl/core/ifwl_comboboxproxy.h b/xfa/fwl/core/cfwl_comboboxproxy.h
index 228045d750..33f5a82e79 100644
--- a/xfa/fwl/core/ifwl_comboboxproxy.h
+++ b/xfa/fwl/core/cfwl_comboboxproxy.h
@@ -4,24 +4,24 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FWL_CORE_IFWL_COMBOBOXPROXY_H_
-#define XFA_FWL_CORE_IFWL_COMBOBOXPROXY_H_
+#ifndef XFA_FWL_CORE_CFWL_COMBOBOXPROXY_H_
+#define XFA_FWL_CORE_CFWL_COMBOBOXPROXY_H_
 
 #include <memory>
 
-#include "xfa/fwl/core/ifwl_formproxy.h"
+#include "xfa/fwl/core/cfwl_formproxy.h"
 
 class IFWL_ComboBox;
 
-class IFWL_ComboBoxProxy : public IFWL_FormProxy {
+class CFWL_ComboBoxProxy : public CFWL_FormProxy {
  public:
-  IFWL_ComboBoxProxy(IFWL_ComboBox* pCombobBox,
+  CFWL_ComboBoxProxy(IFWL_ComboBox* pCombobBox,
                      const CFWL_App* app,
                      std::unique_ptr<CFWL_WidgetProperties> properties,
                      IFWL_Widget* pOuter);
-  ~IFWL_ComboBoxProxy() override;
+  ~CFWL_ComboBoxProxy() override;
 
-  // IFWL_FormProxy
+  // CFWL_FormProxy
   void OnProcessMessage(CFWL_Message* pMessage) override;
   void OnDrawWidget(CFX_Graphics* pGraphics,
                     const CFX_Matrix* pMatrix) override;
@@ -38,4 +38,4 @@ class IFWL_ComboBoxProxy : public IFWL_FormProxy {
   IFWL_ComboBox* m_pComboBox;
 };
 
-#endif  // XFA_FWL_CORE_IFWL_COMBOBOXPROXY_H_
+#endif  // XFA_FWL_CORE_CFWL_COMBOBOXPROXY_H_
diff --git a/xfa/fwl/core/ifwl_comboedit.cpp b/xfa/fwl/core/cfwl_comboedit.cpp
index 7d1260315c..2051daa786 100644
--- a/xfa/fwl/core/ifwl_comboedit.cpp
+++ b/xfa/fwl/core/cfwl_comboedit.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fwl/core/ifwl_comboedit.h"
+#include "xfa/fwl/core/cfwl_comboedit.h"
 
 #include <memory>
 #include <utility>
@@ -13,7 +13,7 @@
 #include "xfa/fwl/core/cfwl_msgmouse.h"
 #include "xfa/fwl/core/ifwl_combobox.h"
 
-IFWL_ComboEdit::IFWL_ComboEdit(
+CFWL_ComboEdit::CFWL_ComboEdit(
     const CFWL_App* app,
     std::unique_ptr<CFWL_WidgetProperties> properties,
     IFWL_Widget* pOuter)
@@ -21,18 +21,18 @@ IFWL_ComboEdit::IFWL_ComboEdit(
   m_pOuter = static_cast<IFWL_ComboBox*>(pOuter);
 }
 
-void IFWL_ComboEdit::ClearSelected() {
+void CFWL_ComboEdit::ClearSelected() {
   ClearSelections();
   Repaint(&GetRTClient());
 }
 
-void IFWL_ComboEdit::SetSelected() {
+void CFWL_ComboEdit::SetSelected() {
   FlagFocus(true);
   GetTxtEdtEngine()->MoveCaretPos(MC_End);
   AddSelRange(0);
 }
 
-void IFWL_ComboEdit::FlagFocus(bool bSet) {
+void CFWL_ComboEdit::FlagFocus(bool bSet) {
   if (bSet) {
     m_pProperties->m_dwStates |= FWL_WGTSTATE_Focused;
     return;
@@ -42,7 +42,7 @@ void IFWL_ComboEdit::FlagFocus(bool bSet) {
   ShowCaret(false);
 }
 
-void IFWL_ComboEdit::OnProcessMessage(CFWL_Message* pMessage) {
+void CFWL_ComboEdit::OnProcessMessage(CFWL_Message* pMessage) {
   if (!pMessage)
     return;
 
diff --git a/xfa/fwl/core/ifwl_comboedit.h b/xfa/fwl/core/cfwl_comboedit.h
index 5b71c1e86e..30c5e85ad1 100644
--- a/xfa/fwl/core/ifwl_comboedit.h
+++ b/xfa/fwl/core/cfwl_comboedit.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FWL_CORE_IFWL_COMBOEDIT_H_
-#define XFA_FWL_CORE_IFWL_COMBOEDIT_H_
+#ifndef XFA_FWL_CORE_CFWL_COMBOEDIT_H_
+#define XFA_FWL_CORE_CFWL_COMBOEDIT_H_
 
 #include <memory>
 
@@ -15,9 +15,9 @@
 
 class IFWL_ComboBox;
 
-class IFWL_ComboEdit : public IFWL_Edit {
+class CFWL_ComboEdit : public IFWL_Edit {
  public:
-  IFWL_ComboEdit(const CFWL_App* app,
+  CFWL_ComboEdit(const CFWL_App* app,
                  std::unique_ptr<CFWL_WidgetProperties> properties,
                  IFWL_Widget* pOuter);
 
@@ -32,4 +32,4 @@ class IFWL_ComboEdit : public IFWL_Edit {
   IFWL_ComboBox* m_pOuter;
 };
 
-#endif  // XFA_FWL_CORE_IFWL_COMBOEDIT_H_
+#endif  // XFA_FWL_CORE_CFWL_COMBOEDIT_H_
diff --git a/xfa/fwl/core/ifwl_combolist.cpp b/xfa/fwl/core/cfwl_combolist.cpp
index ed7732e0ed..e98f38e81a 100644
--- a/xfa/fwl/core/ifwl_combolist.cpp
+++ b/xfa/fwl/core/cfwl_combolist.cpp
@@ -4,20 +4,20 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fwl/core/ifwl_combolist.h"
+#include "xfa/fwl/core/cfwl_combolist.h"
 
 #include <memory>
 #include <utility>
 
 #include "third_party/base/ptr_util.h"
+#include "xfa/fwl/core/cfwl_comboedit.h"
 #include "xfa/fwl/core/cfwl_msgkey.h"
 #include "xfa/fwl/core/cfwl_msgkillfocus.h"
 #include "xfa/fwl/core/cfwl_msgmouse.h"
 #include "xfa/fwl/core/ifwl_combobox.h"
-#include "xfa/fwl/core/ifwl_comboedit.h"
 #include "xfa/fwl/core/ifwl_listbox.h"
 
-IFWL_ComboList::IFWL_ComboList(
+CFWL_ComboList::CFWL_ComboList(
     const CFWL_App* app,
     std::unique_ptr<CFWL_WidgetProperties> properties,
     IFWL_Widget* pOuter)
@@ -25,7 +25,7 @@ IFWL_ComboList::IFWL_ComboList(
   ASSERT(pOuter);
 }
 
-int32_t IFWL_ComboList::MatchItem(const CFX_WideString& wsMatch) {
+int32_t CFWL_ComboList::MatchItem(const CFX_WideString& wsMatch) {
   if (wsMatch.IsEmpty())
     return -1;
 
@@ -41,7 +41,7 @@ int32_t IFWL_ComboList::MatchItem(const CFX_WideString& wsMatch) {
   return -1;
 }
 
-void IFWL_ComboList::ChangeSelected(int32_t iSel) {
+void CFWL_ComboList::ChangeSelected(int32_t iSel) {
   CFWL_ListItem* hItem = GetItem(this, iSel);
   CFX_RectF rtInvalidate;
   rtInvalidate.Reset();
@@ -66,7 +66,7 @@ void IFWL_ComboList::ChangeSelected(int32_t iSel) {
     Repaint(&rtInvalidate);
 }
 
-void IFWL_ComboList::ClientToOuter(FX_FLOAT& fx, FX_FLOAT& fy) {
+void CFWL_ComboList::ClientToOuter(FX_FLOAT& fx, FX_FLOAT& fy) {
   fx += m_pProperties->m_rtWidget.left, fy += m_pProperties->m_rtWidget.top;
   IFWL_Widget* pOwner = GetOwner();
   if (!pOwner)
@@ -74,7 +74,7 @@ void IFWL_ComboList::ClientToOuter(FX_FLOAT& fx, FX_FLOAT& fy) {
   pOwner->TransformTo(m_pOuter, fx, fy);
 }
 
-void IFWL_ComboList::OnProcessMessage(CFWL_Message* pMessage) {
+void CFWL_ComboList::OnProcessMessage(CFWL_Message* pMessage) {
   if (!pMessage)
     return;
 
@@ -85,7 +85,7 @@ void IFWL_ComboList::OnProcessMessage(CFWL_Message* pMessage) {
     OnDropListFocusChanged(pMessage, dwHashCode == CFWL_MessageType::SetFocus);
   } else if (dwHashCode == CFWL_MessageType::Mouse) {
     CFWL_MsgMouse* pMsg = static_cast<CFWL_MsgMouse*>(pMessage);
-    IFWL_ScrollBar* vertSB = GetVertScrollBar();
+    CFWL_ScrollBar* vertSB = GetVertScrollBar();
     if (IsShowScrollBar(true) && vertSB) {
       CFX_RectF rect;
       vertSB->GetWidgetRect(rect);
@@ -122,7 +122,7 @@ void IFWL_ComboList::OnProcessMessage(CFWL_Message* pMessage) {
     IFWL_ListBox::OnProcessMessage(pMessage);
 }
 
-void IFWL_ComboList::OnDropListFocusChanged(CFWL_Message* pMsg, bool bSet) {
+void CFWL_ComboList::OnDropListFocusChanged(CFWL_Message* pMsg, bool bSet) {
   if (bSet)
     return;
 
@@ -134,12 +134,12 @@ void IFWL_ComboList::OnDropListFocusChanged(CFWL_Message* pMsg, bool bSet) {
   }
 }
 
-void IFWL_ComboList::OnDropListMouseMove(CFWL_MsgMouse* pMsg) {
+void CFWL_ComboList::OnDropListMouseMove(CFWL_MsgMouse* pMsg) {
   if (GetRTClient().Contains(pMsg->m_fx, pMsg->m_fy)) {
     if (m_bNotifyOwner)
       m_bNotifyOwner = false;
 
-    IFWL_ScrollBar* vertSB = GetVertScrollBar();
+    CFWL_ScrollBar* vertSB = GetVertScrollBar();
     if (IsShowScrollBar(true) && vertSB) {
       CFX_RectF rect;
       vertSB->GetWidgetRect(rect);
@@ -159,7 +159,7 @@ void IFWL_ComboList::OnDropListMouseMove(CFWL_MsgMouse* pMsg) {
   }
 }
 
-void IFWL_ComboList::OnDropListLButtonDown(CFWL_MsgMouse* pMsg) {
+void CFWL_ComboList::OnDropListLButtonDown(CFWL_MsgMouse* pMsg) {
   if (GetRTClient().Contains(pMsg->m_fx, pMsg->m_fy))
     return;
 
@@ -167,7 +167,7 @@ void IFWL_ComboList::OnDropListLButtonDown(CFWL_MsgMouse* pMsg) {
   pOuter->ShowDropList(false);
 }
 
-void IFWL_ComboList::OnDropListLButtonUp(CFWL_MsgMouse* pMsg) {
+void CFWL_ComboList::OnDropListLButtonUp(CFWL_MsgMouse* pMsg) {
   IFWL_ComboBox* pOuter = static_cast<IFWL_ComboBox*>(m_pOuter);
   if (m_bNotifyOwner) {
     ClientToOuter(pMsg->m_fx, pMsg->m_fy);
@@ -175,7 +175,7 @@ void IFWL_ComboList::OnDropListLButtonUp(CFWL_MsgMouse* pMsg) {
     return;
   }
 
-  IFWL_ScrollBar* vertSB = GetVertScrollBar();
+  CFWL_ScrollBar* vertSB = GetVertScrollBar();
   if (IsShowScrollBar(true) && vertSB) {
     CFX_RectF rect;
     vertSB->GetWidgetRect(rect);
@@ -189,7 +189,7 @@ void IFWL_ComboList::OnDropListLButtonUp(CFWL_MsgMouse* pMsg) {
     pOuter->ProcessSelChanged(true);
 }
 
-bool IFWL_ComboList::OnDropListKey(CFWL_MsgKey* pKey) {
+bool CFWL_ComboList::OnDropListKey(CFWL_MsgKey* pKey) {
   IFWL_ComboBox* pOuter = static_cast<IFWL_ComboBox*>(m_pOuter);
   bool bPropagate = false;
   if (pKey->m_dwCmd == FWL_KeyCommand::KeyDown) {
@@ -222,7 +222,7 @@ bool IFWL_ComboList::OnDropListKey(CFWL_MsgKey* pKey) {
   return false;
 }
 
-void IFWL_ComboList::OnDropListKeyDown(CFWL_MsgKey* pKey) {
+void CFWL_ComboList::OnDropListKeyDown(CFWL_MsgKey* pKey) {
   uint32_t dwKeyCode = pKey->m_dwKeyCode;
   switch (dwKeyCode) {
     case FWL_VKEY_Up:
diff --git a/xfa/fwl/core/ifwl_combolist.h b/xfa/fwl/core/cfwl_combolist.h
index 8d01494091..ad97b5bed7 100644
--- a/xfa/fwl/core/ifwl_combolist.h
+++ b/xfa/fwl/core/cfwl_combolist.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FWL_CORE_IFWL_COMBOLIST_H_
-#define XFA_FWL_CORE_IFWL_COMBOLIST_H_
+#ifndef XFA_FWL_CORE_CFWL_COMBOLIST_H_
+#define XFA_FWL_CORE_CFWL_COMBOLIST_H_
 
 #include <memory>
 
@@ -13,9 +13,9 @@
 #include "xfa/fwl/core/ifwl_listbox.h"
 #include "xfa/fwl/core/ifwl_widget.h"
 
-class IFWL_ComboList : public IFWL_ListBox {
+class CFWL_ComboList : public IFWL_ListBox {
  public:
-  IFWL_ComboList(const CFWL_App* app,
+  CFWL_ComboList(const CFWL_App* app,
                  std::unique_ptr<CFWL_WidgetProperties> properties,
                  IFWL_Widget* pOuter);
 
@@ -40,4 +40,4 @@ class IFWL_ComboList : public IFWL_ListBox {
   bool m_bNotifyOwner;
 };
 
-#endif  // XFA_FWL_CORE_IFWL_COMBOLIST_H_
+#endif  // XFA_FWL_CORE_CFWL_COMBOLIST_H_
diff --git a/xfa/fwl/core/ifwl_datetimeedit.cpp b/xfa/fwl/core/cfwl_datetimeedit.cpp
index 62ab4f6d19..16ebb3c8cf 100644
--- a/xfa/fwl/core/ifwl_datetimeedit.cpp
+++ b/xfa/fwl/core/cfwl_datetimeedit.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fwl/core/ifwl_datetimeedit.h"
+#include "xfa/fwl/core/cfwl_datetimeedit.h"
 
 #include <memory>
 #include <utility>
@@ -14,13 +14,13 @@
 #include "xfa/fwl/core/cfwl_widgetmgr.h"
 #include "xfa/fwl/core/ifwl_datetimepicker.h"
 
-IFWL_DateTimeEdit::IFWL_DateTimeEdit(
+CFWL_DateTimeEdit::CFWL_DateTimeEdit(
     const CFWL_App* app,
     std::unique_ptr<CFWL_WidgetProperties> properties,
     IFWL_Widget* pOuter)
     : IFWL_Edit(app, std::move(properties), pOuter) {}
 
-void IFWL_DateTimeEdit::OnProcessMessage(CFWL_Message* pMessage) {
+void CFWL_DateTimeEdit::OnProcessMessage(CFWL_Message* pMessage) {
   if (m_pWidgetMgr->IsFormDisabled()) {
     DisForm_OnProcessMessage(pMessage);
     return;
@@ -34,7 +34,7 @@ void IFWL_DateTimeEdit::OnProcessMessage(CFWL_Message* pMessage) {
   }
 }
 
-void IFWL_DateTimeEdit::DisForm_OnProcessMessage(CFWL_Message* pMessage) {
+void CFWL_DateTimeEdit::DisForm_OnProcessMessage(CFWL_Message* pMessage) {
   CFWL_MessageType dwHashCode = pMessage->GetClassID();
   if (!m_pWidgetMgr->IsFormDisabled() ||
       dwHashCode != CFWL_MessageType::Mouse) {
diff --git a/xfa/fwl/core/ifwl_datetimeedit.h b/xfa/fwl/core/cfwl_datetimeedit.h
index 1d420b5dcd..68efd2e13a 100644
--- a/xfa/fwl/core/ifwl_datetimeedit.h
+++ b/xfa/fwl/core/cfwl_datetimeedit.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FWL_CORE_IFWL_DATETIMEEDIT_H_
-#define XFA_FWL_CORE_IFWL_DATETIMEEDIT_H_
+#ifndef XFA_FWL_CORE_CFWL_DATETIMEEDIT_H_
+#define XFA_FWL_CORE_CFWL_DATETIMEEDIT_H_
 
 #include <memory>
 
@@ -14,9 +14,9 @@
 #include "xfa/fwl/core/ifwl_edit.h"
 #include "xfa/fwl/core/ifwl_widget.h"
 
-class IFWL_DateTimeEdit : public IFWL_Edit {
+class CFWL_DateTimeEdit : public IFWL_Edit {
  public:
-  IFWL_DateTimeEdit(const CFWL_App* app,
+  CFWL_DateTimeEdit(const CFWL_App* app,
                     std::unique_ptr<CFWL_WidgetProperties> properties,
                     IFWL_Widget* pOuter);
 
@@ -27,4 +27,4 @@ class IFWL_DateTimeEdit : public IFWL_Edit {
   void DisForm_OnProcessMessage(CFWL_Message* pMessage);
 };
 
-#endif  // XFA_FWL_CORE_IFWL_DATETIMEEDIT_H_
+#endif  // XFA_FWL_CORE_CFWL_DATETIMEEDIT_H_
diff --git a/xfa/fwl/core/ifwl_form.cpp b/xfa/fwl/core/cfwl_form.cpp
index 535205d81a..d2fe14993e 100644
--- a/xfa/fwl/core/ifwl_form.cpp
+++ b/xfa/fwl/core/cfwl_form.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fwl/core/ifwl_form.h"
+#include "xfa/fwl/core/cfwl_form.h"
 
 #include <utility>
 
@@ -12,6 +12,7 @@
 #include "xfa/fde/tto/fde_textout.h"
 #include "xfa/fwl/core/cfwl_app.h"
 #include "xfa/fwl/core/cfwl_evtclose.h"
+#include "xfa/fwl/core/cfwl_formproxy.h"
 #include "xfa/fwl/core/cfwl_msgmouse.h"
 #include "xfa/fwl/core/cfwl_notedriver.h"
 #include "xfa/fwl/core/cfwl_noteloop.h"
@@ -20,7 +21,6 @@
 #include "xfa/fwl/core/cfwl_themepart.h"
 #include "xfa/fwl/core/cfwl_themetext.h"
 #include "xfa/fwl/core/cfwl_widgetmgr.h"
-#include "xfa/fwl/core/ifwl_formproxy.h"
 #include "xfa/fwl/core/ifwl_themeprovider.h"
 #include "xfa/fwl/theme/cfwl_widgettp.h"
 
@@ -38,7 +38,7 @@ const uint8_t kCornerEnlarge = 10;
 
 }  // namespace
 
-IFWL_Form::IFWL_Form(const CFWL_App* app,
+CFWL_Form::CFWL_Form(const CFWL_App* app,
                      std::unique_ptr<CFWL_WidgetProperties> properties,
                      IFWL_Widget* pOuter)
     : IFWL_Widget(app, std::move(properties), pOuter),
@@ -64,23 +64,23 @@ IFWL_Form::IFWL_Form(const CFWL_App* app,
   RegisterEventTarget(nullptr);
 }
 
-IFWL_Form::~IFWL_Form() {
+CFWL_Form::~CFWL_Form() {
   UnregisterEventTarget();
   UnRegisterForm();
   RemoveSysButtons();
 }
 
-FWL_Type IFWL_Form::GetClassID() const {
+FWL_Type CFWL_Form::GetClassID() const {
   return FWL_Type::Form;
 }
 
-bool IFWL_Form::IsInstance(const CFX_WideStringC& wsClass) const {
+bool CFWL_Form::IsInstance(const CFX_WideStringC& wsClass) const {
   if (wsClass == CFX_WideStringC(FWL_CLASS_Form))
     return true;
   return IFWL_Widget::IsInstance(wsClass);
 }
 
-void IFWL_Form::GetWidgetRect(CFX_RectF& rect, bool bAutoSize) {
+void CFWL_Form::GetWidgetRect(CFX_RectF& rect, bool bAutoSize) {
   if (!bAutoSize) {
     rect = m_pProperties->m_rtWidget;
     return;
@@ -94,12 +94,12 @@ void IFWL_Form::GetWidgetRect(CFX_RectF& rect, bool bAutoSize) {
   rect.width += fCXBorder + fCXBorder + fEdge + fEdge;
 }
 
-void IFWL_Form::GetClientRect(CFX_RectF& rect) {
+void CFWL_Form::GetClientRect(CFX_RectF& rect) {
   rect = m_pProperties->m_rtWidget;
   rect.Offset(-rect.left, -rect.top);
 }
 
-void IFWL_Form::Update() {
+void CFWL_Form::Update() {
   if (m_iLock > 0)
     return;
   if (!m_pProperties->m_pThemeProvider)
@@ -108,7 +108,7 @@ void IFWL_Form::Update() {
   Layout();
 }
 
-FWL_WidgetHit IFWL_Form::HitTest(FX_FLOAT fx, FX_FLOAT fy) {
+FWL_WidgetHit CFWL_Form::HitTest(FX_FLOAT fx, FX_FLOAT fy) {
   GetAvailableTheme();
 
   if (m_pCloseBox && m_pCloseBox->m_rtBtn.Contains(fx, fy))
@@ -171,7 +171,7 @@ FWL_WidgetHit IFWL_Form::HitTest(FX_FLOAT fx, FX_FLOAT fy) {
   return FWL_WidgetHit::Client;
 }
 
-void IFWL_Form::DrawWidget(CFX_Graphics* pGraphics, const CFX_Matrix* pMatrix) {
+void CFWL_Form::DrawWidget(CFX_Graphics* pGraphics, const CFX_Matrix* pMatrix) {
   if (!pGraphics)
     return;
   if (!m_pProperties->m_pThemeProvider)
@@ -267,7 +267,7 @@ void IFWL_Form::DrawWidget(CFX_Graphics* pGraphics, const CFX_Matrix* pMatrix) {
 #endif
 }
 
-IFWL_Widget* IFWL_Form::DoModal() {
+IFWL_Widget* CFWL_Form::DoModal() {
   const CFWL_App* pApp = GetOwnerApp();
   if (!pApp)
     return nullptr;
@@ -292,7 +292,7 @@ IFWL_Widget* IFWL_Form::DoModal() {
   return nullptr;
 }
 
-void IFWL_Form::EndDoModal() {
+void CFWL_Form::EndDoModal() {
   if (!m_pNoteLoop)
     return;
 
@@ -317,7 +317,7 @@ void IFWL_Form::EndDoModal() {
 #endif
 }
 
-void IFWL_Form::DrawBackground(CFX_Graphics* pGraphics,
+void CFWL_Form::DrawBackground(CFX_Graphics* pGraphics,
                                IFWL_ThemeProvider* pTheme) {
   CFWL_ThemeBackground param;
   param.m_pWidget = this;
@@ -328,7 +328,7 @@ void IFWL_Form::DrawBackground(CFX_Graphics* pGraphics,
   pTheme->DrawBackground(&param);
 }
 
-void IFWL_Form::RemoveSysButtons() {
+void CFWL_Form::RemoveSysButtons() {
   delete m_pCloseBox;
   m_pCloseBox = nullptr;
   delete m_pMinBox;
@@ -337,7 +337,7 @@ void IFWL_Form::RemoveSysButtons() {
   m_pMaxBox = nullptr;
 }
 
-CFWL_SysBtn* IFWL_Form::GetSysBtnAtPoint(FX_FLOAT fx, FX_FLOAT fy) {
+CFWL_SysBtn* CFWL_Form::GetSysBtnAtPoint(FX_FLOAT fx, FX_FLOAT fy) {
   if (m_pCloseBox && m_pCloseBox->m_rtBtn.Contains(fx, fy))
     return m_pCloseBox;
   if (m_pMaxBox && m_pMaxBox->m_rtBtn.Contains(fx, fy))
@@ -347,7 +347,7 @@ CFWL_SysBtn* IFWL_Form::GetSysBtnAtPoint(FX_FLOAT fx, FX_FLOAT fy) {
   return nullptr;
 }
 
-CFWL_SysBtn* IFWL_Form::GetSysBtnByState(uint32_t dwState) {
+CFWL_SysBtn* CFWL_Form::GetSysBtnByState(uint32_t dwState) {
   if (m_pCloseBox && (m_pCloseBox->m_dwState & dwState))
     return m_pCloseBox;
   if (m_pMaxBox && (m_pMaxBox->m_dwState & dwState))
@@ -357,7 +357,7 @@ CFWL_SysBtn* IFWL_Form::GetSysBtnByState(uint32_t dwState) {
   return nullptr;
 }
 
-CFWL_SysBtn* IFWL_Form::GetSysBtnByIndex(int32_t nIndex) {
+CFWL_SysBtn* CFWL_Form::GetSysBtnByIndex(int32_t nIndex) {
   if (nIndex < 0)
     return nullptr;
 
@@ -371,7 +371,7 @@ CFWL_SysBtn* IFWL_Form::GetSysBtnByIndex(int32_t nIndex) {
   return arrBtn[nIndex];
 }
 
-int32_t IFWL_Form::GetSysBtnIndex(CFWL_SysBtn* pBtn) {
+int32_t CFWL_Form::GetSysBtnIndex(CFWL_SysBtn* pBtn) {
   CFX_ArrayTemplate<CFWL_SysBtn*> arrBtn;
   if (m_pMinBox)
     arrBtn.Add(m_pMinBox);
@@ -382,7 +382,7 @@ int32_t IFWL_Form::GetSysBtnIndex(CFWL_SysBtn* pBtn) {
   return arrBtn.Find(pBtn);
 }
 
-void IFWL_Form::GetEdgeRect(CFX_RectF& rtEdge) {
+void CFWL_Form::GetEdgeRect(CFX_RectF& rtEdge) {
   rtEdge = m_rtRelative;
   if (m_pProperties->m_dwStyles & FWL_WGTSTYLE_Border) {
     FX_FLOAT fCX = GetBorderSize();
@@ -391,7 +391,7 @@ void IFWL_Form::GetEdgeRect(CFX_RectF& rtEdge) {
   }
 }
 
-void IFWL_Form::SetWorkAreaRect() {
+void CFWL_Form::SetWorkAreaRect() {
   m_rtRestore = m_pProperties->m_rtWidget;
   CFWL_WidgetMgr* pWidgetMgr = GetOwnerApp()->GetWidgetMgr();
   if (!pWidgetMgr)
@@ -401,7 +401,7 @@ void IFWL_Form::SetWorkAreaRect() {
   Repaint(&m_rtRelative);
 }
 
-void IFWL_Form::Layout() {
+void CFWL_Form::Layout() {
   GetRelativeRect(m_rtRelative);
 
 #ifndef FWL_UseMacSystemBorder
@@ -409,7 +409,7 @@ void IFWL_Form::Layout() {
 #endif
 }
 
-void IFWL_Form::ResetSysBtn() {
+void CFWL_Form::ResetSysBtn() {
   m_fCXBorder =
       *static_cast<FX_FLOAT*>(GetThemeCapacity(CFWL_WidgetCapacity::CXBorder));
   m_fCYBorder =
@@ -456,7 +456,7 @@ void IFWL_Form::ResetSysBtn() {
   }
 }
 
-void IFWL_Form::RegisterForm() {
+void CFWL_Form::RegisterForm() {
   const CFWL_App* pApp = GetOwnerApp();
   if (!pApp)
     return;
@@ -469,7 +469,7 @@ void IFWL_Form::RegisterForm() {
   pDriver->RegisterForm(this);
 }
 
-void IFWL_Form::UnRegisterForm() {
+void CFWL_Form::UnRegisterForm() {
   const CFWL_App* pApp = GetOwnerApp();
   if (!pApp)
     return;
@@ -482,7 +482,7 @@ void IFWL_Form::UnRegisterForm() {
   pDriver->UnRegisterForm(this);
 }
 
-void IFWL_Form::OnProcessMessage(CFWL_Message* pMessage) {
+void CFWL_Form::OnProcessMessage(CFWL_Message* pMessage) {
 #ifndef FWL_UseMacSystemBorder
   if (!pMessage)
     return;
@@ -517,12 +517,12 @@ void IFWL_Form::OnProcessMessage(CFWL_Message* pMessage) {
 #endif  // FWL_UseMacSystemBorder
 }
 
-void IFWL_Form::OnDrawWidget(CFX_Graphics* pGraphics,
+void CFWL_Form::OnDrawWidget(CFX_Graphics* pGraphics,
                              const CFX_Matrix* pMatrix) {
   DrawWidget(pGraphics, pMatrix);
 }
 
-void IFWL_Form::OnLButtonDown(CFWL_MsgMouse* pMsg) {
+void CFWL_Form::OnLButtonDown(CFWL_MsgMouse* pMsg) {
   SetGrab(true);
   m_bLButtonDown = true;
 
@@ -536,7 +536,7 @@ void IFWL_Form::OnLButtonDown(CFWL_MsgMouse* pMsg) {
   Repaint(&pPressBtn->m_rtBtn);
 }
 
-void IFWL_Form::OnLButtonUp(CFWL_MsgMouse* pMsg) {
+void CFWL_Form::OnLButtonUp(CFWL_MsgMouse* pMsg) {
   SetGrab(false);
   m_bLButtonDown = false;
   CFWL_SysBtn* pPointBtn = GetSysBtnAtPoint(pMsg->m_fx, pMsg->m_fy);
@@ -562,7 +562,7 @@ void IFWL_Form::OnLButtonUp(CFWL_MsgMouse* pMsg) {
   }
 }
 
-void IFWL_Form::OnMouseMove(CFWL_MsgMouse* pMsg) {
+void CFWL_Form::OnMouseMove(CFWL_MsgMouse* pMsg) {
   if (m_bLButtonDown)
     return;
 
@@ -616,7 +616,7 @@ void IFWL_Form::OnMouseMove(CFWL_MsgMouse* pMsg) {
     Repaint(&rtInvalidate);
 }
 
-void IFWL_Form::OnMouseLeave(CFWL_MsgMouse* pMsg) {
+void CFWL_Form::OnMouseLeave(CFWL_MsgMouse* pMsg) {
   CFWL_SysBtn* pHover = GetSysBtnByState(FWL_SYSBUTTONSTATE_Hover);
   if (!pHover)
     return;
@@ -625,7 +625,7 @@ void IFWL_Form::OnMouseLeave(CFWL_MsgMouse* pMsg) {
   Repaint(&pHover->m_rtBtn);
 }
 
-void IFWL_Form::OnLButtonDblClk(CFWL_MsgMouse* pMsg) {
+void CFWL_Form::OnLButtonDblClk(CFWL_MsgMouse* pMsg) {
   if ((m_pProperties->m_dwStyleExes & FWL_STYLEEXT_FRM_Resize) &&
       HitTest(pMsg->m_fx, pMsg->m_fy) == FWL_WidgetHit::Titlebar) {
     if (m_bMaximized)
diff --git a/xfa/fwl/core/ifwl_form.h b/xfa/fwl/core/cfwl_form.h
index 5c4c00dbf3..cb01c5b7a8 100644
--- a/xfa/fwl/core/ifwl_form.h
+++ b/xfa/fwl/core/cfwl_form.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FWL_CORE_IFWL_FORM_H_
-#define XFA_FWL_CORE_IFWL_FORM_H_
+#ifndef XFA_FWL_CORE_CFWL_FORM_H_
+#define XFA_FWL_CORE_CFWL_FORM_H_
 
 #include <memory>
 
@@ -33,12 +33,12 @@ class IFWL_Widget;
 class IFWL_ThemeProvider;
 class CFWL_SysBtn;
 
-class IFWL_Form : public IFWL_Widget {
+class CFWL_Form : public IFWL_Widget {
  public:
-  IFWL_Form(const CFWL_App* app,
+  CFWL_Form(const CFWL_App* app,
             std::unique_ptr<CFWL_WidgetProperties> properties,
             IFWL_Widget* pOuter);
-  ~IFWL_Form() override;
+  ~CFWL_Form() override;
 
   // IFWL_Widget
   FWL_Type GetClassID() const override;
@@ -98,4 +98,4 @@ class IFWL_Form : public IFWL_Widget {
   bool m_bDoModalFlag;
 };
 
-#endif  // XFA_FWL_CORE_IFWL_FORM_H_
+#endif  // XFA_FWL_CORE_CFWL_FORM_H_
diff --git a/xfa/fwl/core/ifwl_formproxy.cpp b/xfa/fwl/core/cfwl_formproxy.cpp
index 521e056c75..ef325c4fdd 100644
--- a/xfa/fwl/core/ifwl_formproxy.cpp
+++ b/xfa/fwl/core/cfwl_formproxy.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fwl/core/ifwl_formproxy.h"
+#include "xfa/fwl/core/cfwl_formproxy.h"
 
 #include <memory>
 #include <utility>
@@ -12,29 +12,29 @@
 #include "third_party/base/ptr_util.h"
 #include "xfa/fwl/core/cfwl_notedriver.h"
 
-IFWL_FormProxy::IFWL_FormProxy(
+CFWL_FormProxy::CFWL_FormProxy(
     const CFWL_App* app,
     std::unique_ptr<CFWL_WidgetProperties> properties,
     IFWL_Widget* pOuter)
-    : IFWL_Form(app, std::move(properties), pOuter) {}
+    : CFWL_Form(app, std::move(properties), pOuter) {}
 
-IFWL_FormProxy::~IFWL_FormProxy() {}
+CFWL_FormProxy::~CFWL_FormProxy() {}
 
-FWL_Type IFWL_FormProxy::GetClassID() const {
+FWL_Type CFWL_FormProxy::GetClassID() const {
   return FWL_Type::FormProxy;
 }
 
-bool IFWL_FormProxy::IsInstance(const CFX_WideStringC& wsClass) const {
+bool CFWL_FormProxy::IsInstance(const CFX_WideStringC& wsClass) const {
   if (wsClass == CFX_WideStringC(FWL_CLASS_FormProxy))
     return true;
-  return IFWL_Form::IsInstance(wsClass);
+  return CFWL_Form::IsInstance(wsClass);
 }
 
-void IFWL_FormProxy::Update() {}
+void CFWL_FormProxy::Update() {}
 
-void IFWL_FormProxy::DrawWidget(CFX_Graphics* pGraphics,
+void CFWL_FormProxy::DrawWidget(CFX_Graphics* pGraphics,
                                 const CFX_Matrix* pMatrix) {}
 
-void IFWL_FormProxy::OnProcessMessage(CFWL_Message* pMessage) {
+void CFWL_FormProxy::OnProcessMessage(CFWL_Message* pMessage) {
   m_pOuter->GetDelegate()->OnProcessMessage(pMessage);
 }
diff --git a/xfa/fwl/core/ifwl_formproxy.h b/xfa/fwl/core/cfwl_formproxy.h
index b3c6a10f28..80e0980d0e 100644
--- a/xfa/fwl/core/ifwl_formproxy.h
+++ b/xfa/fwl/core/cfwl_formproxy.h
@@ -4,21 +4,21 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FWL_CORE_IFWL_FORMPROXY_H_
-#define XFA_FWL_CORE_IFWL_FORMPROXY_H_
+#ifndef XFA_FWL_CORE_CFWL_FORMPROXY_H_
+#define XFA_FWL_CORE_CFWL_FORMPROXY_H_
 
 #include <memory>
 
-#include "xfa/fwl/core/ifwl_form.h"
+#include "xfa/fwl/core/cfwl_form.h"
 
 class CFWL_WidgetProperties;
 
-class IFWL_FormProxy : public IFWL_Form {
+class CFWL_FormProxy : public CFWL_Form {
  public:
-  IFWL_FormProxy(const CFWL_App* app,
+  CFWL_FormProxy(const CFWL_App* app,
                  std::unique_ptr<CFWL_WidgetProperties> properties,
                  IFWL_Widget* pOuter);
-  ~IFWL_FormProxy() override;
+  ~CFWL_FormProxy() override;
 
   // IFWL_Widget
   FWL_Type GetClassID() const override;
@@ -29,4 +29,4 @@ class IFWL_FormProxy : public IFWL_Form {
   void OnProcessMessage(CFWL_Message* pMessage) override;
 };
 
-#endif  // XFA_FWL_CORE_IFWL_FORMPROXY_H_
+#endif  // XFA_FWL_CORE_CFWL_FORMPROXY_H_
diff --git a/xfa/fwl/core/ifwl_monthcalendar.cpp b/xfa/fwl/core/cfwl_monthcalendar.cpp
index aaa15e47ae..4f7cff0322 100644
--- a/xfa/fwl/core/ifwl_monthcalendar.cpp
+++ b/xfa/fwl/core/cfwl_monthcalendar.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fwl/core/ifwl_monthcalendar.h"
+#include "xfa/fwl/core/cfwl_monthcalendar.h"
 
 #include <algorithm>
 #include <memory>
@@ -12,12 +12,12 @@
 
 #include "third_party/base/ptr_util.h"
 #include "xfa/fde/tto/fde_textout.h"
+#include "xfa/fwl/core/cfwl_formproxy.h"
 #include "xfa/fwl/core/cfwl_msgmouse.h"
 #include "xfa/fwl/core/cfwl_notedriver.h"
 #include "xfa/fwl/core/cfwl_themebackground.h"
 #include "xfa/fwl/core/cfwl_themetext.h"
 #include "xfa/fwl/core/ifwl_datetimepicker.h"
-#include "xfa/fwl/core/ifwl_formproxy.h"
 #include "xfa/fwl/core/ifwl_themeprovider.h"
 
 #define MONTHCAL_HSEP_HEIGHT 1
@@ -121,7 +121,7 @@ CFX_WideString* GetCapacityForMonth(IFWL_ThemeProvider* pTheme,
 
 }  // namespace
 
-IFWL_MonthCalendar::IFWL_MonthCalendar(
+CFWL_MonthCalendar::CFWL_MonthCalendar(
     const CFWL_App* app,
     std::unique_ptr<CFWL_WidgetProperties> properties,
     IFWL_Widget* pOuter)
@@ -151,16 +151,16 @@ IFWL_MonthCalendar::IFWL_MonthCalendar(
   m_rtWeekNumSep.Reset();
 }
 
-IFWL_MonthCalendar::~IFWL_MonthCalendar() {
+CFWL_MonthCalendar::~CFWL_MonthCalendar() {
   ClearDateItem();
   m_arrSelDays.RemoveAll();
 }
 
-FWL_Type IFWL_MonthCalendar::GetClassID() const {
+FWL_Type CFWL_MonthCalendar::GetClassID() const {
   return FWL_Type::MonthCalendar;
 }
 
-void IFWL_MonthCalendar::GetWidgetRect(CFX_RectF& rect, bool bAutoSize) {
+void CFWL_MonthCalendar::GetWidgetRect(CFX_RectF& rect, bool bAutoSize) {
   if (!bAutoSize) {
     rect = m_pProperties->m_rtWidget;
     return;
@@ -171,7 +171,7 @@ void IFWL_MonthCalendar::GetWidgetRect(CFX_RectF& rect, bool bAutoSize) {
   IFWL_Widget::GetWidgetRect(rect, true);
 }
 
-void IFWL_MonthCalendar::Update() {
+void CFWL_MonthCalendar::Update() {
   if (IsLocked())
     return;
   if (!m_pProperties->m_pThemeProvider)
@@ -188,7 +188,7 @@ void IFWL_MonthCalendar::Update() {
   Layout();
 }
 
-void IFWL_MonthCalendar::DrawWidget(CFX_Graphics* pGraphics,
+void CFWL_MonthCalendar::DrawWidget(CFX_Graphics* pGraphics,
                                     const CFX_Matrix* pMatrix) {
   if (!pGraphics)
     return;
@@ -219,14 +219,14 @@ void IFWL_MonthCalendar::DrawWidget(CFX_Graphics* pGraphics,
   }
 }
 
-void IFWL_MonthCalendar::SetSelect(int32_t iYear,
+void CFWL_MonthCalendar::SetSelect(int32_t iYear,
                                    int32_t iMonth,
                                    int32_t iDay) {
   ChangeToMonth(iYear, iMonth);
   AddSelDay(iDay);
 }
 
-void IFWL_MonthCalendar::DrawBackground(CFX_Graphics* pGraphics,
+void CFWL_MonthCalendar::DrawBackground(CFX_Graphics* pGraphics,
                                         IFWL_ThemeProvider* pTheme,
                                         const CFX_Matrix* pMatrix) {
   CFWL_ThemeBackground params;
@@ -240,7 +240,7 @@ void IFWL_MonthCalendar::DrawBackground(CFX_Graphics* pGraphics,
   pTheme->DrawBackground(&params);
 }
 
-void IFWL_MonthCalendar::DrawHeadBK(CFX_Graphics* pGraphics,
+void CFWL_MonthCalendar::DrawHeadBK(CFX_Graphics* pGraphics,
                                     IFWL_ThemeProvider* pTheme,
                                     const CFX_Matrix* pMatrix) {
   CFWL_ThemeBackground params;
@@ -254,7 +254,7 @@ void IFWL_MonthCalendar::DrawHeadBK(CFX_Graphics* pGraphics,
   pTheme->DrawBackground(&params);
 }
 
-void IFWL_MonthCalendar::DrawLButton(CFX_Graphics* pGraphics,
+void CFWL_MonthCalendar::DrawLButton(CFX_Graphics* pGraphics,
                                      IFWL_ThemeProvider* pTheme,
                                      const CFX_Matrix* pMatrix) {
   CFWL_ThemeBackground params;
@@ -268,7 +268,7 @@ void IFWL_MonthCalendar::DrawLButton(CFX_Graphics* pGraphics,
   pTheme->DrawBackground(&params);
 }
 
-void IFWL_MonthCalendar::DrawRButton(CFX_Graphics* pGraphics,
+void CFWL_MonthCalendar::DrawRButton(CFX_Graphics* pGraphics,
                                      IFWL_ThemeProvider* pTheme,
                                      const CFX_Matrix* pMatrix) {
   CFWL_ThemeBackground params;
@@ -282,7 +282,7 @@ void IFWL_MonthCalendar::DrawRButton(CFX_Graphics* pGraphics,
   pTheme->DrawBackground(&params);
 }
 
-void IFWL_MonthCalendar::DrawCaption(CFX_Graphics* pGraphics,
+void CFWL_MonthCalendar::DrawCaption(CFX_Graphics* pGraphics,
                                      IFWL_ThemeProvider* pTheme,
                                      const CFX_Matrix* pMatrix) {
   CFWL_ThemeText textParam;
@@ -307,7 +307,7 @@ void IFWL_MonthCalendar::DrawCaption(CFX_Graphics* pGraphics,
   pTheme->DrawText(&textParam);
 }
 
-void IFWL_MonthCalendar::DrawSeperator(CFX_Graphics* pGraphics,
+void CFWL_MonthCalendar::DrawSeperator(CFX_Graphics* pGraphics,
                                        IFWL_ThemeProvider* pTheme,
                                        const CFX_Matrix* pMatrix) {
   CFWL_ThemeBackground params;
@@ -321,7 +321,7 @@ void IFWL_MonthCalendar::DrawSeperator(CFX_Graphics* pGraphics,
   pTheme->DrawBackground(&params);
 }
 
-void IFWL_MonthCalendar::DrawDatesInBK(CFX_Graphics* pGraphics,
+void CFWL_MonthCalendar::DrawDatesInBK(CFX_Graphics* pGraphics,
                                        IFWL_ThemeProvider* pTheme,
                                        const CFX_Matrix* pMatrix) {
   CFWL_ThemeBackground params;
@@ -355,7 +355,7 @@ void IFWL_MonthCalendar::DrawDatesInBK(CFX_Graphics* pGraphics,
   }
 }
 
-void IFWL_MonthCalendar::DrawWeek(CFX_Graphics* pGraphics,
+void CFWL_MonthCalendar::DrawWeek(CFX_Graphics* pGraphics,
                                   IFWL_ThemeProvider* pTheme,
                                   const CFX_Matrix* pMatrix) {
   CFWL_ThemeText params;
@@ -378,7 +378,7 @@ void IFWL_MonthCalendar::DrawWeek(CFX_Graphics* pGraphics,
   }
 }
 
-void IFWL_MonthCalendar::DrawWeekNumber(CFX_Graphics* pGraphics,
+void CFWL_MonthCalendar::DrawWeekNumber(CFX_Graphics* pGraphics,
                                         IFWL_ThemeProvider* pTheme,
                                         const CFX_Matrix* pMatrix) {
   CFWL_ThemeText params;
@@ -409,7 +409,7 @@ void IFWL_MonthCalendar::DrawWeekNumber(CFX_Graphics* pGraphics,
   }
 }
 
-void IFWL_MonthCalendar::DrawWeekNumberSep(CFX_Graphics* pGraphics,
+void CFWL_MonthCalendar::DrawWeekNumberSep(CFX_Graphics* pGraphics,
                                            IFWL_ThemeProvider* pTheme,
                                            const CFX_Matrix* pMatrix) {
   CFWL_ThemeBackground params;
@@ -423,7 +423,7 @@ void IFWL_MonthCalendar::DrawWeekNumberSep(CFX_Graphics* pGraphics,
   pTheme->DrawBackground(&params);
 }
 
-void IFWL_MonthCalendar::DrawToday(CFX_Graphics* pGraphics,
+void CFWL_MonthCalendar::DrawToday(CFX_Graphics* pGraphics,
                                    IFWL_ThemeProvider* pTheme,
                                    const CFX_Matrix* pMatrix) {
   if (m_pProperties->m_dwStyleExes & FWL_STYLEEXT_MCD_NoToday)
@@ -451,7 +451,7 @@ void IFWL_MonthCalendar::DrawToday(CFX_Graphics* pGraphics,
   pTheme->DrawText(&params);
 }
 
-void IFWL_MonthCalendar::DrawDatesIn(CFX_Graphics* pGraphics,
+void CFWL_MonthCalendar::DrawDatesIn(CFX_Graphics* pGraphics,
                                      IFWL_ThemeProvider* pTheme,
                                      const CFX_Matrix* pMatrix) {
   CFWL_ThemeText params;
@@ -476,7 +476,7 @@ void IFWL_MonthCalendar::DrawDatesIn(CFX_Graphics* pGraphics,
   }
 }
 
-void IFWL_MonthCalendar::DrawDatesOut(CFX_Graphics* pGraphics,
+void CFWL_MonthCalendar::DrawDatesOut(CFX_Graphics* pGraphics,
                                       IFWL_ThemeProvider* pTheme,
                                       const CFX_Matrix* pMatrix) {
   CFWL_ThemeText params;
@@ -490,7 +490,7 @@ void IFWL_MonthCalendar::DrawDatesOut(CFX_Graphics* pGraphics,
   pTheme->DrawText(&params);
 }
 
-void IFWL_MonthCalendar::DrawDatesInCircle(CFX_Graphics* pGraphics,
+void CFWL_MonthCalendar::DrawDatesInCircle(CFX_Graphics* pGraphics,
                                            IFWL_ThemeProvider* pTheme,
                                            const CFX_Matrix* pMatrix) {
   if (m_pProperties->m_dwStyleExes & FWL_STYLEEXT_MCD_NoTodayCircle)
@@ -515,7 +515,7 @@ void IFWL_MonthCalendar::DrawDatesInCircle(CFX_Graphics* pGraphics,
   pTheme->DrawBackground(&params);
 }
 
-CFX_SizeF IFWL_MonthCalendar::CalcSize(bool bAutoSize) {
+CFX_SizeF CFWL_MonthCalendar::CalcSize(bool bAutoSize) {
   if (!m_pProperties->m_pThemeProvider)
     return CFX_SizeF();
   if (!bAutoSize) {
@@ -583,7 +583,7 @@ CFX_SizeF IFWL_MonthCalendar::CalcSize(bool bAutoSize) {
   return fs;
 }
 
-void IFWL_MonthCalendar::CalcHeadSize() {
+void CFWL_MonthCalendar::CalcHeadSize() {
   FX_FLOAT fHeadHMargin = (m_rtClient.width - m_szHead.x) / 2;
   FX_FLOAT fHeadVMargin = (m_szCell.x - m_szHead.y) / 2;
   m_rtHeadText.Set(m_rtClient.left + fHeadHMargin,
@@ -592,7 +592,7 @@ void IFWL_MonthCalendar::CalcHeadSize() {
                    m_szHead.x, m_szHead.y);
 }
 
-void IFWL_MonthCalendar::CalcTodaySize() {
+void CFWL_MonthCalendar::CalcTodaySize() {
   m_rtTodayFlag.Set(
       m_rtClient.left + MONTHCAL_HEADER_BTN_HMARGIN + MONTHCAL_HMARGIN,
       m_rtDates.bottom() + MONTHCAL_HEADER_BTN_VMARGIN + MONTHCAL_VMARGIN,
@@ -604,7 +604,7 @@ void IFWL_MonthCalendar::CalcTodaySize() {
       m_szToday.x, m_szToday.y);
 }
 
-void IFWL_MonthCalendar::Layout() {
+void CFWL_MonthCalendar::Layout() {
   GetClientRect(m_rtClient);
 
   m_rtHead.Set(
@@ -635,7 +635,7 @@ void IFWL_MonthCalendar::Layout() {
   CalDateItem();
 }
 
-void IFWL_MonthCalendar::CalDateItem() {
+void CFWL_MonthCalendar::CalDateItem() {
   bool bNewWeek = false;
   int32_t iWeekOfMonth = 0;
   FX_FLOAT fLeft = m_rtDates.left;
@@ -659,7 +659,7 @@ void IFWL_MonthCalendar::CalDateItem() {
   }
 }
 
-void IFWL_MonthCalendar::GetCapValue() {
+void CFWL_MonthCalendar::GetCapValue() {
   if (!m_pProperties->m_pThemeProvider)
     m_pProperties->m_pThemeProvider = GetAvailableTheme();
 
@@ -723,7 +723,7 @@ void IFWL_MonthCalendar::GetCapValue() {
       pTheme->GetCapacity(&part, CFWL_WidgetCapacity::Height));
 }
 
-void IFWL_MonthCalendar::InitDate() {
+void CFWL_MonthCalendar::InitDate() {
   // TODO(dsinclair): These should pull the real today values instead of
   // pretending it's 2011-01-01.
   m_iYear = 2011;
@@ -738,13 +738,13 @@ void IFWL_MonthCalendar::InitDate() {
   m_dtMax = DATE(2200, 1, 1);
 }
 
-void IFWL_MonthCalendar::ClearDateItem() {
+void CFWL_MonthCalendar::ClearDateItem() {
   for (int32_t i = 0; i < m_arrDates.GetSize(); i++)
     delete m_arrDates.GetAt(i);
   m_arrDates.RemoveAll();
 }
 
-void IFWL_MonthCalendar::ResetDateItem() {
+void CFWL_MonthCalendar::ResetDateItem() {
   m_pDateTime->Set(m_iCurYear, m_iCurMonth, 1);
   int32_t iDays = FX_DaysInMonth(m_iCurYear, m_iCurMonth);
   int32_t iDayOfWeek = m_pDateTime->GetDayOfWeek();
@@ -767,7 +767,7 @@ void IFWL_MonthCalendar::ResetDateItem() {
   }
 }
 
-void IFWL_MonthCalendar::NextMonth() {
+void CFWL_MonthCalendar::NextMonth() {
   int32_t iYear = m_iCurYear, iMonth = m_iCurMonth;
   if (iMonth >= 12) {
     iMonth = 1;
@@ -783,7 +783,7 @@ void IFWL_MonthCalendar::NextMonth() {
   ChangeToMonth(m_iCurYear, m_iCurMonth);
 }
 
-void IFWL_MonthCalendar::PrevMonth() {
+void CFWL_MonthCalendar::PrevMonth() {
   int32_t iYear = m_iCurYear, iMonth = m_iCurMonth;
   if (iMonth <= 1) {
     iMonth = 12;
@@ -800,7 +800,7 @@ void IFWL_MonthCalendar::PrevMonth() {
   ChangeToMonth(m_iCurYear, m_iCurMonth);
 }
 
-void IFWL_MonthCalendar::ChangeToMonth(int32_t iYear, int32_t iMonth) {
+void CFWL_MonthCalendar::ChangeToMonth(int32_t iYear, int32_t iMonth) {
   m_iCurYear = iYear;
   m_iCurMonth = iMonth;
   m_iHovered = -1;
@@ -811,7 +811,7 @@ void IFWL_MonthCalendar::ChangeToMonth(int32_t iYear, int32_t iMonth) {
   GetHeadText(m_iCurYear, m_iCurMonth, m_wsHead);
 }
 
-void IFWL_MonthCalendar::RemoveSelDay(int32_t iDay, bool bAll) {
+void CFWL_MonthCalendar::RemoveSelDay(int32_t iDay, bool bAll) {
   if (iDay == -1 && !bAll)
     return;
   if (bAll) {
@@ -841,7 +841,7 @@ void IFWL_MonthCalendar::RemoveSelDay(int32_t iDay, bool bAll) {
   m_arrSelDays.RemoveAt(index);
 }
 
-void IFWL_MonthCalendar::AddSelDay(int32_t iDay) {
+void CFWL_MonthCalendar::AddSelDay(int32_t iDay) {
   ASSERT(iDay > 0);
   if (m_pProperties->m_dwStyleExes & FWL_STYLEEXT_MCD_MultiSelect)
     return;
@@ -857,7 +857,7 @@ void IFWL_MonthCalendar::AddSelDay(int32_t iDay) {
   m_arrSelDays.Add(iDay);
 }
 
-void IFWL_MonthCalendar::JumpToToday() {
+void CFWL_MonthCalendar::JumpToToday() {
   if (m_iYear != m_iCurYear || m_iMonth != m_iCurMonth) {
     m_iCurYear = m_iYear;
     m_iCurMonth = m_iMonth;
@@ -870,7 +870,7 @@ void IFWL_MonthCalendar::JumpToToday() {
     AddSelDay(m_iDay);
 }
 
-void IFWL_MonthCalendar::GetHeadText(int32_t iYear,
+void CFWL_MonthCalendar::GetHeadText(int32_t iYear,
                                      int32_t iMonth,
                                      CFX_WideString& wsHead) {
   ASSERT(iMonth > 0 && iMonth < 13);
@@ -881,14 +881,14 @@ void IFWL_MonthCalendar::GetHeadText(int32_t iYear,
   wsHead.Format(L"%s, %d", pMonth[iMonth - 1], iYear);
 }
 
-void IFWL_MonthCalendar::GetTodayText(int32_t iYear,
+void CFWL_MonthCalendar::GetTodayText(int32_t iYear,
                                       int32_t iMonth,
                                       int32_t iDay,
                                       CFX_WideString& wsToday) {
   wsToday.Format(L", %d/%d/%d", iDay, iMonth, iYear);
 }
 
-int32_t IFWL_MonthCalendar::GetDayAtPoint(FX_FLOAT x, FX_FLOAT y) {
+int32_t CFWL_MonthCalendar::GetDayAtPoint(FX_FLOAT x, FX_FLOAT y) {
   int32_t iCount = m_arrDates.GetSize();
   for (int32_t i = 0; i < iCount; i++) {
     DATEINFO* pDateInfo = m_arrDates.GetAt(i);
@@ -898,7 +898,7 @@ int32_t IFWL_MonthCalendar::GetDayAtPoint(FX_FLOAT x, FX_FLOAT y) {
   return -1;
 }
 
-void IFWL_MonthCalendar::GetDayRect(int32_t iDay, CFX_RectF& rtDay) {
+void CFWL_MonthCalendar::GetDayRect(int32_t iDay, CFX_RectF& rtDay) {
   if (iDay <= 0 || iDay > m_arrDates.GetSize())
     return;
 
@@ -908,7 +908,7 @@ void IFWL_MonthCalendar::GetDayRect(int32_t iDay, CFX_RectF& rtDay) {
   rtDay = pDateInfo->rect;
 }
 
-void IFWL_MonthCalendar::OnProcessMessage(CFWL_Message* pMessage) {
+void CFWL_MonthCalendar::OnProcessMessage(CFWL_Message* pMessage) {
   if (!pMessage)
     return;
 
@@ -946,12 +946,12 @@ void IFWL_MonthCalendar::OnProcessMessage(CFWL_Message* pMessage) {
   IFWL_Widget::OnProcessMessage(pMessage);
 }
 
-void IFWL_MonthCalendar::OnDrawWidget(CFX_Graphics* pGraphics,
+void CFWL_MonthCalendar::OnDrawWidget(CFX_Graphics* pGraphics,
                                       const CFX_Matrix* pMatrix) {
   DrawWidget(pGraphics, pMatrix);
 }
 
-void IFWL_MonthCalendar::OnLButtonDown(CFWL_MsgMouse* pMsg) {
+void CFWL_MonthCalendar::OnLButtonDown(CFWL_MsgMouse* pMsg) {
   if (m_rtLBtn.Contains(pMsg->m_fx, pMsg->m_fy)) {
     m_iLBtnPartStates = CFWL_PartState_Pressed;
     PrevMonth();
@@ -972,7 +972,7 @@ void IFWL_MonthCalendar::OnLButtonDown(CFWL_MsgMouse* pMsg) {
   }
 }
 
-void IFWL_MonthCalendar::OnLButtonUp(CFWL_MsgMouse* pMsg) {
+void CFWL_MonthCalendar::OnLButtonUp(CFWL_MsgMouse* pMsg) {
   if (m_pWidgetMgr->IsFormDisabled())
     return DisForm_OnLButtonUp(pMsg);
 
@@ -1017,7 +1017,7 @@ void IFWL_MonthCalendar::OnLButtonUp(CFWL_MsgMouse* pMsg) {
   m_bFlag = 0;
 }
 
-void IFWL_MonthCalendar::DisForm_OnLButtonUp(CFWL_MsgMouse* pMsg) {
+void CFWL_MonthCalendar::DisForm_OnLButtonUp(CFWL_MsgMouse* pMsg) {
   if (m_rtLBtn.Contains(pMsg->m_fx, pMsg->m_fy)) {
     m_iLBtnPartStates = 0;
     Repaint(&(m_rtLBtn));
@@ -1051,7 +1051,7 @@ void IFWL_MonthCalendar::DisForm_OnLButtonUp(CFWL_MsgMouse* pMsg) {
   }
 }
 
-void IFWL_MonthCalendar::OnMouseMove(CFWL_MsgMouse* pMsg) {
+void CFWL_MonthCalendar::OnMouseMove(CFWL_MsgMouse* pMsg) {
   if (m_pProperties->m_dwStyleExes & FWL_STYLEEXT_MCD_MultiSelect)
     return;
 
@@ -1085,7 +1085,7 @@ void IFWL_MonthCalendar::OnMouseMove(CFWL_MsgMouse* pMsg) {
     Repaint(&rtInvalidate);
 }
 
-void IFWL_MonthCalendar::OnMouseLeave(CFWL_MsgMouse* pMsg) {
+void CFWL_MonthCalendar::OnMouseLeave(CFWL_MsgMouse* pMsg) {
   if (m_iHovered <= 0)
     return;
 
@@ -1097,7 +1097,7 @@ void IFWL_MonthCalendar::OnMouseLeave(CFWL_MsgMouse* pMsg) {
     Repaint(&rtInvalidate);
 }
 
-IFWL_MonthCalendar::DATEINFO::DATEINFO(int32_t day,
+CFWL_MonthCalendar::DATEINFO::DATEINFO(int32_t day,
                                        int32_t dayofweek,
                                        uint32_t dwSt,
                                        CFX_RectF rc,
@@ -1108,4 +1108,4 @@ IFWL_MonthCalendar::DATEINFO::DATEINFO(int32_t day,
       rect(rc),
       wsDay(wsday) {}
 
-IFWL_MonthCalendar::DATEINFO::~DATEINFO() {}
+CFWL_MonthCalendar::DATEINFO::~DATEINFO() {}
diff --git a/xfa/fwl/core/ifwl_monthcalendar.h b/xfa/fwl/core/cfwl_monthcalendar.h
index 758ce5c730..1acdf5c977 100644
--- a/xfa/fwl/core/ifwl_monthcalendar.h
+++ b/xfa/fwl/core/cfwl_monthcalendar.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FWL_CORE_IFWL_MONTHCALENDAR_H_
-#define XFA_FWL_CORE_IFWL_MONTHCALENDAR_H_
+#ifndef XFA_FWL_CORE_CFWL_MONTHCALENDAR_H_
+#define XFA_FWL_CORE_CFWL_MONTHCALENDAR_H_
 
 #include <memory>
 
@@ -26,12 +26,12 @@
 class CFWL_MsgMouse;
 class IFWL_Widget;
 
-class IFWL_MonthCalendar : public IFWL_Widget {
+class CFWL_MonthCalendar : public IFWL_Widget {
  public:
-  IFWL_MonthCalendar(const CFWL_App* app,
+  CFWL_MonthCalendar(const CFWL_App* app,
                      std::unique_ptr<CFWL_WidgetProperties> properties,
                      IFWL_Widget* pOuter);
-  ~IFWL_MonthCalendar() override;
+  ~CFWL_MonthCalendar() override;
 
   // FWL_WidgetImp
   FWL_Type GetClassID() const override;
@@ -225,4 +225,4 @@ class IFWL_MonthCalendar : public IFWL_Widget {
   bool m_bFlag;
 };
 
-#endif  // XFA_FWL_CORE_IFWL_MONTHCALENDAR_H_
+#endif  // XFA_FWL_CORE_CFWL_MONTHCALENDAR_H_
diff --git a/xfa/fwl/core/cfwl_notedriver.cpp b/xfa/fwl/core/cfwl_notedriver.cpp
index f4f325f95a..c12882a47e 100644
--- a/xfa/fwl/core/cfwl_notedriver.cpp
+++ b/xfa/fwl/core/cfwl_notedriver.cpp
@@ -13,6 +13,7 @@
 #include "third_party/base/stl_util.h"
 #include "xfa/fwl/core/cfwl_app.h"
 #include "xfa/fwl/core/cfwl_eventtarget.h"
+#include "xfa/fwl/core/cfwl_form.h"
 #include "xfa/fwl/core/cfwl_msgkey.h"
 #include "xfa/fwl/core/cfwl_msgkillfocus.h"
 #include "xfa/fwl/core/cfwl_msgmouse.h"
@@ -20,7 +21,6 @@
 #include "xfa/fwl/core/cfwl_msgsetfocus.h"
 #include "xfa/fwl/core/cfwl_noteloop.h"
 #include "xfa/fwl/core/cfwl_widgetmgr.h"
-#include "xfa/fwl/core/ifwl_form.h"
 
 CFWL_NoteDriver::CFWL_NoteDriver()
     : m_pHover(nullptr),
@@ -103,7 +103,7 @@ bool CFWL_NoteDriver::SetFocus(IFWL_Widget* pFocus, bool bNotify) {
   if (pFocus) {
     IFWL_Widget* pWidget =
         pFocus->GetOwnerApp()->GetWidgetMgr()->GetSystemFormWidget(pFocus);
-    IFWL_Form* pForm = static_cast<IFWL_Form*>(pWidget);
+    CFWL_Form* pForm = static_cast<CFWL_Form*>(pWidget);
     if (pForm)
       pForm->SetSubFocus(pFocus);
 
@@ -149,7 +149,7 @@ void CFWL_NoteDriver::NotifyTargetDestroy(IFWL_Widget* pNoteTarget) {
   UnregisterEventTarget(pNoteTarget);
 
   for (int32_t nIndex = 0; nIndex < m_forms.GetSize(); nIndex++) {
-    IFWL_Form* pForm = static_cast<IFWL_Form*>(m_forms[nIndex]);
+    CFWL_Form* pForm = static_cast<CFWL_Form*>(m_forms[nIndex]);
     if (!pForm)
       continue;
 
@@ -275,7 +275,7 @@ bool CFWL_NoteDriver::DoSetFocus(CFWL_Message* pMessage,
   if (!pWidget)
     return false;
 
-  IFWL_Form* pForm = static_cast<IFWL_Form*>(pWidget);
+  CFWL_Form* pForm = static_cast<CFWL_Form*>(pWidget);
   IFWL_Widget* pSubFocus = pForm->GetSubFocus();
   if (pSubFocus && ((pSubFocus->GetStates() & FWL_WGTSTATE_Focused) == 0)) {
     pMessage->m_pDstTarget = pSubFocus;
@@ -296,7 +296,7 @@ bool CFWL_NoteDriver::DoKillFocus(CFWL_Message* pMessage,
     return true;
   }
 
-  IFWL_Form* pForm = static_cast<IFWL_Form*>(pMessage->m_pDstTarget);
+  CFWL_Form* pForm = static_cast<CFWL_Form*>(pMessage->m_pDstTarget);
   if (!pForm)
     return false;
 
@@ -450,7 +450,7 @@ bool CFWL_NoteDriver::IsValidMessage(CFWL_Message* pMessage) {
   }
 
   for (int32_t j = 0; j < m_forms.GetSize(); j++) {
-    IFWL_Form* pForm = static_cast<IFWL_Form*>(m_forms[j]);
+    CFWL_Form* pForm = static_cast<CFWL_Form*>(m_forms[j]);
     if (pForm == pMessage->m_pDstTarget)
       return true;
   }
diff --git a/xfa/fwl/core/ifwl_scrollbar.cpp b/xfa/fwl/core/cfwl_scrollbar.cpp
index c1feeb847b..85ab271258 100644
--- a/xfa/fwl/core/ifwl_scrollbar.cpp
+++ b/xfa/fwl/core/cfwl_scrollbar.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fwl/core/ifwl_scrollbar.h"
+#include "xfa/fwl/core/cfwl_scrollbar.h"
 
 #include <algorithm>
 #include <memory>
@@ -22,7 +22,7 @@
 #define FWL_SCROLLBAR_Elapse 500
 #define FWL_SCROLLBAR_MinThumb 5
 
-IFWL_ScrollBar::IFWL_ScrollBar(
+CFWL_ScrollBar::CFWL_ScrollBar(
     const CFWL_App* app,
     std::unique_ptr<CFWL_WidgetProperties> properties,
     IFWL_Widget* pOuter)
@@ -56,13 +56,13 @@ IFWL_ScrollBar::IFWL_ScrollBar(
   m_rtMaxTrack.Reset();
 }
 
-IFWL_ScrollBar::~IFWL_ScrollBar() {}
+CFWL_ScrollBar::~CFWL_ScrollBar() {}
 
-FWL_Type IFWL_ScrollBar::GetClassID() const {
+FWL_Type CFWL_ScrollBar::GetClassID() const {
   return FWL_Type::ScrollBar;
 }
 
-void IFWL_ScrollBar::GetWidgetRect(CFX_RectF& rect, bool bAutoSize) {
+void CFWL_ScrollBar::GetWidgetRect(CFX_RectF& rect, bool bAutoSize) {
   if (!bAutoSize) {
     rect = m_pProperties->m_rtWidget;
     return;
@@ -80,7 +80,7 @@ void IFWL_ScrollBar::GetWidgetRect(CFX_RectF& rect, bool bAutoSize) {
   IFWL_Widget::GetWidgetRect(rect, true);
 }
 
-void IFWL_ScrollBar::Update() {
+void CFWL_ScrollBar::Update() {
   if (IsLocked())
     return;
   if (!m_pProperties->m_pThemeProvider)
@@ -89,7 +89,7 @@ void IFWL_ScrollBar::Update() {
   Layout();
 }
 
-void IFWL_ScrollBar::DrawWidget(CFX_Graphics* pGraphics,
+void CFWL_ScrollBar::DrawWidget(CFX_Graphics* pGraphics,
                                 const CFX_Matrix* pMatrix) {
   if (!pGraphics)
     return;
@@ -108,20 +108,20 @@ void IFWL_ScrollBar::DrawWidget(CFX_Graphics* pGraphics,
   DrawThumb(pGraphics, pTheme, pMatrix);
 }
 
-void IFWL_ScrollBar::SetTrackPos(FX_FLOAT fTrackPos) {
+void CFWL_ScrollBar::SetTrackPos(FX_FLOAT fTrackPos) {
   m_fTrackPos = fTrackPos;
   CalcThumbButtonRect(m_rtThumb);
   CalcMinTrackRect(m_rtMinTrack);
   CalcMaxTrackRect(m_rtMaxTrack);
 }
 
-bool IFWL_ScrollBar::DoScroll(FWL_SCBCODE dwCode, FX_FLOAT fPos) {
+bool CFWL_ScrollBar::DoScroll(FWL_SCBCODE dwCode, FX_FLOAT fPos) {
   if (dwCode == FWL_SCBCODE::None)
     return false;
   return OnScroll(dwCode, fPos);
 }
 
-void IFWL_ScrollBar::DrawTrack(CFX_Graphics* pGraphics,
+void CFWL_ScrollBar::DrawTrack(CFX_Graphics* pGraphics,
                                IFWL_ThemeProvider* pTheme,
                                bool bLower,
                                const CFX_Matrix* pMatrix) {
@@ -137,7 +137,7 @@ void IFWL_ScrollBar::DrawTrack(CFX_Graphics* pGraphics,
   pTheme->DrawBackground(&param);
 }
 
-void IFWL_ScrollBar::DrawArrowBtn(CFX_Graphics* pGraphics,
+void CFWL_ScrollBar::DrawArrowBtn(CFX_Graphics* pGraphics,
                                   IFWL_ThemeProvider* pTheme,
                                   bool bMinBtn,
                                   const CFX_Matrix* pMatrix) {
@@ -154,7 +154,7 @@ void IFWL_ScrollBar::DrawArrowBtn(CFX_Graphics* pGraphics,
     pTheme->DrawBackground(&param);
 }
 
-void IFWL_ScrollBar::DrawThumb(CFX_Graphics* pGraphics,
+void CFWL_ScrollBar::DrawThumb(CFX_Graphics* pGraphics,
                                IFWL_ThemeProvider* pTheme,
                                const CFX_Matrix* pMatrix) {
   CFWL_ThemeBackground param;
@@ -169,7 +169,7 @@ void IFWL_ScrollBar::DrawThumb(CFX_Graphics* pGraphics,
   pTheme->DrawBackground(&param);
 }
 
-void IFWL_ScrollBar::Layout() {
+void CFWL_ScrollBar::Layout() {
   IFWL_ThemeProvider* pTheme = m_pProperties->m_pThemeProvider;
   CFWL_ThemePart part;
   part.m_pWidget = this;
@@ -184,7 +184,7 @@ void IFWL_ScrollBar::Layout() {
   CalcMaxTrackRect(m_rtMaxTrack);
 }
 
-void IFWL_ScrollBar::CalcButtonLen() {
+void CFWL_ScrollBar::CalcButtonLen() {
   m_fButtonLen = IsVertical() ? m_rtClient.width : m_rtClient.height;
   FX_FLOAT fLength = IsVertical() ? m_rtClient.height : m_rtClient.width;
   if (fLength < m_fButtonLen * 2) {
@@ -195,14 +195,14 @@ void IFWL_ScrollBar::CalcButtonLen() {
   }
 }
 
-void IFWL_ScrollBar::CalcMinButtonRect(CFX_RectF& rect) {
+void CFWL_ScrollBar::CalcMinButtonRect(CFX_RectF& rect) {
   rect.left = m_rtClient.left;
   rect.top = m_rtClient.top;
   rect.width = IsVertical() ? m_rtClient.width : m_fButtonLen;
   rect.height = IsVertical() ? m_fButtonLen : m_rtClient.height;
 }
 
-void IFWL_ScrollBar::CalcMaxButtonRect(CFX_RectF& rect) {
+void CFWL_ScrollBar::CalcMaxButtonRect(CFX_RectF& rect) {
   rect.left =
       IsVertical() ? m_rtClient.left : m_rtClient.right() - m_fButtonLen;
   rect.top = IsVertical() ? m_rtClient.bottom() - m_fButtonLen : m_rtClient.top;
@@ -210,7 +210,7 @@ void IFWL_ScrollBar::CalcMaxButtonRect(CFX_RectF& rect) {
   rect.height = IsVertical() ? m_fButtonLen : m_rtClient.height;
 }
 
-void IFWL_ScrollBar::CalcThumbButtonRect(CFX_RectF& rect) {
+void CFWL_ScrollBar::CalcThumbButtonRect(CFX_RectF& rect) {
   if (!IsEnabled()) {
     m_rtThumb.Reset();
     return;
@@ -259,7 +259,7 @@ void IFWL_ScrollBar::CalcThumbButtonRect(CFX_RectF& rect) {
   rect.height = IsVertical() ? fThumbSize : rtClient.height;
 }
 
-void IFWL_ScrollBar::CalcMinTrackRect(CFX_RectF& rect) {
+void CFWL_ScrollBar::CalcMinTrackRect(CFX_RectF& rect) {
   if (m_bMinSize) {
     rect.Empty();
     return;
@@ -276,7 +276,7 @@ void IFWL_ScrollBar::CalcMinTrackRect(CFX_RectF& rect) {
   rect.height = bVertical ? iy : m_rtClient.height;
 }
 
-void IFWL_ScrollBar::CalcMaxTrackRect(CFX_RectF& rect) {
+void CFWL_ScrollBar::CalcMaxTrackRect(CFX_RectF& rect) {
   if (m_bMinSize) {
     rect.Empty();
     return;
@@ -291,7 +291,7 @@ void IFWL_ScrollBar::CalcMaxTrackRect(CFX_RectF& rect) {
   rect.height = bVertical ? m_rtClient.bottom() - iy : m_rtClient.height;
 }
 
-FX_FLOAT IFWL_ScrollBar::GetTrackPointPos(FX_FLOAT fx, FX_FLOAT fy) {
+FX_FLOAT CFWL_ScrollBar::GetTrackPointPos(FX_FLOAT fx, FX_FLOAT fy) {
   FX_FLOAT fDiffX = fx - m_cpTrackPointX;
   FX_FLOAT fDiffY = fy - m_cpTrackPointY;
   FX_FLOAT fRange = m_fRangeMax - m_fRangeMin;
@@ -309,7 +309,7 @@ FX_FLOAT IFWL_ScrollBar::GetTrackPointPos(FX_FLOAT fx, FX_FLOAT fy) {
   return std::min(std::max(fPos, m_fRangeMin), m_fRangeMax);
 }
 
-void IFWL_ScrollBar::GetTrackRect(CFX_RectF& rect, bool bLower) {
+void CFWL_ScrollBar::GetTrackRect(CFX_RectF& rect, bool bLower) {
   bool bDisabled = !!(m_pProperties->m_dwStates & FWL_WGTSTATE_Disabled);
   if (bDisabled) {
     rect = bLower ? m_rtMinTrack : m_rtMaxTrack;
@@ -349,7 +349,7 @@ void IFWL_ScrollBar::GetTrackRect(CFX_RectF& rect, bool bLower) {
            m_rtMaxTrack.height);
 }
 
-bool IFWL_ScrollBar::SendEvent() {
+bool CFWL_ScrollBar::SendEvent() {
   if (m_iMinButtonState == CFWL_PartState_Pressed) {
     DoScroll(FWL_SCBCODE::StepBackward, m_fTrackPos);
     return false;
@@ -374,7 +374,7 @@ bool IFWL_ScrollBar::SendEvent() {
   return true;
 }
 
-bool IFWL_ScrollBar::OnScroll(FWL_SCBCODE dwCode, FX_FLOAT fPos) {
+bool CFWL_ScrollBar::OnScroll(FWL_SCBCODE dwCode, FX_FLOAT fPos) {
   bool bRet = true;
   CFWL_EvtScroll ev;
   ev.m_iScrollCode = dwCode;
@@ -385,7 +385,7 @@ bool IFWL_ScrollBar::OnScroll(FWL_SCBCODE dwCode, FX_FLOAT fPos) {
   return bRet;
 }
 
-void IFWL_ScrollBar::OnProcessMessage(CFWL_Message* pMessage) {
+void CFWL_ScrollBar::OnProcessMessage(CFWL_Message* pMessage) {
   if (!pMessage)
     return;
 
@@ -415,12 +415,12 @@ void IFWL_ScrollBar::OnProcessMessage(CFWL_Message* pMessage) {
   }
 }
 
-void IFWL_ScrollBar::OnDrawWidget(CFX_Graphics* pGraphics,
+void CFWL_ScrollBar::OnDrawWidget(CFX_Graphics* pGraphics,
                                   const CFX_Matrix* pMatrix) {
   DrawWidget(pGraphics, pMatrix);
 }
 
-void IFWL_ScrollBar::OnLButtonDown(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy) {
+void CFWL_ScrollBar::OnLButtonDown(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy) {
   if (!IsEnabled())
     return;
 
@@ -444,7 +444,7 @@ void IFWL_ScrollBar::OnLButtonDown(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy) {
     m_pTimerInfo = m_Timer.StartTimer(FWL_SCROLLBAR_Elapse, true);
 }
 
-void IFWL_ScrollBar::OnLButtonUp(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy) {
+void CFWL_ScrollBar::OnLButtonUp(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy) {
   m_pTimerInfo->StopTimer();
   m_bMouseDown = false;
   DoMouseUp(0, m_rtMinBtn, m_iMinButtonState, fx, fy);
@@ -455,7 +455,7 @@ void IFWL_ScrollBar::OnLButtonUp(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy) {
   SetGrab(false);
 }
 
-void IFWL_ScrollBar::OnMouseMove(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy) {
+void CFWL_ScrollBar::OnMouseMove(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy) {
   DoMouseMove(0, m_rtMinBtn, m_iMinButtonState, fx, fy);
   DoMouseMove(1, m_rtThumb, m_iThumbButtonState, fx, fy);
   DoMouseMove(2, m_rtMaxBtn, m_iMaxButtonState, fx, fy);
@@ -463,7 +463,7 @@ void IFWL_ScrollBar::OnMouseMove(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy) {
   DoMouseMove(4, m_rtMaxTrack, m_iMaxTrackState, fx, fy);
 }
 
-void IFWL_ScrollBar::OnMouseLeave() {
+void CFWL_ScrollBar::OnMouseLeave() {
   DoMouseLeave(0, m_rtMinBtn, m_iMinButtonState);
   DoMouseLeave(1, m_rtThumb, m_iThumbButtonState);
   DoMouseLeave(2, m_rtMaxBtn, m_iMaxButtonState);
@@ -471,7 +471,7 @@ void IFWL_ScrollBar::OnMouseLeave() {
   DoMouseLeave(4, m_rtMaxTrack, m_iMaxTrackState);
 }
 
-void IFWL_ScrollBar::OnMouseWheel(FX_FLOAT fx,
+void CFWL_ScrollBar::OnMouseWheel(FX_FLOAT fx,
                                   FX_FLOAT fy,
                                   uint32_t dwFlags,
                                   FX_FLOAT fDeltaX,
@@ -481,7 +481,7 @@ void IFWL_ScrollBar::OnMouseWheel(FX_FLOAT fx,
   m_iMouseWheel = 0;
 }
 
-void IFWL_ScrollBar::DoMouseDown(int32_t iItem,
+void CFWL_ScrollBar::DoMouseDown(int32_t iItem,
                                  const CFX_RectF& rtItem,
                                  int32_t& iState,
                                  FX_FLOAT fx,
@@ -495,7 +495,7 @@ void IFWL_ScrollBar::DoMouseDown(int32_t iItem,
   Repaint(&rtItem);
 }
 
-void IFWL_ScrollBar::DoMouseUp(int32_t iItem,
+void CFWL_ScrollBar::DoMouseUp(int32_t iItem,
                                const CFX_RectF& rtItem,
                                int32_t& iState,
                                FX_FLOAT fx,
@@ -510,7 +510,7 @@ void IFWL_ScrollBar::DoMouseUp(int32_t iItem,
   OnScroll(FWL_SCBCODE::EndScroll, m_fTrackPos);
 }
 
-void IFWL_ScrollBar::DoMouseMove(int32_t iItem,
+void CFWL_ScrollBar::DoMouseMove(int32_t iItem,
                                  const CFX_RectF& rtItem,
                                  int32_t& iState,
                                  FX_FLOAT fx,
@@ -530,7 +530,7 @@ void IFWL_ScrollBar::DoMouseMove(int32_t iItem,
   }
 }
 
-void IFWL_ScrollBar::DoMouseLeave(int32_t iItem,
+void CFWL_ScrollBar::DoMouseLeave(int32_t iItem,
                                   const CFX_RectF& rtItem,
                                   int32_t& iState) {
   if (iState == CFWL_PartState_Normal)
@@ -540,7 +540,7 @@ void IFWL_ScrollBar::DoMouseLeave(int32_t iItem,
   Repaint(&rtItem);
 }
 
-void IFWL_ScrollBar::DoMouseHover(int32_t iItem,
+void CFWL_ScrollBar::DoMouseHover(int32_t iItem,
                                   const CFX_RectF& rtItem,
                                   int32_t& iState) {
   if (iState == CFWL_PartState_Hovered)
@@ -550,10 +550,10 @@ void IFWL_ScrollBar::DoMouseHover(int32_t iItem,
   Repaint(&rtItem);
 }
 
-IFWL_ScrollBar::Timer::Timer(IFWL_ScrollBar* pToolTip) : CFWL_Timer(pToolTip) {}
+CFWL_ScrollBar::Timer::Timer(CFWL_ScrollBar* pToolTip) : CFWL_Timer(pToolTip) {}
 
-void IFWL_ScrollBar::Timer::Run(CFWL_TimerInfo* pTimerInfo) {
-  IFWL_ScrollBar* pButton = static_cast<IFWL_ScrollBar*>(m_pWidget);
+void CFWL_ScrollBar::Timer::Run(CFWL_TimerInfo* pTimerInfo) {
+  CFWL_ScrollBar* pButton = static_cast<CFWL_ScrollBar*>(m_pWidget);
 
   if (pButton->m_pTimerInfo)
     pButton->m_pTimerInfo->StopTimer();
diff --git a/xfa/fwl/core/ifwl_scrollbar.h b/xfa/fwl/core/cfwl_scrollbar.h
index a5619b79a4..69f362d531 100644
--- a/xfa/fwl/core/ifwl_scrollbar.h
+++ b/xfa/fwl/core/cfwl_scrollbar.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FWL_CORE_IFWL_SCROLLBAR_H_
-#define XFA_FWL_CORE_IFWL_SCROLLBAR_H_
+#ifndef XFA_FWL_CORE_CFWL_SCROLLBAR_H_
+#define XFA_FWL_CORE_CFWL_SCROLLBAR_H_
 
 #include <memory>
 
@@ -20,12 +20,12 @@ class IFWL_Widget;
 #define FWL_STYLEEXT_SCB_Horz (0L << 0)
 #define FWL_STYLEEXT_SCB_Vert (1L << 0)
 
-class IFWL_ScrollBar : public IFWL_Widget {
+class CFWL_ScrollBar : public IFWL_Widget {
  public:
-  IFWL_ScrollBar(const CFWL_App* app,
+  CFWL_ScrollBar(const CFWL_App* app,
                  std::unique_ptr<CFWL_WidgetProperties> properties,
                  IFWL_Widget* pOuter);
-  ~IFWL_ScrollBar() override;
+  ~CFWL_ScrollBar() override;
 
   // IFWL_Widget
   FWL_Type GetClassID() const override;
@@ -58,12 +58,12 @@ class IFWL_ScrollBar : public IFWL_Widget {
  private:
   class Timer : public CFWL_Timer {
    public:
-    explicit Timer(IFWL_ScrollBar* pToolTip);
+    explicit Timer(CFWL_ScrollBar* pToolTip);
     ~Timer() override {}
 
     void Run(CFWL_TimerInfo* pTimerInfo) override;
   };
-  friend class IFWL_ScrollBar::Timer;
+  friend class CFWL_ScrollBar::Timer;
 
   bool IsVertical() const {
     return !!(m_pProperties->m_dwStyleExes & FWL_STYLEEXT_SCB_Vert);
@@ -144,7 +144,7 @@ class IFWL_ScrollBar : public IFWL_Widget {
   CFX_RectF m_rtMinTrack;
   CFX_RectF m_rtMaxTrack;
   FX_FLOAT m_fMinThumb;
-  IFWL_ScrollBar::Timer m_Timer;
+  CFWL_ScrollBar::Timer m_Timer;
 };
 
-#endif  // XFA_FWL_CORE_IFWL_SCROLLBAR_H_
+#endif  // XFA_FWL_CORE_CFWL_SCROLLBAR_H_
diff --git a/xfa/fwl/core/ifwl_spinbutton.cpp b/xfa/fwl/core/cfwl_spinbutton.cpp
index d4b790afe9..2afbc8297c 100644
--- a/xfa/fwl/core/ifwl_spinbutton.cpp
+++ b/xfa/fwl/core/cfwl_spinbutton.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fwl/core/ifwl_spinbutton.h"
+#include "xfa/fwl/core/cfwl_spinbutton.h"
 
 #include <memory>
 #include <utility>
@@ -27,7 +27,7 @@ const int kElapseTime = 200;
 
 }  // namespace
 
-IFWL_SpinButton::IFWL_SpinButton(
+CFWL_SpinButton::CFWL_SpinButton(
     const CFWL_App* app,
     std::unique_ptr<CFWL_WidgetProperties> properties)
     : IFWL_Widget(app, std::move(properties), nullptr),
@@ -43,13 +43,13 @@ IFWL_SpinButton::IFWL_SpinButton(
   m_pProperties->m_dwStyleExes |= FWL_STYLEEXE_SPB_Vert;
 }
 
-IFWL_SpinButton::~IFWL_SpinButton() {}
+CFWL_SpinButton::~CFWL_SpinButton() {}
 
-FWL_Type IFWL_SpinButton::GetClassID() const {
+FWL_Type CFWL_SpinButton::GetClassID() const {
   return FWL_Type::SpinButton;
 }
 
-void IFWL_SpinButton::GetWidgetRect(CFX_RectF& rect, bool bAutoSize) {
+void CFWL_SpinButton::GetWidgetRect(CFX_RectF& rect, bool bAutoSize) {
   if (!bAutoSize) {
     rect = m_pProperties->m_rtWidget;
     return;
@@ -59,7 +59,7 @@ void IFWL_SpinButton::GetWidgetRect(CFX_RectF& rect, bool bAutoSize) {
   IFWL_Widget::GetWidgetRect(rect, true);
 }
 
-void IFWL_SpinButton::Update() {
+void CFWL_SpinButton::Update() {
   if (IsLocked())
     return;
 
@@ -77,7 +77,7 @@ void IFWL_SpinButton::Update() {
   }
 }
 
-FWL_WidgetHit IFWL_SpinButton::HitTest(FX_FLOAT fx, FX_FLOAT fy) {
+FWL_WidgetHit CFWL_SpinButton::HitTest(FX_FLOAT fx, FX_FLOAT fy) {
   if (m_rtClient.Contains(fx, fy))
     return FWL_WidgetHit::Client;
   if (HasBorder() && (m_rtClient.Contains(fx, fy)))
@@ -95,7 +95,7 @@ FWL_WidgetHit IFWL_SpinButton::HitTest(FX_FLOAT fx, FX_FLOAT fy) {
   return FWL_WidgetHit::Unknown;
 }
 
-void IFWL_SpinButton::DrawWidget(CFX_Graphics* pGraphics,
+void CFWL_SpinButton::DrawWidget(CFX_Graphics* pGraphics,
                                  const CFX_Matrix* pMatrix) {
   if (!pGraphics)
     return;
@@ -114,20 +114,20 @@ void IFWL_SpinButton::DrawWidget(CFX_Graphics* pGraphics,
   DrawDownButton(pGraphics, pTheme, pMatrix);
 }
 
-void IFWL_SpinButton::EnableButton(bool bEnable, bool bUp) {
+void CFWL_SpinButton::EnableButton(bool bEnable, bool bUp) {
   if (bUp)
     m_dwUpState = bEnable ? CFWL_PartState_Normal : CFWL_PartState_Disabled;
   else
     m_dwDnState = bEnable ? CFWL_PartState_Normal : CFWL_PartState_Disabled;
 }
 
-bool IFWL_SpinButton::IsButtonEnabled(bool bUp) {
+bool CFWL_SpinButton::IsButtonEnabled(bool bUp) {
   if (bUp)
     return (m_dwUpState != CFWL_PartState_Disabled);
   return (m_dwDnState != CFWL_PartState_Disabled);
 }
 
-void IFWL_SpinButton::DrawUpButton(CFX_Graphics* pGraphics,
+void CFWL_SpinButton::DrawUpButton(CFX_Graphics* pGraphics,
                                    IFWL_ThemeProvider* pTheme,
                                    const CFX_Matrix* pMatrix) {
   CFWL_ThemeBackground params;
@@ -142,7 +142,7 @@ void IFWL_SpinButton::DrawUpButton(CFX_Graphics* pGraphics,
   pTheme->DrawBackground(&params);
 }
 
-void IFWL_SpinButton::DrawDownButton(CFX_Graphics* pGraphics,
+void CFWL_SpinButton::DrawDownButton(CFX_Graphics* pGraphics,
                                      IFWL_ThemeProvider* pTheme,
                                      const CFX_Matrix* pMatrix) {
   CFWL_ThemeBackground params;
@@ -157,7 +157,7 @@ void IFWL_SpinButton::DrawDownButton(CFX_Graphics* pGraphics,
   pTheme->DrawBackground(&params);
 }
 
-void IFWL_SpinButton::OnProcessMessage(CFWL_Message* pMessage) {
+void CFWL_SpinButton::OnProcessMessage(CFWL_Message* pMessage) {
   if (!pMessage)
     return;
 
@@ -203,12 +203,12 @@ void IFWL_SpinButton::OnProcessMessage(CFWL_Message* pMessage) {
   IFWL_Widget::OnProcessMessage(pMessage);
 }
 
-void IFWL_SpinButton::OnDrawWidget(CFX_Graphics* pGraphics,
+void CFWL_SpinButton::OnDrawWidget(CFX_Graphics* pGraphics,
                                    const CFX_Matrix* pMatrix) {
   DrawWidget(pGraphics, pMatrix);
 }
 
-void IFWL_SpinButton::OnFocusChanged(CFWL_Message* pMsg, bool bSet) {
+void CFWL_SpinButton::OnFocusChanged(CFWL_Message* pMsg, bool bSet) {
   if (bSet)
     m_pProperties->m_dwStates |= (FWL_WGTSTATE_Focused);
   else
@@ -217,7 +217,7 @@ void IFWL_SpinButton::OnFocusChanged(CFWL_Message* pMsg, bool bSet) {
   Repaint(&m_rtClient);
 }
 
-void IFWL_SpinButton::OnLButtonDown(CFWL_MsgMouse* pMsg) {
+void CFWL_SpinButton::OnLButtonDown(CFWL_MsgMouse* pMsg) {
   m_bLButtonDwn = true;
   SetGrab(true);
   SetFocus(true);
@@ -245,7 +245,7 @@ void IFWL_SpinButton::OnLButtonDown(CFWL_MsgMouse* pMsg) {
   m_pTimerInfo = m_Timer.StartTimer(kElapseTime, true);
 }
 
-void IFWL_SpinButton::OnLButtonUp(CFWL_MsgMouse* pMsg) {
+void CFWL_SpinButton::OnLButtonUp(CFWL_MsgMouse* pMsg) {
   if (m_pProperties->m_dwStates & CFWL_PartState_Disabled)
     return;
 
@@ -271,7 +271,7 @@ void IFWL_SpinButton::OnLButtonUp(CFWL_MsgMouse* pMsg) {
     Repaint(&rtInvalidate);
 }
 
-void IFWL_SpinButton::OnMouseMove(CFWL_MsgMouse* pMsg) {
+void CFWL_SpinButton::OnMouseMove(CFWL_MsgMouse* pMsg) {
   if (m_bLButtonDwn)
     return;
 
@@ -335,7 +335,7 @@ void IFWL_SpinButton::OnMouseMove(CFWL_MsgMouse* pMsg) {
     Repaint(&rtInvlidate);
 }
 
-void IFWL_SpinButton::OnMouseLeave(CFWL_MsgMouse* pMsg) {
+void CFWL_SpinButton::OnMouseLeave(CFWL_MsgMouse* pMsg) {
   if (!pMsg)
     return;
   if (m_dwUpState != CFWL_PartState_Normal && IsButtonEnabled(true))
@@ -346,7 +346,7 @@ void IFWL_SpinButton::OnMouseLeave(CFWL_MsgMouse* pMsg) {
   Repaint(&m_rtClient);
 }
 
-void IFWL_SpinButton::OnKeyDown(CFWL_MsgKey* pMsg) {
+void CFWL_SpinButton::OnKeyDown(CFWL_MsgKey* pMsg) {
   bool bUp =
       pMsg->m_dwKeyCode == FWL_VKEY_Up || pMsg->m_dwKeyCode == FWL_VKEY_Left;
   bool bDown =
@@ -366,11 +366,11 @@ void IFWL_SpinButton::OnKeyDown(CFWL_MsgKey* pMsg) {
   Repaint(bUpEnable ? &m_rtUpButton : &m_rtDnButton);
 }
 
-IFWL_SpinButton::Timer::Timer(IFWL_SpinButton* pToolTip)
+CFWL_SpinButton::Timer::Timer(CFWL_SpinButton* pToolTip)
     : CFWL_Timer(pToolTip) {}
 
-void IFWL_SpinButton::Timer::Run(CFWL_TimerInfo* pTimerInfo) {
-  IFWL_SpinButton* pButton = static_cast<IFWL_SpinButton*>(m_pWidget);
+void CFWL_SpinButton::Timer::Run(CFWL_TimerInfo* pTimerInfo) {
+  CFWL_SpinButton* pButton = static_cast<CFWL_SpinButton*>(m_pWidget);
 
   if (!pButton->m_pTimerInfo)
     return;
diff --git a/xfa/fwl/core/ifwl_spinbutton.h b/xfa/fwl/core/cfwl_spinbutton.h
index ab888b1b0c..87cf16727c 100644
--- a/xfa/fwl/core/ifwl_spinbutton.h
+++ b/xfa/fwl/core/cfwl_spinbutton.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FWL_CORE_IFWL_SPINBUTTON_H_
-#define XFA_FWL_CORE_IFWL_SPINBUTTON_H_
+#ifndef XFA_FWL_CORE_CFWL_SPINBUTTON_H_
+#define XFA_FWL_CORE_CFWL_SPINBUTTON_H_
 
 #include <memory>
 
@@ -19,11 +19,11 @@
 class CFWL_MsgMouse;
 class CFWL_WidgetProperties;
 
-class IFWL_SpinButton : public IFWL_Widget {
+class CFWL_SpinButton : public IFWL_Widget {
  public:
-  IFWL_SpinButton(const CFWL_App* app,
+  CFWL_SpinButton(const CFWL_App* app,
                   std::unique_ptr<CFWL_WidgetProperties> properties);
-  ~IFWL_SpinButton() override;
+  ~CFWL_SpinButton() override;
 
   // IFWL_Widget
   FWL_Type GetClassID() const override;
@@ -40,12 +40,12 @@ class IFWL_SpinButton : public IFWL_Widget {
  private:
   class Timer : public CFWL_Timer {
    public:
-    explicit Timer(IFWL_SpinButton* pToolTip);
+    explicit Timer(CFWL_SpinButton* pToolTip);
     ~Timer() override {}
 
     void Run(CFWL_TimerInfo* pTimerInfo) override;
   };
-  friend class IFWL_SpinButton::Timer;
+  friend class CFWL_SpinButton::Timer;
 
   void EnableButton(bool bEnable, bool bUp = true);
   bool IsButtonEnabled(bool bUp = true);
@@ -70,7 +70,7 @@ class IFWL_SpinButton : public IFWL_Widget {
   int32_t m_iButtonIndex;
   bool m_bLButtonDwn;
   CFWL_TimerInfo* m_pTimerInfo;
-  IFWL_SpinButton::Timer m_Timer;
+  CFWL_SpinButton::Timer m_Timer;
 };
 
-#endif  // XFA_FWL_CORE_IFWL_SPINBUTTON_H_
+#endif  // XFA_FWL_CORE_CFWL_SPINBUTTON_H_
diff --git a/xfa/fwl/core/cfwl_widgetmgr.cpp b/xfa/fwl/core/cfwl_widgetmgr.cpp
index 3d5beb4b6b..8a658b5e6e 100644
--- a/xfa/fwl/core/cfwl_widgetmgr.cpp
+++ b/xfa/fwl/core/cfwl_widgetmgr.cpp
@@ -10,8 +10,8 @@
 
 #include "third_party/base/ptr_util.h"
 #include "xfa/fwl/core/cfwl_app.h"
+#include "xfa/fwl/core/cfwl_form.h"
 #include "xfa/fwl/core/cfwl_notedriver.h"
-#include "xfa/fwl/core/ifwl_form.h"
 #include "xfa/fxfa/app/xfa_fwladapter.h"
 #include "xfa/fxfa/xfa_ffapp.h"
 
diff --git a/xfa/fwl/core/ifwl_barcode.h b/xfa/fwl/core/ifwl_barcode.h
index 7c6f346708..38f798fe16 100644
--- a/xfa/fwl/core/ifwl_barcode.h
+++ b/xfa/fwl/core/ifwl_barcode.h
@@ -9,8 +9,8 @@
 
 #include <memory>
 
+#include "xfa/fwl/core/cfwl_scrollbar.h"
 #include "xfa/fwl/core/ifwl_edit.h"
-#include "xfa/fwl/core/ifwl_scrollbar.h"
 #include "xfa/fwl/core/ifwl_widget.h"
 #include "xfa/fxbarcode/BC_Library.h"
 
diff --git a/xfa/fwl/core/ifwl_combobox.cpp b/xfa/fwl/core/ifwl_combobox.cpp
index 7917b4eabf..07fa64c43a 100644
--- a/xfa/fwl/core/ifwl_combobox.cpp
+++ b/xfa/fwl/core/ifwl_combobox.cpp
@@ -19,6 +19,7 @@
 #include "xfa/fwl/core/cfwl_evtpredropdown.h"
 #include "xfa/fwl/core/cfwl_evtselectchanged.h"
 #include "xfa/fwl/core/cfwl_evttextchanged.h"
+#include "xfa/fwl/core/cfwl_formproxy.h"
 #include "xfa/fwl/core/cfwl_msgkey.h"
 #include "xfa/fwl/core/cfwl_msgkillfocus.h"
 #include "xfa/fwl/core/cfwl_msgmouse.h"
@@ -28,7 +29,6 @@
 #include "xfa/fwl/core/cfwl_themepart.h"
 #include "xfa/fwl/core/cfwl_themetext.h"
 #include "xfa/fwl/core/cfwl_widgetmgr.h"
-#include "xfa/fwl/core/ifwl_formproxy.h"
 #include "xfa/fwl/core/ifwl_listbox.h"
 #include "xfa/fwl/core/ifwl_themeprovider.h"
 
@@ -56,10 +56,10 @@ IFWL_ComboBox::IFWL_ComboBox(const CFWL_App* app,
   if (m_pProperties->m_dwStyleExes & FWL_STYLEEXT_CMB_ListItemIconText)
     prop->m_dwStyleExes |= FWL_STYLEEXT_LTB_Icon;
   m_pListBox =
-      pdfium::MakeUnique<IFWL_ComboList>(m_pOwnerApp, std::move(prop), this);
+      pdfium::MakeUnique<CFWL_ComboList>(m_pOwnerApp, std::move(prop), this);
 
   if ((m_pProperties->m_dwStyleExes & FWL_STYLEEXT_CMB_DropDown) && !m_pEdit) {
-    m_pEdit.reset(new IFWL_ComboEdit(
+    m_pEdit.reset(new CFWL_ComboEdit(
         m_pOwnerApp, pdfium::MakeUnique<CFWL_WidgetProperties>(), this));
     m_pEdit->SetOuter(this);
   }
@@ -122,7 +122,7 @@ void IFWL_ComboBox::ModifyStylesEx(uint32_t dwStylesExAdded,
   bool bAddDropDown = !!(dwStylesExAdded & FWL_STYLEEXT_CMB_DropDown);
   bool bRemoveDropDown = !!(dwStylesExRemoved & FWL_STYLEEXT_CMB_DropDown);
   if (bAddDropDown && !m_pEdit) {
-    m_pEdit = pdfium::MakeUnique<IFWL_ComboEdit>(
+    m_pEdit = pdfium::MakeUnique<CFWL_ComboEdit>(
         m_pOwnerApp, pdfium::MakeUnique<CFWL_WidgetProperties>(), nullptr);
     m_pEdit->SetOuter(this);
     m_pEdit->SetParent(this);
@@ -581,7 +581,7 @@ void IFWL_ComboBox::InitProxyForm() {
 
   // TODO(dsinclair): Does this leak? I don't see a delete, but I'm not sure
   // if the SetParent call is going to transfer ownership.
-  m_pComboBoxProxy = new IFWL_ComboBoxProxy(this, m_pOwnerApp, std::move(prop),
+  m_pComboBoxProxy = new CFWL_ComboBoxProxy(this, m_pOwnerApp, std::move(prop),
                                             m_pListBox.get());
   m_pListBox->SetParent(m_pComboBoxProxy);
 }
@@ -596,7 +596,7 @@ void IFWL_ComboBox::DisForm_InitComboList() {
   prop->m_dwStates = FWL_WGTSTATE_Invisible;
   prop->m_pThemeProvider = m_pProperties->m_pThemeProvider;
   m_pListBox =
-      pdfium::MakeUnique<IFWL_ComboList>(m_pOwnerApp, std::move(prop), this);
+      pdfium::MakeUnique<CFWL_ComboList>(m_pOwnerApp, std::move(prop), this);
 }
 
 void IFWL_ComboBox::DisForm_InitComboEdit() {
@@ -608,7 +608,7 @@ void IFWL_ComboBox::DisForm_InitComboEdit() {
   prop->m_pThemeProvider = m_pProperties->m_pThemeProvider;
 
   m_pEdit =
-      pdfium::MakeUnique<IFWL_ComboEdit>(m_pOwnerApp, std::move(prop), this);
+      pdfium::MakeUnique<CFWL_ComboEdit>(m_pOwnerApp, std::move(prop), this);
   m_pEdit->SetOuter(this);
 }
 
@@ -621,7 +621,7 @@ void IFWL_ComboBox::DisForm_ShowDropList(bool bActivate) {
     preEvent.m_pSrcTarget = this;
     DispatchEvent(&preEvent);
 
-    IFWL_ComboList* pComboList = m_pListBox.get();
+    CFWL_ComboList* pComboList = m_pListBox.get();
     int32_t iItems = pComboList->CountItems(nullptr);
     if (iItems < 1)
       return;
@@ -1093,7 +1093,7 @@ void IFWL_ComboBox::DisForm_OnKey(CFWL_MsgKey* pMsg) {
   const bool bUp = dwKeyCode == FWL_VKEY_Up;
   const bool bDown = dwKeyCode == FWL_VKEY_Down;
   if (bUp || bDown) {
-    IFWL_ComboList* pComboList = m_pListBox.get();
+    CFWL_ComboList* pComboList = m_pListBox.get();
     int32_t iCount = pComboList->CountItems(nullptr);
     if (iCount < 1)
       return;
diff --git a/xfa/fwl/core/ifwl_combobox.h b/xfa/fwl/core/ifwl_combobox.h
index dfe9d646cd..26d0c0f1b8 100644
--- a/xfa/fwl/core/ifwl_combobox.h
+++ b/xfa/fwl/core/ifwl_combobox.h
@@ -9,17 +9,17 @@
 
 #include <memory>
 
-#include "xfa/fwl/core/ifwl_comboboxproxy.h"
-#include "xfa/fwl/core/ifwl_comboedit.h"
-#include "xfa/fwl/core/ifwl_combolist.h"
-#include "xfa/fwl/core/ifwl_form.h"
+#include "xfa/fwl/core/cfwl_comboboxproxy.h"
+#include "xfa/fwl/core/cfwl_comboedit.h"
+#include "xfa/fwl/core/cfwl_combolist.h"
+#include "xfa/fwl/core/cfwl_form.h"
 #include "xfa/fwl/core/ifwl_listbox.h"
 #include "xfa/fxgraphics/cfx_graphics.h"
 
 class CFWL_WidgetProperties;
 class IFWL_ComboBox;
-class IFWL_ComboBoxProxy;
-class IFWL_FormProxy;
+class CFWL_ComboBoxProxy;
+class CFWL_FormProxy;
 class IFWL_ListBox;
 class IFWL_Widget;
 
@@ -114,7 +114,7 @@ class IFWL_ComboBox : public IFWL_Widget {
   }
   void ShowDropList(bool bActivate);
 
-  IFWL_ComboEdit* GetComboEdit() const { return m_pEdit.get(); }
+  CFWL_ComboEdit* GetComboEdit() const { return m_pEdit.get(); }
 
   void ProcessSelChanged(bool bLButtonUp);
   int32_t GetCurrentSelection() const { return m_iCurSel; }
@@ -162,9 +162,9 @@ class IFWL_ComboBox : public IFWL_Widget {
   CFX_RectF m_rtList;
   CFX_RectF m_rtProxy;
   CFX_RectF m_rtHandler;
-  std::unique_ptr<IFWL_ComboEdit> m_pEdit;
-  std::unique_ptr<IFWL_ComboList> m_pListBox;
-  IFWL_ComboBoxProxy* m_pComboBoxProxy;  // Can this be a unique_ptr?
+  std::unique_ptr<CFWL_ComboEdit> m_pEdit;
+  std::unique_ptr<CFWL_ComboList> m_pListBox;
+  CFWL_ComboBoxProxy* m_pComboBoxProxy;  // Can this be a unique_ptr?
   bool m_bLButtonDown;
   bool m_bUpFormHandler;
   int32_t m_iCurSel;
diff --git a/xfa/fwl/core/ifwl_datetimepicker.cpp b/xfa/fwl/core/ifwl_datetimepicker.cpp
index f97e95579c..787be0cb9b 100644
--- a/xfa/fwl/core/ifwl_datetimepicker.cpp
+++ b/xfa/fwl/core/ifwl_datetimepicker.cpp
@@ -12,13 +12,13 @@
 #include "third_party/base/ptr_util.h"
 #include "xfa/fwl/core/cfwl_evteditchanged.h"
 #include "xfa/fwl/core/cfwl_evtselectchanged.h"
+#include "xfa/fwl/core/cfwl_formproxy.h"
 #include "xfa/fwl/core/cfwl_msgmouse.h"
 #include "xfa/fwl/core/cfwl_msgsetfocus.h"
 #include "xfa/fwl/core/cfwl_notedriver.h"
+#include "xfa/fwl/core/cfwl_spinbutton.h"
 #include "xfa/fwl/core/cfwl_themebackground.h"
 #include "xfa/fwl/core/cfwl_widgetmgr.h"
-#include "xfa/fwl/core/ifwl_formproxy.h"
-#include "xfa/fwl/core/ifwl_spinbutton.h"
 #include "xfa/fwl/core/ifwl_themeprovider.h"
 
 namespace {
@@ -47,7 +47,7 @@ IFWL_DateTimePicker::IFWL_DateTimePicker(
   monthProp->m_pParent = this;
   monthProp->m_pThemeProvider = m_pProperties->m_pThemeProvider;
   m_pMonthCal.reset(
-      new IFWL_MonthCalendar(m_pOwnerApp, std::move(monthProp), this));
+      new CFWL_MonthCalendar(m_pOwnerApp, std::move(monthProp), this));
 
   CFX_RectF rtMonthCal;
   m_pMonthCal->GetWidgetRect(rtMonthCal, true);
@@ -58,7 +58,7 @@ IFWL_DateTimePicker::IFWL_DateTimePicker(
   editProp->m_pParent = this;
   editProp->m_pThemeProvider = m_pProperties->m_pThemeProvider;
 
-  m_pEdit.reset(new IFWL_DateTimeEdit(m_pOwnerApp, std::move(editProp), this));
+  m_pEdit.reset(new CFWL_DateTimeEdit(m_pOwnerApp, std::move(editProp), this));
   RegisterEventTarget(m_pMonthCal.get());
   RegisterEventTarget(m_pEdit.get());
 }
@@ -371,7 +371,7 @@ void IFWL_DateTimePicker::InitProxyForm() {
   prop->m_dwStates = FWL_WGTSTATE_Invisible;
   prop->m_pOwner = this;
 
-  m_pForm = pdfium::MakeUnique<IFWL_FormProxy>(m_pOwnerApp, std::move(prop),
+  m_pForm = pdfium::MakeUnique<CFWL_FormProxy>(m_pOwnerApp, std::move(prop),
                                                m_pMonthCal.get());
   m_pMonthCal->SetParent(m_pForm.get());
 }
diff --git a/xfa/fwl/core/ifwl_datetimepicker.h b/xfa/fwl/core/ifwl_datetimepicker.h
index 7d73002d20..b8bec96d9a 100644
--- a/xfa/fwl/core/ifwl_datetimepicker.h
+++ b/xfa/fwl/core/ifwl_datetimepicker.h
@@ -9,10 +9,10 @@
 
 #include <memory>
 
+#include "xfa/fwl/core/cfwl_datetimeedit.h"
 #include "xfa/fwl/core/cfwl_event.h"
+#include "xfa/fwl/core/cfwl_monthcalendar.h"
 #include "xfa/fwl/core/cfwl_widgetproperties.h"
-#include "xfa/fwl/core/ifwl_datetimeedit.h"
-#include "xfa/fwl/core/ifwl_monthcalendar.h"
 #include "xfa/fwl/core/ifwl_widget.h"
 
 #define FWL_STYLEEXT_DTP_AllowEdit (1L << 0)
@@ -32,8 +32,8 @@
 #define FWL_STYLEEXT_DTP_EditVAlignMask (3L << 6)
 #define FWL_STYLEEXT_DTP_EditHAlignModeMask (3L << 8)
 
-class IFWL_DateTimeEdit;
-class IFWL_FormProxy;
+class CFWL_DateTimeEdit;
+class CFWL_FormProxy;
 
 class IFWL_DateTimePicker : public IFWL_Widget {
  public:
@@ -75,7 +75,7 @@ class IFWL_DateTimePicker : public IFWL_Widget {
   void ShowMonthCalendar(bool bActivate);
   void ProcessSelChanged(int32_t iYear, int32_t iMonth, int32_t iDay);
 
-  IFWL_FormProxy* GetFormProxy() const { return m_pForm.get(); }
+  CFWL_FormProxy* GetFormProxy() const { return m_pForm.get(); }
 
  private:
   void DrawDropDownButton(CFX_Graphics* pGraphics,
@@ -111,9 +111,9 @@ class IFWL_DateTimePicker : public IFWL_Widget {
   int32_t m_iMonth;
   int32_t m_iDay;
   bool m_bLBtnDown;
-  std::unique_ptr<IFWL_DateTimeEdit> m_pEdit;
-  std::unique_ptr<IFWL_MonthCalendar> m_pMonthCal;
-  std::unique_ptr<IFWL_FormProxy> m_pForm;
+  std::unique_ptr<CFWL_DateTimeEdit> m_pEdit;
+  std::unique_ptr<CFWL_MonthCalendar> m_pMonthCal;
+  std::unique_ptr<CFWL_FormProxy> m_pForm;
   FX_FLOAT m_fBtn;
 };
 
diff --git a/xfa/fwl/core/ifwl_edit.cpp b/xfa/fwl/core/ifwl_edit.cpp
index f262f85cee..af29745b5c 100644
--- a/xfa/fwl/core/ifwl_edit.cpp
+++ b/xfa/fwl/core/ifwl_edit.cpp
@@ -19,6 +19,7 @@
 #include "xfa/fde/ifde_txtedtpage.h"
 #include "xfa/fgas/font/cfgas_gefont.h"
 #include "xfa/fwl/core/cfwl_app.h"
+#include "xfa/fwl/core/cfwl_caret.h"
 #include "xfa/fwl/core/cfwl_evtcheckword.h"
 #include "xfa/fwl/core/cfwl_evttextchanged.h"
 #include "xfa/fwl/core/cfwl_evttextfull.h"
@@ -28,7 +29,6 @@
 #include "xfa/fwl/core/cfwl_themebackground.h"
 #include "xfa/fwl/core/cfwl_themepart.h"
 #include "xfa/fwl/core/cfwl_widgetmgr.h"
-#include "xfa/fwl/core/ifwl_caret.h"
 #include "xfa/fwl/core/ifwl_themeprovider.h"
 #include "xfa/fxfa/xfa_ffdoc.h"
 #include "xfa/fxfa/xfa_ffwidget.h"
@@ -435,7 +435,7 @@ void IFWL_Edit::On_CaretChanged(CFDE_TxtEdtEngine* pEdit,
   rtInvalid.Set(0, 0, 0, 0);
   bool bRepaintScroll = false;
   if (m_pProperties->m_dwStyleExes & FWL_STYLEEXT_EDT_MultiLine) {
-    IFWL_ScrollBar* pScroll = UpdateScroll();
+    CFWL_ScrollBar* pScroll = UpdateScroll();
     if (pScroll) {
       pScroll->GetWidgetRect(rtInvalid);
       bRepaintScroll = true;
@@ -838,7 +838,7 @@ bool IFWL_Edit::UpdateOffset() {
   return true;
 }
 
-bool IFWL_Edit::UpdateOffset(IFWL_ScrollBar* pScrollBar, FX_FLOAT fPosChanged) {
+bool IFWL_Edit::UpdateOffset(CFWL_ScrollBar* pScrollBar, FX_FLOAT fPosChanged) {
   if (pScrollBar == m_pHorzScrollBar.get())
     m_fScrollOffsetX += fPosChanged;
   else
@@ -906,7 +906,7 @@ void IFWL_Edit::UpdateCaret() {
   ShowCaret(bShow, &rtCaret);
 }
 
-IFWL_ScrollBar* IFWL_Edit::UpdateScroll() {
+CFWL_ScrollBar* IFWL_Edit::UpdateScroll() {
   bool bShowHorz =
       m_pHorzScrollBar &&
       ((m_pHorzScrollBar->GetStates() & FWL_WGTSTATE_Invisible) == 0);
@@ -921,7 +921,7 @@ IFWL_ScrollBar* IFWL_Edit::UpdateScroll() {
     return nullptr;
 
   const CFX_RectF& rtFDE = pPage->GetContentsBox();
-  IFWL_ScrollBar* pRepaint = nullptr;
+  CFWL_ScrollBar* pRepaint = nullptr;
   if (bShowHorz) {
     CFX_RectF rtScroll;
     m_pHorzScrollBar->GetWidgetRect(rtScroll);
@@ -1170,7 +1170,7 @@ void IFWL_Edit::InitScrollBar(bool bVert) {
   prop->m_pParent = this;
   prop->m_pThemeProvider = m_pProperties->m_pThemeProvider;
 
-  IFWL_ScrollBar* sb = new IFWL_ScrollBar(m_pOwnerApp, std::move(prop), this);
+  CFWL_ScrollBar* sb = new CFWL_ScrollBar(m_pOwnerApp, std::move(prop), this);
   if (bVert)
     m_pVertScrollBar.reset(sb);
   else
@@ -1262,7 +1262,7 @@ bool IFWL_Edit::ValidateNumberChar(FX_WCHAR cNum) {
 void IFWL_Edit::InitCaret() {
   if (!m_pCaret) {
     if ((m_pProperties->m_dwStyleExes & FWL_STYLEEXT_EDT_InnerCaret)) {
-      m_pCaret.reset(new IFWL_Caret(
+      m_pCaret.reset(new CFWL_Caret(
           m_pOwnerApp, pdfium::MakeUnique<CFWL_WidgetProperties>(), this));
       m_pCaret->SetParent(this);
       m_pCaret->SetStates(m_pProperties->m_dwStates);
@@ -1344,7 +1344,7 @@ void IFWL_Edit::OnProcessEvent(CFWL_Event* pEvent) {
   if ((pSrcTarget == m_pVertScrollBar.get() && m_pVertScrollBar) ||
       (pSrcTarget == m_pHorzScrollBar.get() && m_pHorzScrollBar)) {
     CFWL_EvtScroll* pScrollEvent = static_cast<CFWL_EvtScroll*>(pEvent);
-    OnScroll(static_cast<IFWL_ScrollBar*>(pSrcTarget),
+    OnScroll(static_cast<CFWL_ScrollBar*>(pSrcTarget),
              pScrollEvent->m_iScrollCode, pScrollEvent->m_fPos);
   }
 }
@@ -1593,7 +1593,7 @@ void IFWL_Edit::OnChar(CFWL_MsgKey* pMsg) {
     ProcessInsertError(iError);
 }
 
-bool IFWL_Edit::OnScroll(IFWL_ScrollBar* pScrollBar,
+bool IFWL_Edit::OnScroll(CFWL_ScrollBar* pScrollBar,
                          FWL_SCBCODE dwCode,
                          FX_FLOAT fPos) {
   CFX_SizeF fs;
diff --git a/xfa/fwl/core/ifwl_edit.h b/xfa/fwl/core/ifwl_edit.h
index b695f77a58..8b217fa45d 100644
--- a/xfa/fwl/core/ifwl_edit.h
+++ b/xfa/fwl/core/ifwl_edit.h
@@ -14,8 +14,8 @@
 #include "xfa/fde/cfde_txtedtengine.h"
 #include "xfa/fde/ifde_txtedtdorecord.h"
 #include "xfa/fwl/core/cfwl_event.h"
+#include "xfa/fwl/core/cfwl_scrollbar.h"
 #include "xfa/fwl/core/cfwl_widget.h"
-#include "xfa/fwl/core/ifwl_scrollbar.h"
 #include "xfa/fwl/core/ifwl_widget.h"
 #include "xfa/fxgraphics/cfx_path.h"
 
@@ -55,7 +55,7 @@ class IFDE_TxtEdtDoRecord;
 class IFWL_Edit;
 class CFWL_MsgMouse;
 class CFWL_WidgetProperties;
-class IFWL_Caret;
+class CFWL_Caret;
 
 class IFWL_Edit : public IFWL_Widget {
  public:
@@ -137,10 +137,10 @@ class IFWL_Edit : public IFWL_Widget {
   void UpdateEditParams();
   void UpdateEditLayout();
   bool UpdateOffset();
-  bool UpdateOffset(IFWL_ScrollBar* pScrollBar, FX_FLOAT fPosChanged);
+  bool UpdateOffset(CFWL_ScrollBar* pScrollBar, FX_FLOAT fPosChanged);
   void UpdateVAlignment();
   void UpdateCaret();
-  IFWL_ScrollBar* UpdateScroll();
+  CFWL_ScrollBar* UpdateScroll();
   void Layout();
   void LayoutScrollBar();
   void DeviceToEngine(CFX_PointF& pt);
@@ -169,7 +169,7 @@ class IFWL_Edit : public IFWL_Widget {
   void OnMouseMove(CFWL_MsgMouse* pMsg);
   void OnKeyDown(CFWL_MsgKey* pMsg);
   void OnChar(CFWL_MsgKey* pMsg);
-  bool OnScroll(IFWL_ScrollBar* pScrollBar, FWL_SCBCODE dwCode, FX_FLOAT fPos);
+  bool OnScroll(CFWL_ScrollBar* pScrollBar, FWL_SCBCODE dwCode, FX_FLOAT fPos);
 
   CFX_RectF m_rtClient;
   CFX_RectF m_rtEngine;
@@ -184,9 +184,9 @@ class IFWL_Edit : public IFWL_Widget {
   FX_FLOAT m_fFontSize;
   bool m_bSetRange;
   int32_t m_iMax;
-  std::unique_ptr<IFWL_ScrollBar> m_pVertScrollBar;
-  std::unique_ptr<IFWL_ScrollBar> m_pHorzScrollBar;
-  std::unique_ptr<IFWL_Caret> m_pCaret;
+  std::unique_ptr<CFWL_ScrollBar> m_pVertScrollBar;
+  std::unique_ptr<CFWL_ScrollBar> m_pHorzScrollBar;
+  std::unique_ptr<CFWL_Caret> m_pCaret;
   CFX_WideString m_wsCache;
   CFX_WideString m_wsFont;
   std::deque<std::unique_ptr<IFDE_TxtEdtDoRecord>> m_DoRecords;
diff --git a/xfa/fwl/core/ifwl_listbox.cpp b/xfa/fwl/core/ifwl_listbox.cpp
index 2961732024..6186e64a4b 100644
--- a/xfa/fwl/core/ifwl_listbox.cpp
+++ b/xfa/fwl/core/ifwl_listbox.cpp
@@ -748,7 +748,7 @@ void IFWL_ListBox::InitScrollBar(bool bVert) {
   prop->m_dwStates = FWL_WGTSTATE_Invisible;
   prop->m_pParent = this;
   prop->m_pThemeProvider = m_pScrollBarTP;
-  IFWL_ScrollBar* sb = new IFWL_ScrollBar(m_pOwnerApp, std::move(prop), this);
+  CFWL_ScrollBar* sb = new CFWL_ScrollBar(m_pOwnerApp, std::move(prop), this);
   if (bVert)
     m_pVertScrollBar.reset(sb);
   else
@@ -756,7 +756,7 @@ void IFWL_ListBox::InitScrollBar(bool bVert) {
 }
 
 bool IFWL_ListBox::IsShowScrollBar(bool bVert) {
-  IFWL_ScrollBar* pScrollbar =
+  CFWL_ScrollBar* pScrollbar =
       bVert ? m_pVertScrollBar.get() : m_pHorzScrollBar.get();
   if (!pScrollbar || (pScrollbar->GetStates() & FWL_WGTSTATE_Invisible))
     return false;
@@ -818,7 +818,7 @@ void IFWL_ListBox::OnProcessEvent(CFWL_Event* pEvent) {
   if ((pSrcTarget == m_pVertScrollBar.get() && m_pVertScrollBar) ||
       (pSrcTarget == m_pHorzScrollBar.get() && m_pHorzScrollBar)) {
     CFWL_EvtScroll* pScrollEvent = static_cast<CFWL_EvtScroll*>(pEvent);
-    OnScroll(static_cast<IFWL_ScrollBar*>(pSrcTarget),
+    OnScroll(static_cast<CFWL_ScrollBar*>(pSrcTarget),
              pScrollEvent->m_iScrollCode, pScrollEvent->m_fPos);
   }
 }
@@ -947,7 +947,7 @@ void IFWL_ListBox::OnVK(CFWL_ListItem* pItem, bool bShift, bool bCtrl) {
   Repaint(&rtInvalidate);
 }
 
-bool IFWL_ListBox::OnScroll(IFWL_ScrollBar* pScrollBar,
+bool IFWL_ListBox::OnScroll(CFWL_ScrollBar* pScrollBar,
                             FWL_SCBCODE dwCode,
                             FX_FLOAT fPos) {
   CFX_SizeF fs;
diff --git a/xfa/fwl/core/ifwl_listbox.h b/xfa/fwl/core/ifwl_listbox.h
index 7b23881c21..a8638eb3b6 100644
--- a/xfa/fwl/core/ifwl_listbox.h
+++ b/xfa/fwl/core/ifwl_listbox.h
@@ -107,7 +107,7 @@ class IFWL_ListBox : public IFWL_Widget {
   bool ScrollToVisible(CFWL_ListItem* hItem);
   void InitScrollBar(bool bVert = true);
   bool IsShowScrollBar(bool bVert);
-  IFWL_ScrollBar* GetVertScrollBar() const { return m_pVertScrollBar.get(); }
+  CFWL_ScrollBar* GetVertScrollBar() const { return m_pVertScrollBar.get(); }
   const CFX_RectF& GetRTClient() const { return m_rtClient; }
 
  private:
@@ -148,13 +148,13 @@ class IFWL_ListBox : public IFWL_Widget {
   void OnMouseWheel(CFWL_MsgMouseWheel* pMsg);
   void OnKeyDown(CFWL_MsgKey* pMsg);
   void OnVK(CFWL_ListItem* hItem, bool bShift, bool bCtrl);
-  bool OnScroll(IFWL_ScrollBar* pScrollBar, FWL_SCBCODE dwCode, FX_FLOAT fPos);
+  bool OnScroll(CFWL_ScrollBar* pScrollBar, FWL_SCBCODE dwCode, FX_FLOAT fPos);
 
   CFX_RectF m_rtClient;
   CFX_RectF m_rtStatic;
   CFX_RectF m_rtConent;
-  std::unique_ptr<IFWL_ScrollBar> m_pHorzScrollBar;
-  std::unique_ptr<IFWL_ScrollBar> m_pVertScrollBar;
+  std::unique_ptr<CFWL_ScrollBar> m_pHorzScrollBar;
+  std::unique_ptr<CFWL_ScrollBar> m_pVertScrollBar;
   uint32_t m_dwTTOStyles;
   int32_t m_iTTOAligns;
   CFWL_ListItem* m_hAnchor;
diff --git a/xfa/fwl/core/ifwl_widget.cpp b/xfa/fwl/core/ifwl_widget.cpp
index dca89c9c94..9a37cc89ca 100644
--- a/xfa/fwl/core/ifwl_widget.cpp
+++ b/xfa/fwl/core/ifwl_widget.cpp
@@ -17,6 +17,7 @@
 #include "xfa/fwl/core/cfwl_evtmousewheel.h"
 #include "xfa/fwl/core/cfwl_evtsetfocus.h"
 #include "xfa/fwl/core/cfwl_evtsizechanged.h"
+#include "xfa/fwl/core/cfwl_form.h"
 #include "xfa/fwl/core/cfwl_msgkey.h"
 #include "xfa/fwl/core/cfwl_msgkillfocus.h"
 #include "xfa/fwl/core/cfwl_msgmouse.h"
@@ -28,7 +29,6 @@
 #include "xfa/fwl/core/cfwl_themetext.h"
 #include "xfa/fwl/core/cfwl_widgetmgr.h"
 #include "xfa/fwl/core/ifwl_combobox.h"
-#include "xfa/fwl/core/ifwl_form.h"
 #include "xfa/fwl/core/ifwl_themeprovider.h"
 #include "xfa/fxfa/xfa_ffapp.h"