diff --git a/CHANGELOG.md b/CHANGELOG.md
index fcad8f540e..1e7b74c78c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 8.0.4-wip
+
+* Remove explicit library names. (#3609)
+
 ## 8.0.3
 
 * Remove `--format` flag that allows for generating Markdown-formatted docs.
diff --git a/analysis_options.yaml b/analysis_options.yaml
index e06e48e2de..f5efc91c00 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -23,8 +23,10 @@ linter:
     - avoid_dynamic_calls
     - avoid_slow_async_io
     - avoid_unused_constructor_parameters
+    - dangling_library_doc_comments
     - directives_ordering
     - invalid_case_patterns
+    - library_annotations
     - no_adjacent_strings_in_list
     - omit_local_variable_types
     - only_throw_errors
@@ -37,6 +39,7 @@ linter:
     - type_annotate_public_apis
     - unawaited_futures
     - unnecessary_lambdas
+    - unnecessary_library_directive
     - unnecessary_parenthesis
     - unnecessary_statements
     - unnecessary_breaks
diff --git a/bin/dartdoc.dart b/bin/dartdoc.dart
index 5c4b11882b..1427a4e841 100644
--- a/bin/dartdoc.dart
+++ b/bin/dartdoc.dart
@@ -2,8 +2,6 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-library dartdoc.bin;
-
 import 'dart:async';
 
 import 'package:dartdoc/src/dartdoc.dart';
diff --git a/dartdoc_options.yaml b/dartdoc_options.yaml
index 491ac7f0d9..e391075b33 100644
--- a/dartdoc_options.yaml
+++ b/dartdoc_options.yaml
@@ -1,4 +1,4 @@
 dartdoc:
   linkToSource:
     root: '.'
-    uriTemplate: 'https://github.com/dart-lang/dartdoc/blob/v8.0.3/%f%#L%l%'
+    uriTemplate: 'https://github.com/dart-lang/dartdoc/blob/v8.0.4-wip/%f%#L%l%'
diff --git a/lib/src/generator/html_generator.dart b/lib/src/generator/html_generator.dart
index feb8b729a0..8e20f60ee9 100644
--- a/lib/src/generator/html_generator.dart
+++ b/lib/src/generator/html_generator.dart
@@ -2,8 +2,6 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-library dartdoc.html_generator;
-
 import 'package:dartdoc/src/dartdoc_options.dart';
 import 'package:dartdoc/src/generator/generator.dart';
 import 'package:dartdoc/src/generator/generator_backend.dart';
diff --git a/lib/src/model_utils.dart b/lib/src/model_utils.dart
index 384edf455a..d152b5b38a 100644
--- a/lib/src/model_utils.dart
+++ b/lib/src/model_utils.dart
@@ -2,8 +2,6 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-library dartdoc.model_utils;
-
 import 'dart:io' show Platform;
 
 import 'package:analyzer/dart/element/element.dart';
diff --git a/lib/src/package_meta.dart b/lib/src/package_meta.dart
index a89bbae039..03baec0e8b 100644
--- a/lib/src/package_meta.dart
+++ b/lib/src/package_meta.dart
@@ -2,8 +2,6 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-library dartdoc.package_meta;
-
 import 'dart:io' show Platform;
 
 import 'package:analyzer/dart/element/element.dart';
@@ -22,7 +20,7 @@ class PackageMetaFailure extends DartdocFailure {
   PackageMetaFailure(super.message);
 }
 
-/// Various relative paths that indicate that a root direoctory is an SDK (Dart
+/// Various relative paths that indicate that a root directory is an SDK (Dart
 /// or Flutter).
 ///
 /// For a given directory to be detected as an SDK, at least one of the given
diff --git a/lib/src/tool_runner.dart b/lib/src/tool_runner.dart
index 51423908fe..a6af687aae 100644
--- a/lib/src/tool_runner.dart
+++ b/lib/src/tool_runner.dart
@@ -2,8 +2,6 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-library dartdoc.tool_runner;
-
 import 'dart:io' show Process, ProcessException;
 
 import 'package:analyzer/file_system/file_system.dart';
diff --git a/lib/src/utils.dart b/lib/src/utils.dart
index ab67154d47..0630dff3b1 100644
--- a/lib/src/utils.dart
+++ b/lib/src/utils.dart
@@ -2,8 +2,6 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-library dartdoc.utils;
-
 final RegExp leadingWhiteSpace = RegExp(r'^([ \t]*)[^ ]');
 
 Iterable<String> stripCommonWhitespace(String str) sync* {
diff --git a/lib/src/version.dart b/lib/src/version.dart
index e5b3331e8a..e1d08a6ca4 100644
--- a/lib/src/version.dart
+++ b/lib/src/version.dart
@@ -1 +1 @@
-const packageVersion = '8.0.3';
+const packageVersion = '8.0.4-wip';
diff --git a/pubspec.yaml b/pubspec.yaml
index 657140866f..ec31989a71 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: dartdoc
-version: 8.0.3
+version: 8.0.4-wip
 description: A non-interactive HTML documentation generator for Dart source code.
 repository: https://github.com/dart-lang/dartdoc
 
diff --git a/test/comment_referable/comment_referable_test.dart b/test/comment_referable/comment_referable_test.dart
index 17ae07ff9b..e33a9c419a 100644
--- a/test/comment_referable/comment_referable_test.dart
+++ b/test/comment_referable/comment_referable_test.dart
@@ -2,8 +2,6 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-library dartdoc.comment_reference_test;
-
 import 'package:collection/collection.dart';
 import 'package:dartdoc/src/model/comment_referable.dart';
 import 'package:dartdoc/src/model/model_object_builder.dart';
diff --git a/test/dartdoc_options_test.dart b/test/dartdoc_options_test.dart
index 7c7d697dcb..d0fa2ca177 100644
--- a/test/dartdoc_options_test.dart
+++ b/test/dartdoc_options_test.dart
@@ -2,8 +2,6 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-library dartdoc.options_test;
-
 import 'package:analyzer/file_system/file_system.dart';
 import 'package:dartdoc/src/dartdoc_options.dart';
 import 'package:dartdoc/src/io_utils.dart';
diff --git a/test/end2end/dartdoc_test.dart b/test/end2end/dartdoc_test.dart
index 438a27e319..991b9ab154 100644
--- a/test/end2end/dartdoc_test.dart
+++ b/test/end2end/dartdoc_test.dart
@@ -2,8 +2,6 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-library dartdoc.dartdoc_test;
-
 import 'dart:async';
 
 import 'package:analyzer/file_system/file_system.dart';
diff --git a/test/end2end/model_special_cases_test.dart b/test/end2end/model_special_cases_test.dart
index 246b0386c5..7126aa6230 100644
--- a/test/end2end/model_special_cases_test.dart
+++ b/test/end2end/model_special_cases_test.dart
@@ -7,7 +7,7 @@
 /// that require different PackageGraph configurations.  Since those
 /// take a long time to initialize, isolate them here to keep model_test
 /// fast.
-library dartdoc.model_special_cases_test;
+library;
 
 import 'package:async/async.dart';
 import 'package:dartdoc/src/matching_link_result.dart';
diff --git a/test/end2end/model_test.dart b/test/end2end/model_test.dart
index c68a267bf4..3a42613344 100644
--- a/test/end2end/model_test.dart
+++ b/test/end2end/model_test.dart
@@ -4,8 +4,6 @@
 
 // ignore_for_file: non_constant_identifier_names
 
-library dartdoc.model_test;
-
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/type.dart';
 import 'package:analyzer/source/line_info.dart';
diff --git a/test/io_utils_test.dart b/test/io_utils_test.dart
index 28be40a655..4ac4dedea4 100644
--- a/test/io_utils_test.dart
+++ b/test/io_utils_test.dart
@@ -2,8 +2,6 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-library dartdoc.io_utils_test;
-
 import 'package:dartdoc/src/io_utils.dart';
 import 'package:test/test.dart';
 
diff --git a/test/markdown_processor_test.dart b/test/markdown_processor_test.dart
index 61a900bad2..c039fef74e 100644
--- a/test/markdown_processor_test.dart
+++ b/test/markdown_processor_test.dart
@@ -2,8 +2,6 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-library dartdoc.markdown_processor_test;
-
 import 'package:dartdoc/src/markdown_processor.dart';
 import 'package:test/test.dart';
 
diff --git a/test/model_utils_test.dart b/test/model_utils_test.dart
index 5b9a4ba851..1bab64abc4 100644
--- a/test/model_utils_test.dart
+++ b/test/model_utils_test.dart
@@ -2,8 +2,6 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-library dartdoc.model_utils_test;
-
 import 'package:dartdoc/src/model_utils.dart';
 import 'package:test/test.dart';
 
diff --git a/test/mustachio/renderers_output_test.dart b/test/mustachio/renderers_output_test.dart
index 9ab8285328..cc5be6a3c0 100644
--- a/test/mustachio/renderers_output_test.dart
+++ b/test/mustachio/renderers_output_test.dart
@@ -2,8 +2,6 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-library dartdoc.dartdoc_test;
-
 import 'dart:async';
 import 'dart:io';
 
diff --git a/test/package_meta_test.dart b/test/package_meta_test.dart
index f6faa390ac..e4322e7eed 100644
--- a/test/package_meta_test.dart
+++ b/test/package_meta_test.dart
@@ -2,8 +2,6 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-library dartdoc.package_utils_test;
-
 import 'package:dartdoc/src/io_utils.dart';
 import 'package:dartdoc/src/package_meta.dart';
 import 'package:test/test.dart';
diff --git a/test/resource_loader_test.dart b/test/resource_loader_test.dart
index 8b267a9312..6e31a0994e 100644
--- a/test/resource_loader_test.dart
+++ b/test/resource_loader_test.dart
@@ -2,8 +2,6 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-library dartdoc.resource_loader_test;
-
 import 'package:analyzer/file_system/physical_file_system.dart';
 import 'package:dartdoc/src/generator/resource_loader.dart';
 import 'package:test/test.dart';
diff --git a/test/source_linker_test.dart b/test/source_linker_test.dart
index 17d99cdb7a..4479ac125d 100644
--- a/test/source_linker_test.dart
+++ b/test/source_linker_test.dart
@@ -2,8 +2,6 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-library dartdoc.source_linker_test;
-
 import 'package:dartdoc/src/dartdoc_options.dart';
 import 'package:dartdoc/src/source_linker.dart';
 import 'package:test/test.dart';
diff --git a/test/tool_runner_test.dart b/test/tool_runner_test.dart
index 99caeabc72..0dccc655fb 100644
--- a/test/tool_runner_test.dart
+++ b/test/tool_runner_test.dart
@@ -2,8 +2,6 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-library dartdoc.model_test;
-
 import 'dart:io';
 
 import 'package:dartdoc/src/dartdoc_options.dart';
diff --git a/test/utils_test.dart b/test/utils_test.dart
index 28a75e2c72..a43e3ed345 100644
--- a/test/utils_test.dart
+++ b/test/utils_test.dart
@@ -2,8 +2,6 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-library dartdoc.utils_test;
-
 import 'package:dartdoc/src/utils.dart';
 import 'package:test/test.dart';