More fpdfsdk filename cleanup

This CL moves more of the fpdfsdk/ code around to better match the
naming of other files.

Change-Id: I203d91e3e345b2b4767df7a69dd5bd981d61f1d2
Reviewed-on: https://pdfium-review.googlesource.com/29372
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>

28 files changed, 119 insertions, 118 deletions

diff --git a/BUILD.gn b/BUILD.gn
index fbc4efbdd3..affff2b6e2 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -107,6 +107,8 @@ jumbo_static_library("pdfium") {
     "fpdfsdk/cba_annotiterator.h",
     "fpdfsdk/cfx_systemhandler.cpp",
     "fpdfsdk/cfx_systemhandler.h",
+    "fpdfsdk/cpdfsdk_actionhandler.cpp",
+    "fpdfsdk/cpdfsdk_actionhandler.h",
     "fpdfsdk/cpdfsdk_annot.cpp",
     "fpdfsdk/cpdfsdk_annot.h",
     "fpdfsdk/cpdfsdk_annothandlermgr.cpp",
@@ -122,6 +124,10 @@ jumbo_static_library("pdfium") {
     "fpdfsdk/cpdfsdk_customaccess.h",
     "fpdfsdk/cpdfsdk_datetime.cpp",
     "fpdfsdk/cpdfsdk_datetime.h",
+    "fpdfsdk/cpdfsdk_fieldaction.cpp",
+    "fpdfsdk/cpdfsdk_fieldaction.h",
+    "fpdfsdk/cpdfsdk_filewriteadapter.cpp",
+    "fpdfsdk/cpdfsdk_filewriteadapter.h",
     "fpdfsdk/cpdfsdk_formfillenvironment.cpp",
     "fpdfsdk/cpdfsdk_formfillenvironment.h",
     "fpdfsdk/cpdfsdk_helpers.cpp",
@@ -157,15 +163,9 @@ jumbo_static_library("pdfium") {
     "fpdfsdk/fpdfsave.cpp",
     "fpdfsdk/fpdftext.cpp",
     "fpdfsdk/fpdfview.cpp",
-    "fpdfsdk/fsdk_actionhandler.cpp",
-    "fpdfsdk/fsdk_actionhandler.h",
-    "fpdfsdk/fsdk_filewriteadapter.cpp",
-    "fpdfsdk/fsdk_filewriteadapter.h",
-    "fpdfsdk/fsdk_pauseadapter.cpp",
-    "fpdfsdk/fsdk_pauseadapter.h",
     "fpdfsdk/ipdfsdk_annothandler.h",
-    "fpdfsdk/pdfsdk_fieldaction.cpp",
-    "fpdfsdk/pdfsdk_fieldaction.h",
+    "fpdfsdk/ipdfsdk_pauseadapter.cpp",
+    "fpdfsdk/ipdfsdk_pauseadapter.h",
     "public/cpp/fpdf_deleters.h",
     "public/fpdf_annot.h",
     "public/fpdf_attachment.h",
@@ -2988,6 +2988,7 @@ test("pdfium_embeddertests") {
     "core/fpdfapi/render/fpdf_render_pattern_embeddertest.cpp",
     "core/fxcodec/codec/fx_codec_embeddertest.cpp",
     "core/fxge/fx_ge_text_embeddertest.cpp",
+    "fpdfsdk/cba_annotiterator_embeddertest.cpp",
     "fpdfsdk/fpdf_dataavail_embeddertest.cpp",
     "fpdfsdk/fpdf_flatten_embeddertest.cpp",
     "fpdfsdk/fpdf_structtree_embeddertest.cpp",
@@ -3004,7 +3005,6 @@ test("pdfium_embeddertests") {
     "fpdfsdk/fpdfview_c_api_test.c",
     "fpdfsdk/fpdfview_c_api_test.h",
     "fpdfsdk/fpdfview_embeddertest.cpp",
-    "fpdfsdk/fsdk_baseform_embeddertest.cpp",
     "fpdfsdk/pwl/cpwl_combo_box_embeddertest.cpp",
     "fpdfsdk/pwl/cpwl_edit_embeddertest.cpp",
     "testing/embedder_test.cpp",
diff --git a/fpdfsdk/fsdk_baseform_embeddertest.cpp b/fpdfsdk/cba_annotiterator_embeddertest.cpp
index 9f2c606309..6198ee1eb4 100644
--- a/fpdfsdk/fsdk_baseform_embeddertest.cpp
+++ b/fpdfsdk/cba_annotiterator_embeddertest.cpp
@@ -23,16 +23,16 @@ void CheckRect(const CFX_FloatRect& actual, const CFX_FloatRect& expected) {
 
 }  // namespace
 
-class FSDKBaseFormEmbeddertest : public EmbedderTest {};
+class CBA_AnnotIteratorTest : public EmbedderTest {};
 
-TEST_F(FSDKBaseFormEmbeddertest, CBA_AnnotIterator) {
+TEST_F(CBA_AnnotIteratorTest, CBA_AnnotIterator) {
   EXPECT_TRUE(OpenDocument("annotiter.pdf"));
   FPDF_PAGE page0 = LoadPage(0);
   FPDF_PAGE page1 = LoadPage(1);
   FPDF_PAGE page2 = LoadPage(2);
-  EXPECT_TRUE(page0);
-  EXPECT_TRUE(page1);
-  EXPECT_TRUE(page2);
+  ASSERT_TRUE(page0);
+  ASSERT_TRUE(page1);
+  ASSERT_TRUE(page2);
 
   CFX_FloatRect LeftBottom(200, 200, 220, 220);
   CFX_FloatRect RightBottom(400, 201, 420, 221);
diff --git a/fpdfsdk/fsdk_actionhandler.cpp b/fpdfsdk/cpdfsdk_actionhandler.cpp
index 73c7d84f69..98c01240b2 100644
--- a/fpdfsdk/fsdk_actionhandler.cpp
+++ b/fpdfsdk/cpdfsdk_actionhandler.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/fsdk_actionhandler.h"
+#include "fpdfsdk/cpdfsdk_actionhandler.h"
 
 #include <set>
 #include <vector>
@@ -47,7 +47,7 @@ bool CPDFSDK_ActionHandler::DoAction_FieldJavaScript(
     CPDF_AAction::AActionType type,
     CPDFSDK_FormFillEnvironment* pFormFillEnv,
     CPDF_FormField* pFormField,
-    PDFSDK_FieldAction* data) {
+    CPDFSDK_FieldAction* data) {
   ASSERT(pFormFillEnv);
   if (pFormFillEnv->IsJSPlatformPresent() &&
       JsAction.GetType() == CPDF_Action::JavaScript) {
@@ -106,7 +106,7 @@ bool CPDFSDK_ActionHandler::DoAction_Field(
     CPDF_AAction::AActionType type,
     CPDFSDK_FormFillEnvironment* pFormFillEnv,
     CPDF_FormField* pFormField,
-    PDFSDK_FieldAction* data) {
+    CPDFSDK_FieldAction* data) {
   std::set<CPDF_Dictionary*> visited;
   return ExecuteFieldAction(action, type, pFormFillEnv, pFormField, data,
                             &visited);
@@ -219,7 +219,7 @@ bool CPDFSDK_ActionHandler::ExecuteFieldAction(
     CPDF_AAction::AActionType type,
     CPDFSDK_FormFillEnvironment* pFormFillEnv,
     CPDF_FormField* pFormField,
-    PDFSDK_FieldAction* data,
+    CPDFSDK_FieldAction* data,
     std::set<CPDF_Dictionary*>* visited) {
   CPDF_Dictionary* pDict = action.GetDict();
   if (pdfium::ContainsKey(*visited, pDict))
@@ -396,7 +396,7 @@ void CPDFSDK_ActionHandler::RunFieldJavaScript(
     CPDFSDK_FormFillEnvironment* pFormFillEnv,
     CPDF_FormField* pFormField,
     CPDF_AAction::AActionType type,
-    PDFSDK_FieldAction* data,
+    CPDFSDK_FieldAction* data,
     const WideString& script) {
   ASSERT(type != CPDF_AAction::Calculate);
   ASSERT(type != CPDF_AAction::Format);
diff --git a/fpdfsdk/fsdk_actionhandler.h b/fpdfsdk/cpdfsdk_actionhandler.h
index 0e5af1a41a..78d3e22e4f 100644
--- a/fpdfsdk/fsdk_actionhandler.h
+++ b/fpdfsdk/cpdfsdk_actionhandler.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_FSDK_ACTIONHANDLER_H_
-#define FPDFSDK_FSDK_ACTIONHANDLER_H_
+#ifndef FPDFSDK_CPDFSDK_ACTIONHANDLER_H_
+#define FPDFSDK_CPDFSDK_ACTIONHANDLER_H_
 
 #include <memory>
 #include <set>
@@ -13,7 +13,7 @@
 #include "core/fpdfdoc/cpdf_aaction.h"
 #include "core/fpdfdoc/cpdf_action.h"
 #include "core/fxcrt/fx_string.h"
-#include "fpdfsdk/pdfsdk_fieldaction.h"
+#include "fpdfsdk/cpdfsdk_fieldaction.h"
 
 class CPDFSDK_Annot;
 class CPDFSDK_FormFillEnvironment;
@@ -49,12 +49,12 @@ class CPDFSDK_ActionHandler {
                       CPDF_AAction::AActionType type,
                       CPDFSDK_FormFillEnvironment* pFormFillEnv,
                       CPDF_FormField* pFormField,
-                      PDFSDK_FieldAction* data);
+                      CPDFSDK_FieldAction* data);
   bool DoAction_FieldJavaScript(const CPDF_Action& JsAction,
                                 CPDF_AAction::AActionType type,
                                 CPDFSDK_FormFillEnvironment* pFormFillEnv,
                                 CPDF_FormField* pFormField,
-                                PDFSDK_FieldAction* data);
+                                CPDFSDK_FieldAction* data);
 
  private:
   using RunScriptCallback = std::function<void(IJS_EventContext* context)>;
@@ -77,7 +77,7 @@ class CPDFSDK_ActionHandler {
                           CPDF_AAction::AActionType type,
                           CPDFSDK_FormFillEnvironment* pFormFillEnv,
                           CPDF_FormField* pFormField,
-                          PDFSDK_FieldAction* data,
+                          CPDFSDK_FieldAction* data,
                           std::set<CPDF_Dictionary*>* visited);
   bool ExecuteScreenAction(const CPDF_Action& action,
                            CPDF_AAction::AActionType type,
@@ -103,7 +103,7 @@ class CPDFSDK_ActionHandler {
   void RunFieldJavaScript(CPDFSDK_FormFillEnvironment* pFormFillEnv,
                           CPDF_FormField* pFormField,
                           CPDF_AAction::AActionType type,
-                          PDFSDK_FieldAction* data,
+                          CPDFSDK_FieldAction* data,
                           const WideString& script);
 
   bool IsValidField(CPDFSDK_FormFillEnvironment* pFormFillEnv,
@@ -126,4 +126,4 @@ class CPDFSDK_ActionHandler {
                           CPDFSDK_FormFillEnvironment* pFormFillEnv);
 };
 
-#endif  // FPDFSDK_FSDK_ACTIONHANDLER_H_
+#endif  // FPDFSDK_CPDFSDK_ACTIONHANDLER_H_
diff --git a/fpdfsdk/pdfsdk_fieldaction.cpp b/fpdfsdk/cpdfsdk_fieldaction.cpp
index ecf01b7488..352da391df 100644
--- a/fpdfsdk/pdfsdk_fieldaction.cpp
+++ b/fpdfsdk/cpdfsdk_fieldaction.cpp
@@ -4,9 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/pdfsdk_fieldaction.h"
+#include "fpdfsdk/cpdfsdk_fieldaction.h"
 
-PDFSDK_FieldAction::PDFSDK_FieldAction()
+CPDFSDK_FieldAction::CPDFSDK_FieldAction()
     : bModifier(false),
       bShift(false),
       bKeyDown(false),
diff --git a/fpdfsdk/pdfsdk_fieldaction.h b/fpdfsdk/cpdfsdk_fieldaction.h
index 27049892a3..36a57e55d2 100644
--- a/fpdfsdk/pdfsdk_fieldaction.h
+++ b/fpdfsdk/cpdfsdk_fieldaction.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_PDFSDK_FIELDACTION_H_
-#define FPDFSDK_PDFSDK_FIELDACTION_H_
+#ifndef FPDFSDK_CPDFSDK_FIELDACTION_H_
+#define FPDFSDK_CPDFSDK_FIELDACTION_H_
 
 #include "core/fxcrt/fx_string.h"
 
@@ -18,9 +18,9 @@ typedef enum {
 } PDFSDK_XFAAActionType;
 #endif  // PDF_ENABLE_XFA
 
-struct PDFSDK_FieldAction {
-  PDFSDK_FieldAction();
-  PDFSDK_FieldAction(const PDFSDK_FieldAction& other) = delete;
+struct CPDFSDK_FieldAction {
+  CPDFSDK_FieldAction();
+  CPDFSDK_FieldAction(const CPDFSDK_FieldAction& other) = delete;
 
   bool bModifier;
   bool bShift;
@@ -35,4 +35,4 @@ struct PDFSDK_FieldAction {
   bool bRC;
 };
 
-#endif  // FPDFSDK_PDFSDK_FIELDACTION_H_
+#endif  // FPDFSDK_CPDFSDK_FIELDACTION_H_
diff --git a/fpdfsdk/fsdk_filewriteadapter.cpp b/fpdfsdk/cpdfsdk_filewriteadapter.cpp
index fad058fb54..8fc269402b 100644
--- a/fpdfsdk/fsdk_filewriteadapter.cpp
+++ b/fpdfsdk/cpdfsdk_filewriteadapter.cpp
@@ -4,19 +4,20 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/fsdk_filewriteadapter.h"
+#include "fpdfsdk/cpdfsdk_filewriteadapter.h"
 
-FSDK_FileWriteAdapter::FSDK_FileWriteAdapter(FPDF_FILEWRITE* fileWriteStruct)
+CPDFSDK_FileWriteAdapter::CPDFSDK_FileWriteAdapter(
+    FPDF_FILEWRITE* fileWriteStruct)
     : fileWriteStruct_(fileWriteStruct) {
   ASSERT(fileWriteStruct_);
 }
 
-FSDK_FileWriteAdapter::~FSDK_FileWriteAdapter() {}
+CPDFSDK_FileWriteAdapter::~CPDFSDK_FileWriteAdapter() {}
 
-bool FSDK_FileWriteAdapter::WriteBlock(const void* data, size_t size) {
+bool CPDFSDK_FileWriteAdapter::WriteBlock(const void* data, size_t size) {
   return fileWriteStruct_->WriteBlock(fileWriteStruct_, data, size) != 0;
 }
 
-bool FSDK_FileWriteAdapter::WriteString(const ByteStringView& str) {
+bool CPDFSDK_FileWriteAdapter::WriteString(const ByteStringView& str) {
   return WriteBlock(str.unterminated_c_str(), str.GetLength());
 }
diff --git a/fpdfsdk/fsdk_filewriteadapter.h b/fpdfsdk/cpdfsdk_filewriteadapter.h
index 6bba1da9a7..a5b4dc89f9 100644
--- a/fpdfsdk/fsdk_filewriteadapter.h
+++ b/fpdfsdk/cpdfsdk_filewriteadapter.h
@@ -4,14 +4,14 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_FSDK_FILEWRITEADAPTER_H_
-#define FPDFSDK_FSDK_FILEWRITEADAPTER_H_
+#ifndef FPDFSDK_CPDFSDK_FILEWRITEADAPTER_H_
+#define FPDFSDK_CPDFSDK_FILEWRITEADAPTER_H_
 
 #include "core/fxcrt/fx_stream.h"
 #include "core/fxcrt/retain_ptr.h"
 #include "public/fpdf_save.h"
 
-class FSDK_FileWriteAdapter : public IFX_WriteStream {
+class CPDFSDK_FileWriteAdapter : public IFX_WriteStream {
  public:
   template <typename T, typename... Args>
   friend RetainPtr<T> pdfium::MakeRetain(Args&&... args);
@@ -20,10 +20,10 @@ class FSDK_FileWriteAdapter : public IFX_WriteStream {
   bool WriteString(const ByteStringView& str) override;
 
  private:
-  explicit FSDK_FileWriteAdapter(FPDF_FILEWRITE* fileWriteStruct);
-  ~FSDK_FileWriteAdapter() override;
+  explicit CPDFSDK_FileWriteAdapter(FPDF_FILEWRITE* fileWriteStruct);
+  ~CPDFSDK_FileWriteAdapter() override;
 
   FPDF_FILEWRITE* fileWriteStruct_;
 };
 
-#endif  // FPDFSDK_FSDK_FILEWRITEADAPTER_H_
+#endif  // FPDFSDK_CPDFSDK_FILEWRITEADAPTER_H_
diff --git a/fpdfsdk/cpdfsdk_formfillenvironment.cpp b/fpdfsdk/cpdfsdk_formfillenvironment.cpp
index 156314fd5a..dd7d082312 100644
--- a/fpdfsdk/cpdfsdk_formfillenvironment.cpp
+++ b/fpdfsdk/cpdfsdk_formfillenvironment.cpp
@@ -11,12 +11,12 @@
 
 #include "core/fpdfapi/parser/cpdf_array.h"
 #include "core/fpdfdoc/cpdf_docjsactions.h"
+#include "fpdfsdk/cpdfsdk_actionhandler.h"
 #include "fpdfsdk/cpdfsdk_annothandlermgr.h"
 #include "fpdfsdk/cpdfsdk_interform.h"
 #include "fpdfsdk/cpdfsdk_pageview.h"
 #include "fpdfsdk/cpdfsdk_widget.h"
 #include "fpdfsdk/formfiller/cffl_interactiveformfiller.h"
-#include "fpdfsdk/fsdk_actionhandler.h"
 #include "fxjs/ijs_runtime.h"
 #include "third_party/base/ptr_util.h"
 
diff --git a/fpdfsdk/cpdfsdk_helpers.h b/fpdfsdk/cpdfsdk_helpers.h
index c2f6515cf9..dcd0cc9558 100644
--- a/fpdfsdk/cpdfsdk_helpers.h
+++ b/fpdfsdk/cpdfsdk_helpers.h
@@ -28,7 +28,7 @@ class CPDF_PageObject;
 class CPDF_PageRenderContext;
 class CPDF_PathObject;
 class CPDF_Stream;
-class IFSDK_PAUSE_Adapter;
+class IPDFSDK_PauseAdapter;
 class FX_PATHPOINT;
 
 // Object types for public FPDF_ types; these correspond to next layer down
@@ -91,7 +91,7 @@ void FPDF_RenderPage_Retail(CPDF_PageRenderContext* pContext,
                             int rotate,
                             int flags,
                             bool bNeedToRestore,
-                            IFSDK_PAUSE_Adapter* pause);
+                            IPDFSDK_PauseAdapter* pause);
 
 void CheckUnSupportError(CPDF_Document* pDoc, uint32_t err_code);
 void CheckUnSupportAnnot(CPDF_Document* pDoc, const CPDF_Annot* pPDFAnnot);
diff --git a/fpdfsdk/cpdfsdk_interform.cpp b/fpdfsdk/cpdfsdk_interform.cpp
index 9b1dbb75ef..22d1a47e33 100644
--- a/fpdfsdk/cpdfsdk_interform.cpp
+++ b/fpdfsdk/cpdfsdk_interform.cpp
@@ -22,13 +22,13 @@
 #include "core/fxge/cfx_graphstatedata.h"
 #include "core/fxge/cfx_pathdata.h"
 #include "fpdfsdk/cba_annotiterator.h"
+#include "fpdfsdk/cpdfsdk_actionhandler.h"
 #include "fpdfsdk/cpdfsdk_annot.h"
 #include "fpdfsdk/cpdfsdk_formfillenvironment.h"
 #include "fpdfsdk/cpdfsdk_helpers.h"
 #include "fpdfsdk/cpdfsdk_pageview.h"
 #include "fpdfsdk/cpdfsdk_widget.h"
 #include "fpdfsdk/formfiller/cffl_formfiller.h"
-#include "fpdfsdk/fsdk_actionhandler.h"
 #include "fpdfsdk/ipdfsdk_annothandler.h"
 #include "fxjs/ijs_event_context.h"
 #include "fxjs/ijs_runtime.h"
@@ -380,7 +380,7 @@ bool CPDFSDK_InterForm::OnKeyStrokeCommit(CPDF_FormField* pFormField,
     return true;
 
   CPDFSDK_ActionHandler* pActionHandler = m_pFormFillEnv->GetActionHandler();
-  PDFSDK_FieldAction fa;
+  CPDFSDK_FieldAction fa;
   fa.bModifier = false;
   fa.bShift = false;
   fa.sValue = csValue;
@@ -400,7 +400,7 @@ bool CPDFSDK_InterForm::OnValidate(CPDF_FormField* pFormField,
     return true;
 
   CPDFSDK_ActionHandler* pActionHandler = m_pFormFillEnv->GetActionHandler();
-  PDFSDK_FieldAction fa;
+  CPDFSDK_FieldAction fa;
   fa.bModifier = false;
   fa.bShift = false;
   fa.sValue = csValue;
diff --git a/fpdfsdk/cpdfsdk_widget.cpp b/fpdfsdk/cpdfsdk_widget.cpp
index 23241953e4..3a49f9c6a0 100644
--- a/fpdfsdk/cpdfsdk_widget.cpp
+++ b/fpdfsdk/cpdfsdk_widget.cpp
@@ -23,12 +23,12 @@
 #include "core/fxge/cfx_graphstatedata.h"
 #include "core/fxge/cfx_pathdata.h"
 #include "core/fxge/cfx_renderdevice.h"
+#include "fpdfsdk/cpdfsdk_actionhandler.h"
 #include "fpdfsdk/cpdfsdk_formfillenvironment.h"
 #include "fpdfsdk/cpdfsdk_helpers.h"
 #include "fpdfsdk/cpdfsdk_interform.h"
 #include "fpdfsdk/cpdfsdk_pageview.h"
 #include "fpdfsdk/formfiller/cba_fontmap.h"
-#include "fpdfsdk/fsdk_actionhandler.h"
 #include "fpdfsdk/pwl/cpwl_appstream.h"
 #include "fpdfsdk/pwl/cpwl_edit.h"
 
@@ -210,7 +210,7 @@ bool CPDFSDK_Widget::HasXFAAAction(PDFSDK_XFAAActionType eXFAAAT) {
 }
 
 bool CPDFSDK_Widget::OnXFAAAction(PDFSDK_XFAAActionType eXFAAAT,
-                                  PDFSDK_FieldAction* data,
+                                  CPDFSDK_FieldAction* data,
                                   CPDFSDK_PageView* pPageView) {
   CPDFXFA_Context* pContext = m_pPageView->GetFormFillEnv()->GetXFAContext();
 
@@ -816,7 +816,7 @@ CFX_Color CPDFSDK_Widget::GetFillPWLColor() const {
 }
 
 bool CPDFSDK_Widget::OnAAction(CPDF_AAction::AActionType type,
-                               PDFSDK_FieldAction* data,
+                               CPDFSDK_FieldAction* data,
                                CPDFSDK_PageView* pPageView) {
   CPDFSDK_FormFillEnvironment* pFormFillEnv = pPageView->GetFormFillEnv();
 
diff --git a/fpdfsdk/cpdfsdk_widget.h b/fpdfsdk/cpdfsdk_widget.h
index c3257325e7..81d87376f9 100644
--- a/fpdfsdk/cpdfsdk_widget.h
+++ b/fpdfsdk/cpdfsdk_widget.h
@@ -17,7 +17,7 @@
 #include "core/fxcrt/unowned_ptr.h"
 #include "core/fxge/cfx_color.h"
 #include "fpdfsdk/cpdfsdk_baannot.h"
-#include "fpdfsdk/pdfsdk_fieldaction.h"
+#include "fpdfsdk/cpdfsdk_fieldaction.h"
 
 class CFX_RenderDevice;
 class CPDF_Annot;
@@ -42,7 +42,7 @@ class CPDFSDK_Widget : public CPDFSDK_BAAnnot {
 
   bool HasXFAAAction(PDFSDK_XFAAActionType eXFAAAT);
   bool OnXFAAAction(PDFSDK_XFAAActionType eXFAAAT,
-                    PDFSDK_FieldAction* data,
+                    CPDFSDK_FieldAction* data,
                     CPDFSDK_PageView* pPageView);
 
   void Synchronize(bool bSynchronizeElse);
@@ -100,7 +100,7 @@ class CPDFSDK_Widget : public CPDFSDK_BAAnnot {
   WideString OnFormat(bool& bFormatted);
 
   bool OnAAction(CPDF_AAction::AActionType type,
-                 PDFSDK_FieldAction* data,
+                 CPDFSDK_FieldAction* data,
                  CPDFSDK_PageView* pPageView);
 
   CPDFSDK_InterForm* GetInterForm() const { return m_pInterForm.Get(); }
diff --git a/fpdfsdk/formfiller/cffl_combobox.cpp b/fpdfsdk/formfiller/cffl_combobox.cpp
index 92dc8d621a..055b697669 100644
--- a/fpdfsdk/formfiller/cffl_combobox.cpp
+++ b/fpdfsdk/formfiller/cffl_combobox.cpp
@@ -123,7 +123,7 @@ void CFFL_ComboBox::SaveData(CPDFSDK_PageView* pPageView) {
 
 void CFFL_ComboBox::GetActionData(CPDFSDK_PageView* pPageView,
                                   CPDF_AAction::AActionType type,
-                                  PDFSDK_FieldAction& fa) {
+                                  CPDFSDK_FieldAction& fa) {
   switch (type) {
     case CPDF_AAction::KeyStroke:
       if (CPWL_ComboBox* pComboBox =
@@ -164,7 +164,7 @@ void CFFL_ComboBox::GetActionData(CPDFSDK_PageView* pPageView,
 
 void CFFL_ComboBox::SetActionData(CPDFSDK_PageView* pPageView,
                                   CPDF_AAction::AActionType type,
-                                  const PDFSDK_FieldAction& fa) {
+                                  const CPDFSDK_FieldAction& fa) {
   switch (type) {
     case CPDF_AAction::KeyStroke:
       if (CPWL_ComboBox* pComboBox =
@@ -181,8 +181,8 @@ void CFFL_ComboBox::SetActionData(CPDFSDK_PageView* pPageView,
 }
 
 bool CFFL_ComboBox::IsActionDataChanged(CPDF_AAction::AActionType type,
-                                        const PDFSDK_FieldAction& faOld,
-                                        const PDFSDK_FieldAction& faNew) {
+                                        const CPDFSDK_FieldAction& faOld,
+                                        const CPDFSDK_FieldAction& faNew) {
   switch (type) {
     case CPDF_AAction::KeyStroke:
       return (!faOld.bFieldFull && faOld.nSelEnd != faNew.nSelEnd) ||
diff --git a/fpdfsdk/formfiller/cffl_combobox.h b/fpdfsdk/formfiller/cffl_combobox.h
index bdc0934862..7a6390e491 100644
--- a/fpdfsdk/formfiller/cffl_combobox.h
+++ b/fpdfsdk/formfiller/cffl_combobox.h
@@ -33,13 +33,13 @@ class CFFL_ComboBox : public CFFL_TextObject,
   void SaveData(CPDFSDK_PageView* pPageView) override;
   void GetActionData(CPDFSDK_PageView* pPageView,
                      CPDF_AAction::AActionType type,
-                     PDFSDK_FieldAction& fa) override;
+                     CPDFSDK_FieldAction& fa) override;
   void SetActionData(CPDFSDK_PageView* pPageView,
                      CPDF_AAction::AActionType type,
-                     const PDFSDK_FieldAction& fa) override;
+                     const CPDFSDK_FieldAction& fa) override;
   bool IsActionDataChanged(CPDF_AAction::AActionType type,
-                           const PDFSDK_FieldAction& faOld,
-                           const PDFSDK_FieldAction& faNew) override;
+                           const CPDFSDK_FieldAction& faOld,
+                           const CPDFSDK_FieldAction& faNew) override;
   void SaveState(CPDFSDK_PageView* pPageView) override;
   void RestoreState(CPDFSDK_PageView* pPageView) override;
 #ifdef PDF_ENABLE_XFA
diff --git a/fpdfsdk/formfiller/cffl_formfiller.cpp b/fpdfsdk/formfiller/cffl_formfiller.cpp
index 6ec7e266e3..dcbe0181f3 100644
--- a/fpdfsdk/formfiller/cffl_formfiller.cpp
+++ b/fpdfsdk/formfiller/cffl_formfiller.cpp
@@ -524,17 +524,17 @@ void CFFL_FormFiller::SetChangeMark() {
 
 void CFFL_FormFiller::GetActionData(CPDFSDK_PageView* pPageView,
                                     CPDF_AAction::AActionType type,
-                                    PDFSDK_FieldAction& fa) {
+                                    CPDFSDK_FieldAction& fa) {
   fa.sValue = m_pWidget->GetValue();
 }
 
 void CFFL_FormFiller::SetActionData(CPDFSDK_PageView* pPageView,
                                     CPDF_AAction::AActionType type,
-                                    const PDFSDK_FieldAction& fa) {}
+                                    const CPDFSDK_FieldAction& fa) {}
 
 bool CFFL_FormFiller::IsActionDataChanged(CPDF_AAction::AActionType type,
-                                          const PDFSDK_FieldAction& faOld,
-                                          const PDFSDK_FieldAction& faNew) {
+                                          const CPDFSDK_FieldAction& faOld,
+                                          const CPDFSDK_FieldAction& faNew) {
   return false;
 }
 
diff --git a/fpdfsdk/formfiller/cffl_formfiller.h b/fpdfsdk/formfiller/cffl_formfiller.h
index 11a2f8c935..0dfb0bb177 100644
--- a/fpdfsdk/formfiller/cffl_formfiller.h
+++ b/fpdfsdk/formfiller/cffl_formfiller.h
@@ -10,9 +10,9 @@
 #include <map>
 
 #include "core/fxcrt/unowned_ptr.h"
+#include "fpdfsdk/cpdfsdk_fieldaction.h"
 #include "fpdfsdk/formfiller/cba_fontmap.h"
 #include "fpdfsdk/formfiller/cffl_interactiveformfiller.h"
-#include "fpdfsdk/pdfsdk_fieldaction.h"
 
 class CPDFSDK_Annot;
 class CPDFSDK_FormFillEnvironment;
@@ -90,13 +90,13 @@ class CFFL_FormFiller : public CPWL_Wnd::ProviderIface,
 
   virtual void GetActionData(CPDFSDK_PageView* pPageView,
                              CPDF_AAction::AActionType type,
-                             PDFSDK_FieldAction& fa);
+                             CPDFSDK_FieldAction& fa);
   virtual void SetActionData(CPDFSDK_PageView* pPageView,
                              CPDF_AAction::AActionType type,
-                             const PDFSDK_FieldAction& fa);
+                             const CPDFSDK_FieldAction& fa);
   virtual bool IsActionDataChanged(CPDF_AAction::AActionType type,
-                                   const PDFSDK_FieldAction& faOld,
-                                   const PDFSDK_FieldAction& faNew);
+                                   const CPDFSDK_FieldAction& faOld,
+                                   const CPDFSDK_FieldAction& faNew);
 
   virtual void SaveState(CPDFSDK_PageView* pPageView);
   virtual void RestoreState(CPDFSDK_PageView* pPageView);
diff --git a/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp b/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp
index f33bde68cc..83b425725a 100644
--- a/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp
+++ b/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp
@@ -126,7 +126,7 @@ void CFFL_InteractiveFormFiller::OnMouseEnter(
       pWidget->ClearAppModified();
       ASSERT(pPageView);
 
-      PDFSDK_FieldAction fa;
+      CPDFSDK_FieldAction fa;
       fa.bModifier = CPDFSDK_FormFillEnvironment::IsCTRLKeyDown(nFlag);
       fa.bShift = CPDFSDK_FormFillEnvironment::IsSHIFTKeyDown(nFlag);
       pWidget->OnAAction(CPDF_AAction::CursorEnter, &fa, pPageView);
@@ -159,7 +159,7 @@ void CFFL_InteractiveFormFiller::OnMouseExit(CPDFSDK_PageView* pPageView,
       pWidget->ClearAppModified();
       ASSERT(pPageView);
 
-      PDFSDK_FieldAction fa;
+      CPDFSDK_FieldAction fa;
       fa.bModifier = CPDFSDK_FormFillEnvironment::IsCTRLKeyDown(nFlag);
       fa.bShift = CPDFSDK_FormFillEnvironment::IsSHIFTKeyDown(nFlag);
       pWidget->OnAAction(CPDF_AAction::CursorExit, &fa, pPageView);
@@ -195,7 +195,7 @@ bool CFFL_InteractiveFormFiller::OnLButtonDown(
       pWidget->ClearAppModified();
       ASSERT(pPageView);
 
-      PDFSDK_FieldAction fa;
+      CPDFSDK_FieldAction fa;
       fa.bModifier = CPDFSDK_FormFillEnvironment::IsCTRLKeyDown(nFlags);
       fa.bShift = CPDFSDK_FormFillEnvironment::IsSHIFTKeyDown(nFlags);
       pWidget->OnAAction(CPDF_AAction::ButtonDown, &fa, pPageView);
@@ -273,7 +273,7 @@ bool CFFL_InteractiveFormFiller::OnButtonUp(CPDFSDK_Annot::ObservedPtr* pAnnot,
   uint32_t nValueAge = pWidget->GetValueAge();
   ASSERT(pPageView);
 
-  PDFSDK_FieldAction fa;
+  CPDFSDK_FieldAction fa;
   fa.bModifier = CPDFSDK_FormFillEnvironment::IsCTRLKeyDown(nFlag);
   fa.bShift = CPDFSDK_FormFillEnvironment::IsSHIFTKeyDown(nFlag);
   pWidget->OnAAction(CPDF_AAction::ButtonUp, &fa, pPageView);
@@ -385,7 +385,7 @@ bool CFFL_InteractiveFormFiller::OnSetFocus(CPDFSDK_Annot::ObservedPtr* pAnnot,
       CPDFSDK_PageView* pPageView = (*pAnnot)->GetPageView();
       ASSERT(pPageView);
 
-      PDFSDK_FieldAction fa;
+      CPDFSDK_FieldAction fa;
       fa.bModifier = CPDFSDK_FormFillEnvironment::IsCTRLKeyDown(nFlag);
       fa.bShift = CPDFSDK_FormFillEnvironment::IsSHIFTKeyDown(nFlag);
       pFormFiller->GetActionData(pPageView, CPDF_AAction::GetFocus, fa);
@@ -436,7 +436,7 @@ bool CFFL_InteractiveFormFiller::OnKillFocus(CPDFSDK_Annot::ObservedPtr* pAnnot,
   CPDFSDK_PageView* pPageView = pWidget->GetPageView();
   ASSERT(pPageView);
 
-  PDFSDK_FieldAction fa;
+  CPDFSDK_FieldAction fa;
   fa.bModifier = CPDFSDK_FormFillEnvironment::IsCTRLKeyDown(nFlag);
   fa.bShift = CPDFSDK_FormFillEnvironment::IsSHIFTKeyDown(nFlag);
   pFormFiller->GetActionData(pPageView, CPDF_AAction::LoseFocus, fa);
@@ -611,7 +611,7 @@ bool CFFL_InteractiveFormFiller::OnKeyStrokeCommit(
   m_bNotifying = true;
   pWidget->ClearAppModified();
 
-  PDFSDK_FieldAction fa;
+  CPDFSDK_FieldAction fa;
   fa.bModifier = CPDFSDK_FormFillEnvironment::IsCTRLKeyDown(nFlag);
   fa.bShift = CPDFSDK_FormFillEnvironment::IsSHIFTKeyDown(nFlag);
   fa.bWillCommit = true;
@@ -643,7 +643,7 @@ bool CFFL_InteractiveFormFiller::OnValidate(CPDFSDK_Annot::ObservedPtr* pAnnot,
   m_bNotifying = true;
   pWidget->ClearAppModified();
 
-  PDFSDK_FieldAction fa;
+  CPDFSDK_FieldAction fa;
   fa.bModifier = CPDFSDK_FormFillEnvironment::IsCTRLKeyDown(nFlag);
   fa.bShift = CPDFSDK_FormFillEnvironment::IsSHIFTKeyDown(nFlag);
   fa.bKeyDown = true;
@@ -712,7 +712,7 @@ bool CFFL_InteractiveFormFiller::OnClick(CPDFSDK_Annot::ObservedPtr* pAnnot,
   uint32_t nAge = pWidget->GetAppearanceAge();
   uint32_t nValueAge = pWidget->GetValueAge();
 
-  PDFSDK_FieldAction fa;
+  CPDFSDK_FieldAction fa;
   fa.bModifier = CPDFSDK_FormFillEnvironment::IsCTRLKeyDown(nFlag);
   fa.bShift = CPDFSDK_FormFillEnvironment::IsSHIFTKeyDown(nFlag);
 
@@ -742,7 +742,7 @@ bool CFFL_InteractiveFormFiller::OnFull(CPDFSDK_Annot::ObservedPtr* pAnnot,
   uint32_t nAge = pWidget->GetAppearanceAge();
   uint32_t nValueAge = pWidget->GetValueAge();
 
-  PDFSDK_FieldAction fa;
+  CPDFSDK_FieldAction fa;
   fa.bModifier = CPDFSDK_FormFillEnvironment::IsCTRLKeyDown(nFlag);
   fa.bShift = CPDFSDK_FormFillEnvironment::IsSHIFTKeyDown(nFlag);
 
@@ -795,7 +795,7 @@ bool CFFL_InteractiveFormFiller::OnPreOpen(CPDFSDK_Annot::ObservedPtr* pAnnot,
   uint32_t nAge = pWidget->GetAppearanceAge();
   uint32_t nValueAge = pWidget->GetValueAge();
 
-  PDFSDK_FieldAction fa;
+  CPDFSDK_FieldAction fa;
   fa.bModifier = CPDFSDK_FormFillEnvironment::IsCTRLKeyDown(nFlag);
   fa.bShift = CPDFSDK_FormFillEnvironment::IsSHIFTKeyDown(nFlag);
 
@@ -826,7 +826,7 @@ bool CFFL_InteractiveFormFiller::OnPostOpen(CPDFSDK_Annot::ObservedPtr* pAnnot,
   uint32_t nAge = pWidget->GetAppearanceAge();
   uint32_t nValueAge = pWidget->GetValueAge();
 
-  PDFSDK_FieldAction fa;
+  CPDFSDK_FieldAction fa;
   fa.bModifier = CPDFSDK_FormFillEnvironment::IsCTRLKeyDown(nFlag);
   fa.bShift = CPDFSDK_FormFillEnvironment::IsSHIFTKeyDown(nFlag);
 
@@ -884,7 +884,7 @@ std::pair<bool, bool> CFFL_InteractiveFormFiller::OnBeforeKeyStroke(
   CPDFSDK_FormFillEnvironment* pFormFillEnv =
       privateData.pPageView->GetFormFillEnv();
 
-  PDFSDK_FieldAction fa;
+  CPDFSDK_FieldAction fa;
   fa.bModifier = CPDFSDK_FormFillEnvironment::IsCTRLKeyDown(nFlag);
   fa.bShift = CPDFSDK_FormFillEnvironment::IsSHIFTKeyDown(nFlag);
   fa.sChange = strChange;
diff --git a/fpdfsdk/formfiller/cffl_listbox.cpp b/fpdfsdk/formfiller/cffl_listbox.cpp
index 41e4774218..943412d509 100644
--- a/fpdfsdk/formfiller/cffl_listbox.cpp
+++ b/fpdfsdk/formfiller/cffl_listbox.cpp
@@ -134,7 +134,7 @@ void CFFL_ListBox::SaveData(CPDFSDK_PageView* pPageView) {
 
 void CFFL_ListBox::GetActionData(CPDFSDK_PageView* pPageView,
                                  CPDF_AAction::AActionType type,
-                                 PDFSDK_FieldAction& fa) {
+                                 CPDFSDK_FieldAction& fa) {
   switch (type) {
     case CPDF_AAction::Validate:
       if (m_pWidget->GetFieldFlags() & FIELDFLAG_MULTISELECT) {
diff --git a/fpdfsdk/formfiller/cffl_listbox.h b/fpdfsdk/formfiller/cffl_listbox.h
index 014865d567..9db3c5da1d 100644
--- a/fpdfsdk/formfiller/cffl_listbox.h
+++ b/fpdfsdk/formfiller/cffl_listbox.h
@@ -27,7 +27,7 @@ class CFFL_ListBox : public CFFL_TextObject {
   void SaveData(CPDFSDK_PageView* pPageView) override;
   void GetActionData(CPDFSDK_PageView* pPageView,
                      CPDF_AAction::AActionType type,
-                     PDFSDK_FieldAction& fa) override;
+                     CPDFSDK_FieldAction& fa) override;
   void SaveState(CPDFSDK_PageView* pPageView) override;
   void RestoreState(CPDFSDK_PageView* pPageView) override;
 
diff --git a/fpdfsdk/formfiller/cffl_textfield.cpp b/fpdfsdk/formfiller/cffl_textfield.cpp
index 6d7277c8fa..eeed266235 100644
--- a/fpdfsdk/formfiller/cffl_textfield.cpp
+++ b/fpdfsdk/formfiller/cffl_textfield.cpp
@@ -156,7 +156,7 @@ void CFFL_TextField::SaveData(CPDFSDK_PageView* pPageView) {
 
 void CFFL_TextField::GetActionData(CPDFSDK_PageView* pPageView,
                                    CPDF_AAction::AActionType type,
-                                   PDFSDK_FieldAction& fa) {
+                                   CPDFSDK_FieldAction& fa) {
   switch (type) {
     case CPDF_AAction::KeyStroke:
       if (CPWL_Edit* pWnd = GetEdit(pPageView, false)) {
@@ -186,7 +186,7 @@ void CFFL_TextField::GetActionData(CPDFSDK_PageView* pPageView,
 
 void CFFL_TextField::SetActionData(CPDFSDK_PageView* pPageView,
                                    CPDF_AAction::AActionType type,
-                                   const PDFSDK_FieldAction& fa) {
+                                   const CPDFSDK_FieldAction& fa) {
   switch (type) {
     case CPDF_AAction::KeyStroke:
       if (CPWL_Edit* pEdit = GetEdit(pPageView, false)) {
@@ -201,8 +201,8 @@ void CFFL_TextField::SetActionData(CPDFSDK_PageView* pPageView,
 }
 
 bool CFFL_TextField::IsActionDataChanged(CPDF_AAction::AActionType type,
-                                         const PDFSDK_FieldAction& faOld,
-                                         const PDFSDK_FieldAction& faNew) {
+                                         const CPDFSDK_FieldAction& faOld,
+                                         const CPDFSDK_FieldAction& faNew) {
   switch (type) {
     case CPDF_AAction::KeyStroke:
       return (!faOld.bFieldFull && faOld.nSelEnd != faNew.nSelEnd) ||
diff --git a/fpdfsdk/formfiller/cffl_textfield.h b/fpdfsdk/formfiller/cffl_textfield.h
index 49ffc0fc33..4d34d055a5 100644
--- a/fpdfsdk/formfiller/cffl_textfield.h
+++ b/fpdfsdk/formfiller/cffl_textfield.h
@@ -38,13 +38,13 @@ class CFFL_TextField : public CFFL_TextObject,
   void SaveData(CPDFSDK_PageView* pPageView) override;
   void GetActionData(CPDFSDK_PageView* pPageView,
                      CPDF_AAction::AActionType type,
-                     PDFSDK_FieldAction& fa) override;
+                     CPDFSDK_FieldAction& fa) override;
   void SetActionData(CPDFSDK_PageView* pPageView,
                      CPDF_AAction::AActionType type,
-                     const PDFSDK_FieldAction& fa) override;
+                     const CPDFSDK_FieldAction& fa) override;
   bool IsActionDataChanged(CPDF_AAction::AActionType type,
-                           const PDFSDK_FieldAction& faOld,
-                           const PDFSDK_FieldAction& faNew) override;
+                           const CPDFSDK_FieldAction& faOld,
+                           const CPDFSDK_FieldAction& faNew) override;
   void SaveState(CPDFSDK_PageView* pPageView) override;
   void RestoreState(CPDFSDK_PageView* pPageView) override;
 #ifdef PDF_ENABLE_XFA
diff --git a/fpdfsdk/fpdf_progressive.cpp b/fpdfsdk/fpdf_progressive.cpp
index d53ab15d0e..6ac6686ac8 100644
--- a/fpdfsdk/fpdf_progressive.cpp
+++ b/fpdfsdk/fpdf_progressive.cpp
@@ -15,7 +15,7 @@
 #include "core/fxge/cfx_defaultrenderdevice.h"
 #include "core/fxge/cfx_renderdevice.h"
 #include "fpdfsdk/cpdfsdk_helpers.h"
-#include "fpdfsdk/fsdk_pauseadapter.h"
+#include "fpdfsdk/ipdfsdk_pauseadapter.h"
 #include "public/fpdfview.h"
 #include "third_party/base/ptr_util.h"
 
@@ -56,7 +56,7 @@ FPDF_EXPORT int FPDF_CALLCONV FPDF_RenderPageBitmap_Start(FPDF_BITMAP bitmap,
   pContext->m_pDevice = std::move(pOwnedDevice);
   pDevice->Attach(pBitmap, !!(flags & FPDF_REVERSE_BYTE_ORDER), nullptr, false);
 
-  IFSDK_PAUSE_Adapter IPauseAdapter(pause);
+  IPDFSDK_PauseAdapter IPauseAdapter(pause);
   FPDF_RenderPage_Retail(pContext, page, start_x, start_y, size_x, size_y,
                          rotate, flags, false, &IPauseAdapter);
 
@@ -82,7 +82,7 @@ FPDF_EXPORT int FPDF_CALLCONV FPDF_RenderPage_Continue(FPDF_PAGE page,
 
   CPDF_PageRenderContext* pContext = pPage->GetRenderContext();
   if (pContext && pContext->m_pRenderer) {
-    IFSDK_PAUSE_Adapter IPauseAdapter(pause);
+    IPDFSDK_PauseAdapter IPauseAdapter(pause);
     pContext->m_pRenderer->Continue(&IPauseAdapter);
 #ifdef _SKIA_SUPPORT_PATHS_
     CFX_RenderDevice* pDevice = pContext->m_pDevice.get();
diff --git a/fpdfsdk/fpdfformfill.cpp b/fpdfsdk/fpdfformfill.cpp
index 6cf587c7ac..ddd460da05 100644
--- a/fpdfsdk/fpdfformfill.cpp
+++ b/fpdfsdk/fpdfformfill.cpp
@@ -17,11 +17,11 @@
 #include "core/fpdfdoc/cpdf_interform.h"
 #include "core/fpdfdoc/cpdf_occontext.h"
 #include "core/fxge/cfx_defaultrenderdevice.h"
+#include "fpdfsdk/cpdfsdk_actionhandler.h"
 #include "fpdfsdk/cpdfsdk_formfillenvironment.h"
 #include "fpdfsdk/cpdfsdk_helpers.h"
 #include "fpdfsdk/cpdfsdk_interform.h"
 #include "fpdfsdk/cpdfsdk_pageview.h"
-#include "fpdfsdk/fsdk_actionhandler.h"
 #include "public/fpdfview.h"
 #include "third_party/base/ptr_util.h"
 #include "third_party/base/stl_util.h"
diff --git a/fpdfsdk/fpdfsave.cpp b/fpdfsdk/fpdfsave.cpp
index 2c615f434c..da3e12fc9c 100644
--- a/fpdfsdk/fpdfsave.cpp
+++ b/fpdfsdk/fpdfsave.cpp
@@ -18,8 +18,8 @@
 #include "core/fpdfapi/parser/cpdf_string.h"
 #include "core/fxcrt/cfx_memorystream.h"
 #include "core/fxcrt/fx_extension.h"
+#include "fpdfsdk/cpdfsdk_filewriteadapter.h"
 #include "fpdfsdk/cpdfsdk_helpers.h"
-#include "fpdfsdk/fsdk_filewriteadapter.h"
 #include "public/fpdf_edit.h"
 
 #ifdef PDF_ENABLE_XFA
@@ -254,8 +254,8 @@ bool FPDF_Doc_Save(FPDF_DOCUMENT document,
   if (flags < FPDF_INCREMENTAL || flags > FPDF_REMOVE_SECURITY)
     flags = 0;
 
-  CPDF_Creator fileMaker(pPDFDoc,
-                         pdfium::MakeRetain<FSDK_FileWriteAdapter>(pFileWrite));
+  CPDF_Creator fileMaker(
+      pPDFDoc, pdfium::MakeRetain<CPDFSDK_FileWriteAdapter>(pFileWrite));
   if (bSetVersion)
     fileMaker.SetFileVersion(fileVerion);
   if (flags == FPDF_REMOVE_SECURITY) {
diff --git a/fpdfsdk/fpdfview.cpp b/fpdfsdk/fpdfview.cpp
index ff2a4633f1..187db9b126 100644
--- a/fpdfsdk/fpdfview.cpp
+++ b/fpdfsdk/fpdfview.cpp
@@ -35,7 +35,7 @@
 #include "fpdfsdk/cpdfsdk_helpers.h"
 #include "fpdfsdk/cpdfsdk_memoryaccess.h"
 #include "fpdfsdk/cpdfsdk_pageview.h"
-#include "fpdfsdk/fsdk_pauseadapter.h"
+#include "fpdfsdk/ipdfsdk_pauseadapter.h"
 #include "fxjs/ijs_runtime.h"
 #include "public/fpdf_formfill.h"
 #include "third_party/base/ptr_util.h"
@@ -71,7 +71,7 @@ void RenderPageImpl(CPDF_PageRenderContext* pContext,
                     const FX_RECT& clipping_rect,
                     int flags,
                     bool bNeedToRestore,
-                    IFSDK_PAUSE_Adapter* pause) {
+                    IPDFSDK_PauseAdapter* pause) {
   if (!pContext->m_pOptions)
     pContext->m_pOptions = pdfium::MakeUnique<CPDF_RenderOptions>();
 
@@ -899,7 +899,7 @@ void FPDF_RenderPage_Retail(CPDF_PageRenderContext* pContext,
                             int rotate,
                             int flags,
                             bool bNeedToRestore,
-                            IFSDK_PAUSE_Adapter* pause) {
+                            IPDFSDK_PauseAdapter* pause) {
   CPDF_Page* pPage = CPDFPageFromFPDFPage(page);
   if (!pPage)
     return;
diff --git a/fpdfsdk/fsdk_pauseadapter.cpp b/fpdfsdk/ipdfsdk_pauseadapter.cpp
index cf99253ff9..3cdf1330d8 100644
--- a/fpdfsdk/fsdk_pauseadapter.cpp
+++ b/fpdfsdk/ipdfsdk_pauseadapter.cpp
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/fsdk_pauseadapter.h"
+#include "fpdfsdk/ipdfsdk_pauseadapter.h"
 
-IFSDK_PAUSE_Adapter::IFSDK_PAUSE_Adapter(IFSDK_PAUSE* IPause)
+IPDFSDK_PauseAdapter::IPDFSDK_PauseAdapter(IFSDK_PAUSE* IPause)
     : m_IPause(IPause) {}
 
-IFSDK_PAUSE_Adapter::~IFSDK_PAUSE_Adapter() {}
+IPDFSDK_PauseAdapter::~IPDFSDK_PauseAdapter() {}
 
-bool IFSDK_PAUSE_Adapter::NeedToPauseNow() {
+bool IPDFSDK_PauseAdapter::NeedToPauseNow() {
   return m_IPause->NeedToPauseNow && m_IPause->NeedToPauseNow(m_IPause.Get());
 }
diff --git a/fpdfsdk/fsdk_pauseadapter.h b/fpdfsdk/ipdfsdk_pauseadapter.h
index 405f4d94d1..7ee01ba53f 100644
--- a/fpdfsdk/fsdk_pauseadapter.h
+++ b/fpdfsdk/ipdfsdk_pauseadapter.h
@@ -4,18 +4,18 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_FSDK_PAUSEADAPTER_H_
-#define FPDFSDK_FSDK_PAUSEADAPTER_H_
+#ifndef FPDFSDK_IPDFSDK_PAUSEADAPTER_H_
+#define FPDFSDK_IPDFSDK_PAUSEADAPTER_H_
 
 #include "core/fxcrt/fx_system.h"
 #include "core/fxcrt/pauseindicator_iface.h"
 #include "core/fxcrt/unowned_ptr.h"
 #include "public/fpdf_progressive.h"
 
-class IFSDK_PAUSE_Adapter : public PauseIndicatorIface {
+class IPDFSDK_PauseAdapter : public PauseIndicatorIface {
  public:
-  explicit IFSDK_PAUSE_Adapter(IFSDK_PAUSE* IPause);
-  ~IFSDK_PAUSE_Adapter() override;
+  explicit IPDFSDK_PauseAdapter(IFSDK_PAUSE* IPause);
+  ~IPDFSDK_PauseAdapter() override;
 
   bool NeedToPauseNow() override;
 
@@ -23,4 +23,4 @@ class IFSDK_PAUSE_Adapter : public PauseIndicatorIface {
   UnownedPtr<IFSDK_PAUSE> const m_IPause;
 };
 
-#endif  // FPDFSDK_FSDK_PAUSEADAPTER_H_
+#endif  // FPDFSDK_IPDFSDK_PAUSEADAPTER_H_