Rename "Embeddertest" to "EmbedderTest".

Change-Id: Iaac832b2f64d4ce9212c94b997afb3b242fe3ebc
Reviewed-on: https://pdfium-review.googlesource.com/c/47690
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
diff --git a/core/fpdfapi/page/cpdf_docpagedata_embeddertest.cpp b/core/fpdfapi/page/cpdf_docpagedata_embeddertest.cpp
index 5120b21..8ba1d48 100644
--- a/core/fpdfapi/page/cpdf_docpagedata_embeddertest.cpp
+++ b/core/fpdfapi/page/cpdf_docpagedata_embeddertest.cpp
@@ -5,9 +5,9 @@
 #include "testing/embedder_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-class CPDF_DocPageDataEmbeddertest : public EmbedderTest {};
+class CPDF_DocPageDataEmbedderTest : public EmbedderTest {};
 
-TEST_F(CPDF_DocPageDataEmbeddertest, Crasher_828206) {
+TEST_F(CPDF_DocPageDataEmbedderTest, Crasher_828206) {
   EXPECT_TRUE(OpenDocument("bug_828206.pdf"));
   FPDF_PAGE page = LoadPage(0);
   ASSERT_TRUE(page);
diff --git a/core/fpdfapi/page/cpdf_function_embeddertest.cpp b/core/fpdfapi/page/cpdf_function_embeddertest.cpp
index 521cc0f..f96c82f 100644
--- a/core/fpdfapi/page/cpdf_function_embeddertest.cpp
+++ b/core/fpdfapi/page/cpdf_function_embeddertest.cpp
@@ -5,9 +5,9 @@
 #include "testing/embedder_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-class CPDF_FunctionEmbeddertest : public EmbedderTest {};
+class CPDF_FunctionEmbedderTest : public EmbedderTest {};
 
-TEST_F(CPDF_FunctionEmbeddertest, Crasher_830221) {
+TEST_F(CPDF_FunctionEmbedderTest, Crasher_830221) {
   EXPECT_TRUE(OpenDocument("bug_830221.pdf"));
   FPDF_PAGE page = LoadPage(0);
   ASSERT_TRUE(page);
diff --git a/core/fpdfapi/page/cpdf_stitchfunc_embeddertest.cpp b/core/fpdfapi/page/cpdf_stitchfunc_embeddertest.cpp
index 9b3b18d..fa85a4f 100644
--- a/core/fpdfapi/page/cpdf_stitchfunc_embeddertest.cpp
+++ b/core/fpdfapi/page/cpdf_stitchfunc_embeddertest.cpp
@@ -8,9 +8,9 @@
 #include "testing/embedder_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-class FPDFPageFuncEmbeddertest : public EmbedderTest {};
+class FPDFPageFuncEmbedderTest : public EmbedderTest {};
 
-TEST_F(FPDFPageFuncEmbeddertest, Bug_551460) {
+TEST_F(FPDFPageFuncEmbedderTest, Bug_551460) {
   // Should not crash under ASan.
   // Tests that the number of inputs is not simply calculated from the domain
   // and trusted. The number of inputs has to be 1.
diff --git a/core/fpdfapi/parser/cpdf_parser_embeddertest.cpp b/core/fpdfapi/parser/cpdf_parser_embeddertest.cpp
index 3b8f550..9294534 100644
--- a/core/fpdfapi/parser/cpdf_parser_embeddertest.cpp
+++ b/core/fpdfapi/parser/cpdf_parser_embeddertest.cpp
@@ -6,15 +6,15 @@
 #include "testing/embedder_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-class CPDFParserEmbeddertest : public EmbedderTest {};
+class CPDFParserEmbedderTest : public EmbedderTest {};
 
-TEST_F(CPDFParserEmbeddertest, LoadError_454695) {
+TEST_F(CPDFParserEmbedderTest, LoadError_454695) {
   // Test a dictionary with hex string instead of correct content.
   // Verify that the defective pdf shouldn't be opened correctly.
   EXPECT_FALSE(OpenDocument("bug_454695.pdf"));
 }
 
-TEST_F(CPDFParserEmbeddertest, Bug_481363) {
+TEST_F(CPDFParserEmbedderTest, Bug_481363) {
   // Test colorspace object with malformed dictionary.
   EXPECT_TRUE(OpenDocument("bug_481363.pdf"));
   FPDF_PAGE page = LoadPage(0);
@@ -22,7 +22,7 @@
   UnloadPage(page);
 }
 
-TEST_F(CPDFParserEmbeddertest, Bug_544880) {
+TEST_F(CPDFParserEmbedderTest, Bug_544880) {
   // Test self referencing /Pages object.
   EXPECT_TRUE(OpenDocument("bug_544880.pdf"));
   // Shouldn't crash. We don't check the return value here because we get the
@@ -31,15 +31,15 @@
   (void)GetPageCount();
 }
 
-TEST_F(CPDFParserEmbeddertest, Bug_325a) {
+TEST_F(CPDFParserEmbedderTest, Bug_325a) {
   EXPECT_FALSE(OpenDocument("bug_325_a.pdf"));
 }
 
-TEST_F(CPDFParserEmbeddertest, Bug_325b) {
+TEST_F(CPDFParserEmbedderTest, Bug_325b) {
   EXPECT_FALSE(OpenDocument("bug_325_b.pdf"));
 }
 
-TEST_F(CPDFParserEmbeddertest, Bug_602650) {
+TEST_F(CPDFParserEmbedderTest, Bug_602650) {
   // Test the case that cross reference entries, which are well formed,
   // but do not match with the objects.
   EXPECT_TRUE(OpenDocument("bug_602650.pdf"));
@@ -54,11 +54,11 @@
   UnloadPage(page);
 }
 
-TEST_F(CPDFParserEmbeddertest, Bug_757705) {
+TEST_F(CPDFParserEmbedderTest, Bug_757705) {
   EXPECT_TRUE(OpenDocument("bug_757705.pdf"));
 }
 
-TEST_F(CPDFParserEmbeddertest, LoadMainCrossRefTable) {
+TEST_F(CPDFParserEmbedderTest, LoadMainCrossRefTable) {
   EXPECT_TRUE(OpenDocumentLinearized("feature_linearized_loading.pdf"));
   // To check that main cross ref table is loaded correctly,will be enough to
   // check that the second page was correctly loaded. Because it is contains
@@ -74,7 +74,7 @@
   UnloadPage(page);
 }
 
-TEST_F(CPDFParserEmbeddertest, Bug_828049) {
+TEST_F(CPDFParserEmbedderTest, Bug_828049) {
   EXPECT_TRUE(OpenDocument("bug_828049.pdf"));
   FPDF_PAGE page = LoadPage(0);
   EXPECT_NE(nullptr, page);
diff --git a/core/fpdfapi/parser/cpdf_security_handler_embeddertest.cpp b/core/fpdfapi/parser/cpdf_security_handler_embeddertest.cpp
index ab1b06d..d436a93 100644
--- a/core/fpdfapi/parser/cpdf_security_handler_embeddertest.cpp
+++ b/core/fpdfapi/parser/cpdf_security_handler_embeddertest.cpp
@@ -13,37 +13,37 @@
 #include "testing/embedder_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-class CPDFSecurityHandlerEmbeddertest : public EmbedderTest {};
+class CPDFSecurityHandlerEmbedderTest : public EmbedderTest {};
 
-TEST_F(CPDFSecurityHandlerEmbeddertest, Unencrypted) {
+TEST_F(CPDFSecurityHandlerEmbedderTest, Unencrypted) {
   ASSERT_TRUE(OpenDocument("about_blank.pdf"));
   EXPECT_EQ(0xFFFFFFFF, FPDF_GetDocPermissions(document()));
 }
 
-TEST_F(CPDFSecurityHandlerEmbeddertest, UnencryptedWithPassword) {
+TEST_F(CPDFSecurityHandlerEmbedderTest, UnencryptedWithPassword) {
   ASSERT_TRUE(OpenDocumentWithPassword("about_blank.pdf", "foobar"));
   EXPECT_EQ(0xFFFFFFFF, FPDF_GetDocPermissions(document()));
 }
 
-TEST_F(CPDFSecurityHandlerEmbeddertest, NoPassword) {
+TEST_F(CPDFSecurityHandlerEmbedderTest, NoPassword) {
   EXPECT_FALSE(OpenDocument("encrypted.pdf"));
 }
 
-TEST_F(CPDFSecurityHandlerEmbeddertest, BadPassword) {
+TEST_F(CPDFSecurityHandlerEmbedderTest, BadPassword) {
   EXPECT_FALSE(OpenDocumentWithPassword("encrypted.pdf", "tiger"));
 }
 
-TEST_F(CPDFSecurityHandlerEmbeddertest, UserPassword) {
+TEST_F(CPDFSecurityHandlerEmbedderTest, UserPassword) {
   ASSERT_TRUE(OpenDocumentWithPassword("encrypted.pdf", "1234"));
   EXPECT_EQ(0xFFFFF2C0, FPDF_GetDocPermissions(document()));
 }
 
-TEST_F(CPDFSecurityHandlerEmbeddertest, OwnerPassword) {
+TEST_F(CPDFSecurityHandlerEmbedderTest, OwnerPassword) {
   ASSERT_TRUE(OpenDocumentWithPassword("encrypted.pdf", "5678"));
   EXPECT_EQ(0xFFFFFFFC, FPDF_GetDocPermissions(document()));
 }
 
-TEST_F(CPDFSecurityHandlerEmbeddertest, PasswordAfterGenerateSave) {
+TEST_F(CPDFSecurityHandlerEmbedderTest, PasswordAfterGenerateSave) {
 #if _FX_PLATFORM_ == _FX_PLATFORM_LINUX_
   const char md5[] = "7048dca58e2ed8f93339008b91e4eb4e";
 #elif _FX_PLATFORM_ == _FX_PLATFORM_APPLE_
@@ -93,20 +93,20 @@
   }
 }
 
-TEST_F(CPDFSecurityHandlerEmbeddertest, NoPasswordVersion5) {
+TEST_F(CPDFSecurityHandlerEmbedderTest, NoPasswordVersion5) {
   ASSERT_FALSE(OpenDocument("bug_644.pdf"));
 }
 
-TEST_F(CPDFSecurityHandlerEmbeddertest, BadPasswordVersion5) {
+TEST_F(CPDFSecurityHandlerEmbedderTest, BadPasswordVersion5) {
   ASSERT_FALSE(OpenDocumentWithPassword("bug_644.pdf", "tiger"));
 }
 
-TEST_F(CPDFSecurityHandlerEmbeddertest, OwnerPasswordVersion5) {
+TEST_F(CPDFSecurityHandlerEmbedderTest, OwnerPasswordVersion5) {
   ASSERT_TRUE(OpenDocumentWithPassword("bug_644.pdf", "a"));
   EXPECT_EQ(0xFFFFFFFC, FPDF_GetDocPermissions(document()));
 }
 
-TEST_F(CPDFSecurityHandlerEmbeddertest, UserPasswordVersion5) {
+TEST_F(CPDFSecurityHandlerEmbedderTest, UserPasswordVersion5) {
   ASSERT_TRUE(OpenDocumentWithPassword("bug_644.pdf", "b"));
   EXPECT_EQ(0xFFFFFFFC, FPDF_GetDocPermissions(document()));
 }
diff --git a/core/fpdfapi/parser/fpdf_parser_decode_embeddertest.cpp b/core/fpdfapi/parser/fpdf_parser_decode_embeddertest.cpp
index 4c99394..2131064 100644
--- a/core/fpdfapi/parser/fpdf_parser_decode_embeddertest.cpp
+++ b/core/fpdfapi/parser/fpdf_parser_decode_embeddertest.cpp
@@ -12,12 +12,12 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/test_support.h"
 
-using FPDFParserDecodeEmbeddertest = EmbedderTest;
+using FPDFParserDecodeEmbedderTest = EmbedderTest;
 
 // NOTE: python's zlib.compress() and zlib.decompress() may be useful for
 // external validation of the FlateEncode/FlateDecode test cases.
 
-TEST_F(FPDFParserDecodeEmbeddertest, FlateEncode) {
+TEST_F(FPDFParserDecodeEmbedderTest, FlateEncode) {
   static const pdfium::StrFuncTestData flate_encode_cases[] = {
       STR_IN_OUT_CASE("", "\x78\x9c\x03\x00\x00\x00\x00\x01"),
       STR_IN_OUT_CASE(" ", "\x78\x9c\x53\x00\x00\x00\x21\x00\x21"),
@@ -49,7 +49,7 @@
   }
 }
 
-TEST_F(FPDFParserDecodeEmbeddertest, FlateDecode) {
+TEST_F(FPDFParserDecodeEmbedderTest, FlateDecode) {
   static const pdfium::DecodeTestData flate_decode_cases[] = {
       STR_IN_OUT_CASE("", "", 0),
       STR_IN_OUT_CASE("preposterous nonsense", "", 2),
@@ -87,7 +87,7 @@
   }
 }
 
-TEST_F(FPDFParserDecodeEmbeddertest, Bug_552046) {
+TEST_F(FPDFParserDecodeEmbedderTest, Bug_552046) {
   // Tests specifying multiple image filters for a stream. Should not cause a
   // crash when rendered.
   EXPECT_TRUE(OpenDocument("bug_552046.pdf"));
@@ -98,7 +98,7 @@
   UnloadPage(page);
 }
 
-TEST_F(FPDFParserDecodeEmbeddertest, Bug_555784) {
+TEST_F(FPDFParserDecodeEmbedderTest, Bug_555784) {
   // Tests bad input to the run length decoder that caused a heap overflow.
   // Should not cause a crash when rendered.
   EXPECT_TRUE(OpenDocument("bug_555784.pdf"));
@@ -109,7 +109,7 @@
   UnloadPage(page);
 }
 
-TEST_F(FPDFParserDecodeEmbeddertest, Bug_455199) {
+TEST_F(FPDFParserDecodeEmbedderTest, Bug_455199) {
   // Tests object numbers with a value > 01000000.
   // Should open successfully.
   EXPECT_TRUE(OpenDocument("bug_455199.pdf"));
diff --git a/core/fpdfapi/render/fpdf_render_loadimage_embeddertest.cpp b/core/fpdfapi/render/fpdf_render_loadimage_embeddertest.cpp
index e3bd297..30ba2d6 100644
--- a/core/fpdfapi/render/fpdf_render_loadimage_embeddertest.cpp
+++ b/core/fpdfapi/render/fpdf_render_loadimage_embeddertest.cpp
@@ -8,9 +8,9 @@
 #include "testing/embedder_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-class FPDFRenderLoadImageEmbeddertest : public EmbedderTest {};
+class FPDFRenderLoadImageEmbedderTest : public EmbedderTest {};
 
-TEST_F(FPDFRenderLoadImageEmbeddertest, Bug_554151) {
+TEST_F(FPDFRenderLoadImageEmbedderTest, Bug_554151) {
   // Test scanline downsampling with a BitsPerComponent of 4.
   // Should not crash.
   EXPECT_TRUE(OpenDocument("bug_554151.pdf"));
@@ -21,7 +21,7 @@
   UnloadPage(page);
 }
 
-TEST_F(FPDFRenderLoadImageEmbeddertest, Bug_557223) {
+TEST_F(FPDFRenderLoadImageEmbedderTest, Bug_557223) {
   // Should not crash
   EXPECT_TRUE(OpenDocument("bug_557223.pdf"));
   FPDF_PAGE page = LoadPage(0);
@@ -31,7 +31,7 @@
   UnloadPage(page);
 }
 
-TEST_F(FPDFRenderLoadImageEmbeddertest, Bug_603518) {
+TEST_F(FPDFRenderLoadImageEmbedderTest, Bug_603518) {
   // Should not crash
   EXPECT_TRUE(OpenDocument("bug_603518.pdf"));
   FPDF_PAGE page = LoadPage(0);
@@ -41,7 +41,7 @@
   UnloadPage(page);
 }
 
-TEST_F(FPDFRenderLoadImageEmbeddertest, Bug_1087) {
+TEST_F(FPDFRenderLoadImageEmbedderTest, Bug_1087) {
   EXPECT_TRUE(OpenDocument("bug_1087.pdf"));
   FPDF_PAGE page = LoadPage(0);
   ASSERT_TRUE(page);
diff --git a/core/fpdfapi/render/fpdf_render_pattern_embeddertest.cpp b/core/fpdfapi/render/fpdf_render_pattern_embeddertest.cpp
index 31ce246..6de721c 100644
--- a/core/fpdfapi/render/fpdf_render_pattern_embeddertest.cpp
+++ b/core/fpdfapi/render/fpdf_render_pattern_embeddertest.cpp
@@ -8,9 +8,9 @@
 #include "testing/embedder_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-class FPDFRenderPatternEmbeddertest : public EmbedderTest {};
+class FPDFRenderPatternEmbedderTest : public EmbedderTest {};
 
-TEST_F(FPDFRenderPatternEmbeddertest, LoadError_547706) {
+TEST_F(FPDFRenderPatternEmbedderTest, LoadError_547706) {
   // Test shading where object is a dictionary instead of a stream.
   EXPECT_TRUE(OpenDocument("bug_547706.pdf"));
   FPDF_PAGE page = LoadPage(0);
diff --git a/core/fxcodec/codec/fx_codec_embeddertest.cpp b/core/fxcodec/codec/fx_codec_embeddertest.cpp
index 3773cb2..825bcae 100644
--- a/core/fxcodec/codec/fx_codec_embeddertest.cpp
+++ b/core/fxcodec/codec/fx_codec_embeddertest.cpp
@@ -8,9 +8,9 @@
 #include "testing/embedder_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-class FXCodecEmbeddertest : public EmbedderTest {};
+class FXCodecEmbedderTest : public EmbedderTest {};
 
-TEST_F(FXCodecEmbeddertest, Bug_631912) {
+TEST_F(FXCodecEmbedderTest, Bug_631912) {
   // Test jbig2 image in PDF file can be loaded successfully.
   // Should not crash.
   EXPECT_TRUE(OpenDocument("bug_631912.pdf"));
diff --git a/fpdfsdk/fpdf_annot_embeddertest.cpp b/fpdfsdk/fpdf_annot_embeddertest.cpp
index 33788b4..459d915 100644
--- a/fpdfsdk/fpdf_annot_embeddertest.cpp
+++ b/fpdfsdk/fpdf_annot_embeddertest.cpp
@@ -18,7 +18,7 @@
 
 static constexpr char kContentsKey[] = "Contents";
 
-class FPDFAnnotEmbeddertest : public EmbedderTest {};
+class FPDFAnnotEmbedderTest : public EmbedderTest {};
 
 std::wstring BufferToWString(const std::vector<char>& buf) {
   return GetPlatformWString(reinterpret_cast<FPDF_WIDESTRING>(buf.data()));
@@ -28,7 +28,7 @@
   return GetPlatformString(reinterpret_cast<FPDF_WIDESTRING>(buf.data()));
 }
 
-TEST_F(FPDFAnnotEmbeddertest, BadParams) {
+TEST_F(FPDFAnnotEmbedderTest, BadParams) {
   ASSERT_TRUE(OpenDocument("hello_world.pdf"));
   FPDF_PAGE page = LoadPage(0);
   ASSERT_TRUE(page);
@@ -65,7 +65,7 @@
   UnloadPage(page);
 }
 
-TEST_F(FPDFAnnotEmbeddertest, RenderAnnotWithOnlyRolloverAP) {
+TEST_F(FPDFAnnotEmbedderTest, RenderAnnotWithOnlyRolloverAP) {
   // Open a file with one annotation and load its first page.
   ASSERT_TRUE(OpenDocument("annotation_highlight_rollover_ap.pdf"));
   FPDF_PAGE page = LoadPage(0);
@@ -81,7 +81,7 @@
   UnloadPage(page);
 }
 
-TEST_F(FPDFAnnotEmbeddertest, RenderMultilineMarkupAnnotWithoutAP) {
+TEST_F(FPDFAnnotEmbedderTest, RenderMultilineMarkupAnnotWithoutAP) {
   const char md5_hash[] = "76512832d88017668d9acc7aacd13dae";
   // Open a file with multiline markup annotations.
   ASSERT_TRUE(OpenDocument("annotation_markup_multiline_no_ap.pdf"));
@@ -94,7 +94,7 @@
   UnloadPage(page);
 }
 
-TEST_F(FPDFAnnotEmbeddertest, ExtractHighlightLongContent) {
+TEST_F(FPDFAnnotEmbedderTest, ExtractHighlightLongContent) {
   // Open a file with one annotation and load its first page.
   ASSERT_TRUE(OpenDocument("annotation_highlight_long_content.pdf"));
   FPDF_PAGE page = LoadPageNoEvents(0);
@@ -174,7 +174,7 @@
   UnloadPageNoEvents(page);
 }
 
-TEST_F(FPDFAnnotEmbeddertest, ExtractInkMultiple) {
+TEST_F(FPDFAnnotEmbedderTest, ExtractInkMultiple) {
   // Open a file with three annotations and load its first page.
   ASSERT_TRUE(OpenDocument("annotation_ink_multiple.pdf"));
   FPDF_PAGE page = LoadPageNoEvents(0);
@@ -221,7 +221,7 @@
   UnloadPageNoEvents(page);
 }
 
-TEST_F(FPDFAnnotEmbeddertest, AddIllegalSubtypeAnnotation) {
+TEST_F(FPDFAnnotEmbedderTest, AddIllegalSubtypeAnnotation) {
   // Open a file with one annotation and load its first page.
   ASSERT_TRUE(OpenDocument("annotation_highlight_long_content.pdf"));
   FPDF_PAGE page = LoadPage(0);
@@ -233,7 +233,7 @@
   UnloadPage(page);
 }
 
-TEST_F(FPDFAnnotEmbeddertest, AddFirstTextAnnotation) {
+TEST_F(FPDFAnnotEmbedderTest, AddFirstTextAnnotation) {
   // Open a file with no annotation and load its first page.
   ASSERT_TRUE(OpenDocument("hello_world.pdf"));
   FPDF_PAGE page = LoadPage(0);
@@ -318,7 +318,7 @@
   UnloadPage(page);
 }
 
-TEST_F(FPDFAnnotEmbeddertest, AddAndSaveUnderlineAnnotation) {
+TEST_F(FPDFAnnotEmbedderTest, AddAndSaveUnderlineAnnotation) {
   // Open a file with one annotation and load its first page.
   ASSERT_TRUE(OpenDocument("annotation_highlight_long_content.pdf"));
   FPDF_PAGE page = LoadPage(0);
@@ -381,7 +381,7 @@
   CloseSavedDocument();
 }
 
-TEST_F(FPDFAnnotEmbeddertest, GetAndSetQuadPoints) {
+TEST_F(FPDFAnnotEmbedderTest, GetAndSetQuadPoints) {
   // Open a file with four annotations and load its first page.
   ASSERT_TRUE(OpenDocument("annotation_highlight_square_with_ap.pdf"));
   FPDF_PAGE page = LoadPage(0);
@@ -465,7 +465,7 @@
   UnloadPage(page);
 }
 
-TEST_F(FPDFAnnotEmbeddertest, ModifyRectQuadpointsWithAP) {
+TEST_F(FPDFAnnotEmbedderTest, ModifyRectQuadpointsWithAP) {
 #if _FX_PLATFORM_ == _FX_PLATFORM_APPLE_
   const char md5_original[] = "63af8432fab95a67cdebb7cd0e514941";
   const char md5_modified_highlight[] = "aec26075011349dec9bace891856b5f2";
@@ -576,7 +576,7 @@
   UnloadPage(page);
 }
 
-TEST_F(FPDFAnnotEmbeddertest, CountAttachmentPoints) {
+TEST_F(FPDFAnnotEmbedderTest, CountAttachmentPoints) {
   // Open a file with multiline markup annotations.
   ASSERT_TRUE(OpenDocument("annotation_markup_multiline_no_ap.pdf"));
   FPDF_PAGE page = LoadPage(0);
@@ -594,7 +594,7 @@
   EXPECT_EQ(0u, FPDFAnnot_CountAttachmentPoints(nullptr));
 }
 
-TEST_F(FPDFAnnotEmbeddertest, RemoveAnnotation) {
+TEST_F(FPDFAnnotEmbedderTest, RemoveAnnotation) {
   // Open a file with 3 annotations on its first page.
   ASSERT_TRUE(OpenDocument("annotation_ink_multiple.pdf"));
   FPDF_PAGE page = LoadPageNoEvents(0);
@@ -670,7 +670,7 @@
   FPDF_CloseDocument(new_doc);
 }
 
-TEST_F(FPDFAnnotEmbeddertest, AddAndModifyPath) {
+TEST_F(FPDFAnnotEmbedderTest, AddAndModifyPath) {
 #if _FX_PLATFORM_ == _FX_PLATFORM_APPLE_
   const char md5_original[] = "c35408717759562d1f8bf33d317483d2";
   const char md5_modified_path[] = "873b92ea83ccf006e58415d866ce145b";
@@ -818,7 +818,7 @@
   CloseSavedDocument();
 }
 
-TEST_F(FPDFAnnotEmbeddertest, ModifyAnnotationFlags) {
+TEST_F(FPDFAnnotEmbedderTest, ModifyAnnotationFlags) {
   // Open a file with an annotation and load its first page.
   ASSERT_TRUE(OpenDocument("annotation_highlight_rollover_ap.pdf"));
   FPDF_PAGE page = LoadPage(0);
@@ -872,7 +872,7 @@
   UnloadPage(page);
 }
 
-TEST_F(FPDFAnnotEmbeddertest, AddAndModifyImage) {
+TEST_F(FPDFAnnotEmbedderTest, AddAndModifyImage) {
 #if _FX_PLATFORM_ == _FX_PLATFORM_APPLE_
   const char md5_original[] = "c35408717759562d1f8bf33d317483d2";
   const char md5_new_image[] = "ff012f5697436dfcaec25b32d1333596";
@@ -957,7 +957,7 @@
   VerifySavedDocument(595, 842, md5_modified_image);
 }
 
-TEST_F(FPDFAnnotEmbeddertest, AddAndModifyText) {
+TEST_F(FPDFAnnotEmbedderTest, AddAndModifyText) {
 #if _FX_PLATFORM_ == _FX_PLATFORM_APPLE_
   const char md5_original[] = "c35408717759562d1f8bf33d317483d2";
   const char md5_new_text[] = "e5680ed048c2cfd9a1d27212cdf41286";
@@ -1044,7 +1044,7 @@
   UnloadPage(page);
 }
 
-TEST_F(FPDFAnnotEmbeddertest, GetSetStringValue) {
+TEST_F(FPDFAnnotEmbedderTest, GetSetStringValue) {
   // Open a file with four annotations and load its first page.
   ASSERT_TRUE(OpenDocument("annotation_stamp_with_ap.pdf"));
   FPDF_PAGE page = LoadPage(0);
@@ -1128,7 +1128,7 @@
   CloseSavedDocument();
 }
 
-TEST_F(FPDFAnnotEmbeddertest, GetSetAP) {
+TEST_F(FPDFAnnotEmbedderTest, GetSetAP) {
   // Open a file with four annotations and load its first page.
   ASSERT_TRUE(OpenDocument("annotation_stamp_with_ap.pdf"));
   FPDF_PAGE page = LoadPage(0);
@@ -1251,7 +1251,7 @@
   CloseSavedDocument();
 }
 
-TEST_F(FPDFAnnotEmbeddertest, RemoveOptionalAP) {
+TEST_F(FPDFAnnotEmbedderTest, RemoveOptionalAP) {
   // Open a file with four annotations and load its first page.
   ASSERT_TRUE(OpenDocument("annotation_stamp_with_ap.pdf"));
   FPDF_PAGE page = LoadPage(0);
@@ -1287,7 +1287,7 @@
   UnloadPage(page);
 }
 
-TEST_F(FPDFAnnotEmbeddertest, RemoveRequiredAP) {
+TEST_F(FPDFAnnotEmbedderTest, RemoveRequiredAP) {
   // Open a file with four annotations and load its first page.
   ASSERT_TRUE(OpenDocument("annotation_stamp_with_ap.pdf"));
   FPDF_PAGE page = LoadPage(0);
@@ -1321,7 +1321,7 @@
   UnloadPage(page);
 }
 
-TEST_F(FPDFAnnotEmbeddertest, ExtractLinkedAnnotations) {
+TEST_F(FPDFAnnotEmbedderTest, ExtractLinkedAnnotations) {
   // Open a file with annotations and load its first page.
   ASSERT_TRUE(OpenDocument("annotation_highlight_square_with_ap.pdf"));
   FPDF_PAGE page = LoadPage(0);
@@ -1368,7 +1368,7 @@
   UnloadPage(page);
 }
 
-TEST_F(FPDFAnnotEmbeddertest, GetFormFieldFlagsTextField) {
+TEST_F(FPDFAnnotEmbedderTest, GetFormFieldFlagsTextField) {
   // Open file with form text fields.
   ASSERT_TRUE(OpenDocument("text_form_multiple.pdf"));
   FPDF_PAGE page = LoadPage(0);
@@ -1397,7 +1397,7 @@
   UnloadPage(page);
 }
 
-TEST_F(FPDFAnnotEmbeddertest, GetFormFieldFlagsComboBox) {
+TEST_F(FPDFAnnotEmbedderTest, GetFormFieldFlagsComboBox) {
   // Open file with form text fields.
   ASSERT_TRUE(OpenDocument("combobox_form.pdf"));
   FPDF_PAGE page = LoadPage(0);
@@ -1442,7 +1442,7 @@
   UnloadPage(page);
 }
 
-TEST_F(FPDFAnnotEmbeddertest, GetFormAnnotNull) {
+TEST_F(FPDFAnnotEmbedderTest, GetFormAnnotNull) {
   // Open file with form text fields.
   EXPECT_TRUE(OpenDocument("text_form.pdf"));
   FPDF_PAGE page = LoadPage(0);
@@ -1466,7 +1466,7 @@
   UnloadPage(page);
 }
 
-TEST_F(FPDFAnnotEmbeddertest, GetFormAnnotAndCheckFlagsTextField) {
+TEST_F(FPDFAnnotEmbedderTest, GetFormAnnotAndCheckFlagsTextField) {
   // Open file with form text fields.
   EXPECT_TRUE(OpenDocument("text_form_multiple.pdf"));
   FPDF_PAGE page = LoadPage(0);
@@ -1497,7 +1497,7 @@
   UnloadPage(page);
 }
 
-TEST_F(FPDFAnnotEmbeddertest, GetFormAnnotAndCheckFlagsComboBox) {
+TEST_F(FPDFAnnotEmbedderTest, GetFormAnnotAndCheckFlagsComboBox) {
   // Open file with form comboboxes.
   EXPECT_TRUE(OpenDocument("combobox_form.pdf"));
   FPDF_PAGE page = LoadPage(0);
diff --git a/fpdfsdk/fpdf_attachment_embeddertest.cpp b/fpdfsdk/fpdf_attachment_embeddertest.cpp
index dd9b5ae..b128d82 100644
--- a/fpdfsdk/fpdf_attachment_embeddertest.cpp
+++ b/fpdfsdk/fpdf_attachment_embeddertest.cpp
@@ -13,9 +13,9 @@
 static constexpr char kDateKey[] = "CreationDate";
 static constexpr char kChecksumKey[] = "CheckSum";
 
-class FPDFAttachmentEmbeddertest : public EmbedderTest {};
+class FPDFAttachmentEmbedderTest : public EmbedderTest {};
 
-TEST_F(FPDFAttachmentEmbeddertest, ExtractAttachments) {
+TEST_F(FPDFAttachmentEmbedderTest, ExtractAttachments) {
   // Open a file with two attachments.
   ASSERT_TRUE(OpenDocument("embedded_attachments.pdf"));
   EXPECT_EQ(2, FPDFDoc_GetAttachmentCount(document()));
@@ -86,7 +86,7 @@
             GetPlatformWString(reinterpret_cast<unsigned short*>(buf.data())));
 }
 
-TEST_F(FPDFAttachmentEmbeddertest, AddAttachments) {
+TEST_F(FPDFAttachmentEmbedderTest, AddAttachments) {
   // Open a file with two attachments.
   ASSERT_TRUE(OpenDocument("embedded_attachments.pdf"));
   EXPECT_EQ(2, FPDFDoc_GetAttachmentCount(document()));
@@ -152,7 +152,7 @@
   EXPECT_EQ(std::string(kContents2), std::string(buf.data(), 6));
 }
 
-TEST_F(FPDFAttachmentEmbeddertest, AddAttachmentsWithParams) {
+TEST_F(FPDFAttachmentEmbedderTest, AddAttachmentsWithParams) {
   // Open a file with two attachments.
   ASSERT_TRUE(OpenDocument("embedded_attachments.pdf"));
   EXPECT_EQ(2, FPDFDoc_GetAttachmentCount(document()));
@@ -230,7 +230,7 @@
             GetPlatformWString(reinterpret_cast<unsigned short*>(buf.data())));
 }
 
-TEST_F(FPDFAttachmentEmbeddertest, DeleteAttachment) {
+TEST_F(FPDFAttachmentEmbedderTest, DeleteAttachment) {
   // Open a file with two attachments.
   ASSERT_TRUE(OpenDocument("embedded_attachments.pdf"));
   EXPECT_EQ(2, FPDFDoc_GetAttachmentCount(document()));
diff --git a/fpdfsdk/fpdf_dataavail_embeddertest.cpp b/fpdfsdk/fpdf_dataavail_embeddertest.cpp
index 08bc6c0..58b989c 100644
--- a/fpdfsdk/fpdf_dataavail_embeddertest.cpp
+++ b/fpdfsdk/fpdf_dataavail_embeddertest.cpp
@@ -158,23 +158,23 @@
 
 }  // namespace
 
-class FPDFDataAvailEmbeddertest : public EmbedderTest {};
+class FPDFDataAvailEmbedderTest : public EmbedderTest {};
 
-TEST_F(FPDFDataAvailEmbeddertest, TrailerUnterminated) {
+TEST_F(FPDFDataAvailEmbedderTest, TrailerUnterminated) {
   // Document must load without crashing but is too malformed to be available.
   EXPECT_FALSE(OpenDocument("trailer_unterminated.pdf"));
   MockDownloadHints hints;
   EXPECT_FALSE(FPDFAvail_IsDocAvail(avail_, &hints));
 }
 
-TEST_F(FPDFDataAvailEmbeddertest, TrailerAsHexstring) {
+TEST_F(FPDFDataAvailEmbedderTest, TrailerAsHexstring) {
   // Document must load without crashing but is too malformed to be available.
   EXPECT_FALSE(OpenDocument("trailer_as_hexstring.pdf"));
   MockDownloadHints hints;
   EXPECT_FALSE(FPDFAvail_IsDocAvail(avail_, &hints));
 }
 
-TEST_F(FPDFDataAvailEmbeddertest, LoadUsingHintTables) {
+TEST_F(FPDFDataAvailEmbedderTest, LoadUsingHintTables) {
   TestAsyncLoader loader("feature_linearized_loading.pdf");
   avail_ = FPDFAvail_Create(loader.file_avail(), loader.file_access());
   ASSERT_EQ(PDF_DATA_AVAIL, FPDFAvail_IsDocAvail(avail_, loader.hints()));
@@ -189,7 +189,7 @@
   FPDF_ClosePage(page);
 }
 
-TEST_F(FPDFDataAvailEmbeddertest, CheckFormAvailIfLinearized) {
+TEST_F(FPDFDataAvailEmbedderTest, CheckFormAvailIfLinearized) {
   TestAsyncLoader loader("feature_linearized_loading.pdf");
   avail_ = FPDFAvail_Create(loader.file_avail(), loader.file_access());
   ASSERT_EQ(PDF_DATA_AVAIL, FPDFAvail_IsDocAvail(avail_, loader.hints()));
@@ -209,7 +209,7 @@
   EXPECT_NE(PDF_FORM_ERROR, status);
 }
 
-TEST_F(FPDFDataAvailEmbeddertest,
+TEST_F(FPDFDataAvailEmbedderTest,
        DoNotLoadMainCrossRefForFirstPageIfLinearized) {
   TestAsyncLoader loader("feature_linearized_loading.pdf");
   avail_ = FPDFAvail_Create(loader.file_avail(), loader.file_access());
@@ -249,7 +249,7 @@
   FPDF_ClosePage(page);
 }
 
-TEST_F(FPDFDataAvailEmbeddertest, LoadSecondPageIfLinearizedWithHints) {
+TEST_F(FPDFDataAvailEmbedderTest, LoadSecondPageIfLinearizedWithHints) {
   TestAsyncLoader loader("feature_linearized_loading.pdf");
   avail_ = FPDFAvail_Create(loader.file_avail(), loader.file_access());
   ASSERT_EQ(PDF_DATA_AVAIL, FPDFAvail_IsDocAvail(avail_, loader.hints()));
@@ -277,7 +277,7 @@
   FPDF_ClosePage(page);
 }
 
-TEST_F(FPDFDataAvailEmbeddertest, LoadInfoAfterReceivingWholeDocument) {
+TEST_F(FPDFDataAvailEmbedderTest, LoadInfoAfterReceivingWholeDocument) {
   TestAsyncLoader loader("linearized.pdf");
   loader.set_is_new_data_available(false);
   avail_ = FPDFAvail_Create(loader.file_avail(), loader.file_access());
@@ -299,7 +299,7 @@
   EXPECT_TRUE(FPDF_GetMetaText(document_, "CreationDate", nullptr, 0));
 }
 
-TEST_F(FPDFDataAvailEmbeddertest, LoadInfoAfterReceivingFirstPage) {
+TEST_F(FPDFDataAvailEmbedderTest, LoadInfoAfterReceivingFirstPage) {
   TestAsyncLoader loader("linearized.pdf");
   // Map "Info" to an object within the first section without breaking
   // linearization.
@@ -327,7 +327,7 @@
             WideString::FromUTF16LE(buffer, FXSYS_len(kExpectedValue)));
 }
 
-TEST_F(FPDFDataAvailEmbeddertest, TryLoadInvalidInfo) {
+TEST_F(FPDFDataAvailEmbedderTest, TryLoadInvalidInfo) {
   TestAsyncLoader loader("linearized.pdf");
   // Map "Info" to an invalid object without breaking linearization.
   ByteString data(loader.file_contents(), loader.file_length());
@@ -353,7 +353,7 @@
   EXPECT_FALSE(FPDF_GetMetaText(document_, "Type", nullptr, 0));
 }
 
-TEST_F(FPDFDataAvailEmbeddertest, TryLoadNonExistsInfo) {
+TEST_F(FPDFDataAvailEmbedderTest, TryLoadNonExistsInfo) {
   TestAsyncLoader loader("linearized.pdf");
   // Break the "Info" parameter without breaking linearization.
   ByteString data(loader.file_contents(), loader.file_length());
diff --git a/fpdfsdk/fpdf_doc_embeddertest.cpp b/fpdfsdk/fpdf_doc_embeddertest.cpp
index a3d8b3a..c4a154c 100644
--- a/fpdfsdk/fpdf_doc_embeddertest.cpp
+++ b/fpdfsdk/fpdf_doc_embeddertest.cpp
@@ -18,9 +18,9 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/test_support.h"
 
-class FPDFDocEmbeddertest : public EmbedderTest {};
+class FPDFDocEmbedderTest : public EmbedderTest {};
 
-TEST_F(FPDFDocEmbeddertest, MultipleSamePage) {
+TEST_F(FPDFDocEmbedderTest, MultipleSamePage) {
   EXPECT_TRUE(OpenDocument("hello_world.pdf"));
   CPDF_Document* pDoc = CPDFDocumentFromFPDFDocument(document());
 
@@ -39,7 +39,7 @@
 #endif  // PDF_ENABLE_XFA
 }
 
-TEST_F(FPDFDocEmbeddertest, DestGetPageIndex) {
+TEST_F(FPDFDocEmbedderTest, DestGetPageIndex) {
   EXPECT_TRUE(OpenDocument("named_dests.pdf"));
 
   // NULL argument cases.
@@ -67,7 +67,7 @@
   EXPECT_EQ(-1, FPDFDest_GetDestPageIndex(document(), dest));
 }
 
-TEST_F(FPDFDocEmbeddertest, DestGetView) {
+TEST_F(FPDFDocEmbedderTest, DestGetView) {
   EXPECT_TRUE(OpenDocument("named_dests.pdf"));
 
   unsigned long numParams;
@@ -126,7 +126,7 @@
   EXPECT_FLOAT_EQ(42.4242f, params[3]);
 }
 
-TEST_F(FPDFDocEmbeddertest, DestGetLocationInPage) {
+TEST_F(FPDFDocEmbedderTest, DestGetLocationInPage) {
   EXPECT_TRUE(OpenDocument("named_dests.pdf"));
 
   FPDF_DEST dest = FPDF_GetNamedDestByName(document(), "First");
@@ -154,7 +154,7 @@
   EXPECT_EQ(1, zoom);
 }
 
-TEST_F(FPDFDocEmbeddertest, BUG_680376) {
+TEST_F(FPDFDocEmbedderTest, BUG_680376) {
   EXPECT_TRUE(OpenDocument("bug_680376.pdf"));
 
   // Page number directly in item from Dests NameTree.
@@ -163,7 +163,7 @@
   EXPECT_EQ(-1, FPDFDest_GetDestPageIndex(document(), dest));
 }
 
-TEST_F(FPDFDocEmbeddertest, BUG_821454) {
+TEST_F(FPDFDocEmbedderTest, BUG_821454) {
   EXPECT_TRUE(OpenDocument("bug_821454.pdf"));
 
   FPDF_PAGE page = LoadPage(0);
@@ -225,7 +225,7 @@
   UnloadPage(page);
 }
 
-TEST_F(FPDFDocEmbeddertest, ActionBadArguments) {
+TEST_F(FPDFDocEmbedderTest, ActionBadArguments) {
   EXPECT_TRUE(OpenDocument("launch_action.pdf"));
   EXPECT_EQ(static_cast<unsigned long>(PDFACTION_UNSUPPORTED),
             FPDFAction_GetType(nullptr));
@@ -237,7 +237,7 @@
   EXPECT_EQ(0u, FPDFAction_GetURIPath(document(), nullptr, nullptr, 0));
 }
 
-TEST_F(FPDFDocEmbeddertest, ActionLaunch) {
+TEST_F(FPDFDocEmbedderTest, ActionLaunch) {
   EXPECT_TRUE(OpenDocument("launch_action.pdf"));
 
   FPDF_PAGE page = LoadPage(0);
@@ -268,7 +268,7 @@
   UnloadPage(page);
 }
 
-TEST_F(FPDFDocEmbeddertest, ActionURI) {
+TEST_F(FPDFDocEmbedderTest, ActionURI) {
   EXPECT_TRUE(OpenDocument("uri_action.pdf"));
 
   FPDF_PAGE page = LoadPage(0);
@@ -299,7 +299,7 @@
   UnloadPage(page);
 }
 
-TEST_F(FPDFDocEmbeddertest, ActionGoto) {
+TEST_F(FPDFDocEmbedderTest, ActionGoto) {
   EXPECT_TRUE(OpenDocument("goto_action.pdf"));
 
   FPDF_PAGE page = LoadPage(0);
@@ -324,7 +324,7 @@
   UnloadPage(page);
 }
 
-TEST_F(FPDFDocEmbeddertest, ActionNonesuch) {
+TEST_F(FPDFDocEmbedderTest, ActionNonesuch) {
   EXPECT_TRUE(OpenDocument("nonesuch_action.pdf"));
 
   FPDF_PAGE page = LoadPage(0);
@@ -348,7 +348,7 @@
   UnloadPage(page);
 }
 
-TEST_F(FPDFDocEmbeddertest, NoBookmarks) {
+TEST_F(FPDFDocEmbedderTest, NoBookmarks) {
   // Open a file with no bookmarks.
   EXPECT_TRUE(OpenDocument("named_dests.pdf"));
 
@@ -368,7 +368,7 @@
   EXPECT_EQ(nullptr, FPDFBookmark_GetAction(nullptr));
 }
 
-TEST_F(FPDFDocEmbeddertest, Bookmarks) {
+TEST_F(FPDFDocEmbedderTest, Bookmarks) {
   // Open a file with two bookmarks.
   EXPECT_TRUE(OpenDocument("bookmarks.pdf"));
 
@@ -391,7 +391,7 @@
   EXPECT_EQ(nullptr, FPDFBookmark_GetNextSibling(document(), sibling));
 }
 
-TEST_F(FPDFDocEmbeddertest, FindBookmarks) {
+TEST_F(FPDFDocEmbedderTest, FindBookmarks) {
   // Open a file with two bookmarks.
   EXPECT_TRUE(OpenDocument("bookmarks.pdf"));
 
@@ -416,7 +416,7 @@
 }
 
 // Check circular bookmarks will not cause infinite loop.
-TEST_F(FPDFDocEmbeddertest, FindBookmarks_bug420) {
+TEST_F(FPDFDocEmbedderTest, FindBookmarks_bug420) {
   // Open a file with circular bookmarks.
   EXPECT_TRUE(OpenDocument("bookmarks_circular.pdf"));
 
@@ -426,14 +426,14 @@
   EXPECT_EQ(nullptr, FPDFBookmark_Find(document(), title.get()));
 }
 
-TEST_F(FPDFDocEmbeddertest, DeletePage) {
+TEST_F(FPDFDocEmbedderTest, DeletePage) {
   EXPECT_TRUE(OpenDocument("hello_world.pdf"));
   EXPECT_EQ(1, FPDF_GetPageCount(document()));
   FPDFPage_Delete(document(), 0);
   EXPECT_EQ(0, FPDF_GetPageCount(document()));
 }
 
-TEST_F(FPDFDocEmbeddertest, GetMetaText) {
+TEST_F(FPDFDocEmbedderTest, GetMetaText) {
   ASSERT_TRUE(OpenDocument("bug_601362.pdf"));
 
   // Invalid document / tag results in 0.
@@ -467,7 +467,7 @@
             WideString::FromUTF16LE(buf, FXSYS_len(kExpectedModDate)));
 }
 
-TEST_F(FPDFDocEmbeddertest, Bug_182) {
+TEST_F(FPDFDocEmbedderTest, Bug_182) {
   ASSERT_TRUE(OpenDocument("bug_182.pdf"));
 
   unsigned short buf[128];
@@ -478,7 +478,7 @@
             WideString::FromUTF16LE(buf, FXSYS_len(kExpectedTitle)));
 }
 
-TEST_F(FPDFDocEmbeddertest, GetMetaTextSameObjectNumber) {
+TEST_F(FPDFDocEmbedderTest, GetMetaTextSameObjectNumber) {
   ASSERT_TRUE(OpenDocument("annotation_highlight_square_with_ap.pdf"));
 
   // The PDF has been edited. It has two %%EOF markers, and 2 objects numbered
@@ -491,7 +491,7 @@
             WideString::FromUTF16LE(buf, FXSYS_len(kExpectedModDate)));
 }
 
-TEST_F(FPDFDocEmbeddertest, GetMetaTextInAttachmentFile) {
+TEST_F(FPDFDocEmbedderTest, GetMetaTextInAttachmentFile) {
   ASSERT_TRUE(OpenDocument("embedded_attachments.pdf"));
 
   // Make sure this is the date from the PDF itself and not the attached PDF.
@@ -502,21 +502,21 @@
             WideString::FromUTF16LE(buf, FXSYS_len(kExpectedModDate)));
 }
 
-TEST_F(FPDFDocEmbeddertest, GetMetaTextFromNewDocument) {
+TEST_F(FPDFDocEmbedderTest, GetMetaTextFromNewDocument) {
   FPDF_DOCUMENT empty_doc = FPDF_CreateNewDocument();
   unsigned short buf[128];
   EXPECT_EQ(2u, FPDF_GetMetaText(empty_doc, "Title", buf, sizeof(buf)));
   FPDF_CloseDocument(empty_doc);
 }
 
-TEST_F(FPDFDocEmbeddertest, NoPageLabels) {
+TEST_F(FPDFDocEmbedderTest, NoPageLabels) {
   EXPECT_TRUE(OpenDocument("about_blank.pdf"));
   EXPECT_EQ(1, FPDF_GetPageCount(document()));
 
   ASSERT_EQ(0u, FPDF_GetPageLabel(document(), 0, nullptr, 0));
 }
 
-TEST_F(FPDFDocEmbeddertest, GetPageLabels) {
+TEST_F(FPDFDocEmbedderTest, GetPageLabels) {
   EXPECT_TRUE(OpenDocument("page_labels.pdf"));
   EXPECT_EQ(7, FPDF_GetPageCount(document()));
 
@@ -568,7 +568,7 @@
 }
 
 #ifdef PDF_ENABLE_XFA
-TEST_F(FPDFDocEmbeddertest, GetXFALinks) {
+TEST_F(FPDFDocEmbedderTest, GetXFALinks) {
   EXPECT_TRUE(OpenDocument("simple_xfa.pdf"));
 
   ScopedFPDFPage page(FPDF_LoadPage(document(), 0));
diff --git a/fpdfsdk/fpdf_edit_embeddertest.cpp b/fpdfsdk/fpdf_edit_embeddertest.cpp
index a3acfb9..89c69bf 100644
--- a/fpdfsdk/fpdf_edit_embeddertest.cpp
+++ b/fpdfsdk/fpdf_edit_embeddertest.cpp
@@ -27,7 +27,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/test_support.h"
 
-class FPDFEditEmbeddertest : public EmbedderTest {
+class FPDFEditEmbedderTest : public EmbedderTest {
  protected:
   FPDF_DOCUMENT CreateNewDocument() {
     document_ = FPDF_CreateNewDocument();
@@ -180,7 +180,7 @@
 
 }  // namespace
 
-TEST_F(FPDFEditEmbeddertest, EmptyCreation) {
+TEST_F(FPDFEditEmbedderTest, EmptyCreation) {
   EXPECT_TRUE(CreateEmptyDocument());
   FPDF_PAGE page = FPDFPage_New(document(), 0, 640.0, 480.0);
   EXPECT_NE(nullptr, page);
@@ -194,7 +194,7 @@
 }
 
 // Regression test for https://crbug.com/667012
-TEST_F(FPDFEditEmbeddertest, RasterizePDF) {
+TEST_F(FPDFEditEmbedderTest, RasterizePDF) {
   const char kAllBlackMd5sum[] = "5708fc5c4a8bd0abde99c8e8f0390615";
 
   // Get the bitmap for the original document/
@@ -232,7 +232,7 @@
   VerifySavedDocument(612, 792, kAllBlackMd5sum);
 }
 
-TEST_F(FPDFEditEmbeddertest, AddPaths) {
+TEST_F(FPDFEditEmbedderTest, AddPaths) {
   // Start with a blank page
   FPDF_PAGE page = FPDFPage_New(CreateNewDocument(), 0, 612, 792);
   ASSERT_TRUE(page);
@@ -428,7 +428,7 @@
   VerifySavedDocument(612, 792, kLastMD5);
 }
 
-TEST_F(FPDFEditEmbeddertest, SetText) {
+TEST_F(FPDFEditEmbedderTest, SetText) {
   // Load document with some text.
   EXPECT_TRUE(OpenDocument("hello_world.pdf"));
   FPDF_PAGE page = LoadPage(0);
@@ -476,7 +476,7 @@
   CloseSavedDocument();
 }
 
-TEST_F(FPDFEditEmbeddertest, RemovePageObject) {
+TEST_F(FPDFEditEmbedderTest, RemovePageObject) {
   // Load document with some text.
   EXPECT_TRUE(OpenDocument("hello_world.pdf"));
   FPDF_PAGE page = LoadPage(0);
@@ -621,7 +621,7 @@
   EXPECT_EQ(expected_bounds_count, bounds_count);
 }
 
-TEST_F(FPDFEditEmbeddertest, ReadMarkedObjectsIndirectDict) {
+TEST_F(FPDFEditEmbedderTest, ReadMarkedObjectsIndirectDict) {
   // Load document with some text marked with an indirect property.
   EXPECT_TRUE(OpenDocument("text_in_page_marked_indirect.pdf"));
   FPDF_PAGE page = LoadPage(0);
@@ -632,7 +632,7 @@
   UnloadPage(page);
 }
 
-TEST_F(FPDFEditEmbeddertest, RemoveMarkedObjectsPrime) {
+TEST_F(FPDFEditEmbedderTest, RemoveMarkedObjectsPrime) {
   // Load document with some text.
   EXPECT_TRUE(OpenDocument("text_in_page_marked.pdf"));
   FPDF_PAGE page = LoadPage(0);
@@ -716,7 +716,7 @@
   CloseSavedDocument();
 }
 
-TEST_F(FPDFEditEmbeddertest, RemoveMarks) {
+TEST_F(FPDFEditEmbedderTest, RemoveMarks) {
   // Load document with some text.
   EXPECT_TRUE(OpenDocument("text_in_page_marked.pdf"));
   FPDF_PAGE page = LoadPage(0);
@@ -769,7 +769,7 @@
   CloseSavedDocument();
 }
 
-TEST_F(FPDFEditEmbeddertest, RemoveMarkParam) {
+TEST_F(FPDFEditEmbedderTest, RemoveMarkParam) {
   // Load document with some text.
   EXPECT_TRUE(OpenDocument("text_in_page_marked.pdf"));
   FPDF_PAGE page = LoadPage(0);
@@ -853,7 +853,7 @@
   CloseSavedDocument();
 }
 
-TEST_F(FPDFEditEmbeddertest, MaintainMarkedObjects) {
+TEST_F(FPDFEditEmbedderTest, MaintainMarkedObjects) {
   // Load document with some text.
   EXPECT_TRUE(OpenDocument("text_in_page_marked.pdf"));
   FPDF_PAGE page = LoadPage(0);
@@ -884,7 +884,7 @@
   CloseSavedDocument();
 }
 
-TEST_F(FPDFEditEmbeddertest, MaintainIndirectMarkedObjects) {
+TEST_F(FPDFEditEmbedderTest, MaintainIndirectMarkedObjects) {
   // Load document with some text.
   EXPECT_TRUE(OpenDocument("text_in_page_marked_indirect.pdf"));
   FPDF_PAGE page = LoadPage(0);
@@ -915,7 +915,7 @@
   CloseSavedDocument();
 }
 
-TEST_F(FPDFEditEmbeddertest, RemoveExistingPageObject) {
+TEST_F(FPDFEditEmbedderTest, RemoveExistingPageObject) {
   // Load document with some text.
   EXPECT_TRUE(OpenDocument("hello_world.pdf"));
   FPDF_PAGE page = LoadPage(0);
@@ -944,7 +944,7 @@
   CloseSavedDocument();
 }
 
-TEST_F(FPDFEditEmbeddertest, RemoveExistingPageObjectSplitStreamsNotLonely) {
+TEST_F(FPDFEditEmbedderTest, RemoveExistingPageObjectSplitStreamsNotLonely) {
   // Load document with some text.
   EXPECT_TRUE(OpenDocument("hello_world_split_streams.pdf"));
   FPDF_PAGE page = LoadPage(0);
@@ -991,7 +991,7 @@
   CloseSavedDocument();
 }
 
-TEST_F(FPDFEditEmbeddertest, RemoveExistingPageObjectSplitStreamsLonely) {
+TEST_F(FPDFEditEmbedderTest, RemoveExistingPageObjectSplitStreamsLonely) {
   // Load document with some text.
   EXPECT_TRUE(OpenDocument("hello_world_split_streams.pdf"));
   FPDF_PAGE page = LoadPage(0);
@@ -1038,7 +1038,7 @@
   CloseSavedDocument();
 }
 
-TEST_F(FPDFEditEmbeddertest, GetContentStream) {
+TEST_F(FPDFEditEmbedderTest, GetContentStream) {
   // Load document with some text split across streams.
   EXPECT_TRUE(OpenDocument("split_streams.pdf"));
   FPDF_PAGE page = LoadPage(0);
@@ -1064,7 +1064,7 @@
   UnloadPage(page);
 }
 
-TEST_F(FPDFEditEmbeddertest, RemoveAllFromStream) {
+TEST_F(FPDFEditEmbedderTest, RemoveAllFromStream) {
   // Load document with some text split across streams.
   EXPECT_TRUE(OpenDocument("split_streams.pdf"));
   FPDF_PAGE page = LoadPage(0);
@@ -1166,7 +1166,7 @@
   CloseSavedDocument();
 }
 
-TEST_F(FPDFEditEmbeddertest, RemoveAllFromSingleStream) {
+TEST_F(FPDFEditEmbedderTest, RemoveAllFromSingleStream) {
   // Load document with a single stream.
   EXPECT_TRUE(OpenDocument("hello_world.pdf"));
   FPDF_PAGE page = LoadPage(0);
@@ -1220,7 +1220,7 @@
   CloseSavedDocument();
 }
 
-TEST_F(FPDFEditEmbeddertest, RemoveFirstFromSingleStream) {
+TEST_F(FPDFEditEmbedderTest, RemoveFirstFromSingleStream) {
   // Load document with a single stream.
   EXPECT_TRUE(OpenDocument("hello_world.pdf"));
   FPDF_PAGE page = LoadPage(0);
@@ -1288,7 +1288,7 @@
   CloseSavedDocument();
 }
 
-TEST_F(FPDFEditEmbeddertest, RemoveLastFromSingleStream) {
+TEST_F(FPDFEditEmbedderTest, RemoveLastFromSingleStream) {
   // Load document with a single stream.
   EXPECT_TRUE(OpenDocument("hello_world.pdf"));
   FPDF_PAGE page = LoadPage(0);
@@ -1356,7 +1356,7 @@
   CloseSavedDocument();
 }
 
-TEST_F(FPDFEditEmbeddertest, RemoveAllFromMultipleStreams) {
+TEST_F(FPDFEditEmbedderTest, RemoveAllFromMultipleStreams) {
   // Load document with some text.
   EXPECT_TRUE(OpenDocument("hello_world_split_streams.pdf"));
   FPDF_PAGE page = LoadPage(0);
@@ -1408,7 +1408,7 @@
   CloseSavedDocument();
 }
 
-TEST_F(FPDFEditEmbeddertest, InsertPageObjectAndSave) {
+TEST_F(FPDFEditEmbedderTest, InsertPageObjectAndSave) {
   // Load document with some text.
   EXPECT_TRUE(OpenDocument("hello_world.pdf"));
   FPDF_PAGE page = LoadPage(0);
@@ -1437,7 +1437,7 @@
   CloseSavedDocument();
 }
 
-TEST_F(FPDFEditEmbeddertest, InsertPageObjectEditAndSave) {
+TEST_F(FPDFEditEmbedderTest, InsertPageObjectEditAndSave) {
   // Load document with some text.
   EXPECT_TRUE(OpenDocument("hello_world.pdf"));
   FPDF_PAGE page = LoadPage(0);
@@ -1470,7 +1470,7 @@
   CloseSavedDocument();
 }
 
-TEST_F(FPDFEditEmbeddertest, InsertAndRemoveLargeFile) {
+TEST_F(FPDFEditEmbedderTest, InsertAndRemoveLargeFile) {
   const int kOriginalObjectCount = 600;
 
   // Load document with many objects.
@@ -1544,7 +1544,7 @@
   CloseSavedDocument();
 }
 
-TEST_F(FPDFEditEmbeddertest, AddAndRemovePaths) {
+TEST_F(FPDFEditEmbedderTest, AddAndRemovePaths) {
   // Start with a blank page.
   FPDF_PAGE page = FPDFPage_New(CreateNewDocument(), 0, 612, 792);
   ASSERT_TRUE(page);
@@ -1586,7 +1586,7 @@
   FPDFPageObj_Destroy(red_rect);
 }
 
-TEST_F(FPDFEditEmbeddertest, PathsPoints) {
+TEST_F(FPDFEditEmbedderTest, PathsPoints) {
   CreateNewDocument();
   FPDF_PAGEOBJECT img = FPDFPageObj_NewImageObj(document_);
   // This should fail gracefully, even if img is not a path.
@@ -1613,7 +1613,7 @@
   FPDFPageObj_Destroy(img);
 }
 
-TEST_F(FPDFEditEmbeddertest, PathOnTopOfText) {
+TEST_F(FPDFEditEmbedderTest, PathOnTopOfText) {
   // Load document with some text
   EXPECT_TRUE(OpenDocument("hello_world.pdf"));
   FPDF_PAGE page = LoadPage(0);
@@ -1647,7 +1647,7 @@
   UnloadPage(page);
 }
 
-TEST_F(FPDFEditEmbeddertest, EditOverExistingContent) {
+TEST_F(FPDFEditEmbedderTest, EditOverExistingContent) {
   // Load document with existing content
   EXPECT_TRUE(OpenDocument("bug_717.pdf"));
   FPDF_PAGE page = LoadPage(0);
@@ -1707,7 +1707,7 @@
   VerifySavedDocument(612, 792, kLastMD5);
 }
 
-TEST_F(FPDFEditEmbeddertest, AddStrokedPaths) {
+TEST_F(FPDFEditEmbedderTest, AddStrokedPaths) {
   // Start with a blank page
   FPDF_PAGE page = FPDFPage_New(CreateNewDocument(), 0, 612, 792);
 
@@ -1765,7 +1765,7 @@
 }
 
 // Tests adding text from standard font using FPDFPageObj_NewTextObj.
-TEST_F(FPDFEditEmbeddertest, AddStandardFontText) {
+TEST_F(FPDFEditEmbedderTest, AddStandardFontText) {
   // Start with a blank page
   FPDF_PAGE page = FPDFPage_New(CreateNewDocument(), 0, 612, 792);
 
@@ -1857,7 +1857,7 @@
   FPDF_ClosePage(page);
 }
 
-TEST_F(FPDFEditEmbeddertest, TestGetTextRenderMode) {
+TEST_F(FPDFEditEmbedderTest, TestGetTextRenderMode) {
   EXPECT_TRUE(OpenDocument("text_render_mode.pdf"));
   FPDF_PAGE page = LoadPage(0);
   ASSERT_TRUE(page);
@@ -1874,7 +1874,7 @@
   UnloadPage(page);
 }
 
-TEST_F(FPDFEditEmbeddertest, TestGetTextFontName) {
+TEST_F(FPDFEditEmbedderTest, TestGetTextFontName) {
   EXPECT_TRUE(OpenDocument("text_font.pdf"));
   FPDF_PAGE page = LoadPage(0);
   ASSERT_TRUE(page);
@@ -1902,7 +1902,7 @@
   UnloadPage(page);
 }
 
-TEST_F(FPDFEditEmbeddertest, TestFormGetObjects) {
+TEST_F(FPDFEditEmbedderTest, TestFormGetObjects) {
   EXPECT_TRUE(OpenDocument("form_object.pdf"));
   FPDF_PAGE page = LoadPage(0);
   ASSERT_TRUE(page);
@@ -1970,7 +1970,7 @@
 }
 
 // Tests adding text from standard font using FPDFText_LoadStandardFont.
-TEST_F(FPDFEditEmbeddertest, AddStandardFontText2) {
+TEST_F(FPDFEditEmbedderTest, AddStandardFontText2) {
   // Start with a blank page
   ScopedFPDFPage page(FPDFPage_New(CreateNewDocument(), 0, 612, 792));
 
@@ -1998,7 +1998,7 @@
   CompareBitmap(page_bitmap.get(), 612, 792, md5);
 }
 
-TEST_F(FPDFEditEmbeddertest, LoadStandardFonts) {
+TEST_F(FPDFEditEmbedderTest, LoadStandardFonts) {
   CreateNewDocument();
   static constexpr const char* standard_font_names[] = {
       "Arial",
@@ -2039,7 +2039,7 @@
   }
 }
 
-TEST_F(FPDFEditEmbeddertest, GraphicsData) {
+TEST_F(FPDFEditEmbedderTest, GraphicsData) {
   // New page
   ScopedFPDFPage page(FPDFPage_New(CreateNewDocument(), 0, 612, 792));
 
@@ -2091,7 +2091,7 @@
   EXPECT_EQ(4u, graphics_dict->size());
 }
 
-TEST_F(FPDFEditEmbeddertest, DoubleGenerating) {
+TEST_F(FPDFEditEmbedderTest, DoubleGenerating) {
   // Start with a blank page
   FPDF_PAGE page = FPDFPage_New(CreateNewDocument(), 0, 612, 792);
 
@@ -2156,7 +2156,7 @@
   FPDF_ClosePage(page);
 }
 
-TEST_F(FPDFEditEmbeddertest, LoadSimpleType1Font) {
+TEST_F(FPDFEditEmbedderTest, LoadSimpleType1Font) {
   CreateNewDocument();
   // TODO(npm): use other fonts after disallowing loading any font as any type
   const CPDF_Font* stock_font =
@@ -2186,7 +2186,7 @@
   CheckFontDescriptor(font_dict, FPDF_FONT_TYPE1, true, false, span);
 }
 
-TEST_F(FPDFEditEmbeddertest, LoadSimpleTrueTypeFont) {
+TEST_F(FPDFEditEmbedderTest, LoadSimpleTrueTypeFont) {
   CreateNewDocument();
   const CPDF_Font* stock_font = CPDF_Font::GetStockFont(cpdf_doc(), "Courier");
   pdfium::span<const uint8_t> span = stock_font->GetFont()->GetFontSpan();
@@ -2214,7 +2214,7 @@
   CheckFontDescriptor(font_dict, FPDF_FONT_TRUETYPE, false, false, span);
 }
 
-TEST_F(FPDFEditEmbeddertest, LoadCIDType0Font) {
+TEST_F(FPDFEditEmbedderTest, LoadCIDType0Font) {
   CreateNewDocument();
   const CPDF_Font* stock_font =
       CPDF_Font::GetStockFont(cpdf_doc(), "Times-Roman");
@@ -2256,7 +2256,7 @@
   CheckCompositeFontWidths(widths_array, typed_font);
 }
 
-TEST_F(FPDFEditEmbeddertest, LoadCIDType2Font) {
+TEST_F(FPDFEditEmbedderTest, LoadCIDType2Font) {
   CreateNewDocument();
   const CPDF_Font* stock_font =
       CPDF_Font::GetStockFont(cpdf_doc(), "Helvetica-Oblique");
@@ -2297,7 +2297,7 @@
   CheckCompositeFontWidths(widths_array, typed_font);
 }
 
-TEST_F(FPDFEditEmbeddertest, NormalizeNegativeRotation) {
+TEST_F(FPDFEditEmbedderTest, NormalizeNegativeRotation) {
   // Load document with a -90 degree rotation
   EXPECT_TRUE(OpenDocument("bug_713197.pdf"));
   FPDF_PAGE page = LoadPage(0);
@@ -2307,7 +2307,7 @@
   UnloadPage(page);
 }
 
-TEST_F(FPDFEditEmbeddertest, AddTrueTypeFontText) {
+TEST_F(FPDFEditEmbedderTest, AddTrueTypeFontText) {
   // Start with a blank page
   FPDF_PAGE page = FPDFPage_New(CreateNewDocument(), 0, 612, 792);
   {
@@ -2362,7 +2362,7 @@
   VerifySavedDocument(612, 792, md5_2);
 }
 
-TEST_F(FPDFEditEmbeddertest, TransformAnnot) {
+TEST_F(FPDFEditEmbedderTest, TransformAnnot) {
   // Open a file with one annotation and load its first page.
   ASSERT_TRUE(OpenDocument("annotation_highlight_long_content.pdf"));
   FPDF_PAGE page = LoadPage(0);
@@ -2383,7 +2383,7 @@
 
 // TODO(npm): Add tests using Japanese fonts in other OS.
 #if _FX_PLATFORM_ == _FX_PLATFORM_LINUX_
-TEST_F(FPDFEditEmbeddertest, AddCIDFontText) {
+TEST_F(FPDFEditEmbedderTest, AddCIDFontText) {
   // Start with a blank page
   FPDF_PAGE page = FPDFPage_New(CreateNewDocument(), 0, 612, 792);
   CFX_Font CIDfont;
@@ -2439,7 +2439,7 @@
 }
 #endif  // _FX_PLATFORM_ == _FX_PLATFORM_LINUX_
 
-TEST_F(FPDFEditEmbeddertest, SaveAndRender) {
+TEST_F(FPDFEditEmbedderTest, SaveAndRender) {
   const char md5[] = "3c20472b0552c0c22b88ab1ed8c6202b";
   {
     EXPECT_TRUE(OpenDocument("bug_779.pdf"));
@@ -2470,7 +2470,7 @@
   VerifySavedDocument(612, 792, md5);
 }
 
-TEST_F(FPDFEditEmbeddertest, AddMark) {
+TEST_F(FPDFEditEmbedderTest, AddMark) {
   // Load document with some text.
   EXPECT_TRUE(OpenDocument("text_in_page_marked.pdf"));
   FPDF_PAGE page = LoadPage(0);
@@ -2503,7 +2503,7 @@
   CloseSavedDocument();
 }
 
-TEST_F(FPDFEditEmbeddertest, SetMarkParam) {
+TEST_F(FPDFEditEmbedderTest, SetMarkParam) {
   // Load document with some text.
   EXPECT_TRUE(OpenDocument("text_in_page_marked.pdf"));
   FPDF_PAGE page = LoadPage(0);
@@ -2567,7 +2567,7 @@
   CloseSavedDocument();
 }
 
-TEST_F(FPDFEditEmbeddertest, AddMarkedText) {
+TEST_F(FPDFEditEmbedderTest, AddMarkedText) {
   // Start with a blank page.
   FPDF_PAGE page = FPDFPage_New(CreateNewDocument(), 0, 612, 792);
 
@@ -2684,7 +2684,7 @@
   CloseSavedDocument();
 }
 
-TEST_F(FPDFEditEmbeddertest, MarkGetName) {
+TEST_F(FPDFEditEmbedderTest, MarkGetName) {
   EXPECT_TRUE(OpenDocument("text_in_page_marked.pdf"));
   FPDF_PAGE page = LoadPage(0);
   ASSERT_TRUE(page);
@@ -2717,7 +2717,7 @@
   UnloadPage(page);
 }
 
-TEST_F(FPDFEditEmbeddertest, MarkGetParamKey) {
+TEST_F(FPDFEditEmbedderTest, MarkGetParamKey) {
   EXPECT_TRUE(OpenDocument("text_in_page_marked.pdf"));
   FPDF_PAGE page = LoadPage(0);
   ASSERT_TRUE(page);
@@ -2757,7 +2757,7 @@
   UnloadPage(page);
 }
 
-TEST_F(FPDFEditEmbeddertest, MarkGetIntParam) {
+TEST_F(FPDFEditEmbedderTest, MarkGetIntParam) {
   EXPECT_TRUE(OpenDocument("text_in_page_marked.pdf"));
   FPDF_PAGE page = LoadPage(0);
   ASSERT_TRUE(page);
@@ -2793,7 +2793,7 @@
   UnloadPage(page);
 }
 
-TEST_F(FPDFEditEmbeddertest, MarkGetStringParam) {
+TEST_F(FPDFEditEmbedderTest, MarkGetStringParam) {
   EXPECT_TRUE(OpenDocument("text_in_page_marked.pdf"));
   FPDF_PAGE page = LoadPage(0);
   ASSERT_TRUE(page);
@@ -2841,7 +2841,7 @@
   UnloadPage(page);
 }
 
-TEST_F(FPDFEditEmbeddertest, ExtractImageBitmap) {
+TEST_F(FPDFEditEmbedderTest, ExtractImageBitmap) {
   ASSERT_TRUE(OpenDocument("embedded_images.pdf"));
   FPDF_PAGE page = LoadPage(0);
   ASSERT_TRUE(page);
@@ -2895,7 +2895,7 @@
   UnloadPage(page);
 }
 
-TEST_F(FPDFEditEmbeddertest, ExtractJBigImageBitmap) {
+TEST_F(FPDFEditEmbedderTest, ExtractJBigImageBitmap) {
   ASSERT_TRUE(OpenDocument("bug_631912.pdf"));
   FPDF_PAGE page = LoadPage(0);
   ASSERT_TRUE(page);
@@ -2913,7 +2913,7 @@
   UnloadPage(page);
 }
 
-TEST_F(FPDFEditEmbeddertest, GetImageData) {
+TEST_F(FPDFEditEmbedderTest, GetImageData) {
   EXPECT_TRUE(OpenDocument("embedded_images.pdf"));
   FPDF_PAGE page = LoadPage(0);
   ASSERT_TRUE(page);
@@ -2963,7 +2963,7 @@
   UnloadPage(page);
 }
 
-TEST_F(FPDFEditEmbeddertest, GetImageMatrix) {
+TEST_F(FPDFEditEmbedderTest, GetImageMatrix) {
   ASSERT_TRUE(OpenDocument("embedded_images.pdf"));
   FPDF_PAGE page = LoadPage(0);
   ASSERT_TRUE(page);
@@ -3040,7 +3040,7 @@
   UnloadPage(page);
 }
 
-TEST_F(FPDFEditEmbeddertest, DestroyPageObject) {
+TEST_F(FPDFEditEmbedderTest, DestroyPageObject) {
   FPDF_PAGEOBJECT rect = FPDFPageObj_CreateNewRect(10, 10, 20, 20);
   ASSERT_TRUE(rect);
 
@@ -3048,7 +3048,7 @@
   FPDFPageObj_Destroy(rect);
 }
 
-TEST_F(FPDFEditEmbeddertest, GetImageFilters) {
+TEST_F(FPDFEditEmbedderTest, GetImageFilters) {
   EXPECT_TRUE(OpenDocument("embedded_images.pdf"));
   FPDF_PAGE page = LoadPage(0);
   ASSERT_TRUE(page);
@@ -3094,7 +3094,7 @@
   UnloadPage(page);
 }
 
-TEST_F(FPDFEditEmbeddertest, GetImageMetadata) {
+TEST_F(FPDFEditEmbedderTest, GetImageMetadata) {
   ASSERT_TRUE(OpenDocument("embedded_images.pdf"));
   FPDF_PAGE page = LoadPage(0);
   ASSERT_TRUE(page);
diff --git a/fpdfsdk/fpdf_ext_embeddertest.cpp b/fpdfsdk/fpdf_ext_embeddertest.cpp
index 7c28c29..f3ae06e 100644
--- a/fpdfsdk/fpdf_ext_embeddertest.cpp
+++ b/fpdfsdk/fpdf_ext_embeddertest.cpp
@@ -7,18 +7,18 @@
 #include "testing/embedder_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-class FPDFExtEmbeddertest : public EmbedderTest {};
+class FPDFExtEmbedderTest : public EmbedderTest {};
 
-TEST_F(FPDFExtEmbeddertest, PageModeUnknown) {
+TEST_F(FPDFExtEmbedderTest, PageModeUnknown) {
   EXPECT_EQ(PAGEMODE_UNKNOWN, FPDFDoc_GetPageMode(nullptr));
 }
 
-TEST_F(FPDFExtEmbeddertest, PageModeUseNone) {
+TEST_F(FPDFExtEmbedderTest, PageModeUseNone) {
   EXPECT_TRUE(OpenDocument("hello_world.pdf"));
   EXPECT_EQ(PAGEMODE_USENONE, FPDFDoc_GetPageMode(document()));
 }
 
-TEST_F(FPDFExtEmbeddertest, PageModeUseOutlines) {
+TEST_F(FPDFExtEmbedderTest, PageModeUseOutlines) {
   EXPECT_TRUE(OpenDocument("use_outlines.pdf"));
   EXPECT_EQ(PAGEMODE_USEOUTLINES, FPDFDoc_GetPageMode(document()));
 }
diff --git a/fpdfsdk/fpdf_flatten_embeddertest.cpp b/fpdfsdk/fpdf_flatten_embeddertest.cpp
index 450c30c..7545cf0 100644
--- a/fpdfsdk/fpdf_flatten_embeddertest.cpp
+++ b/fpdfsdk/fpdf_flatten_embeddertest.cpp
@@ -10,11 +10,11 @@
 
 namespace {
 
-class FPDFFlattenEmbeddertest : public EmbedderTest {};
+class FPDFFlattenEmbedderTest : public EmbedderTest {};
 
 }  // namespace
 
-TEST_F(FPDFFlattenEmbeddertest, FlatNothing) {
+TEST_F(FPDFFlattenEmbedderTest, FlatNothing) {
   EXPECT_TRUE(OpenDocument("hello_world.pdf"));
   FPDF_PAGE page = LoadPage(0);
   EXPECT_TRUE(page);
@@ -22,7 +22,7 @@
   UnloadPage(page);
 }
 
-TEST_F(FPDFFlattenEmbeddertest, FlatNormal) {
+TEST_F(FPDFFlattenEmbedderTest, FlatNormal) {
   EXPECT_TRUE(OpenDocument("annotiter.pdf"));
   FPDF_PAGE page = LoadPage(0);
   EXPECT_TRUE(page);
@@ -30,7 +30,7 @@
   UnloadPage(page);
 }
 
-TEST_F(FPDFFlattenEmbeddertest, FlatPrint) {
+TEST_F(FPDFFlattenEmbedderTest, FlatPrint) {
   EXPECT_TRUE(OpenDocument("annotiter.pdf"));
   FPDF_PAGE page = LoadPage(0);
   EXPECT_TRUE(page);
@@ -38,7 +38,7 @@
   UnloadPage(page);
 }
 
-TEST_F(FPDFFlattenEmbeddertest, BUG_890322) {
+TEST_F(FPDFFlattenEmbedderTest, BUG_890322) {
   static const char md5_hash[] = "6c674642154408e877d88c6c082d67e9";
   EXPECT_TRUE(OpenDocument("bug_890322.pdf"));
   FPDF_PAGE page = LoadPage(0);
@@ -55,7 +55,7 @@
   VerifySavedDocument(200, 200, md5_hash);
 }
 
-TEST_F(FPDFFlattenEmbeddertest, BUG_896366) {
+TEST_F(FPDFFlattenEmbedderTest, BUG_896366) {
   static const char md5_hash[] = "f71ab085c52c8445ae785eca3ec858b1";
   EXPECT_TRUE(OpenDocument("bug_896366.pdf"));
   FPDF_PAGE page = LoadPage(0);
diff --git a/fpdfsdk/fpdf_formfill_embeddertest.cpp b/fpdfsdk/fpdf_formfill_embeddertest.cpp
index 8b6023a..fe36b7f 100644
--- a/fpdfsdk/fpdf_formfill_embeddertest.cpp
+++ b/fpdfsdk/fpdf_formfill_embeddertest.cpp
@@ -21,17 +21,17 @@
 
 using testing::_;
 
-using FPDFFormFillEmbeddertest = EmbedderTest;
+using FPDFFormFillEmbedderTest = EmbedderTest;
 
 // A base class for many related tests that involve clicking and typing into
 // form fields.
-class FPDFFormFillInteractiveEmbeddertest : public FPDFFormFillEmbeddertest {
+class FPDFFormFillInteractiveEmbedderTest : public FPDFFormFillEmbedderTest {
  protected:
-  FPDFFormFillInteractiveEmbeddertest() = default;
-  ~FPDFFormFillInteractiveEmbeddertest() override = default;
+  FPDFFormFillInteractiveEmbedderTest() = default;
+  ~FPDFFormFillInteractiveEmbedderTest() override = default;
 
   void SetUp() override {
-    FPDFFormFillEmbeddertest::SetUp();
+    FPDFFormFillEmbedderTest::SetUp();
     ASSERT_TRUE(OpenDocument(GetDocumentName()));
     page_ = LoadPage(0);
     ASSERT_TRUE(page_);
@@ -40,7 +40,7 @@
 
   void TearDown() override {
     UnloadPage(page_);
-    FPDFFormFillEmbeddertest::TearDown();
+    FPDFFormFillEmbedderTest::TearDown();
   }
 
   // Returns the name of the PDF to use.
@@ -157,11 +157,11 @@
   FPDF_PAGE page_ = nullptr;
 };
 
-class FPDFFormFillTextFormEmbeddertest
-    : public FPDFFormFillInteractiveEmbeddertest {
+class FPDFFormFillTextFormEmbedderTest
+    : public FPDFFormFillInteractiveEmbedderTest {
  protected:
-  FPDFFormFillTextFormEmbeddertest() = default;
-  ~FPDFFormFillTextFormEmbeddertest() override = default;
+  FPDFFormFillTextFormEmbedderTest() = default;
+  ~FPDFFormFillTextFormEmbedderTest() override = default;
 
   const char* GetDocumentName() const override {
     // PDF with several form text fields:
@@ -227,11 +227,11 @@
   static constexpr float kRegularFormY = 115.0;
 };
 
-class FPDFFormFillComboBoxFormEmbeddertest
-    : public FPDFFormFillInteractiveEmbeddertest {
+class FPDFFormFillComboBoxFormEmbedderTest
+    : public FPDFFormFillInteractiveEmbedderTest {
  protected:
-  FPDFFormFillComboBoxFormEmbeddertest() = default;
-  ~FPDFFormFillComboBoxFormEmbeddertest() override = default;
+  FPDFFormFillComboBoxFormEmbedderTest() = default;
+  ~FPDFFormFillComboBoxFormEmbedderTest() override = default;
 
   const char* GetDocumentName() const override {
     // PDF with form comboboxes:
@@ -336,7 +336,7 @@
   static constexpr float kNonEditableFormY = 410.0;
 };
 
-TEST_F(FPDFFormFillEmbeddertest, FirstTest) {
+TEST_F(FPDFFormFillEmbedderTest, FirstTest) {
   EmbedderTestMockDelegate mock;
   EXPECT_CALL(mock, Alert(_, _, _, _)).Times(0);
   EXPECT_CALL(mock, UnsupportedHandler(_)).Times(0);
@@ -350,7 +350,7 @@
   UnloadPage(page);
 }
 
-TEST_F(FPDFFormFillEmbeddertest, BUG_487928) {
+TEST_F(FPDFFormFillEmbedderTest, BUG_487928) {
   EmbedderTestTimerHandlingDelegate delegate;
   SetDelegate(&delegate);
 
@@ -362,7 +362,7 @@
   UnloadPage(page);
 }
 
-TEST_F(FPDFFormFillEmbeddertest, BUG_507316) {
+TEST_F(FPDFFormFillEmbedderTest, BUG_507316) {
   EmbedderTestTimerHandlingDelegate delegate;
   SetDelegate(&delegate);
 
@@ -374,7 +374,7 @@
   UnloadPage(page);
 }
 
-TEST_F(FPDFFormFillEmbeddertest, BUG_514690) {
+TEST_F(FPDFFormFillEmbedderTest, BUG_514690) {
   EXPECT_TRUE(OpenDocument("hello_world.pdf"));
   FPDF_PAGE page = LoadPage(0);
   EXPECT_TRUE(page);
@@ -386,7 +386,7 @@
   UnloadPage(page);
 }
 
-TEST_F(FPDFFormFillEmbeddertest, BUG_900552) {
+TEST_F(FPDFFormFillEmbedderTest, BUG_900552) {
   EmbedderTestTimerHandlingDelegate delegate;
   SetDelegate(&delegate);
 
@@ -404,7 +404,7 @@
   UnloadPage(page);
 }
 
-TEST_F(FPDFFormFillEmbeddertest, BUG_901654) {
+TEST_F(FPDFFormFillEmbedderTest, BUG_901654) {
   EmbedderTestTimerHandlingDelegate delegate;
   SetDelegate(&delegate);
 
@@ -423,7 +423,7 @@
   UnloadPage(page);
 }
 
-TEST_F(FPDFFormFillEmbeddertest, BUG_901654_2) {
+TEST_F(FPDFFormFillEmbedderTest, BUG_901654_2) {
   EmbedderTestTimerHandlingDelegate delegate;
   SetDelegate(&delegate);
 
@@ -449,7 +449,7 @@
   }
 };
 
-TEST_F(FPDFFormFillEmbeddertest, BUG_851821) {
+TEST_F(FPDFFormFillEmbedderTest, BUG_851821) {
   DoURIActionBlockedDelegate delegate;
   SetDelegate(&delegate);
 
@@ -462,7 +462,7 @@
 }
 
 #ifdef PDF_ENABLE_V8
-TEST_F(FPDFFormFillEmbeddertest, DisableJavaScript) {
+TEST_F(FPDFFormFillEmbedderTest, DisableJavaScript) {
   // Test that timers and intervals can't fire without JS.
   EmbedderTestTimerHandlingDelegate delegate;
   SetDelegate(&delegate);
@@ -492,7 +492,7 @@
   UnloadPage(page);
 }
 
-TEST_F(FPDFFormFillEmbeddertest, DocumentAActions) {
+TEST_F(FPDFFormFillEmbedderTest, DocumentAActions) {
   EmbedderTestTimerHandlingDelegate delegate;
   SetDelegate(&delegate);
 
@@ -516,7 +516,7 @@
   EXPECT_STREQ(L"Did Print", alerts[3].message.c_str());
 }
 
-TEST_F(FPDFFormFillEmbeddertest, BUG_551248) {
+TEST_F(FPDFFormFillEmbedderTest, BUG_551248) {
   // Test that timers fire once and intervals fire repeatedly.
   EmbedderTestTimerHandlingDelegate delegate;
   SetDelegate(&delegate);
@@ -568,7 +568,7 @@
   EXPECT_EQ(0, alerts[3].icon);
 }
 
-TEST_F(FPDFFormFillEmbeddertest, BUG_620428) {
+TEST_F(FPDFFormFillEmbedderTest, BUG_620428) {
   // Test that timers and intervals are cancelable.
   EmbedderTestTimerHandlingDelegate delegate;
   SetDelegate(&delegate);
@@ -585,7 +585,7 @@
   EXPECT_STREQ(L"done", alerts[0].message.c_str());
 }
 
-TEST_F(FPDFFormFillEmbeddertest, BUG_634394) {
+TEST_F(FPDFFormFillEmbedderTest, BUG_634394) {
   // Cancel timer inside timer callback.
   EmbedderTestTimerHandlingDelegate delegate;
   SetDelegate(&delegate);
@@ -608,7 +608,7 @@
   EXPECT_EQ(2U, alerts.size());
 }
 
-TEST_F(FPDFFormFillEmbeddertest, BUG_634716) {
+TEST_F(FPDFFormFillEmbedderTest, BUG_634716) {
   EmbedderTestTimerHandlingDelegate delegate;
   SetDelegate(&delegate);
 
@@ -630,7 +630,7 @@
   EXPECT_EQ(2U, alerts.size());
 }
 
-TEST_F(FPDFFormFillEmbeddertest, BUG_679649) {
+TEST_F(FPDFFormFillEmbedderTest, BUG_679649) {
   EmbedderTestTimerHandlingDelegate delegate;
   SetDelegate(&delegate);
 
@@ -647,7 +647,7 @@
   EXPECT_EQ(0u, alerts.size());
 }
 
-TEST_F(FPDFFormFillEmbeddertest, BUG_707673) {
+TEST_F(FPDFFormFillEmbedderTest, BUG_707673) {
   EmbedderTestTimerHandlingDelegate delegate;
   SetDelegate(&delegate);
 
@@ -665,7 +665,7 @@
   EXPECT_EQ(0u, alerts.size());
 }
 
-TEST_F(FPDFFormFillEmbeddertest, BUG_765384) {
+TEST_F(FPDFFormFillEmbedderTest, BUG_765384) {
   EXPECT_TRUE(OpenDocument("bug_765384.pdf"));
   FPDF_PAGE page = LoadPage(0);
   EXPECT_TRUE(page);
@@ -677,7 +677,7 @@
 }
 #endif  // PDF_ENABLE_V8
 
-TEST_F(FPDFFormFillEmbeddertest, FormText) {
+TEST_F(FPDFFormFillEmbedderTest, FormText) {
 #if _FX_PLATFORM_ == _FX_PLATFORM_APPLE_
   const char md5_1[] = "5f11dbe575fe197a37c3fb422559f8ff";
   const char md5_2[] = "35b1a4b679eafc749a0b6fda750c0e8d";
@@ -728,27 +728,27 @@
   VerifySavedDocument(300, 300, md5_3);
 }
 
-TEST_F(FPDFFormFillEmbeddertest, HasFormInfoNone) {
+TEST_F(FPDFFormFillEmbedderTest, HasFormInfoNone) {
   EXPECT_TRUE(OpenDocument("hello_world.pdf"));
   EXPECT_EQ(FORMTYPE_NONE, FPDF_GetFormType(document_));
 }
 
-TEST_F(FPDFFormFillEmbeddertest, HasFormInfoAcroForm) {
+TEST_F(FPDFFormFillEmbedderTest, HasFormInfoAcroForm) {
   EXPECT_TRUE(OpenDocument("text_form.pdf"));
   EXPECT_EQ(FORMTYPE_ACRO_FORM, FPDF_GetFormType(document_));
 }
 
-TEST_F(FPDFFormFillEmbeddertest, HasFormInfoXFAFull) {
+TEST_F(FPDFFormFillEmbedderTest, HasFormInfoXFAFull) {
   EXPECT_TRUE(OpenDocument("simple_xfa.pdf"));
   EXPECT_EQ(FORMTYPE_XFA_FULL, FPDF_GetFormType(document_));
 }
 
-TEST_F(FPDFFormFillEmbeddertest, HasFormInfoXFAForeground) {
+TEST_F(FPDFFormFillEmbedderTest, HasFormInfoXFAForeground) {
   EXPECT_TRUE(OpenDocument("bug_216.pdf"));
   EXPECT_EQ(FORMTYPE_XFA_FOREGROUND, FPDF_GetFormType(document_));
 }
 
-TEST_F(FPDFFormFillTextFormEmbeddertest, GetSelectedTextEmptyAndBasicKeyboard) {
+TEST_F(FPDFFormFillTextFormEmbedderTest, GetSelectedTextEmptyAndBasicKeyboard) {
   // Test empty selection.
   CheckFocusedFieldText(L"");
   CheckSelection(L"");
@@ -760,7 +760,7 @@
   CheckSelection(L"ABC");
 }
 
-TEST_F(FPDFFormFillTextFormEmbeddertest, GetSelectedTextEmptyAndBasicMouse) {
+TEST_F(FPDFFormFillTextFormEmbedderTest, GetSelectedTextEmptyAndBasicMouse) {
   // Test empty selection.
   CheckFocusedFieldText(L"");
   CheckSelection(L"");
@@ -772,7 +772,7 @@
   CheckSelection(L"ABC");
 }
 
-TEST_F(FPDFFormFillTextFormEmbeddertest, GetSelectedTextFragmentsKeyBoard) {
+TEST_F(FPDFFormFillTextFormEmbedderTest, GetSelectedTextFragmentsKeyBoard) {
   TypeTextIntoTextField(12, RegularFormBegin());
   CheckFocusedFieldText(L"ABCDEFGHIJKL");
 
@@ -798,7 +798,7 @@
   CheckFocusedFieldText(L"ABCDEFGHIJKL");
 }
 
-TEST_F(FPDFFormFillTextFormEmbeddertest, GetSelectedTextFragmentsMouse) {
+TEST_F(FPDFFormFillTextFormEmbedderTest, GetSelectedTextFragmentsMouse) {
   TypeTextIntoTextField(12, RegularFormBegin());
 
   // Test selecting first character in forward direction.
@@ -822,7 +822,7 @@
   CheckSelection(L"L");
 }
 
-TEST_F(FPDFFormFillComboBoxFormEmbeddertest,
+TEST_F(FPDFFormFillComboBoxFormEmbedderTest,
        GetSelectedTextEmptyAndBasicNormalComboBox) {
   // Test empty selection.
   CheckSelection(L"");
@@ -839,7 +839,7 @@
   CheckSelection(L"Apple");
 }
 
-TEST_F(FPDFFormFillComboBoxFormEmbeddertest,
+TEST_F(FPDFFormFillComboBoxFormEmbedderTest,
        GetSelectedTextEmptyAndBasicEditableComboBoxKeyboard) {
   // Test empty selection.
   CheckSelection(L"");
@@ -857,7 +857,7 @@
   CheckFocusedFieldText(L"Bar");
 }
 
-TEST_F(FPDFFormFillComboBoxFormEmbeddertest,
+TEST_F(FPDFFormFillComboBoxFormEmbedderTest,
        GetSelectedTextEmptyAndBasicEditableComboBoxMouse) {
   // Test empty selection.
   CheckSelection(L"");
@@ -873,7 +873,7 @@
   CheckSelection(L"Qux");
 }
 
-TEST_F(FPDFFormFillComboBoxFormEmbeddertest,
+TEST_F(FPDFFormFillComboBoxFormEmbedderTest,
        GetSelectedTextFragmentsNormalComboBox) {
   CheckFocusedFieldText(L"");
 
@@ -907,7 +907,7 @@
   CheckSelection(L"Che");
 }
 
-TEST_F(FPDFFormFillComboBoxFormEmbeddertest,
+TEST_F(FPDFFormFillComboBoxFormEmbedderTest,
        GetSelectedTextFragmentsEditableComboBoxKeyboard) {
   CheckFocusedFieldText(L"");
   TypeTextIntoTextField(10, EditableFormBegin());
@@ -941,7 +941,7 @@
   CheckFocusedFieldText(L"Foo");
 }
 
-TEST_F(FPDFFormFillComboBoxFormEmbeddertest,
+TEST_F(FPDFFormFillComboBoxFormEmbedderTest,
        GetSelectedTextFragmentsEditableComboBoxMouse) {
   TypeTextIntoTextField(10, EditableFormBegin());
 
@@ -967,7 +967,7 @@
   CheckFocusedFieldText(L"ABCDEFGHIJ");
 }
 
-TEST_F(FPDFFormFillTextFormEmbeddertest, DeleteTextFieldEntireSelection) {
+TEST_F(FPDFFormFillTextFormEmbedderTest, DeleteTextFieldEntireSelection) {
   // Select entire contents of text field.
   TypeTextIntoTextField(12, RegularFormBegin());
   SelectAllRegularFormTextWithMouse();
@@ -983,7 +983,7 @@
   CheckSelection(L"");
 }
 
-TEST_F(FPDFFormFillTextFormEmbeddertest, DeleteTextFieldSelectionMiddle) {
+TEST_F(FPDFFormFillTextFormEmbedderTest, DeleteTextFieldSelectionMiddle) {
   // Select middle section of text.
   TypeTextIntoTextField(12, RegularFormBegin());
   SelectTextWithMouse(RegularFormAtX(170.0), RegularFormAtX(125.0));
@@ -998,7 +998,7 @@
   CheckSelection(L"ABCJKL");
 }
 
-TEST_F(FPDFFormFillTextFormEmbeddertest, DeleteTextFieldSelectionLeft) {
+TEST_F(FPDFFormFillTextFormEmbedderTest, DeleteTextFieldSelectionLeft) {
   // Select first few characters of text.
   TypeTextIntoTextField(12, RegularFormBegin());
   SelectTextWithMouse(RegularFormBegin(), RegularFormAtX(132.0));
@@ -1012,7 +1012,7 @@
   CheckSelection(L"EFGHIJKL");
 }
 
-TEST_F(FPDFFormFillTextFormEmbeddertest, DeleteTextFieldSelectionRight) {
+TEST_F(FPDFFormFillTextFormEmbedderTest, DeleteTextFieldSelectionRight) {
   // Select last few characters of text.
   TypeTextIntoTextField(12, RegularFormBegin());
   SelectTextWithMouse(RegularFormEnd(), RegularFormAtX(165.0));
@@ -1026,7 +1026,7 @@
   CheckSelection(L"ABCDEFGH");
 }
 
-TEST_F(FPDFFormFillTextFormEmbeddertest, DeleteEmptyTextFieldSelection) {
+TEST_F(FPDFFormFillTextFormEmbedderTest, DeleteEmptyTextFieldSelection) {
   // Do not select text.
   TypeTextIntoTextField(12, RegularFormBegin());
   CheckSelection(L"");
@@ -1038,7 +1038,7 @@
   CheckSelection(L"ABCDEFGHIJKL");
 }
 
-TEST_F(FPDFFormFillComboBoxFormEmbeddertest,
+TEST_F(FPDFFormFillComboBoxFormEmbedderTest,
        DeleteEditableComboBoxEntireSelection) {
   // Select entire contents of user-editable combobox text field.
   TypeTextIntoTextField(10, EditableFormBegin());
@@ -1053,7 +1053,7 @@
   CheckSelection(L"");
 }
 
-TEST_F(FPDFFormFillComboBoxFormEmbeddertest,
+TEST_F(FPDFFormFillComboBoxFormEmbedderTest,
        DeleteEditableComboBoxSelectionMiddle) {
   // Select middle section of text.
   TypeTextIntoTextField(10, EditableFormBegin());
@@ -1068,7 +1068,7 @@
   CheckSelection(L"ABCIJ");
 }
 
-TEST_F(FPDFFormFillComboBoxFormEmbeddertest,
+TEST_F(FPDFFormFillComboBoxFormEmbedderTest,
        DeleteEditableComboBoxSelectionLeft) {
   // Select first few characters of text.
   TypeTextIntoTextField(10, EditableFormBegin());
@@ -1082,7 +1082,7 @@
   CheckSelection(L"EFGHIJ");
 }
 
-TEST_F(FPDFFormFillComboBoxFormEmbeddertest,
+TEST_F(FPDFFormFillComboBoxFormEmbedderTest,
        DeleteEditableComboBoxSelectionRight) {
   // Select last few characters of text.
   TypeTextIntoTextField(10, EditableFormBegin());
@@ -1096,7 +1096,7 @@
   CheckSelection(L"ABCDEF");
 }
 
-TEST_F(FPDFFormFillComboBoxFormEmbeddertest,
+TEST_F(FPDFFormFillComboBoxFormEmbedderTest,
        DeleteEmptyEditableComboBoxSelection) {
   // Do not select text.
   TypeTextIntoTextField(10, EditableFormBegin());
@@ -1108,7 +1108,7 @@
   CheckSelection(L"ABCDEFGHIJ");
 }
 
-TEST_F(FPDFFormFillTextFormEmbeddertest, InsertTextInEmptyTextField) {
+TEST_F(FPDFFormFillTextFormEmbedderTest, InsertTextInEmptyTextField) {
   CheckFocusedFieldText(L"");
   ClickOnFormFieldAtPoint(RegularFormBegin());
   CheckFocusedFieldText(L"");
@@ -1126,7 +1126,7 @@
   CheckSelection(L"Hello");
 }
 
-TEST_F(FPDFFormFillTextFormEmbeddertest, InsertTextInPopulatedTextFieldLeft) {
+TEST_F(FPDFFormFillTextFormEmbedderTest, InsertTextInPopulatedTextFieldLeft) {
   TypeTextIntoTextField(8, RegularFormBegin());
   CheckFocusedFieldText(L"ABCDEFGH");
 
@@ -1147,7 +1147,7 @@
   CheckSelection(L"HelloABCDEFGH");
 }
 
-TEST_F(FPDFFormFillTextFormEmbeddertest, InsertTextInPopulatedTextFieldMiddle) {
+TEST_F(FPDFFormFillTextFormEmbedderTest, InsertTextInPopulatedTextFieldMiddle) {
   TypeTextIntoTextField(8, RegularFormBegin());
 
   // Click on the middle of the text field.
@@ -1166,7 +1166,7 @@
   CheckSelection(L"ABCDHelloEFGH");
 }
 
-TEST_F(FPDFFormFillTextFormEmbeddertest, InsertTextInPopulatedTextFieldRight) {
+TEST_F(FPDFFormFillTextFormEmbedderTest, InsertTextInPopulatedTextFieldRight) {
   TypeTextIntoTextField(8, RegularFormBegin());
 
   // Click on the rightmost part of the text field.
@@ -1185,7 +1185,7 @@
   CheckSelection(L"ABCDEFGHHello");
 }
 
-TEST_F(FPDFFormFillTextFormEmbeddertest,
+TEST_F(FPDFFormFillTextFormEmbedderTest,
        InsertTextAndReplaceSelectionInPopulatedTextFieldWhole) {
   TypeTextIntoTextField(12, RegularFormBegin());
 
@@ -1207,7 +1207,7 @@
   CheckSelection(L"Hello");
 }
 
-TEST_F(FPDFFormFillTextFormEmbeddertest,
+TEST_F(FPDFFormFillTextFormEmbedderTest,
        InsertTextAndReplaceSelectionInPopulatedTextFieldLeft) {
   TypeTextIntoTextField(12, RegularFormBegin());
 
@@ -1229,7 +1229,7 @@
   CheckSelection(L"HelloGHIJKL");
 }
 
-TEST_F(FPDFFormFillTextFormEmbeddertest,
+TEST_F(FPDFFormFillTextFormEmbedderTest,
        InsertTextAndReplaceSelectionInPopulatedTextFieldMiddle) {
   TypeTextIntoTextField(12, RegularFormBegin());
 
@@ -1250,7 +1250,7 @@
   CheckSelection(L"ABCHelloJKL");
 }
 
-TEST_F(FPDFFormFillTextFormEmbeddertest,
+TEST_F(FPDFFormFillTextFormEmbedderTest,
        InsertTextAndReplaceSelectionInPopulatedTextFieldRight) {
   TypeTextIntoTextField(12, RegularFormBegin());
 
@@ -1271,7 +1271,7 @@
   CheckSelection(L"ABCDEFHello");
 }
 
-TEST_F(FPDFFormFillComboBoxFormEmbeddertest,
+TEST_F(FPDFFormFillComboBoxFormEmbedderTest,
        InsertTextInEmptyEditableComboBox) {
   ClickOnFormFieldAtPoint(EditableFormBegin());
   CheckFocusedFieldText(L"");
@@ -1289,7 +1289,7 @@
   CheckSelection(L"Hello");
 }
 
-TEST_F(FPDFFormFillComboBoxFormEmbeddertest,
+TEST_F(FPDFFormFillComboBoxFormEmbedderTest,
        InsertTextInPopulatedEditableComboBoxLeft) {
   TypeTextIntoTextField(6, EditableFormBegin());
 
@@ -1308,7 +1308,7 @@
   CheckSelection(L"HelloABCDEF");
 }
 
-TEST_F(FPDFFormFillComboBoxFormEmbeddertest,
+TEST_F(FPDFFormFillComboBoxFormEmbedderTest,
        InsertTextInPopulatedEditableComboBoxMiddle) {
   TypeTextIntoTextField(6, EditableFormBegin());
 
@@ -1328,7 +1328,7 @@
   CheckSelection(L"ABCHelloDEF");
 }
 
-TEST_F(FPDFFormFillComboBoxFormEmbeddertest,
+TEST_F(FPDFFormFillComboBoxFormEmbedderTest,
        InsertTextInPopulatedEditableComboBoxRight) {
   TypeTextIntoTextField(6, EditableFormBegin());
 
@@ -1347,7 +1347,7 @@
   CheckSelection(L"ABCDEFHello");
 }
 
-TEST_F(FPDFFormFillComboBoxFormEmbeddertest,
+TEST_F(FPDFFormFillComboBoxFormEmbedderTest,
        InsertTextAndReplaceSelectionInPopulatedEditableComboBoxWhole) {
   TypeTextIntoTextField(10, EditableFormBegin());
 
@@ -1368,7 +1368,7 @@
   CheckSelection(L"Hello");
 }
 
-TEST_F(FPDFFormFillComboBoxFormEmbeddertest,
+TEST_F(FPDFFormFillComboBoxFormEmbedderTest,
        InsertTextAndReplaceSelectionInPopulatedEditableComboBoxLeft) {
   TypeTextIntoTextField(10, EditableFormBegin());
 
@@ -1389,7 +1389,7 @@
   CheckSelection(L"HelloFGHIJ");
 }
 
-TEST_F(FPDFFormFillComboBoxFormEmbeddertest,
+TEST_F(FPDFFormFillComboBoxFormEmbedderTest,
        InsertTextAndReplaceSelectionInPopulatedEditableComboBoxMiddle) {
   TypeTextIntoTextField(10, EditableFormBegin());
 
@@ -1410,7 +1410,7 @@
   CheckSelection(L"ABCHelloIJ");
 }
 
-TEST_F(FPDFFormFillComboBoxFormEmbeddertest,
+TEST_F(FPDFFormFillComboBoxFormEmbedderTest,
        InsertTextAndReplaceSelectionInPopulatedEditableComboBoxRight) {
   TypeTextIntoTextField(10, EditableFormBegin());
 
@@ -1431,7 +1431,7 @@
   CheckSelection(L"ABCDEHello");
 }
 
-TEST_F(FPDFFormFillTextFormEmbeddertest,
+TEST_F(FPDFFormFillTextFormEmbedderTest,
        InsertTextInEmptyCharLimitTextFieldOverflow) {
   // Click on the textfield.
   CheckFocusedFieldText(L"");
@@ -1459,7 +1459,7 @@
   CheckSelection(L"Hippopotam");
 }
 
-TEST_F(FPDFFormFillTextFormEmbeddertest,
+TEST_F(FPDFFormFillTextFormEmbedderTest,
        InsertTextInEmptyCharLimitTextFieldFit) {
   // Click on the textfield.
   ClickOnFormFieldAtPoint(CharLimitFormEnd());
@@ -1485,7 +1485,7 @@
   CheckSelection(L"Zebra");
 }
 
-TEST_F(FPDFFormFillTextFormEmbeddertest,
+TEST_F(FPDFFormFillTextFormEmbedderTest,
        InsertTextInPopulatedCharLimitTextFieldLeft) {
   // Click on the leftmost part of the text field.
   ClickOnFormFieldAtPoint(CharLimitFormBegin());
@@ -1502,7 +1502,7 @@
   CheckSelection(L"HiElephant");
 }
 
-TEST_F(FPDFFormFillTextFormEmbeddertest,
+TEST_F(FPDFFormFillTextFormEmbedderTest,
        InsertTextInPopulatedCharLimitTextFieldMiddle) {
   CheckFocusedFieldText(L"");
   TypeTextIntoTextField(8, RegularFormBegin());
@@ -1525,7 +1525,7 @@
   CheckSelection(L"ElephHiant");
 }
 
-TEST_F(FPDFFormFillTextFormEmbeddertest,
+TEST_F(FPDFFormFillTextFormEmbedderTest,
        InsertTextInPopulatedCharLimitTextFieldRight) {
   TypeTextIntoTextField(8, RegularFormBegin());
 
@@ -1544,7 +1544,7 @@
   CheckSelection(L"ElephantHi");
 }
 
-TEST_F(FPDFFormFillTextFormEmbeddertest,
+TEST_F(FPDFFormFillTextFormEmbedderTest,
        InsertTextAndReplaceSelectionInPopulatedCharLimitTextFieldWhole) {
   TypeTextIntoTextField(12, RegularFormBegin());
 
@@ -1565,7 +1565,7 @@
   CheckSelection(L"Hippopotam");
 }
 
-TEST_F(FPDFFormFillTextFormEmbeddertest,
+TEST_F(FPDFFormFillTextFormEmbedderTest,
        InsertTextAndReplaceSelectionInPopulatedCharLimitTextFieldLeft) {
   TypeTextIntoTextField(12, RegularFormBegin());
 
@@ -1586,7 +1586,7 @@
   CheckSelection(L"Hippophant");
 }
 
-TEST_F(FPDFFormFillTextFormEmbeddertest,
+TEST_F(FPDFFormFillTextFormEmbedderTest,
        InsertTextAndReplaceSelectionInPopulatedCharLimitTextFieldMiddle) {
   TypeTextIntoTextField(12, RegularFormBegin());
 
@@ -1607,7 +1607,7 @@
   CheckSelection(L"ElHippopnt");
 }
 
-TEST_F(FPDFFormFillTextFormEmbeddertest,
+TEST_F(FPDFFormFillTextFormEmbedderTest,
        InsertTextAndReplaceSelectionInPopulatedCharLimitTextFieldRight) {
   TypeTextIntoTextField(12, RegularFormBegin());
 
@@ -1628,7 +1628,7 @@
   CheckSelection(L"ElepHippop");
 }
 
-TEST_F(FPDFFormFillTextFormEmbeddertest, DoubleClickInTextField) {
+TEST_F(FPDFFormFillTextFormEmbedderTest, DoubleClickInTextField) {
   CheckFocusedFieldText(L"");
   ClickOnFormFieldAtPoint(RegularFormBegin());
   CheckFocusedFieldText(L"");
@@ -1645,7 +1645,7 @@
   CheckSelection(L"Hello World");
 }
 
-TEST_F(FPDFFormFillTextFormEmbeddertest, FocusChanges) {
+TEST_F(FPDFFormFillTextFormEmbedderTest, FocusChanges) {
   static const CFX_PointF kNonFormPoint(1, 1);
   CheckFocusedFieldText(L"");
   ClickOnFormFieldAtPoint(CharLimitFormEnd());
@@ -1678,7 +1678,7 @@
   CheckFocusedFieldText(L"");
 }
 
-TEST_F(FPDFFormFillComboBoxFormEmbeddertest, FocusChanges) {
+TEST_F(FPDFFormFillComboBoxFormEmbedderTest, FocusChanges) {
   static const CFX_PointF kNonFormPoint(1, 1);
   CheckFocusedFieldText(L"");
   ClickOnFormFieldAtPoint(NonEditableFormBegin());
@@ -1752,7 +1752,7 @@
   CheckFocusedFieldText(L"Foo");
 }
 
-TEST_F(FPDFFormFillTextFormEmbeddertest, UndoRedo) {
+TEST_F(FPDFFormFillTextFormEmbedderTest, UndoRedo) {
   ClickOnFormFieldAtPoint(RegularFormBegin());
   CheckFocusedFieldText(L"");
   CheckCanUndo(false);
@@ -1782,7 +1782,7 @@
   CheckCanRedo(false);
 }
 
-TEST_F(FPDFFormFillComboBoxFormEmbeddertest, UndoRedo) {
+TEST_F(FPDFFormFillComboBoxFormEmbedderTest, UndoRedo) {
   ClickOnFormFieldAtPoint(NonEditableFormBegin());
   CheckFocusedFieldText(L"Banana");
   CheckCanUndo(false);
diff --git a/fpdfsdk/fpdf_ppo_embeddertest.cpp b/fpdfsdk/fpdf_ppo_embeddertest.cpp
index 84e97dc..bb503ec 100644
--- a/fpdfsdk/fpdf_ppo_embeddertest.cpp
+++ b/fpdfsdk/fpdf_ppo_embeddertest.cpp
@@ -17,7 +17,7 @@
 
 namespace {
 
-class FPDFPPOEmbeddertest : public EmbedderTest {};
+class FPDFPPOEmbedderTest : public EmbedderTest {};
 
 int FakeBlockWriter(FPDF_FILEWRITE* pThis,
                     const void* pData,
@@ -27,7 +27,7 @@
 
 }  // namespace
 
-TEST_F(FPDFPPOEmbeddertest, NoViewerPreferences) {
+TEST_F(FPDFPPOEmbedderTest, NoViewerPreferences) {
   EXPECT_TRUE(OpenDocument("hello_world.pdf"));
 
   FPDF_DOCUMENT output_doc = FPDF_CreateNewDocument();
@@ -36,7 +36,7 @@
   FPDF_CloseDocument(output_doc);
 }
 
-TEST_F(FPDFPPOEmbeddertest, ViewerPreferences) {
+TEST_F(FPDFPPOEmbedderTest, ViewerPreferences) {
   EXPECT_TRUE(OpenDocument("viewer_ref.pdf"));
 
   FPDF_DOCUMENT output_doc = FPDF_CreateNewDocument();
@@ -45,7 +45,7 @@
   FPDF_CloseDocument(output_doc);
 }
 
-TEST_F(FPDFPPOEmbeddertest, ImportPages) {
+TEST_F(FPDFPPOEmbedderTest, ImportPages) {
   ASSERT_TRUE(OpenDocument("viewer_ref.pdf"));
 
   FPDF_PAGE page = LoadPage(0);
@@ -61,7 +61,7 @@
   UnloadPage(page);
 }
 
-TEST_F(FPDFPPOEmbeddertest, ImportNPages) {
+TEST_F(FPDFPPOEmbedderTest, ImportNPages) {
   ASSERT_TRUE(OpenDocument("rectangles_multi_pages.pdf"));
 
   ScopedFPDFDocument output_doc_2up(
@@ -82,7 +82,7 @@
   EXPECT_EQ(1, FPDF_GetPageCount(output_doc_128up.get()));
 }
 
-TEST_F(FPDFPPOEmbeddertest, BadNupParams) {
+TEST_F(FPDFPPOEmbedderTest, BadNupParams) {
   ASSERT_TRUE(OpenDocument("rectangles_multi_pages.pdf"));
 
   FPDF_DOCUMENT output_doc_zero_row =
@@ -101,7 +101,7 @@
 
 // TODO(Xlou): Add more tests to check output doc content of
 // FPDF_ImportNPagesToOne()
-TEST_F(FPDFPPOEmbeddertest, NupRenderImage) {
+TEST_F(FPDFPPOEmbedderTest, NupRenderImage) {
   ASSERT_TRUE(OpenDocument("rectangles_multi_pages.pdf"));
   const int kPageCount = 2;
   constexpr const char* kExpectedMD5s[kPageCount] = {
@@ -120,7 +120,7 @@
   }
 }
 
-TEST_F(FPDFPPOEmbeddertest, BadRepeatViewerPref) {
+TEST_F(FPDFPPOEmbedderTest, BadRepeatViewerPref) {
   ASSERT_TRUE(OpenDocument("repeat_viewer_ref.pdf"));
 
   FPDF_DOCUMENT output_doc = FPDF_CreateNewDocument();
@@ -135,7 +135,7 @@
   FPDF_CloseDocument(output_doc);
 }
 
-TEST_F(FPDFPPOEmbeddertest, BadCircularViewerPref) {
+TEST_F(FPDFPPOEmbedderTest, BadCircularViewerPref) {
   ASSERT_TRUE(OpenDocument("circular_viewer_ref.pdf"));
 
   FPDF_DOCUMENT output_doc = FPDF_CreateNewDocument();
@@ -150,7 +150,7 @@
   FPDF_CloseDocument(output_doc);
 }
 
-TEST_F(FPDFPPOEmbeddertest, BadRanges) {
+TEST_F(FPDFPPOEmbedderTest, BadRanges) {
   EXPECT_TRUE(OpenDocument("hello_world.pdf"));
 
   FPDF_PAGE page = LoadPage(0);
@@ -173,7 +173,7 @@
   UnloadPage(page);
 }
 
-TEST_F(FPDFPPOEmbeddertest, GoodRanges) {
+TEST_F(FPDFPPOEmbedderTest, GoodRanges) {
   EXPECT_TRUE(OpenDocument("viewer_ref.pdf"));
 
   FPDF_PAGE page = LoadPage(0);
@@ -195,7 +195,7 @@
   UnloadPage(page);
 }
 
-TEST_F(FPDFPPOEmbeddertest, BUG_664284) {
+TEST_F(FPDFPPOEmbedderTest, BUG_664284) {
   EXPECT_TRUE(OpenDocument("bug_664284.pdf"));
 
   FPDF_PAGE page = LoadPage(0);
@@ -209,7 +209,7 @@
   UnloadPage(page);
 }
 
-TEST_F(FPDFPPOEmbeddertest, BUG_750568) {
+TEST_F(FPDFPPOEmbedderTest, BUG_750568) {
   const char* const kHashes[] = {
       "64ad08132a1c5a166768298c8a578f57", "83b83e2f6bc80707d0a917c7634140b9",
       "913cd3723a451e4e46fbc2c05702d1ee", "81fb7cfd4860f855eb468f73dfeb6d60"};
@@ -249,7 +249,7 @@
   FPDF_CloseDocument(output_doc);
 }
 
-TEST_F(FPDFPPOEmbeddertest, ImportWithZeroLengthStream) {
+TEST_F(FPDFPPOEmbedderTest, ImportWithZeroLengthStream) {
   EXPECT_TRUE(OpenDocument("zero_length_stream.pdf"));
   FPDF_PAGE page = LoadPage(0);
   ASSERT_TRUE(page);
diff --git a/fpdfsdk/fpdf_structtree_embeddertest.cpp b/fpdfsdk/fpdf_structtree_embeddertest.cpp
index 016d29d..322ab3a 100644
--- a/fpdfsdk/fpdf_structtree_embeddertest.cpp
+++ b/fpdfsdk/fpdf_structtree_embeddertest.cpp
@@ -8,9 +8,9 @@
 #include "testing/test_support.h"
 #include "third_party/base/optional.h"
 
-class FPDFStructTreeEmbeddertest : public EmbedderTest {};
+class FPDFStructTreeEmbedderTest : public EmbedderTest {};
 
-TEST_F(FPDFStructTreeEmbeddertest, GetAltText) {
+TEST_F(FPDFStructTreeEmbedderTest, GetAltText) {
   ASSERT_TRUE(OpenDocument("tagged_alt_text.pdf"));
   FPDF_PAGE page = LoadPage(0);
   ASSERT_TRUE(page);
@@ -76,7 +76,7 @@
   UnloadPage(page);
 }
 
-TEST_F(FPDFStructTreeEmbeddertest, GetMarkedContentID) {
+TEST_F(FPDFStructTreeEmbedderTest, GetMarkedContentID) {
   ASSERT_TRUE(OpenDocument("marked_content_id.pdf"));
   FPDF_PAGE page = LoadPage(0);
   ASSERT_TRUE(page);
@@ -94,7 +94,7 @@
   UnloadPage(page);
 }
 
-TEST_F(FPDFStructTreeEmbeddertest, GetType) {
+TEST_F(FPDFStructTreeEmbedderTest, GetType) {
   ASSERT_TRUE(OpenDocument("tagged_alt_text.pdf"));
   FPDF_PAGE page = LoadPage(0);
   ASSERT_TRUE(page);
diff --git a/fpdfsdk/fpdf_text_embeddertest.cpp b/fpdfsdk/fpdf_text_embeddertest.cpp
index 1f29589..109bbfd 100644
--- a/fpdfsdk/fpdf_text_embeddertest.cpp
+++ b/fpdfsdk/fpdf_text_embeddertest.cpp
@@ -37,9 +37,9 @@
 
 }  // namespace
 
-class FPDFTextEmbeddertest : public EmbedderTest {};
+class FPDFTextEmbedderTest : public EmbedderTest {};
 
-TEST_F(FPDFTextEmbeddertest, Text) {
+TEST_F(FPDFTextEmbedderTest, Text) {
   ASSERT_TRUE(OpenDocument("hello_world.pdf"));
   FPDF_PAGE page = LoadPage(0);
   ASSERT_TRUE(page);
@@ -192,7 +192,7 @@
   UnloadPage(page);
 }
 
-TEST_F(FPDFTextEmbeddertest, TextSearch) {
+TEST_F(FPDFTextEmbedderTest, TextSearch) {
   ASSERT_TRUE(OpenDocument("hello_world.pdf"));
   FPDF_PAGE page = LoadPage(0);
   ASSERT_TRUE(page);
@@ -303,7 +303,7 @@
 }
 
 // Test that the page has characters despite a bad stream length.
-TEST_F(FPDFTextEmbeddertest, StreamLengthPastEndOfFile) {
+TEST_F(FPDFTextEmbedderTest, StreamLengthPastEndOfFile) {
   ASSERT_TRUE(OpenDocument("bug_57.pdf"));
   FPDF_PAGE page = LoadPage(0);
   ASSERT_TRUE(page);
@@ -316,7 +316,7 @@
   UnloadPage(page);
 }
 
-TEST_F(FPDFTextEmbeddertest, WebLinks) {
+TEST_F(FPDFTextEmbedderTest, WebLinks) {
   ASSERT_TRUE(OpenDocument("weblinks.pdf"));
   FPDF_PAGE page = LoadPage(0);
   ASSERT_TRUE(page);
@@ -426,7 +426,7 @@
   UnloadPage(page);
 }
 
-TEST_F(FPDFTextEmbeddertest, WebLinksAcrossLines) {
+TEST_F(FPDFTextEmbedderTest, WebLinksAcrossLines) {
   ASSERT_TRUE(OpenDocument("weblinks_across_lines.pdf"));
   FPDF_PAGE page = LoadPage(0);
   ASSERT_TRUE(page);
@@ -465,7 +465,7 @@
   UnloadPage(page);
 }
 
-TEST_F(FPDFTextEmbeddertest, WebLinksAcrossLinesBug) {
+TEST_F(FPDFTextEmbedderTest, WebLinksAcrossLinesBug) {
   ASSERT_TRUE(OpenDocument("bug_650.pdf"));
   FPDF_PAGE page = LoadPage(0);
   ASSERT_TRUE(page);
@@ -492,7 +492,7 @@
   UnloadPage(page);
 }
 
-TEST_F(FPDFTextEmbeddertest, GetFontSize) {
+TEST_F(FPDFTextEmbedderTest, GetFontSize) {
   ASSERT_TRUE(OpenDocument("hello_world.pdf"));
   FPDF_PAGE page = LoadPage(0);
   ASSERT_TRUE(page);
@@ -513,7 +513,7 @@
   UnloadPage(page);
 }
 
-TEST_F(FPDFTextEmbeddertest, GetFontInfo) {
+TEST_F(FPDFTextEmbedderTest, GetFontInfo) {
   ASSERT_TRUE(OpenDocument("hello_world.pdf"));
   FPDF_PAGE page = LoadPage(0);
   ASSERT_TRUE(page);
@@ -595,7 +595,7 @@
   UnloadPage(page);
 }
 
-TEST_F(FPDFTextEmbeddertest, ToUnicode) {
+TEST_F(FPDFTextEmbedderTest, ToUnicode) {
   ASSERT_TRUE(OpenDocument("bug_583.pdf"));
   FPDF_PAGE page = LoadPage(0);
   ASSERT_TRUE(page);
@@ -610,7 +610,7 @@
   UnloadPage(page);
 }
 
-TEST_F(FPDFTextEmbeddertest, Bug_921) {
+TEST_F(FPDFTextEmbedderTest, Bug_921) {
   ASSERT_TRUE(OpenDocument("bug_921.pdf"));
   FPDF_PAGE page = LoadPage(0);
   ASSERT_TRUE(page);
@@ -641,7 +641,7 @@
   UnloadPage(page);
 }
 
-TEST_F(FPDFTextEmbeddertest, GetTextWithHyphen) {
+TEST_F(FPDFTextEmbedderTest, GetTextWithHyphen) {
   ASSERT_TRUE(OpenDocument("bug_781804.pdf"));
   FPDF_PAGE page = LoadPage(0);
   ASSERT_TRUE(page);
@@ -688,7 +688,7 @@
   UnloadPage(page);
 }
 
-TEST_F(FPDFTextEmbeddertest, bug_782596) {
+TEST_F(FPDFTextEmbedderTest, bug_782596) {
   // If there is a regression in this test, it will only fail under ASAN
   ASSERT_TRUE(OpenDocument("bug_782596.pdf"));
   FPDF_PAGE page = LoadPage(0);
@@ -699,7 +699,7 @@
   UnloadPage(page);
 }
 
-TEST_F(FPDFTextEmbeddertest, ControlCharacters) {
+TEST_F(FPDFTextEmbedderTest, ControlCharacters) {
   ASSERT_TRUE(OpenDocument("control_characters.pdf"));
   FPDF_PAGE page = LoadPage(0);
   ASSERT_TRUE(page);
@@ -734,7 +734,7 @@
 
 // Testing that hyphen makers (0x0002) are replacing hard hyphens when
 // the word contains non-ASCII characters.
-TEST_F(FPDFTextEmbeddertest, bug_1029) {
+TEST_F(FPDFTextEmbedderTest, bug_1029) {
   ASSERT_TRUE(OpenDocument("bug_1029.pdf"));
   FPDF_PAGE page = LoadPage(0);
   ASSERT_TRUE(page);
@@ -774,7 +774,7 @@
   UnloadPage(page);
 }
 
-TEST_F(FPDFTextEmbeddertest, CountRects) {
+TEST_F(FPDFTextEmbedderTest, CountRects) {
   ASSERT_TRUE(OpenDocument("hello_world.pdf"));
   FPDF_PAGE page = LoadPage(0);
   ASSERT_TRUE(page);
@@ -846,7 +846,7 @@
   UnloadPage(page);
 }
 
-TEST_F(FPDFTextEmbeddertest, GetText) {
+TEST_F(FPDFTextEmbedderTest, GetText) {
   ASSERT_TRUE(OpenDocument("hello_world.pdf"));
   FPDF_PAGE page = LoadPage(0);
   ASSERT_TRUE(page);
@@ -890,7 +890,7 @@
   UnloadPage(page);
 }
 
-TEST_F(FPDFTextEmbeddertest, CroppedText) {
+TEST_F(FPDFTextEmbedderTest, CroppedText) {
   static constexpr int kPageCount = 4;
   static constexpr FS_RECTF kBoxes[kPageCount] = {
       {50.0f, 150.0f, 150.0f, 50.0f},
@@ -945,7 +945,7 @@
   }
 }
 
-TEST_F(FPDFTextEmbeddertest, Bug_1139) {
+TEST_F(FPDFTextEmbedderTest, Bug_1139) {
   ASSERT_TRUE(OpenDocument("bug_1139.pdf"));
   FPDF_PAGE page = LoadPage(0);
   ASSERT_TRUE(page);
diff --git a/fpdfsdk/fpdf_view_embeddertest.cpp b/fpdfsdk/fpdf_view_embeddertest.cpp
index 807462e..1bab8c6 100644
--- a/fpdfsdk/fpdf_view_embeddertest.cpp
+++ b/fpdfsdk/fpdf_view_embeddertest.cpp
@@ -37,7 +37,7 @@
   EXPECT_TRUE(CheckPDFiumCApi());
 }
 
-class FPDFViewEmbeddertest : public EmbedderTest {
+class FPDFViewEmbedderTest : public EmbedderTest {
  protected:
   void TestRenderPageBitmapWithMatrix(FPDF_PAGE page,
                                       const int bitmap_width,
@@ -47,7 +47,7 @@
                                       const char* expected_md5);
 };
 
-TEST_F(FPDFViewEmbeddertest, Document) {
+TEST_F(FPDFViewEmbedderTest, Document) {
   EXPECT_TRUE(OpenDocument("about_blank.pdf"));
   EXPECT_EQ(1, GetPageCount());
   EXPECT_EQ(0, GetFirstPageNum());
@@ -60,14 +60,14 @@
   EXPECT_EQ(-1, FPDF_GetSecurityHandlerRevision(document()));
 }
 
-TEST_F(FPDFViewEmbeddertest, LoadNonexistentDocument) {
+TEST_F(FPDFViewEmbedderTest, LoadNonexistentDocument) {
   FPDF_DOCUMENT doc = FPDF_LoadDocument("nonexistent_document.pdf", "");
   ASSERT_FALSE(doc);
   EXPECT_EQ(static_cast<int>(FPDF_GetLastError()), FPDF_ERR_FILE);
 }
 
 // See bug 465.
-TEST_F(FPDFViewEmbeddertest, EmptyDocument) {
+TEST_F(FPDFViewEmbedderTest, EmptyDocument) {
   EXPECT_TRUE(CreateEmptyDocument());
 
   {
@@ -100,14 +100,14 @@
   EXPECT_EQ(0u, FPDF_CountNamedDests(document()));
 }
 
-TEST_F(FPDFViewEmbeddertest, LinearizedDocument) {
+TEST_F(FPDFViewEmbedderTest, LinearizedDocument) {
   EXPECT_TRUE(OpenDocumentLinearized("feature_linearized_loading.pdf"));
   int version;
   EXPECT_TRUE(FPDF_GetFileVersion(document(), &version));
   EXPECT_EQ(16, version);
 }
 
-TEST_F(FPDFViewEmbeddertest, Page) {
+TEST_F(FPDFViewEmbedderTest, Page) {
   EXPECT_TRUE(OpenDocument("about_blank.pdf"));
   FPDF_PAGE page = LoadPage(0);
   EXPECT_NE(nullptr, page);
@@ -126,7 +126,7 @@
   EXPECT_EQ(nullptr, LoadPage(1));
 }
 
-TEST_F(FPDFViewEmbeddertest, ViewerRefDummy) {
+TEST_F(FPDFViewEmbedderTest, ViewerRefDummy) {
   EXPECT_TRUE(OpenDocument("about_blank.pdf"));
   EXPECT_TRUE(FPDF_VIEWERREF_GetPrintScaling(document()));
   EXPECT_EQ(1, FPDF_VIEWERREF_GetNumCopies(document()));
@@ -143,7 +143,7 @@
   EXPECT_EQ(-1, FPDF_VIEWERREF_GetPrintPageRangeElement(page_range, 1));
 }
 
-TEST_F(FPDFViewEmbeddertest, ViewerRef) {
+TEST_F(FPDFViewEmbedderTest, ViewerRef) {
   EXPECT_TRUE(OpenDocument("viewer_ref.pdf"));
   EXPECT_TRUE(FPDF_VIEWERREF_GetPrintScaling(document()));
   EXPECT_EQ(5, FPDF_VIEWERREF_GetNumCopies(document()));
@@ -191,7 +191,7 @@
   EXPECT_EQ(-1, FPDF_VIEWERREF_GetPrintPageRangeElement(page_range, 4));
 }
 
-TEST_F(FPDFViewEmbeddertest, NamedDests) {
+TEST_F(FPDFViewEmbedderTest, NamedDests) {
   EXPECT_TRUE(OpenDocument("named_dests.pdf"));
   long buffer_size;
   char fixed_buffer[512];
@@ -292,7 +292,7 @@
             static_cast<size_t>(buffer_size));  // unmodified.
 }
 
-TEST_F(FPDFViewEmbeddertest, NamedDestsByName) {
+TEST_F(FPDFViewEmbedderTest, NamedDestsByName) {
   EXPECT_TRUE(OpenDocument("named_dests.pdf"));
 
   // Null pointer returns nullptr.
@@ -330,43 +330,43 @@
 }
 
 // The following tests pass if the document opens without crashing.
-TEST_F(FPDFViewEmbeddertest, Crasher_113) {
+TEST_F(FPDFViewEmbedderTest, Crasher_113) {
   EXPECT_TRUE(OpenDocument("bug_113.pdf"));
 }
 
-TEST_F(FPDFViewEmbeddertest, Crasher_451830) {
+TEST_F(FPDFViewEmbedderTest, Crasher_451830) {
   // Document is damaged and can't be opened.
   EXPECT_FALSE(OpenDocument("bug_451830.pdf"));
 }
 
-TEST_F(FPDFViewEmbeddertest, Crasher_452455) {
+TEST_F(FPDFViewEmbedderTest, Crasher_452455) {
   EXPECT_TRUE(OpenDocument("bug_452455.pdf"));
   FPDF_PAGE page = LoadPage(0);
   EXPECT_NE(nullptr, page);
   UnloadPage(page);
 }
 
-TEST_F(FPDFViewEmbeddertest, Crasher_454695) {
+TEST_F(FPDFViewEmbedderTest, Crasher_454695) {
   // Document is damaged and can't be opened.
   EXPECT_FALSE(OpenDocument("bug_454695.pdf"));
 }
 
-TEST_F(FPDFViewEmbeddertest, Crasher_572871) {
+TEST_F(FPDFViewEmbedderTest, Crasher_572871) {
   EXPECT_TRUE(OpenDocument("bug_572871.pdf"));
 }
 
 // It tests that document can still be loaded even the trailer has no 'Size'
 // field if other information is right.
-TEST_F(FPDFViewEmbeddertest, Failed_213) {
+TEST_F(FPDFViewEmbedderTest, Failed_213) {
   EXPECT_TRUE(OpenDocument("bug_213.pdf"));
 }
 
 // The following tests pass if the document opens without infinite looping.
-TEST_F(FPDFViewEmbeddertest, Hang_298) {
+TEST_F(FPDFViewEmbedderTest, Hang_298) {
   EXPECT_FALSE(OpenDocument("bug_298.pdf"));
 }
 
-TEST_F(FPDFViewEmbeddertest, Crasher_773229) {
+TEST_F(FPDFViewEmbedderTest, Crasher_773229) {
   EXPECT_TRUE(OpenDocument("bug_773229.pdf"));
 }
 
@@ -374,7 +374,7 @@
 // Previously this test will hang in a loop inside LoadAllCrossRefV4. After
 // the fix, LoadAllCrossRefV4 will return false after detecting a cross
 // reference loop. Cross references will be rebuilt successfully.
-TEST_F(FPDFViewEmbeddertest, CrossRefV4Loop) {
+TEST_F(FPDFViewEmbedderTest, CrossRefV4Loop) {
   EXPECT_TRUE(OpenDocument("bug_xrefv4_loop.pdf"));
   MockDownloadHints hints;
 
@@ -388,36 +388,36 @@
 
 // The test should pass when circular references to ParseIndirectObject will not
 // cause infinite loop.
-TEST_F(FPDFViewEmbeddertest, Hang_343) {
+TEST_F(FPDFViewEmbedderTest, Hang_343) {
   EXPECT_FALSE(OpenDocument("bug_343.pdf"));
 }
 
 // The test should pass when the absence of 'Contents' field in a signature
 // dictionary will not cause an infinite loop in CPDF_SyntaxParser::GetObject().
-TEST_F(FPDFViewEmbeddertest, Hang_344) {
+TEST_F(FPDFViewEmbedderTest, Hang_344) {
   EXPECT_FALSE(OpenDocument("bug_344.pdf"));
 }
 
 // The test should pass when there is no infinite recursion in
 // CPDF_SyntaxParser::GetString().
-TEST_F(FPDFViewEmbeddertest, Hang_355) {
+TEST_F(FPDFViewEmbedderTest, Hang_355) {
   EXPECT_FALSE(OpenDocument("bug_355.pdf"));
 }
 // The test should pass even when the file has circular references to pages.
-TEST_F(FPDFViewEmbeddertest, Hang_360) {
+TEST_F(FPDFViewEmbedderTest, Hang_360) {
   EXPECT_FALSE(OpenDocument("bug_360.pdf"));
 }
 
 // Deliberately damaged version of linearized.pdf with bad data in the shared
 // object hint table.
-TEST_F(FPDFViewEmbeddertest, Hang_1055) {
+TEST_F(FPDFViewEmbedderTest, Hang_1055) {
   EXPECT_TRUE(OpenDocumentLinearized("linearized_bug_1055.pdf"));
   int version;
   EXPECT_TRUE(FPDF_GetFileVersion(document(), &version));
   EXPECT_EQ(16, version);
 }
 
-void FPDFViewEmbeddertest::TestRenderPageBitmapWithMatrix(
+void FPDFViewEmbedderTest::TestRenderPageBitmapWithMatrix(
     FPDF_PAGE page,
     const int bitmap_width,
     const int bitmap_height,
@@ -431,7 +431,7 @@
   FPDFBitmap_Destroy(bitmap);
 }
 
-TEST_F(FPDFViewEmbeddertest, FPDF_RenderPageBitmapWithMatrix) {
+TEST_F(FPDFViewEmbedderTest, FPDF_RenderPageBitmapWithMatrix) {
   const char kOriginalMD5[] = "0a90de37f52127619c3dfb642b5fa2fe";
   const char kClippedMD5[] = "a84cab93c102b9b9290fba3047ba702c";
   const char kTopLeftQuarterMD5[] = "f11a11137c8834389e31cf555a4a6979";
@@ -591,7 +591,7 @@
   UnloadPage(page);
 }
 
-TEST_F(FPDFViewEmbeddertest, FPDF_GetPageSizeByIndex) {
+TEST_F(FPDFViewEmbedderTest, FPDF_GetPageSizeByIndex) {
   EXPECT_TRUE(OpenDocument("rectangles.pdf"));
 
   double width = 0;
@@ -639,7 +639,7 @@
   int type_;
 };
 
-TEST_F(FPDFViewEmbeddertest, UnSupportedOperations_NotFound) {
+TEST_F(FPDFViewEmbedderTest, UnSupportedOperations_NotFound) {
   UnSupRecordDelegate delegate;
   SetDelegate(&delegate);
   ASSERT_TRUE(OpenDocument("hello_world.pdf"));
@@ -647,7 +647,7 @@
   SetDelegate(nullptr);
 }
 
-TEST_F(FPDFViewEmbeddertest, UnSupportedOperations_LoadCustomDocument) {
+TEST_F(FPDFViewEmbedderTest, UnSupportedOperations_LoadCustomDocument) {
   UnSupRecordDelegate delegate;
   SetDelegate(&delegate);
   ASSERT_TRUE(OpenDocument("unsupported_feature.pdf"));
@@ -655,7 +655,7 @@
   SetDelegate(nullptr);
 }
 
-TEST_F(FPDFViewEmbeddertest, UnSupportedOperations_LoadDocument) {
+TEST_F(FPDFViewEmbedderTest, UnSupportedOperations_LoadDocument) {
   std::string file_path;
   ASSERT_TRUE(
       PathService::GetTestFilePath("unsupported_feature.pdf", &file_path));
diff --git a/fpdfsdk/pwl/cpwl_combo_box_embeddertest.cpp b/fpdfsdk/pwl/cpwl_combo_box_embeddertest.cpp
index f207aa0..b3bfe55 100644
--- a/fpdfsdk/pwl/cpwl_combo_box_embeddertest.cpp
+++ b/fpdfsdk/pwl/cpwl_combo_box_embeddertest.cpp
@@ -13,7 +13,7 @@
 #include "testing/embedder_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-class CPWLComboBoxEditEmbeddertest : public EmbedderTest {
+class CPWLComboBoxEditEmbedderTest : public EmbedderTest {
  protected:
   void SetUp() override {
     EmbedderTest::SetUp();
@@ -97,7 +97,7 @@
   CPDFSDK_FormFillEnvironment* m_pFormFillEnv;
 };
 
-TEST_F(CPWLComboBoxEditEmbeddertest, GetSelectedTextEmptyAndBasicNormal) {
+TEST_F(CPWLComboBoxEditEmbedderTest, GetSelectedTextEmptyAndBasicNormal) {
   FormFillerAndWindowSetup(GetCPDFSDKAnnotNormal());
 
   // Automatically pre-filled with "Banana".
@@ -119,7 +119,7 @@
   EXPECT_FALSE(GetCFFLFormFiller()->OnChar(GetCPDFSDKAnnotNormal(), 'a', 0));
 }
 
-TEST_F(CPWLComboBoxEditEmbeddertest, GetSelectedTextFragmentsNormal) {
+TEST_F(CPWLComboBoxEditEmbedderTest, GetSelectedTextFragmentsNormal) {
   FormFillerAndWindowSetup(GetCPDFSDKAnnotNormal());
   EXPECT_STREQ(L"Banana", GetCPWLComboBox()->GetText().c_str());
 
@@ -145,7 +145,7 @@
   EXPECT_STREQ(L"a", GetCPWLComboBox()->GetSelectedText().c_str());
 }
 
-TEST_F(CPWLComboBoxEditEmbeddertest, GetSelectedTextEmptyAndBasicEditable) {
+TEST_F(CPWLComboBoxEditEmbedderTest, GetSelectedTextEmptyAndBasicEditable) {
   FormFillerAndWindowSetup(GetCPDFSDKAnnotUserEditable());
   EXPECT_TRUE(GetCPWLComboBox()->GetText().IsEmpty());
 
@@ -174,7 +174,7 @@
   EXPECT_STREQ(L"Baabc", GetCPWLComboBox()->GetSelectedText().c_str());
 }
 
-TEST_F(CPWLComboBoxEditEmbeddertest, GetSelectedTextFragmentsEditable) {
+TEST_F(CPWLComboBoxEditEmbedderTest, GetSelectedTextFragmentsEditable) {
   FormFillerAndWindowSetup(GetCPDFSDKAnnotUserEditable());
   TypeTextIntoTextField(50);
 
@@ -204,7 +204,7 @@
   EXPECT_STREQ(L"r", GetCPWLComboBox()->GetSelectedText().c_str());
 }
 
-TEST_F(CPWLComboBoxEditEmbeddertest, DeleteEntireTextSelection) {
+TEST_F(CPWLComboBoxEditEmbedderTest, DeleteEntireTextSelection) {
   FormFillerAndWindowSetup(GetCPDFSDKAnnotUserEditable());
   TypeTextIntoTextField(50);
 
@@ -216,7 +216,7 @@
   EXPECT_TRUE(GetCPWLComboBox()->GetText().IsEmpty());
 }
 
-TEST_F(CPWLComboBoxEditEmbeddertest, DeleteTextSelectionMiddle) {
+TEST_F(CPWLComboBoxEditEmbedderTest, DeleteTextSelectionMiddle) {
   FormFillerAndWindowSetup(GetCPDFSDKAnnotUserEditable());
   TypeTextIntoTextField(50);
 
@@ -228,7 +228,7 @@
                GetCPWLComboBox()->GetText().c_str());
 }
 
-TEST_F(CPWLComboBoxEditEmbeddertest, DeleteTextSelectionLeft) {
+TEST_F(CPWLComboBoxEditEmbedderTest, DeleteTextSelectionLeft) {
   FormFillerAndWindowSetup(GetCPDFSDKAnnotUserEditable());
   TypeTextIntoTextField(50);
 
@@ -240,7 +240,7 @@
                GetCPWLComboBox()->GetText().c_str());
 }
 
-TEST_F(CPWLComboBoxEditEmbeddertest, DeleteTextSelectionRight) {
+TEST_F(CPWLComboBoxEditEmbedderTest, DeleteTextSelectionRight) {
   FormFillerAndWindowSetup(GetCPDFSDKAnnotUserEditable());
   TypeTextIntoTextField(50);
 
@@ -252,7 +252,7 @@
                GetCPWLComboBox()->GetText().c_str());
 }
 
-TEST_F(CPWLComboBoxEditEmbeddertest, DeleteEmptyTextSelection) {
+TEST_F(CPWLComboBoxEditEmbedderTest, DeleteEmptyTextSelection) {
   FormFillerAndWindowSetup(GetCPDFSDKAnnotUserEditable());
   TypeTextIntoTextField(50);
 
@@ -261,13 +261,13 @@
                GetCPWLComboBox()->GetText().c_str());
 }
 
-TEST_F(CPWLComboBoxEditEmbeddertest, InsertTextInEmptyEditableComboBox) {
+TEST_F(CPWLComboBoxEditEmbedderTest, InsertTextInEmptyEditableComboBox) {
   FormFillerAndWindowSetup(GetCPDFSDKAnnotUserEditable());
   GetCPWLComboBox()->ReplaceSelection(L"Hello");
   EXPECT_STREQ(L"Hello", GetCPWLComboBox()->GetText().c_str());
 }
 
-TEST_F(CPWLComboBoxEditEmbeddertest,
+TEST_F(CPWLComboBoxEditEmbedderTest,
        InsertTextInPopulatedEditableComboBoxLeft) {
   FormFillerAndWindowSetup(GetCPDFSDKAnnotUserEditable());
   TypeTextIntoTextField(10);
@@ -280,7 +280,7 @@
   EXPECT_STREQ(L"HelloABCDEFGHIJ", GetCPWLComboBox()->GetText().c_str());
 }
 
-TEST_F(CPWLComboBoxEditEmbeddertest,
+TEST_F(CPWLComboBoxEditEmbedderTest,
        InsertTextInPopulatedEditableComboBoxMiddle) {
   FormFillerAndWindowSetup(GetCPDFSDKAnnotUserEditable());
   TypeTextIntoTextField(10);
@@ -295,7 +295,7 @@
   EXPECT_STREQ(L"ABCDEHelloFGHIJ", GetCPWLComboBox()->GetText().c_str());
 }
 
-TEST_F(CPWLComboBoxEditEmbeddertest,
+TEST_F(CPWLComboBoxEditEmbedderTest,
        InsertTextInPopulatedEditableComboBoxRight) {
   FormFillerAndWindowSetup(GetCPDFSDKAnnotUserEditable());
   TypeTextIntoTextField(10);
@@ -304,7 +304,7 @@
   EXPECT_STREQ(L"ABCDEFGHIJHello", GetCPWLComboBox()->GetText().c_str());
 }
 
-TEST_F(CPWLComboBoxEditEmbeddertest,
+TEST_F(CPWLComboBoxEditEmbedderTest,
        InsertTextAndReplaceSelectionInPopulatedEditableComboBoxWhole) {
   FormFillerAndWindowSetup(GetCPDFSDKAnnotUserEditable());
   TypeTextIntoTextField(10);
@@ -315,7 +315,7 @@
   EXPECT_STREQ(L"Hello", GetCPWLComboBox()->GetText().c_str());
 }
 
-TEST_F(CPWLComboBoxEditEmbeddertest,
+TEST_F(CPWLComboBoxEditEmbedderTest,
        InsertTextAndReplaceSelectionInPopulatedEditableComboBoxLeft) {
   FormFillerAndWindowSetup(GetCPDFSDKAnnotUserEditable());
   TypeTextIntoTextField(10);
@@ -326,7 +326,7 @@
   EXPECT_STREQ(L"HelloFGHIJ", GetCPWLComboBox()->GetText().c_str());
 }
 
-TEST_F(CPWLComboBoxEditEmbeddertest,
+TEST_F(CPWLComboBoxEditEmbedderTest,
        InsertTextAndReplaceSelectionInPopulatedEditableComboBoxMiddle) {
   FormFillerAndWindowSetup(GetCPDFSDKAnnotUserEditable());
   TypeTextIntoTextField(10);
@@ -337,7 +337,7 @@
   EXPECT_STREQ(L"ABHelloHIJ", GetCPWLComboBox()->GetText().c_str());
 }
 
-TEST_F(CPWLComboBoxEditEmbeddertest,
+TEST_F(CPWLComboBoxEditEmbedderTest,
        InsertTextAndReplaceSelectionInPopulatedEditableComboBoxRight) {
   FormFillerAndWindowSetup(GetCPDFSDKAnnotUserEditable());
   TypeTextIntoTextField(10);
diff --git a/fpdfsdk/pwl/cpwl_edit_embeddertest.cpp b/fpdfsdk/pwl/cpwl_edit_embeddertest.cpp
index 7dc0b11..296dd4f 100644
--- a/fpdfsdk/pwl/cpwl_edit_embeddertest.cpp
+++ b/fpdfsdk/pwl/cpwl_edit_embeddertest.cpp
@@ -13,7 +13,7 @@
 #include "testing/embedder_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-class CPWLEditEmbeddertest : public EmbedderTest {
+class CPWLEditEmbedderTest : public EmbedderTest {
  protected:
   void SetUp() override {
     EmbedderTest::SetUp();
@@ -91,7 +91,7 @@
   CPDFSDK_FormFillEnvironment* m_pFormFillEnv;
 };
 
-TEST_F(CPWLEditEmbeddertest, TypeText) {
+TEST_F(CPWLEditEmbedderTest, TypeText) {
   FormFillerAndWindowSetup(GetCPDFSDKAnnot());
   EXPECT_TRUE(GetCPWLEdit()->GetText().IsEmpty());
   EXPECT_TRUE(GetCFFLFormFiller()->OnChar(GetCPDFSDKAnnot(), 'a', 0));
@@ -101,7 +101,7 @@
   EXPECT_STREQ(L"abc", GetCPWLEdit()->GetText().c_str());
 }
 
-TEST_F(CPWLEditEmbeddertest, GetSelectedTextEmptyAndBasic) {
+TEST_F(CPWLEditEmbedderTest, GetSelectedTextEmptyAndBasic) {
   FormFillerAndWindowSetup(GetCPDFSDKAnnot());
   // Attempt to set selection before text has been typed to test that
   // selection is identified as empty.
@@ -118,7 +118,7 @@
   EXPECT_STREQ(L"ab", GetCPWLEdit()->GetSelectedText().c_str());
 }
 
-TEST_F(CPWLEditEmbeddertest, GetSelectedTextFragments) {
+TEST_F(CPWLEditEmbedderTest, GetSelectedTextFragments) {
   FormFillerAndWindowSetup(GetCPDFSDKAnnot());
   TypeTextIntoTextField(50);
 
@@ -148,7 +148,7 @@
   EXPECT_STREQ(L"r", GetCPWLEdit()->GetSelectedText().c_str());
 }
 
-TEST_F(CPWLEditEmbeddertest, DeleteEntireTextSelection) {
+TEST_F(CPWLEditEmbedderTest, DeleteEntireTextSelection) {
   FormFillerAndWindowSetup(GetCPDFSDKAnnot());
   TypeTextIntoTextField(50);
 
@@ -160,7 +160,7 @@
   EXPECT_TRUE(GetCPWLEdit()->GetText().IsEmpty());
 }
 
-TEST_F(CPWLEditEmbeddertest, DeleteTextSelectionMiddle) {
+TEST_F(CPWLEditEmbedderTest, DeleteTextSelectionMiddle) {
   FormFillerAndWindowSetup(GetCPDFSDKAnnot());
   TypeTextIntoTextField(50);
 
@@ -172,7 +172,7 @@
                GetCPWLEdit()->GetText().c_str());
 }
 
-TEST_F(CPWLEditEmbeddertest, DeleteTextSelectionLeft) {
+TEST_F(CPWLEditEmbedderTest, DeleteTextSelectionLeft) {
   FormFillerAndWindowSetup(GetCPDFSDKAnnot());
   TypeTextIntoTextField(50);
 
@@ -184,7 +184,7 @@
                GetCPWLEdit()->GetText().c_str());
 }
 
-TEST_F(CPWLEditEmbeddertest, DeleteTextSelectionRight) {
+TEST_F(CPWLEditEmbedderTest, DeleteTextSelectionRight) {
   FormFillerAndWindowSetup(GetCPDFSDKAnnot());
   TypeTextIntoTextField(50);
 
@@ -196,7 +196,7 @@
                GetCPWLEdit()->GetText().c_str());
 }
 
-TEST_F(CPWLEditEmbeddertest, DeleteEmptyTextSelection) {
+TEST_F(CPWLEditEmbedderTest, DeleteEmptyTextSelection) {
   FormFillerAndWindowSetup(GetCPDFSDKAnnot());
   TypeTextIntoTextField(50);
 
@@ -205,13 +205,13 @@
                GetCPWLEdit()->GetText().c_str());
 }
 
-TEST_F(CPWLEditEmbeddertest, InsertTextInEmptyTextField) {
+TEST_F(CPWLEditEmbedderTest, InsertTextInEmptyTextField) {
   FormFillerAndWindowSetup(GetCPDFSDKAnnot());
   GetCPWLEdit()->ReplaceSelection(L"Hello");
   EXPECT_STREQ(L"Hello", GetCPWLEdit()->GetText().c_str());
 }
 
-TEST_F(CPWLEditEmbeddertest, InsertTextInPopulatedTextFieldLeft) {
+TEST_F(CPWLEditEmbedderTest, InsertTextInPopulatedTextFieldLeft) {
   FormFillerAndWindowSetup(GetCPDFSDKAnnot());
   TypeTextIntoTextField(10);
 
@@ -223,7 +223,7 @@
   EXPECT_STREQ(L"HelloABCDEFGHIJ", GetCPWLEdit()->GetText().c_str());
 }
 
-TEST_F(CPWLEditEmbeddertest, InsertTextInPopulatedTextFieldMiddle) {
+TEST_F(CPWLEditEmbedderTest, InsertTextInPopulatedTextFieldMiddle) {
   FormFillerAndWindowSetup(GetCPDFSDKAnnot());
   TypeTextIntoTextField(10);
 
@@ -237,7 +237,7 @@
   EXPECT_STREQ(L"ABCDEHelloFGHIJ", GetCPWLEdit()->GetText().c_str());
 }
 
-TEST_F(CPWLEditEmbeddertest, InsertTextInPopulatedTextFieldRight) {
+TEST_F(CPWLEditEmbedderTest, InsertTextInPopulatedTextFieldRight) {
   FormFillerAndWindowSetup(GetCPDFSDKAnnot());
   TypeTextIntoTextField(10);
 
@@ -245,7 +245,7 @@
   EXPECT_STREQ(L"ABCDEFGHIJHello", GetCPWLEdit()->GetText().c_str());
 }
 
-TEST_F(CPWLEditEmbeddertest,
+TEST_F(CPWLEditEmbedderTest,
        InsertTextAndReplaceSelectionInPopulatedTextFieldWhole) {
   FormFillerAndWindowSetup(GetCPDFSDKAnnot());
   TypeTextIntoTextField(10);
@@ -256,7 +256,7 @@
   EXPECT_STREQ(L"Hello", GetCPWLEdit()->GetText().c_str());
 }
 
-TEST_F(CPWLEditEmbeddertest,
+TEST_F(CPWLEditEmbedderTest,
        InsertTextAndReplaceSelectionInPopulatedTextFieldLeft) {
   FormFillerAndWindowSetup(GetCPDFSDKAnnot());
   TypeTextIntoTextField(10);
@@ -267,7 +267,7 @@
   EXPECT_STREQ(L"HelloFGHIJ", GetCPWLEdit()->GetText().c_str());
 }
 
-TEST_F(CPWLEditEmbeddertest,
+TEST_F(CPWLEditEmbedderTest,
        InsertTextAndReplaceSelectionInPopulatedTextFieldMiddle) {
   FormFillerAndWindowSetup(GetCPDFSDKAnnot());
   TypeTextIntoTextField(10);
@@ -278,7 +278,7 @@
   EXPECT_STREQ(L"ABHelloHIJ", GetCPWLEdit()->GetText().c_str());
 }
 
-TEST_F(CPWLEditEmbeddertest,
+TEST_F(CPWLEditEmbedderTest,
        InsertTextAndReplaceSelectionInPopulatedTextFieldRight) {
   FormFillerAndWindowSetup(GetCPDFSDKAnnot());
   TypeTextIntoTextField(10);
@@ -289,7 +289,7 @@
   EXPECT_STREQ(L"ABCDEHello", GetCPWLEdit()->GetText().c_str());
 }
 
-TEST_F(CPWLEditEmbeddertest, InsertTextInEmptyCharLimitTextFieldOverflow) {
+TEST_F(CPWLEditEmbedderTest, InsertTextInEmptyCharLimitTextFieldOverflow) {
   FormFillerAndWindowSetup(GetCPDFSDKAnnotCharLimit());
   GetCPWLEdit()->SetSelection(0, -1);
   EXPECT_STREQ(L"Elephant", GetCPWLEdit()->GetSelectedText().c_str());
@@ -299,7 +299,7 @@
   EXPECT_STREQ(L"Hippopotam", GetCPWLEdit()->GetText().c_str());
 }
 
-TEST_F(CPWLEditEmbeddertest, InsertTextInEmptyCharLimitTextFieldFit) {
+TEST_F(CPWLEditEmbedderTest, InsertTextInEmptyCharLimitTextFieldFit) {
   FormFillerAndWindowSetup(GetCPDFSDKAnnotCharLimit());
   GetCPWLEdit()->SetSelection(0, -1);
   EXPECT_STREQ(L"Elephant", GetCPWLEdit()->GetSelectedText().c_str());
@@ -309,13 +309,13 @@
   EXPECT_STREQ(L"Zebra", GetCPWLEdit()->GetText().c_str());
 }
 
-TEST_F(CPWLEditEmbeddertest, InsertTextInPopulatedCharLimitTextFieldLeft) {
+TEST_F(CPWLEditEmbedderTest, InsertTextInPopulatedCharLimitTextFieldLeft) {
   FormFillerAndWindowSetup(GetCPDFSDKAnnotCharLimit());
   GetCPWLEdit()->ReplaceSelection(L"Hippopotamus");
   EXPECT_STREQ(L"HiElephant", GetCPWLEdit()->GetText().c_str());
 }
 
-TEST_F(CPWLEditEmbeddertest, InsertTextInPopulatedCharLimitTextFieldMiddle) {
+TEST_F(CPWLEditEmbedderTest, InsertTextInPopulatedCharLimitTextFieldMiddle) {
   FormFillerAndWindowSetup(GetCPDFSDKAnnotCharLimit());
   // Move cursor to middle of text field.
   for (int i = 0; i < 5; ++i) {
@@ -327,7 +327,7 @@
   EXPECT_STREQ(L"ElephHiant", GetCPWLEdit()->GetText().c_str());
 }
 
-TEST_F(CPWLEditEmbeddertest, InsertTextInPopulatedCharLimitTextFieldRight) {
+TEST_F(CPWLEditEmbedderTest, InsertTextInPopulatedCharLimitTextFieldRight) {
   FormFillerAndWindowSetup(GetCPDFSDKAnnotCharLimit());
   // Move cursor to end of text field.
   EXPECT_TRUE(GetCFFLFormFiller()->OnKeyDown(GetCPDFSDKAnnotCharLimit(),
@@ -337,7 +337,7 @@
   EXPECT_STREQ(L"ElephantHi", GetCPWLEdit()->GetText().c_str());
 }
 
-TEST_F(CPWLEditEmbeddertest,
+TEST_F(CPWLEditEmbedderTest,
        InsertTextAndReplaceSelectionInPopulatedCharLimitTextFieldWhole) {
   FormFillerAndWindowSetup(GetCPDFSDKAnnotCharLimit());
   GetCPWLEdit()->SetSelection(0, -1);
@@ -346,7 +346,7 @@
   EXPECT_STREQ(L"Hippopotam", GetCPWLEdit()->GetText().c_str());
 }
 
-TEST_F(CPWLEditEmbeddertest,
+TEST_F(CPWLEditEmbedderTest,
        InsertTextAndReplaceSelectionInPopulatedCharLimitTextFieldLeft) {
   FormFillerAndWindowSetup(GetCPDFSDKAnnotCharLimit());
   GetCPWLEdit()->SetSelection(0, 4);
@@ -355,7 +355,7 @@
   EXPECT_STREQ(L"Hippophant", GetCPWLEdit()->GetText().c_str());
 }
 
-TEST_F(CPWLEditEmbeddertest,
+TEST_F(CPWLEditEmbedderTest,
        InsertTextAndReplaceSelectionInPopulatedCharLimitTextFieldMiddle) {
   FormFillerAndWindowSetup(GetCPDFSDKAnnotCharLimit());
   GetCPWLEdit()->SetSelection(2, 6);
@@ -364,7 +364,7 @@
   EXPECT_STREQ(L"ElHippopnt", GetCPWLEdit()->GetText().c_str());
 }
 
-TEST_F(CPWLEditEmbeddertest,
+TEST_F(CPWLEditEmbedderTest,
        InsertTextAndReplaceSelectionInPopulatedCharLimitTextFieldRight) {
   FormFillerAndWindowSetup(GetCPDFSDKAnnotCharLimit());
   GetCPWLEdit()->SetSelection(4, 8);
@@ -373,49 +373,49 @@
   EXPECT_STREQ(L"ElepHippop", GetCPWLEdit()->GetText().c_str());
 }
 
-TEST_F(CPWLEditEmbeddertest, SetTextWithEndCarriageFeed) {
+TEST_F(CPWLEditEmbedderTest, SetTextWithEndCarriageFeed) {
   FormFillerAndWindowSetup(GetCPDFSDKAnnot());
   GetCPWLEdit()->SetText(L"Foo\r");
   EXPECT_STREQ(L"Foo", GetCPWLEdit()->GetText().c_str());
 }
 
-TEST_F(CPWLEditEmbeddertest, SetTextWithEndNewline) {
+TEST_F(CPWLEditEmbedderTest, SetTextWithEndNewline) {
   FormFillerAndWindowSetup(GetCPDFSDKAnnot());
   GetCPWLEdit()->SetText(L"Foo\n");
   EXPECT_STREQ(L"Foo", GetCPWLEdit()->GetText().c_str());
 }
 
-TEST_F(CPWLEditEmbeddertest, SetTextWithEndCarriageFeedAndNewLine) {
+TEST_F(CPWLEditEmbedderTest, SetTextWithEndCarriageFeedAndNewLine) {
   FormFillerAndWindowSetup(GetCPDFSDKAnnot());
   GetCPWLEdit()->SetText(L"Foo\r\n");
   EXPECT_STREQ(L"Foo", GetCPWLEdit()->GetText().c_str());
 }
 
-TEST_F(CPWLEditEmbeddertest, SetTextWithEndNewLineAndCarriageFeed) {
+TEST_F(CPWLEditEmbedderTest, SetTextWithEndNewLineAndCarriageFeed) {
   FormFillerAndWindowSetup(GetCPDFSDKAnnot());
   GetCPWLEdit()->SetText(L"Foo\n\r");
   EXPECT_STREQ(L"Foo", GetCPWLEdit()->GetText().c_str());
 }
 
-TEST_F(CPWLEditEmbeddertest, SetTextWithBodyCarriageFeed) {
+TEST_F(CPWLEditEmbedderTest, SetTextWithBodyCarriageFeed) {
   FormFillerAndWindowSetup(GetCPDFSDKAnnot());
   GetCPWLEdit()->SetText(L"Foo\rBar");
   EXPECT_STREQ(L"FooBar", GetCPWLEdit()->GetText().c_str());
 }
 
-TEST_F(CPWLEditEmbeddertest, SetTextWithBodyNewline) {
+TEST_F(CPWLEditEmbedderTest, SetTextWithBodyNewline) {
   FormFillerAndWindowSetup(GetCPDFSDKAnnot());
   GetCPWLEdit()->SetText(L"Foo\nBar");
   EXPECT_STREQ(L"FooBar", GetCPWLEdit()->GetText().c_str());
 }
 
-TEST_F(CPWLEditEmbeddertest, SetTextWithBodyCarriageFeedAndNewLine) {
+TEST_F(CPWLEditEmbedderTest, SetTextWithBodyCarriageFeedAndNewLine) {
   FormFillerAndWindowSetup(GetCPDFSDKAnnot());
   GetCPWLEdit()->SetText(L"Foo\r\nBar");
   EXPECT_STREQ(L"FooBar", GetCPWLEdit()->GetText().c_str());
 }
 
-TEST_F(CPWLEditEmbeddertest, SetTextWithBodyNewLineAndCarriageFeed) {
+TEST_F(CPWLEditEmbedderTest, SetTextWithBodyNewLineAndCarriageFeed) {
   FormFillerAndWindowSetup(GetCPDFSDKAnnot());
   GetCPWLEdit()->SetText(L"Foo\n\rBar");
   EXPECT_STREQ(L"FooBar", GetCPWLEdit()->GetText().c_str());
diff --git a/xfa/fwl/cfwl_edit_embeddertest.cpp b/xfa/fwl/cfwl_edit_embeddertest.cpp
index ecc3b5e..fb2ba5b 100644
--- a/xfa/fwl/cfwl_edit_embeddertest.cpp
+++ b/xfa/fwl/cfwl_edit_embeddertest.cpp
@@ -10,7 +10,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/xfa_js_embedder_test.h"
 
-class CFWLEditEmbeddertest : public XFAJSEmbedderTest {
+class CFWLEditEmbedderTest : public XFAJSEmbedderTest {
  protected:
   void SetUp() override {
     EmbedderTest::SetUp();
@@ -36,12 +36,12 @@
   EmbedderTestTimerHandlingDelegate delegate_;
 };
 
-TEST_F(CFWLEditEmbeddertest, Trivial) {
+TEST_F(CFWLEditEmbedderTest, Trivial) {
   CreateAndInitializeFormPDF("xfa/email_recommended.pdf");
   ASSERT_EQ(0u, delegate().GetAlerts().size());
 }
 
-TEST_F(CFWLEditEmbeddertest, LeftClickMouseSelection) {
+TEST_F(CFWLEditEmbedderTest, LeftClickMouseSelection) {
   CreateAndInitializeFormPDF("xfa/email_recommended.pdf");
   FORM_OnLButtonDown(form_handle(), page(), 0, 115, 58);
   for (size_t i = 0; i < 10; ++i)
@@ -59,7 +59,7 @@
   EXPECT_STREQ(L"defgh", WideString::FromUTF16LE(buf, len).c_str());
 }
 
-TEST_F(CFWLEditEmbeddertest, DragMouseSelection) {
+TEST_F(CFWLEditEmbedderTest, DragMouseSelection) {
   CreateAndInitializeFormPDF("xfa/email_recommended.pdf");
   FORM_OnLButtonDown(form_handle(), page(), 0, 115, 58);
   for (size_t i = 0; i < 10; ++i)
@@ -85,7 +85,7 @@
   }
 }
 
-TEST_F(CFWLEditEmbeddertest, SimpleFill) {
+TEST_F(CFWLEditEmbedderTest, SimpleFill) {
   CreateAndInitializeFormPDF("xfa/email_recommended.pdf");
   const char kBlankMD5[] = "eea5c72701270ac4a7edcc4df66d812a";
   {
@@ -106,7 +106,7 @@
   }
 }
 
-TEST_F(CFWLEditEmbeddertest, FillWithNewLineWithoutMultiline) {
+TEST_F(CFWLEditEmbedderTest, FillWithNewLineWithoutMultiline) {
   CreateAndInitializeFormPDF("xfa/email_recommended.pdf");
   FORM_OnLButtonDown(form_handle(), page(), 0, 115, 58);
   for (size_t i = 0; i < 5; ++i)
@@ -124,7 +124,7 @@
 }
 
 // Disabled due to flakiness.
-TEST_F(CFWLEditEmbeddertest, DISABLED_FillWithNewLineWithMultiline) {
+TEST_F(CFWLEditEmbedderTest, DISABLED_FillWithNewLineWithMultiline) {
   CreateAndInitializeFormPDF("xfa/xfa_multiline_textfield.pdf");
   FORM_OnLButtonDown(form_handle(), page(), 0, 115, 58);
 
diff --git a/xfa/fxfa/parser/cxfa_document_parser_embeddertest.cpp b/xfa/fxfa/parser/cxfa_document_parser_embeddertest.cpp
index 174febf..129c8bc 100644
--- a/xfa/fxfa/parser/cxfa_document_parser_embeddertest.cpp
+++ b/xfa/fxfa/parser/cxfa_document_parser_embeddertest.cpp
@@ -5,16 +5,16 @@
 #include "testing/embedder_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-class CXFASimpleParserEmbeddertest : public EmbedderTest {};
+class CXFASimpleParserEmbedderTest : public EmbedderTest {};
 
-TEST_F(CXFASimpleParserEmbeddertest, Bug_216) {
+TEST_F(CXFASimpleParserEmbedderTest, Bug_216) {
   EXPECT_TRUE(OpenDocument("bug_216.pdf"));
   FPDF_PAGE page = LoadPage(0);
   EXPECT_NE(nullptr, page);
   UnloadPage(page);
 }
 
-TEST_F(CXFASimpleParserEmbeddertest, Bug_709793) {
+TEST_F(CXFASimpleParserEmbedderTest, Bug_709793) {
   EXPECT_TRUE(OpenDocument("bug_709793.pdf"));
   FPDF_PAGE page = LoadPage(0);
   EXPECT_NE(nullptr, page);