diff --git a/test/unit/clitests.json b/test/unit/clitests.json
index 1755c691d..99cca1b41 100644
--- a/test/unit/clitests.json
+++ b/test/unit/clitests.json
@@ -9,7 +9,6 @@
     "annotation_spec.js",
     "annotation_storage_spec.js",
     "api_spec.js",
-    "base_viewer_spec.js",
     "bidi_spec.js",
     "cff_parser_spec.js",
     "cmap_spec.js",
@@ -35,6 +34,7 @@
     "pdf_find_controller_spec.js",
     "pdf_find_utils_spec.js",
     "pdf_history_spec.js",
+    "pdf_viewer_spec.js",
     "primitives_spec.js",
     "stream_spec.js",
     "struct_tree_spec.js",
diff --git a/test/unit/jasmine-boot.js b/test/unit/jasmine-boot.js
index 89d8d474a..0997edf51 100644
--- a/test/unit/jasmine-boot.js
+++ b/test/unit/jasmine-boot.js
@@ -54,7 +54,6 @@ async function initializePDFJS(callback) {
       "pdfjs-test/unit/annotation_spec.js",
       "pdfjs-test/unit/annotation_storage_spec.js",
       "pdfjs-test/unit/api_spec.js",
-      "pdfjs-test/unit/base_viewer_spec.js",
       "pdfjs-test/unit/bidi_spec.js",
       "pdfjs-test/unit/cff_parser_spec.js",
       "pdfjs-test/unit/cmap_spec.js",
@@ -81,6 +80,7 @@ async function initializePDFJS(callback) {
       "pdfjs-test/unit/pdf_find_controller_spec.js",
       "pdfjs-test/unit/pdf_find_utils_spec.js",
       "pdfjs-test/unit/pdf_history_spec.js",
+      "pdfjs-test/unit/pdf_viewer_spec.js",
       "pdfjs-test/unit/primitives_spec.js",
       "pdfjs-test/unit/scripting_spec.js",
       "pdfjs-test/unit/stream_spec.js",
diff --git a/test/unit/base_viewer_spec.js b/test/unit/pdf_viewer_spec.js
similarity index 98%
rename from test/unit/base_viewer_spec.js
rename to test/unit/pdf_viewer_spec.js
index 2333f3e0e..b8890c109 100644
--- a/test/unit/base_viewer_spec.js
+++ b/test/unit/pdf_viewer_spec.js
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-import { PDFPageViewBuffer } from "../../web/base_viewer.js";
+import { PDFPageViewBuffer } from "../../web/pdf_viewer.js";
 
 describe("PDFViewer", function () {
   describe("PDFPageViewBuffer", function () {
diff --git a/web/app.js b/web/app.js
index 5955fb353..63eb8a9ce 100644
--- a/web/app.js
+++ b/web/app.js
@@ -73,7 +73,7 @@ import { PDFScriptingManager } from "./pdf_scripting_manager.js";
 import { PDFSidebar } from "./pdf_sidebar.js";
 import { PDFSidebarResizer } from "./pdf_sidebar_resizer.js";
 import { PDFThumbnailViewer } from "./pdf_thumbnail_viewer.js";
-import { PDFViewer } from "./base_viewer.js";
+import { PDFViewer } from "./pdf_viewer.js";
 import { SecondaryToolbar } from "./secondary_toolbar.js";
 import { Toolbar } from "./toolbar.js";
 import { ViewHistory } from "./view_history.js";
diff --git a/web/pdf_single_page_viewer.js b/web/pdf_single_page_viewer.js
index 0ca0e6c05..84473a96f 100644
--- a/web/pdf_single_page_viewer.js
+++ b/web/pdf_single_page_viewer.js
@@ -14,7 +14,7 @@
  */
 
 import { ScrollMode, SpreadMode } from "./ui_utils.js";
-import { PDFViewer } from "./base_viewer.js";
+import { PDFViewer } from "./pdf_viewer.js";
 
 class PDFSinglePageViewer extends PDFViewer {
   _resetView() {
diff --git a/web/pdf_viewer.component.js b/web/pdf_viewer.component.js
index 1a6d29375..bf25bcbb8 100644
--- a/web/pdf_viewer.component.js
+++ b/web/pdf_viewer.component.js
@@ -41,7 +41,7 @@ import { PDFHistory } from "./pdf_history.js";
 import { PDFPageView } from "./pdf_page_view.js";
 import { PDFScriptingManager } from "./pdf_scripting_manager.js";
 import { PDFSinglePageViewer } from "./pdf_single_page_viewer.js";
-import { PDFViewer } from "./base_viewer.js";
+import { PDFViewer } from "./pdf_viewer.js";
 import { StructTreeLayerBuilder } from "./struct_tree_layer_builder.js";
 import { TextLayerBuilder } from "./text_layer_builder.js";
 import { XfaLayerBuilder } from "./xfa_layer_builder.js";
diff --git a/web/base_viewer.js b/web/pdf_viewer.js
similarity index 100%
rename from web/base_viewer.js
rename to web/pdf_viewer.js
diff --git a/web/secondary_toolbar.js b/web/secondary_toolbar.js
index 10383830c..a561ff170 100644
--- a/web/secondary_toolbar.js
+++ b/web/secondary_toolbar.js
@@ -15,7 +15,7 @@
 
 import { ScrollMode, SpreadMode } from "./ui_utils.js";
 import { CursorTool } from "./pdf_cursor_tools.js";
-import { PagesCountLimit } from "./base_viewer.js";
+import { PagesCountLimit } from "./pdf_viewer.js";
 
 /**
  * @typedef {Object} SecondaryToolbarOptions