diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 3860b17a07..fc409e503e 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -22,7 +22,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        sdk: [3.7.0, dev]
+        sdk: [3.8.0, dev]
         job: [main, flutter, packages, sdk-docs]
         include:
           - os: macos-latest
@@ -35,9 +35,9 @@ jobs:
             # Do not try to run flutter against the "stable" sdk,
             # it is unlikely to work and produces uninteresting
             # results.
-          - sdk: 3.7.0
+          - sdk: 3.8.0
             job: flutter
-          - sdk: 3.7.0
+          - sdk: 3.8.0
             job: sdk-docs
 
     steps:
diff --git a/lib/src/model/canonicalization.dart b/lib/src/model/canonicalization.dart
index 28bbe93cfe..0556a02aa4 100644
--- a/lib/src/model/canonicalization.dart
+++ b/lib/src/model/canonicalization.dart
@@ -89,7 +89,7 @@ final class _Canonicalization {
     Element2? ancestor = element;
     while (ancestor != null) {
       if (ancestor is LibraryElement2) {
-        components.insert(0, ancestor.identifier);
+        components.insert(0, ancestor.uri.toString());
       } else {
         components.insert(0, ancestor.name3!);
       }
diff --git a/lib/src/model/model_element.dart b/lib/src/model/model_element.dart
index c49e9fd48f..485ef28ece 100644
--- a/lib/src/model/model_element.dart
+++ b/lib/src/model/model_element.dart
@@ -412,11 +412,12 @@ abstract class ModelElement
       return false;
     }
 
-    if (element case LibraryElement2(:var identifier, :var firstFragment)) {
+    if (element case LibraryElement2(:var uri, :var firstFragment)) {
+      final url = uri.toString();
       // Private Dart SDK libraries are not public.
-      if (identifier.startsWith('dart:_') ||
-          identifier.startsWith('dart:nativewrappers/') ||
-          'dart:nativewrappers' == identifier) {
+      if (url.startsWith('dart:_') ||
+          url.startsWith('dart:nativewrappers/') ||
+          url == 'dart:nativewrappers') {
         return false;
       }
       // Package-private libraries are not public.
diff --git a/test/end2end/dartdoc_test.dart b/test/end2end/dartdoc_test.dart
index 1ec3cf0667..6f0f14b8b5 100644
--- a/test/end2end/dartdoc_test.dart
+++ b/test/end2end/dartdoc_test.dart
@@ -110,7 +110,7 @@ void main() {
       expect(
           useSomethingInAnotherPackage.modelType.linkedName,
           matches(
-              r'<a class="deprecated" href="https://pub.dev/documentation/meta/[^"]*/meta/Required-class.html">Required</a>'));
+              r'<a class="deprecated" href="https://pub.dev/documentation/meta/[^"]*/meta/Required-class.html">Required</a>\?'));
       var link = RegExp('/dart-core/String-class.html">String</a>');
       expect(useSomethingInTheSdk.modelType.linkedName, contains(link));
     });