diff --git a/pkg/analyzer/test/generated/resolver_test.dart b/pkg/analyzer/test/generated/resolver_test.dart
index d71f18f..41b2a991 100644
--- a/pkg/analyzer/test/generated/resolver_test.dart
+++ b/pkg/analyzer/test/generated/resolver_test.dart
@@ -262,7 +262,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: m
-    element: <testLibraryFragment>::@class::B::@method::m#element
+    element: <testLibrary>::@class::B::@method::m
     staticType: B Function()
   argumentList: ArgumentList
     leftParenthesis: (
diff --git a/pkg/analyzer/test/generated/simple_resolver_test.dart b/pkg/analyzer/test/generated/simple_resolver_test.dart
index a22aeff7..263cc64 100644
--- a/pkg/analyzer/test/generated/simple_resolver_test.dart
+++ b/pkg/analyzer/test/generated/simple_resolver_test.dart
@@ -1209,7 +1209,7 @@
     assertResolvedNodeText(findNode.simple('f();'), r'''
 SimpleIdentifier
   token: f
-  element: <testLibraryFragment>::@mixin::M2::@method::f#element
+  element: <testLibrary>::@mixin::M2::@method::f
   staticType: void Function()
 ''');
   }
@@ -1233,7 +1233,7 @@
     assertResolvedNodeText(findNode.simple('f();'), r'''
 SimpleIdentifier
   token: f
-  element: <testLibraryFragment>::@mixin::M2::@method::f#element
+  element: <testLibrary>::@mixin::M2::@method::f
   staticType: void Function()
 ''');
   }
@@ -1256,7 +1256,7 @@
     assertResolvedNodeText(findNode.simple('f();'), r'''
 SimpleIdentifier
   token: f
-  element: <testLibraryFragment>::@mixin::M2::@method::f#element
+  element: <testLibrary>::@mixin::M2::@method::f
   staticType: void Function()
 ''');
   }
diff --git a/pkg/analyzer/test/generated/strong_mode_test.dart b/pkg/analyzer/test/generated/strong_mode_test.dart
index 602b07f..63765cc 100644
--- a/pkg/analyzer/test/generated/strong_mode_test.dart
+++ b/pkg/analyzer/test/generated/strong_mode_test.dart
@@ -2107,7 +2107,7 @@
   methodName: SimpleIdentifier
     token: fold
     element: MethodMember
-      baseElement: <testLibraryFragment>::@class::Iterable::@method::fold#element
+      baseElement: <testLibrary>::@class::Iterable::@method::fold
       substitution: {T: dynamic, S: S}
     staticType: S Function<S>(S, S Function(S, dynamic))
   argumentList: ArgumentList
@@ -4221,7 +4221,7 @@
   methodName: SimpleIdentifier
     token: map
     element: MethodMember
-      baseElement: <testLibraryFragment>::@class::List::@method::map#element
+      baseElement: <testLibrary>::@class::List::@method::map
       substitution: {E: dynamic, T: T}
     staticType: T Function<T>(T Function(dynamic))
   argumentList: ArgumentList
@@ -4265,7 +4265,7 @@
   methodName: SimpleIdentifier
     token: map
     element: MethodMember
-      baseElement: <testLibraryFragment>::@class::List::@method::map#element
+      baseElement: <testLibrary>::@class::List::@method::map
       substitution: {E: dynamic, T: T}
     staticType: T Function<T>(T Function(dynamic))
   argumentList: ArgumentList
@@ -4417,7 +4417,7 @@
   methodName: SimpleIdentifier
     token: f
     element: MethodMember
-      baseElement: <testLibraryFragment>::@class::C::@method::f#element
+      baseElement: <testLibrary>::@class::C::@method::f
       substitution: {T: S, S: S}
     staticType: S Function<S₀>(S₀)
   typeArguments: TypeArgumentList
@@ -4491,7 +4491,7 @@
   methodName: SimpleIdentifier
     token: f
     element: MethodMember
-      baseElement: <testLibraryFragment>::@class::C::@method::f#element
+      baseElement: <testLibrary>::@class::C::@method::f
       substitution: {T: S, S: S}
     staticType: S Function<S₀ extends S>(S₀)
   typeArguments: TypeArgumentList
@@ -4523,7 +4523,7 @@
 SimpleIdentifier
   token: f
   element: MethodMember
-    baseElement: <testLibraryFragment>::@class::C::@method::f#element
+    baseElement: <testLibrary>::@class::C::@method::f
     substitution: {T: S, S: S}
   staticType: S Function<S₀ extends S>(S₀)
 ''');
@@ -5276,7 +5276,7 @@
 MethodInvocation
   methodName: SimpleIdentifier
     token: m
-    element: <testLibraryFragment>::@class::C::@method::m#element
+    element: <testLibrary>::@class::C::@method::m
     staticType: void Function<S0 extends T, S1 extends List<S0>>(S0, S1)
   argumentList: ArgumentList
     leftParenthesis: (
@@ -5321,7 +5321,7 @@
 MethodInvocation
   methodName: SimpleIdentifier
     token: m
-    element: <testLibraryFragment>::@class::C::@method::m#element
+    element: <testLibrary>::@class::C::@method::m
     staticType: Map<S0, S1> Function<S0 extends T, S1 extends List<S0>>()
   argumentList: ArgumentList
     leftParenthesis: (
@@ -5353,7 +5353,7 @@
 MethodInvocation
   methodName: SimpleIdentifier
     token: m
-    element: <testLibraryFragment>::@class::C::@method::m#element
+    element: <testLibrary>::@class::C::@method::m
     staticType: void Function<S extends T>(S)
   argumentList: ArgumentList
     leftParenthesis: (
@@ -5391,7 +5391,7 @@
 MethodInvocation
   methodName: SimpleIdentifier
     token: m
-    element: <testLibraryFragment>::@class::C::@method::m#element
+    element: <testLibrary>::@class::C::@method::m
     staticType: S Function<S extends T>()
   argumentList: ArgumentList
     leftParenthesis: (
diff --git a/pkg/analyzer/test/src/dart/ast/element_locator_test.dart b/pkg/analyzer/test/src/dart/ast/element_locator_test.dart
index dab671b..fb1d3ce 100644
--- a/pkg/analyzer/test/src/dart/ast/element_locator_test.dart
+++ b/pkg/analyzer/test/src/dart/ast/element_locator_test.dart
@@ -45,7 +45,7 @@
     var node = findNode.assignment('+=');
     var element = ElementLocator.locate2(node);
     _assertElement(element, r'''
-dart:core::<fragment>::@class::num::@method::+#element
+dart:core::@class::num::@method::+
 ''');
   }
 
@@ -54,7 +54,7 @@
     var node = findNode.binary('+');
     var element = ElementLocator.locate2(node);
     _assertElement(element, r'''
-dart:core::<fragment>::@class::num::@method::+#element
+dart:core::@class::num::@method::+
 ''');
   }
 
@@ -166,7 +166,7 @@
     var node = findNode.singleDotShorthandInvocation;
     var element = ElementLocator.locate2(node);
     _assertElement(element, r'''
-<testLibraryFragment>::@class::A::@method::foo#element
+<testLibrary>::@class::A::@method::foo
 ''');
   }
 
@@ -367,7 +367,7 @@
     var element = ElementLocator.locate2(node);
     _assertElement(element, r'''
 MethodMember
-  baseElement: dart:core::<fragment>::@class::List::@method::[]#element
+  baseElement: dart:core::@class::List::@method::[]
   substitution: {E: int}
 ''');
   }
@@ -449,7 +449,7 @@
     var node = findNode.methodDeclaration('foo');
     var element = ElementLocator.locate2(node);
     _assertElement(element, r'''
-<testLibraryFragment>::@class::A::@method::foo#element
+<testLibrary>::@class::A::@method::foo
 ''');
   }
 
@@ -466,7 +466,7 @@
     var node = findNode.methodInvocation('foo();');
     var element = ElementLocator.locate2(node);
     _assertElement(element, r'''
-<testLibraryFragment>::@class::A::@method::foo#element
+<testLibrary>::@class::A::@method::foo
 ''');
   }
 
@@ -512,7 +512,7 @@
     var node = findNode.postfix('x++');
     var element = ElementLocator.locate2(node);
     _assertElement(element, r'''
-dart:core::<fragment>::@class::num::@method::+#element
+dart:core::@class::num::@method::+
 ''');
   }
 
@@ -547,7 +547,7 @@
     var node = findNode.prefix('++x');
     var element = ElementLocator.locate2(node);
     _assertElement(element, r'''
-dart:core::<fragment>::@class::num::@method::+#element
+dart:core::@class::num::@method::+
 ''');
   }
 
diff --git a/pkg/analyzer/test/src/dart/constant/evaluation_test.dart b/pkg/analyzer/test/src/dart/constant/evaluation_test.dart
index 477e622..156d768 100644
--- a/pkg/analyzer/test/src/dart/constant/evaluation_test.dart
+++ b/pkg/analyzer/test/src/dart/constant/evaluation_test.dart
@@ -3197,7 +3197,7 @@
     var result = _topLevelVar('g');
     assertDartObjectText(result, '''
 void Function(int)
-  element: <testLibraryFragment>::@class::C::@method::f#element
+  element: <testLibrary>::@class::C::@method::f
   variable: <testLibrary>::@topLevelVariable::g
 ''');
   }
@@ -3213,7 +3213,7 @@
     var result = _topLevelVar('g');
     assertDartObjectText(result, '''
 void Function(int)
-  element: <testLibraryFragment>::@class::C::@method::f#element
+  element: <testLibrary>::@class::C::@method::f
   typeArguments
     int
   variable: <testLibrary>::@topLevelVariable::g
@@ -3231,7 +3231,7 @@
     var result = _topLevelVar('g');
     assertDartObjectText(result, '''
 int Function(String)
-  element: <testLibraryFragment>::@extension::E::@method::f#element
+  element: <testLibrary>::@extension::E::@method::f
   variable: <testLibrary>::@topLevelVariable::g
 ''');
   }
@@ -3247,7 +3247,7 @@
     var result = _topLevelVar('g');
     assertDartObjectText(result, '''
 int Function(String)
-  element: <testLibraryFragment>::@extensionType::ET::@method::f#element
+  element: <testLibrary>::@extensionType::ET::@method::f
   variable: <testLibrary>::@topLevelVariable::g
 ''');
   }
diff --git a/pkg/analyzer/test/src/dart/element/inheritance_manager3_test.dart b/pkg/analyzer/test/src/dart/element/inheritance_manager3_test.dart
index ad10dad..7361685 100644
--- a/pkg/analyzer/test/src/dart/element/inheritance_manager3_test.dart
+++ b/pkg/analyzer/test/src/dart/element/inheritance_manager3_test.dart
@@ -1573,13 +1573,13 @@
     assertInterfaceText(element, r'''
 overridden
   foo
-    <testLibraryFragment>::@mixin::A::@method::foo#element
-    <testLibraryFragment>::@class::B::@method::foo#element
+    <testLibrary>::@mixin::A::@method::foo
+    <testLibrary>::@class::B::@method::foo
 superImplemented
 conflicts
   CandidatesConflict
-    <testLibraryFragment>::@mixin::A::@method::foo#element
-    <testLibraryFragment>::@class::B::@method::foo#element
+    <testLibrary>::@mixin::A::@method::foo
+    <testLibrary>::@class::B::@method::foo
 ''');
   }
 
@@ -1639,12 +1639,12 @@
 overridden
   foo
     <testLibraryFragment>::@class::A::@getter::foo#element
-    <testLibraryFragment>::@class::B::@method::foo#element
+    <testLibrary>::@class::B::@method::foo
 superImplemented
 conflicts
   GetterMethodConflict
     getter: <testLibraryFragment>::@class::A::@getter::foo#element
-    method: <testLibraryFragment>::@class::B::@method::foo#element
+    method: <testLibrary>::@class::B::@method::foo
 ''');
   }
 
@@ -1666,20 +1666,20 @@
     var element = library.class_('C');
     assertInterfaceText(element, r'''
 map
-  foo: <testLibraryFragment>::@class::C::@method::foo#element
+  foo: <testLibrary>::@class::C::@method::foo
 declared
-  foo: <testLibraryFragment>::@class::C::@method::foo#element
+  foo: <testLibrary>::@class::C::@method::foo
 implemented
-  foo: <testLibraryFragment>::@class::C::@method::foo#element
+  foo: <testLibrary>::@class::C::@method::foo
 overridden
   foo
     <testLibraryFragment>::@class::A::@getter::foo#element
-    <testLibraryFragment>::@class::B::@method::foo#element
+    <testLibrary>::@class::B::@method::foo
 superImplemented
 conflicts
   GetterMethodConflict
     getter: <testLibraryFragment>::@class::A::@getter::foo#element
-    method: <testLibraryFragment>::@class::B::@method::foo#element
+    method: <testLibrary>::@class::B::@method::foo
 ''');
   }
 }
@@ -1762,9 +1762,9 @@
   it: <testLibraryFragment>::@extensionType::C::@getter::it#element
 redeclared
   foo
-    <testLibraryFragment>::@class::A::@method::foo#element
+    <testLibrary>::@class::A::@method::foo
 inheritedMap
-  foo: <testLibraryFragment>::@class::A::@method::foo#element
+  foo: <testLibrary>::@class::A::@method::foo
 ''');
   }
 
@@ -1824,10 +1824,10 @@
     var element = library.extensionType('A');
     assertInterfaceText(element, r'''
 map
-  foo: <testLibraryFragment>::@extensionType::A::@method::foo#element
+  foo: <testLibrary>::@extensionType::A::@method::foo
   it: <testLibraryFragment>::@extensionType::A::@getter::it#element
 declared
-  foo: <testLibraryFragment>::@extensionType::A::@method::foo#element
+  foo: <testLibrary>::@extensionType::A::@method::foo
   it: <testLibraryFragment>::@extensionType::A::@getter::it#element
 ''');
   }
@@ -1850,19 +1850,19 @@
     var element = library.extensionType('C');
     assertInterfaceText(element, r'''
 map
-  foo: <testLibraryFragment>::@extensionType::C::@method::foo#element
+  foo: <testLibrary>::@extensionType::C::@method::foo
   it: <testLibraryFragment>::@extensionType::C::@getter::it#element
 declared
-  foo: <testLibraryFragment>::@extensionType::C::@method::foo#element
+  foo: <testLibrary>::@extensionType::C::@method::foo
   it: <testLibraryFragment>::@extensionType::C::@getter::it#element
 redeclared
   foo
-    <testLibraryFragment>::@extensionType::B::@method::foo#element
-    <testLibraryFragment>::@class::A::@method::foo#element
+    <testLibrary>::@extensionType::B::@method::foo
+    <testLibrary>::@class::A::@method::foo
   it
     <testLibraryFragment>::@extensionType::B::@getter::it#element
 inheritedMap
-  foo: <testLibraryFragment>::@extensionType::B::@method::foo#element
+  foo: <testLibrary>::@extensionType::B::@method::foo
   it: <testLibraryFragment>::@extensionType::B::@getter::it#element
 ''');
   }
@@ -1885,15 +1885,15 @@
     var element = library.extensionType('C');
     assertInterfaceText(element, r'''
 map
-  foo: <testLibraryFragment>::@extensionType::C::@method::foo#element
+  foo: <testLibrary>::@extensionType::C::@method::foo
   it: <testLibraryFragment>::@extensionType::C::@getter::it#element
 declared
-  foo: <testLibraryFragment>::@extensionType::C::@method::foo#element
+  foo: <testLibrary>::@extensionType::C::@method::foo
   it: <testLibraryFragment>::@extensionType::C::@getter::it#element
 redeclared
   foo
-    <testLibraryFragment>::@class::A::@method::foo#element
-    <testLibraryFragment>::@class::B::@method::foo#element
+    <testLibrary>::@class::A::@method::foo
+    <testLibrary>::@class::B::@method::foo
 ''');
   }
 
@@ -1913,10 +1913,10 @@
     var element = library.extensionType('C');
     assertInterfaceText(element, r'''
 map
-  foo: <testLibraryFragment>::@extensionType::C::@method::foo#element
+  foo: <testLibrary>::@extensionType::C::@method::foo
   it: <testLibraryFragment>::@extensionType::C::@getter::it#element
 declared
-  foo: <testLibraryFragment>::@extensionType::C::@method::foo#element
+  foo: <testLibrary>::@extensionType::C::@method::foo
   it: <testLibraryFragment>::@extensionType::C::@getter::it#element
 ''');
   }
@@ -1939,10 +1939,10 @@
     var element = library.extensionType('C');
     assertInterfaceText(element, r'''
 map
-  foo: <testLibraryFragment>::@extensionType::C::@method::foo#element
+  foo: <testLibrary>::@extensionType::C::@method::foo
   it: <testLibraryFragment>::@extensionType::C::@getter::it#element
 declared
-  foo: <testLibraryFragment>::@extensionType::C::@method::foo#element
+  foo: <testLibrary>::@extensionType::C::@method::foo
   it: <testLibraryFragment>::@extensionType::C::@getter::it#element
 redeclared
   foo
@@ -1970,16 +1970,16 @@
     var element = library.extensionType('C');
     assertInterfaceText(element, r'''
 map
-  foo: <testLibraryFragment>::@extensionType::C::@method::foo#element
+  foo: <testLibrary>::@extensionType::C::@method::foo
   it: <testLibraryFragment>::@extensionType::C::@getter::it#element
 declared
-  foo: <testLibraryFragment>::@extensionType::C::@method::foo#element
+  foo: <testLibrary>::@extensionType::C::@method::foo
   it: <testLibraryFragment>::@extensionType::C::@getter::it#element
 redeclared
   foo
-    <testLibraryFragment>::@class::A::@method::foo#element
+    <testLibrary>::@class::A::@method::foo
 inheritedMap
-  foo: <testLibraryFragment>::@class::A::@method::foo#element
+  foo: <testLibrary>::@class::A::@method::foo
 ''');
   }
 
@@ -1999,10 +1999,10 @@
     var element = library.extensionType('C');
     assertInterfaceText(element, r'''
 map
-  foo: <testLibraryFragment>::@extensionType::C::@method::foo#element
+  foo: <testLibrary>::@extensionType::C::@method::foo
   it: <testLibraryFragment>::@extensionType::C::@getter::it#element
 declared
-  foo: <testLibraryFragment>::@extensionType::C::@method::foo#element
+  foo: <testLibrary>::@extensionType::C::@method::foo
   it: <testLibraryFragment>::@extensionType::C::@getter::it#element
 redeclared
   foo=
@@ -2030,20 +2030,20 @@
     var element = library.extensionType('B');
     assertInterfaceText(element, r'''
 map
-  foo: <testLibraryFragment>::@extensionType::B::@method::foo#element
+  foo: <testLibrary>::@extensionType::B::@method::foo
   it: <testLibraryFragment>::@extensionType::B::@getter::it#element
 declared
-  foo: <testLibraryFragment>::@extensionType::B::@method::foo#element
+  foo: <testLibrary>::@extensionType::B::@method::foo
   it: <testLibraryFragment>::@extensionType::B::@getter::it#element
 redeclared
   foo
-    <testLibraryFragment>::@extensionType::A1::@method::foo#element
-    <testLibraryFragment>::@extensionType::A2::@method::foo#element
+    <testLibrary>::@extensionType::A1::@method::foo
+    <testLibrary>::@extensionType::A2::@method::foo
   it
     <testLibraryFragment>::@extensionType::A1::@getter::it#element
     <testLibraryFragment>::@extensionType::A2::@getter::it#element
 inheritedMap
-  foo: <testLibraryFragment>::@extensionType::A1::@method::foo#element
+  foo: <testLibrary>::@extensionType::A1::@method::foo
   it: <testLibraryFragment>::@extensionType::A1::@getter::it#element
 ''');
   }
@@ -2062,10 +2062,10 @@
     var element = library.extensionType('B');
     assertInterfaceText(element, r'''
 map
-  foo: <testLibraryFragment>::@extensionType::B::@method::foo#element
+  foo: <testLibrary>::@extensionType::B::@method::foo
   it: <testLibraryFragment>::@extensionType::B::@getter::it#element
 declared
-  foo: <testLibraryFragment>::@extensionType::B::@method::foo#element
+  foo: <testLibrary>::@extensionType::B::@method::foo
   it: <testLibraryFragment>::@extensionType::B::@getter::it#element
 redeclared
   foo
@@ -2092,18 +2092,18 @@
     var element = library.extensionType('B');
     assertInterfaceText(element, r'''
 map
-  foo: <testLibraryFragment>::@extensionType::B::@method::foo#element
+  foo: <testLibrary>::@extensionType::B::@method::foo
   it: <testLibraryFragment>::@extensionType::B::@getter::it#element
 declared
-  foo: <testLibraryFragment>::@extensionType::B::@method::foo#element
+  foo: <testLibrary>::@extensionType::B::@method::foo
   it: <testLibraryFragment>::@extensionType::B::@getter::it#element
 redeclared
   foo
-    <testLibraryFragment>::@extensionType::A::@method::foo#element
+    <testLibrary>::@extensionType::A::@method::foo
   it
     <testLibraryFragment>::@extensionType::A::@getter::it#element
 inheritedMap
-  foo: <testLibraryFragment>::@extensionType::A::@method::foo#element
+  foo: <testLibrary>::@extensionType::A::@method::foo
   it: <testLibraryFragment>::@extensionType::A::@getter::it#element
 ''');
   }
@@ -2122,10 +2122,10 @@
     var element = library.extensionType('B');
     assertInterfaceText(element, r'''
 map
-  foo: <testLibraryFragment>::@extensionType::B::@method::foo#element
+  foo: <testLibrary>::@extensionType::B::@method::foo
   it: <testLibraryFragment>::@extensionType::B::@getter::it#element
 declared
-  foo: <testLibraryFragment>::@extensionType::B::@method::foo#element
+  foo: <testLibrary>::@extensionType::B::@method::foo
   it: <testLibraryFragment>::@extensionType::B::@getter::it#element
 redeclared
   foo=
@@ -2225,9 +2225,9 @@
   it: <testLibraryFragment>::@extensionType::C::@getter::it#element
 redeclared
   foo
-    <testLibraryFragment>::@class::A::@method::foo#element
+    <testLibrary>::@class::A::@method::foo
 inheritedMap
-  foo: <testLibraryFragment>::@class::A::@method::foo#element
+  foo: <testLibrary>::@class::A::@method::foo
 ''');
   }
 
@@ -2283,11 +2283,11 @@
   it: <testLibraryFragment>::@extensionType::B::@getter::it#element
 redeclared
   foo
-    <testLibraryFragment>::@extensionType::A::@method::foo#element
+    <testLibrary>::@extensionType::A::@method::foo
   it
     <testLibraryFragment>::@extensionType::A::@getter::it#element
 inheritedMap
-  foo: <testLibraryFragment>::@extensionType::A::@method::foo#element
+  foo: <testLibrary>::@extensionType::A::@method::foo
   it: <testLibraryFragment>::@extensionType::A::@getter::it#element
 ''');
   }
@@ -2323,7 +2323,7 @@
     assertInterfaceText(element, r'''
 map
   foo: MethodMember
-    baseElement: <testLibraryFragment>::@class::A::@method::foo#element
+    baseElement: <testLibrary>::@class::A::@method::foo
     substitution: {T: int}
   it: <testLibraryFragment>::@extensionType::C::@getter::it#element
 declared
@@ -2331,11 +2331,11 @@
 redeclared
   foo
     MethodMember
-      baseElement: <testLibraryFragment>::@class::A::@method::foo#element
+      baseElement: <testLibrary>::@class::A::@method::foo
       substitution: {T: int}
 inheritedMap
   foo: MethodMember
-    baseElement: <testLibraryFragment>::@class::A::@method::foo#element
+    baseElement: <testLibrary>::@class::A::@method::foo
     substitution: {T: int}
 ''');
   }
@@ -2361,19 +2361,19 @@
   it: <testLibraryFragment>::@extensionType::C::@getter::it#element
 redeclared
   foo
-    <testLibraryFragment>::@extensionType::B::@method::foo#element
-    <testLibraryFragment>::@class::A::@method::foo#element
+    <testLibrary>::@extensionType::B::@method::foo
+    <testLibrary>::@class::A::@method::foo
   it
     <testLibraryFragment>::@extensionType::B::@getter::it#element
 inheritedMap
-  foo: <testLibraryFragment>::@extensionType::B::@method::foo#element
+  foo: <testLibrary>::@extensionType::B::@method::foo
   it: <testLibraryFragment>::@extensionType::B::@getter::it#element
 conflicts
   HasNonExtensionAndExtensionMemberConflict
     nonExtension
-      <testLibraryFragment>::@class::A::@method::foo#element
+      <testLibrary>::@class::A::@method::foo
     extension
-      <testLibraryFragment>::@extensionType::B::@method::foo#element
+      <testLibrary>::@extensionType::B::@method::foo
 ''');
   }
 
@@ -2432,10 +2432,10 @@
     var element = library.extensionType('C');
     assertInterfaceText(element, r'''
 map
-  foo: <testLibraryFragment>::@extensionType::C::@method::foo#element
+  foo: <testLibrary>::@extensionType::C::@method::foo
   it: <testLibraryFragment>::@extensionType::C::@getter::it#element
 declared
-  foo: <testLibraryFragment>::@extensionType::C::@method::foo#element
+  foo: <testLibrary>::@extensionType::C::@method::foo
   it: <testLibraryFragment>::@extensionType::C::@getter::it#element
 redeclared
   foo=
@@ -2474,12 +2474,12 @@
   it: <testLibraryFragment>::@extensionType::C::@getter::it#element
 redeclared
   foo
-    <testLibraryFragment>::@extensionType::B::@method::foo#element
-    <testLibraryFragment>::@class::A::@method::foo#element
+    <testLibrary>::@extensionType::B::@method::foo
+    <testLibrary>::@class::A::@method::foo
   it
     <testLibraryFragment>::@extensionType::B::@getter::it#element
 inheritedMap
-  foo: <testLibraryFragment>::@extensionType::B::@method::foo#element
+  foo: <testLibrary>::@extensionType::B::@method::foo
   it: <testLibraryFragment>::@extensionType::B::@getter::it#element
 ''');
   }
@@ -2498,15 +2498,15 @@
     var element = library.extensionType('C');
     assertInterfaceText(element, r'''
 map
-  foo: <testLibraryFragment>::@class::A::@method::foo#element
+  foo: <testLibrary>::@class::A::@method::foo
   it: <testLibraryFragment>::@extensionType::C::@getter::it#element
 declared
   it: <testLibraryFragment>::@extensionType::C::@getter::it#element
 redeclared
   foo
-    <testLibraryFragment>::@class::A::@method::foo#element
+    <testLibrary>::@class::A::@method::foo
 inheritedMap
-  foo: <testLibraryFragment>::@class::A::@method::foo#element
+  foo: <testLibrary>::@class::A::@method::foo
 ''');
   }
 
@@ -2531,12 +2531,12 @@
   it: <testLibraryFragment>::@extensionType::C::@getter::it#element
 redeclared
   foo
-    <testLibraryFragment>::@class::A::@method::foo#element
-    <testLibraryFragment>::@class::B::@method::foo#element
+    <testLibrary>::@class::A::@method::foo
+    <testLibrary>::@class::B::@method::foo
 conflicts
   CandidatesConflict
-    <testLibraryFragment>::@class::A::@method::foo#element
-    <testLibraryFragment>::@class::B::@method::foo#element
+    <testLibrary>::@class::A::@method::foo
+    <testLibrary>::@class::B::@method::foo
 ''');
   }
 
@@ -2556,16 +2556,16 @@
     var element = library.extensionType('C');
     assertInterfaceText(element, r'''
 map
-  foo: <testLibraryFragment>::@class::A::@method::foo#element
+  foo: <testLibrary>::@class::A::@method::foo
   it: <testLibraryFragment>::@extensionType::C::@getter::it#element
 declared
   it: <testLibraryFragment>::@extensionType::C::@getter::it#element
 redeclared
   foo
-    <testLibraryFragment>::@class::A::@method::foo#element
-    <testLibraryFragment>::@class::B::@method::foo#element
+    <testLibrary>::@class::A::@method::foo
+    <testLibrary>::@class::B::@method::foo
 inheritedMap
-  foo: <testLibraryFragment>::@class::A::@method::foo#element
+  foo: <testLibrary>::@class::A::@method::foo
 ''');
   }
 
@@ -2587,15 +2587,15 @@
     var element = library.extensionType('D');
     assertInterfaceText(element, r'''
 map
-  foo: <testLibraryFragment>::@class::A::@method::foo#element
+  foo: <testLibrary>::@class::A::@method::foo
   it: <testLibraryFragment>::@extensionType::D::@getter::it#element
 declared
   it: <testLibraryFragment>::@extensionType::D::@getter::it#element
 redeclared
   foo
-    <testLibraryFragment>::@class::A::@method::foo#element
+    <testLibrary>::@class::A::@method::foo
 inheritedMap
-  foo: <testLibraryFragment>::@class::A::@method::foo#element
+  foo: <testLibrary>::@class::A::@method::foo
 ''');
   }
 
@@ -2638,7 +2638,7 @@
     assertInterfaceText(element, r'''
 map
   foo: MethodMember
-    baseElement: <testLibraryFragment>::@extensionType::A::@method::foo#element
+    baseElement: <testLibrary>::@extensionType::A::@method::foo
     substitution: {T: int}
   it: <testLibraryFragment>::@extensionType::B::@getter::it#element
 declared
@@ -2646,7 +2646,7 @@
 redeclared
   foo
     MethodMember
-      baseElement: <testLibraryFragment>::@extensionType::A::@method::foo#element
+      baseElement: <testLibrary>::@extensionType::A::@method::foo
       substitution: {T: int}
   it
     GetterMember
@@ -2654,7 +2654,7 @@
       substitution: {T: int}
 inheritedMap
   foo: MethodMember
-    baseElement: <testLibraryFragment>::@extensionType::A::@method::foo#element
+    baseElement: <testLibrary>::@extensionType::A::@method::foo
     substitution: {T: int}
   it: GetterMember
     baseElement: <testLibraryFragment>::@extensionType::A::@getter::it#element
@@ -2674,17 +2674,17 @@
     var element = library.extensionType('B');
     assertInterfaceText(element, r'''
 map
-  foo: <testLibraryFragment>::@extensionType::A::@method::foo#element
+  foo: <testLibrary>::@extensionType::A::@method::foo
   it: <testLibraryFragment>::@extensionType::B::@getter::it#element
 declared
   it: <testLibraryFragment>::@extensionType::B::@getter::it#element
 redeclared
   foo
-    <testLibraryFragment>::@extensionType::A::@method::foo#element
+    <testLibrary>::@extensionType::A::@method::foo
   it
     <testLibraryFragment>::@extensionType::A::@getter::it#element
 inheritedMap
-  foo: <testLibraryFragment>::@extensionType::A::@method::foo#element
+  foo: <testLibrary>::@extensionType::A::@method::foo
   it: <testLibraryFragment>::@extensionType::A::@getter::it#element
 ''');
   }
@@ -2710,18 +2710,18 @@
   it: <testLibraryFragment>::@extensionType::B::@getter::it#element
 redeclared
   foo
-    <testLibraryFragment>::@extensionType::A1::@method::foo#element
-    <testLibraryFragment>::@extensionType::A2::@method::foo#element
+    <testLibrary>::@extensionType::A1::@method::foo
+    <testLibrary>::@extensionType::A2::@method::foo
   it
     <testLibraryFragment>::@extensionType::A1::@getter::it#element
     <testLibraryFragment>::@extensionType::A2::@getter::it#element
 inheritedMap
-  foo: <testLibraryFragment>::@extensionType::A1::@method::foo#element
+  foo: <testLibrary>::@extensionType::A1::@method::foo
   it: <testLibraryFragment>::@extensionType::A1::@getter::it#element
 conflicts
   NotUniqueExtensionMemberConflict
-    <testLibraryFragment>::@extensionType::A1::@method::foo#element
-    <testLibraryFragment>::@extensionType::A2::@method::foo#element
+    <testLibrary>::@extensionType::A1::@method::foo
+    <testLibrary>::@extensionType::A2::@method::foo
 ''');
   }
 
@@ -2750,13 +2750,13 @@
   it: <testLibraryFragment>::@extensionType::B::@getter::it#element
 redeclared
   foo
-    <testLibraryFragment>::@extensionType::A1::@method::foo#element
-    <testLibraryFragment>::@extensionType::A2::@method::foo#element
+    <testLibrary>::@extensionType::A1::@method::foo
+    <testLibrary>::@extensionType::A2::@method::foo
   it
     <testLibraryFragment>::@extensionType::A1::@getter::it#element
     <testLibraryFragment>::@extensionType::A2::@getter::it#element
 inheritedMap
-  foo: <testLibraryFragment>::@extensionType::A1::@method::foo#element
+  foo: <testLibrary>::@extensionType::A1::@method::foo
   it: <testLibraryFragment>::@extensionType::A1::@getter::it#element
 ''');
   }
@@ -2777,18 +2777,18 @@
     var element = library.extensionType('C');
     assertInterfaceText(element, r'''
 map
-  foo: <testLibraryFragment>::@extensionType::A::@method::foo#element
+  foo: <testLibrary>::@extensionType::A::@method::foo
   it: <testLibraryFragment>::@extensionType::C::@getter::it#element
 declared
   it: <testLibraryFragment>::@extensionType::C::@getter::it#element
 redeclared
   foo
-    <testLibraryFragment>::@extensionType::A::@method::foo#element
+    <testLibrary>::@extensionType::A::@method::foo
   it
     <testLibraryFragment>::@extensionType::B1::@getter::it#element
     <testLibraryFragment>::@extensionType::B2::@getter::it#element
 inheritedMap
-  foo: <testLibraryFragment>::@extensionType::A::@method::foo#element
+  foo: <testLibrary>::@extensionType::A::@method::foo
   it: <testLibraryFragment>::@extensionType::B1::@getter::it#element
 ''');
   }
@@ -2847,10 +2847,10 @@
     var element = library.extensionType('B');
     assertInterfaceText(element, r'''
 map
-  foo: <testLibraryFragment>::@extensionType::B::@method::foo#element
+  foo: <testLibrary>::@extensionType::B::@method::foo
   it: <testLibraryFragment>::@extensionType::B::@getter::it#element
 declared
-  foo: <testLibraryFragment>::@extensionType::B::@method::foo#element
+  foo: <testLibrary>::@extensionType::B::@method::foo
   it: <testLibraryFragment>::@extensionType::B::@getter::it#element
 redeclared
   foo=
diff --git a/pkg/analyzer/test/src/dart/resolution/assignment_test.dart b/pkg/analyzer/test/src/dart/resolution/assignment_test.dart
index 2d05373..4b1b010 100644
--- a/pkg/analyzer/test/src/dart/resolution/assignment_test.dart
+++ b/pkg/analyzer/test/src/dart/resolution/assignment_test.dart
@@ -53,7 +53,7 @@
   readType: int
   writeElement2: <testLibraryFragment>::@function::g::@parameter::a#element
   writeType: int
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticType: int
 ''');
   }
@@ -99,14 +99,14 @@
     typeArgumentTypes
       int
   readElement2: MethodMember
-    baseElement: dart:core::<fragment>::@class::List::@method::[]#element
+    baseElement: dart:core::@class::List::@method::[]
     substitution: {E: int}
   readType: int
   writeElement2: MethodMember
-    baseElement: dart:core::<fragment>::@class::List::@method::[]=#element
+    baseElement: dart:core::@class::List::@method::[]=
     substitution: {E: int}
   writeType: int
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticType: int
 ''');
   }
@@ -146,7 +146,7 @@
   readType: int
   writeElement2: <testLibraryFragment>::@function::g::@parameter::a#element
   writeType: num
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticType: int
 ''');
   }
@@ -198,7 +198,7 @@
   readType: int
   writeElement2: <testLibraryFragment>::@function::g::@parameter::a#element
   writeType: num
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticType: num
 ''');
 
@@ -421,11 +421,11 @@
     literal: 2
     correspondingParameter: dart:core::<fragment>::@class::num::@method::+::@parameter::other#element
     staticType: int
-  readElement2: <testLibraryFragment>::@class::A::@method::[]#element
+  readElement2: <testLibrary>::@class::A::@method::[]
   readType: int
-  writeElement2: <testLibraryFragment>::@class::A::@method::[]=#element
+  writeElement2: <testLibrary>::@class::A::@method::[]=
   writeType: num
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticType: int
 ''');
   }
@@ -501,11 +501,11 @@
     literal: 2
     correspondingParameter: dart:core::<fragment>::@class::num::@method::+::@parameter::other#element
     staticType: int
-  readElement2: <testLibraryFragment>::@class::A::@method::[]#element
+  readElement2: <testLibrary>::@class::A::@method::[]
   readType: int
-  writeElement2: <testLibraryFragment>::@class::A::@method::[]=#element
+  writeElement2: <testLibrary>::@class::A::@method::[]=
   writeType: num
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticType: int
 ''');
   }
@@ -544,11 +544,11 @@
     literal: 2.0
     correspondingParameter: dart:core::<fragment>::@class::num::@method::+::@parameter::other#element
     staticType: double
-  readElement2: <testLibraryFragment>::@class::A::@method::[]#element
+  readElement2: <testLibrary>::@class::A::@method::[]
   readType: num
-  writeElement2: <testLibraryFragment>::@class::A::@method::[]=#element
+  writeElement2: <testLibrary>::@class::A::@method::[]=
   writeType: num
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticType: double
 ''');
   }
@@ -587,9 +587,9 @@
     literal: 2
     correspondingParameter: <null>
     staticType: int
-  readElement2: <testLibraryFragment>::@class::A::@method::[]#element
+  readElement2: <testLibrary>::@class::A::@method::[]
   readType: int?
-  writeElement2: <testLibraryFragment>::@class::A::@method::[]=#element
+  writeElement2: <testLibrary>::@class::A::@method::[]=
   writeType: num?
   element: <null>
   staticType: int
@@ -631,7 +631,7 @@
     staticType: int
   readElement2: <null>
   readType: null
-  writeElement2: <testLibraryFragment>::@class::A::@method::[]=#element
+  writeElement2: <testLibrary>::@class::A::@method::[]=
   writeType: num
   element: <null>
   staticType: int
@@ -673,11 +673,11 @@
     literal: 2
     correspondingParameter: dart:core::<fragment>::@class::num::@method::+::@parameter::other#element
     staticType: int
-  readElement2: <testLibraryFragment>::@class::A::@method::[]#element
+  readElement2: <testLibrary>::@class::A::@method::[]
   readType: int
-  writeElement2: <testLibraryFragment>::@class::A::@method::[]=#element
+  writeElement2: <testLibrary>::@class::A::@method::[]=
   writeType: num
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticType: int
 ''');
   }
@@ -715,11 +715,11 @@
     literal: 2
     correspondingParameter: dart:core::<fragment>::@class::num::@method::+::@parameter::other#element
     staticType: int
-  readElement2: <testLibraryFragment>::@class::A::@method::[]#element
+  readElement2: <testLibrary>::@class::A::@method::[]
   readType: int
-  writeElement2: <testLibraryFragment>::@class::A::@method::[]=#element
+  writeElement2: <testLibrary>::@class::A::@method::[]=
   writeType: num
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticType: int
 ''');
   }
@@ -856,7 +856,7 @@
     staticType: int
   readElement2: <null>
   readType: null
-  writeElement2: <testLibraryFragment>::@class::A::@method::[]=#element
+  writeElement2: <testLibrary>::@class::A::@method::[]=
   writeType: num
   element: <null>
   staticType: int
@@ -983,7 +983,7 @@
       correspondingParameter: dart:core::<fragment>::@class::num::@method::+::@parameter::other#element
       element: <testLibraryFragment>::@function::f::@parameter::b#element
       staticType: int
-    element: dart:core::<fragment>::@class::num::@method::+#element
+    element: dart:core::@class::num::@method::+
     staticInvokeType: num Function(num)
     staticType: int
   operator: +=
@@ -1031,7 +1031,7 @@
         correspondingParameter: dart:core::<fragment>::@class::num::@method::+::@parameter::other#element
         element: <testLibraryFragment>::@function::f::@parameter::b#element
         staticType: int
-      element: dart:core::<fragment>::@class::num::@method::+#element
+      element: dart:core::@class::num::@method::+
       staticInvokeType: num Function(num)
       staticType: int
     rightParenthesis: )
@@ -1118,7 +1118,7 @@
         literal: 0
         correspondingParameter: dart:core::<fragment>::@class::num::@method::+::@parameter::other#element
         staticType: int
-      element: dart:core::<fragment>::@class::num::@method::+#element
+      element: dart:core::@class::num::@method::+
       staticInvokeType: num Function(num)
       staticType: int
     rightParenthesis: )
@@ -1165,7 +1165,7 @@
     readType: num
     writeElement2: <testLibraryFragment>::@function::f::@parameter::x#element
     writeType: num
-    element: dart:core::<fragment>::@class::num::@method::+#element
+    element: dart:core::@class::num::@method::+
     staticType: num
   operator: +=
   rightHandSide: SimpleIdentifier
@@ -1209,7 +1209,7 @@
     readType: num
     writeElement2: <testLibraryFragment>::@function::f::@parameter::x#element
     writeType: num
-    element: dart:core::<fragment>::@class::num::@method::+#element
+    element: dart:core::@class::num::@method::+
     staticType: num
   operator: ??=
   rightHandSide: SimpleIdentifier
@@ -1253,7 +1253,7 @@
     readType: num
     writeElement2: <testLibraryFragment>::@function::f::@parameter::x#element
     writeType: num
-    element: dart:core::<fragment>::@class::num::@method::+#element
+    element: dart:core::@class::num::@method::+
     staticType: num
   operator: =
   rightHandSide: SimpleIdentifier
@@ -1297,7 +1297,7 @@
     readType: num
     writeElement2: <testLibraryFragment>::@function::f::@parameter::x#element
     writeType: num
-    element: dart:core::<fragment>::@class::num::@method::+#element
+    element: dart:core::@class::num::@method::+
     staticType: num
   operator: +=
   rightHandSide: SimpleIdentifier
@@ -1341,7 +1341,7 @@
     readType: num
     writeElement2: <testLibraryFragment>::@function::f::@parameter::x#element
     writeType: num
-    element: dart:core::<fragment>::@class::num::@method::+#element
+    element: dart:core::@class::num::@method::+
     staticType: num
   operator: ??=
   rightHandSide: SimpleIdentifier
@@ -1385,7 +1385,7 @@
     readType: num
     writeElement2: <testLibraryFragment>::@function::f::@parameter::x#element
     writeType: num
-    element: dart:core::<fragment>::@class::num::@method::+#element
+    element: dart:core::@class::num::@method::+
     staticType: num
   operator: =
   rightHandSide: SimpleIdentifier
@@ -1549,7 +1549,7 @@
   readType: int
   writeElement2: <testLibraryFragment>::@class::A::@setter::x#element
   writeType: num
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticType: int
 ''');
   }
@@ -2243,7 +2243,7 @@
   readType: int
   writeElement2: package:test/a.dart::<fragment>::@setter::x#element
   writeType: num
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticType: int
 ''');
   }
@@ -2287,7 +2287,7 @@
   readType: int
   writeElement2: <testLibraryFragment>::@class::A::@setter::x#element
   writeType: int
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticType: int
 ''');
   }
@@ -2409,7 +2409,7 @@
   readType: int
   writeElement2: <testLibraryFragment>::@class::A::@setter::x#element
   writeType: num
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticType: int
 ''');
   }
@@ -2505,7 +2505,7 @@
   readType: int
   writeElement2: <testLibraryFragment>::@class::A::@setter::x#element
   writeType: num
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticType: int
 ''');
   }
@@ -2558,7 +2558,7 @@
   readType: int
   writeElement2: <testLibraryFragment>::@mixin::M2::@setter::x#element
   writeType: num
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticType: int
 ''');
   }
@@ -2984,7 +2984,7 @@
   readType: int
   writeElement2: <testLibraryFragment>::@extension::E::@getter::foo#element
   writeType: InvalidType
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticType: int
 ''');
   }
@@ -3074,7 +3074,7 @@
   readType: int
   writeElement2: <testLibraryFragment>::@extension::E::@setter::foo#element
   writeType: int
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticType: int
 ''');
   }
@@ -3160,7 +3160,7 @@
   readType: int
   writeElement2: <null>
   writeType: InvalidType
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticType: int
 ''');
   }
@@ -3248,7 +3248,7 @@
   readType: int
   writeElement2: <null>
   writeType: InvalidType
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticType: int
 ''');
   }
@@ -3340,7 +3340,7 @@
   readType: int
   writeElement2: <null>
   writeType: InvalidType
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticType: int
 ''');
   }
@@ -3433,7 +3433,7 @@
   readType: int
   writeElement2: <null>
   writeType: InvalidType
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticType: int
 ''');
   }
@@ -3613,7 +3613,7 @@
   readType: int
   writeElement2: <testLibraryFragment>::@extension::E::@getter::$3#element
   writeType: InvalidType
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticType: int
 ''');
   }
@@ -3701,7 +3701,7 @@
   readType: int
   writeElement2: <null>
   writeType: InvalidType
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticType: int
 ''');
   }
@@ -3789,7 +3789,7 @@
   readType: int
   writeElement2: <null>
   writeType: InvalidType
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticType: int
 ''');
   }
@@ -3880,7 +3880,7 @@
   readType: int
   writeElement2: <testLibraryFragment>::@class::A::@setter::x#element
   writeType: num
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticType: int
 ''');
   }
@@ -3920,7 +3920,7 @@
   readType: int
   writeElement2: <testLibraryFragment>::@class::A::@setter::x#element
   writeType: num
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticType: int
 ''');
   }
@@ -4329,7 +4329,7 @@
   readType: num
   writeElement2: x@51
   writeType: num
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticType: num
 ''');
   }
@@ -4782,7 +4782,7 @@
     staticType: int
   readElement2: <null>
   readType: null
-  writeElement2: <testLibraryFragment>::@class::B::@method::x#element
+  writeElement2: <testLibrary>::@class::B::@method::x
   writeType: InvalidType
   element: <null>
   staticType: int
@@ -4923,7 +4923,7 @@
   readType: int
   writeElement2: <testLibraryFragment>::@class::C::@setter::x#element
   writeType: num
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticType: int
 ''');
   }
@@ -4964,7 +4964,7 @@
   readType: int
   writeElement2: <testLibraryFragment>::@mixin::M2::@setter::x#element
   writeType: num
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticType: int
 ''');
   }
@@ -5071,7 +5071,7 @@
   readType: int
   writeElement2: <testLibraryFragment>::@setter::x#element
   writeType: num
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticType: int
 ''');
   }
@@ -5152,7 +5152,7 @@
   readType: int
   writeElement2: <testLibraryFragment>::@setter::x#element
   writeType: num
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticType: int
 ''');
   }
diff --git a/pkg/analyzer/test/src/dart/resolution/ast_rewrite_test.dart b/pkg/analyzer/test/src/dart/resolution/ast_rewrite_test.dart
index 4530c67..4d8bbcf 100644
--- a/pkg/analyzer/test/src/dart/resolution/ast_rewrite_test.dart
+++ b/pkg/analyzer/test/src/dart/resolution/ast_rewrite_test.dart
@@ -67,12 +67,12 @@
     readElement2: <null>
     readType: null
     writeElement2: MethodMember
-      baseElement: dart:core::<fragment>::@class::Map::@method::[]=#element
+      baseElement: dart:core::@class::Map::@method::[]=
       substitution: {K: int, V: C}
     writeType: C
     element: <null>
     staticType: C
-  element: <testLibraryFragment>::@class::C::@method::call#element
+  element: <testLibrary>::@class::C::@method::call
   staticType: void Function(int)
 ''');
   }
@@ -168,7 +168,7 @@
         element2: dart:core::@class::int
         type: int
     rightBracket: >
-  element: <testLibraryFragment>::@class::C::@method::call#element
+  element: <testLibrary>::@class::C::@method::call
   staticType: int Function(int)
   typeArgumentTypes
     int
@@ -240,7 +240,7 @@
     element: <null>
     staticInvokeType: null
     staticType: C
-  element: <testLibraryFragment>::@class::C::@method::call#element
+  element: <testLibrary>::@class::C::@method::call
   staticType: void Function(int)
 ''');
   }
@@ -263,7 +263,7 @@
     token: c
     element: <testLibraryFragment>::@function::foo::@parameter::c#element
     staticType: C
-  element: <testLibraryFragment>::@class::C::@method::call#element
+  element: <testLibrary>::@class::C::@method::call
   staticType: void Function(int)
 ''');
   }
@@ -288,7 +288,7 @@
     token: c
     element: <testLibraryFragment>::@function::foo::@parameter::c#element
     staticType: C
-  element: <testLibraryFragment>::@class::C::@method::call#element
+  element: <testLibrary>::@class::C::@method::call
   staticType: void Function(int)
 ''');
   }
@@ -313,7 +313,7 @@
     token: c
     element: <testLibraryFragment>::@function::foo::@parameter::c#element
     staticType: C
-  element: <testLibraryFragment>::@class::C::@method::call#element
+  element: <testLibrary>::@class::C::@method::call
   staticType: void Function(int)
 ''');
   }
@@ -339,7 +339,7 @@
     token: c2
     element: <testLibraryFragment>::@function::foo::@parameter::c2#element
     staticType: C
-  element: <testLibraryFragment>::@class::C::@method::call#element
+  element: <testLibrary>::@class::C::@method::call
   staticType: void Function(int)
 ''');
   }
@@ -370,7 +370,7 @@
         operator: ..
         methodName: SimpleIdentifier
           token: m
-          element: <testLibraryFragment>::@class::C::@method::m#element
+          element: <testLibrary>::@class::C::@method::m
           staticType: void Function()
         argumentList: ArgumentList
           leftParenthesis: (
@@ -378,7 +378,7 @@
         staticInvokeType: void Function()
         staticType: void
     staticType: C
-  element: <testLibraryFragment>::@class::C::@method::call#element
+  element: <testLibrary>::@class::C::@method::call
   staticType: void Function()
 ''');
   }
@@ -410,7 +410,7 @@
       staticType: C
     element: <testLibraryFragment>::@class::C::@getter::c#element
     staticType: C
-  element: <testLibraryFragment>::@class::C::@method::call#element
+  element: <testLibrary>::@class::C::@method::call
   staticType: void Function(int)
 ''');
   }
@@ -449,7 +449,7 @@
       element: <testLibraryFragment>::@class::C::@getter::c#element
       staticType: C
     staticType: C
-  element: <testLibraryFragment>::@class::C::@method::call#element
+  element: <testLibrary>::@class::C::@method::call
   staticType: void Function(int)
 ''');
   }
@@ -472,7 +472,7 @@
     token: c
     element: <testLibraryFragment>::@function::foo::@parameter::c#element
     staticType: C
-  element: <testLibraryFragment>::@class::C::@method::call#element
+  element: <testLibrary>::@class::C::@method::call
   staticType: void Function(int)
 ''');
   }
@@ -495,7 +495,7 @@
     token: c
     element: <testLibraryFragment>::@function::foo::@parameter::c#element
     staticType: C
-  element: <testLibraryFragment>::@class::C::@method::call#element
+  element: <testLibrary>::@class::C::@method::call
   staticType: void Function(int)
 ''');
   }
@@ -518,7 +518,7 @@
     token: c
     element: <testLibraryFragment>::@function::foo::@parameter::c#element
     staticType: C
-  element: <testLibraryFragment>::@class::C::@method::call#element
+  element: <testLibrary>::@class::C::@method::call
   staticType: void Function(int)
 ''');
   }
@@ -541,7 +541,7 @@
     token: c
     element: <testLibraryFragment>::@function::foo::@parameter::c#element
     staticType: C
-  element: <testLibraryFragment>::@class::C::@method::call#element
+  element: <testLibrary>::@class::C::@method::call
   staticType: void Function(int)
 ''');
   }
@@ -563,7 +563,7 @@
     element: <testLibraryFragment>::@function::f::@parameter::b#element
     staticType: A
       alias: <testLibrary>::@typeAlias::B
-  element: <testLibraryFragment>::@class::A::@method::call#element
+  element: <testLibrary>::@class::A::@method::call
   staticType: void Function()
 ''');
   }
@@ -583,7 +583,7 @@
     token: x
     element: <testLibraryFragment>::@function::f::@parameter::x#element
     staticType: X
-  element: <testLibraryFragment>::@class::A::@method::call#element
+  element: <testLibrary>::@class::A::@method::call
   staticType: void Function()
 ''');
   }
@@ -603,7 +603,7 @@
     token: y
     element: <testLibraryFragment>::@function::f::@parameter::y#element
     staticType: Y
-  element: <testLibraryFragment>::@class::A::@method::call#element
+  element: <testLibrary>::@class::A::@method::call
   staticType: void Function()
 ''');
   }
@@ -673,7 +673,7 @@
   operator: ..
   methodName: SimpleIdentifier
     token: foo
-    element: <testLibraryFragment>::@class::A::@method::foo#element
+    element: <testLibrary>::@class::A::@method::foo
     staticType: void Function()
   argumentList: ArgumentList
     leftParenthesis: (
@@ -1109,7 +1109,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: bar
-    element: package:test/a.dart::<fragment>::@class::A::@method::bar#element
+    element: package:test/a.dart::@class::A::@method::bar
     staticType: void Function(int)
   argumentList: ArgumentList
     leftParenthesis: (
@@ -1373,7 +1373,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: foo
-    element: <testLibraryFragment>::@class::A::@method::foo#element
+    element: <testLibrary>::@class::A::@method::foo
     staticType: void Function(int)
   argumentList: ArgumentList
     leftParenthesis: (
diff --git a/pkg/analyzer/test/src/dart/resolution/binary_expression_test.dart b/pkg/analyzer/test/src/dart/resolution/binary_expression_test.dart
index bd8faf1..dbe47f3 100644
--- a/pkg/analyzer/test/src/dart/resolution/binary_expression_test.dart
+++ b/pkg/analyzer/test/src/dart/resolution/binary_expression_test.dart
@@ -46,7 +46,7 @@
     literal: 0
     correspondingParameter: <testLibraryFragment>::@class::A::@method::==::@parameter::_#element
     staticType: int
-  element: <testLibraryFragment>::@class::A::@method::==#element
+  element: <testLibrary>::@class::A::@method::==
   staticInvokeType: MyBool Function(Object)
   staticType: bool
 ''');
@@ -90,7 +90,7 @@
     literal: 0
     correspondingParameter: dart:core::<fragment>::@class::num::@method::==::@parameter::other#element
     staticType: int
-  element: dart:core::<fragment>::@class::num::@method::==#element
+  element: dart:core::@class::num::@method::==
   staticInvokeType: bool Function(Object)
   staticType: bool
 ''');
@@ -134,7 +134,7 @@
     rightBracket: }
     correspondingParameter: dart:core::<fragment>::@class::num::@method::==::@parameter::other#element
     staticType: int
-  element: dart:core::<fragment>::@class::num::@method::==#element
+  element: dart:core::@class::num::@method::==
   staticInvokeType: bool Function(Object)
   staticType: bool
 ''');
@@ -163,7 +163,7 @@
     literal: 0
     correspondingParameter: <testLibraryFragment>::@extension::0::@method::+::@parameter::other#element
     staticType: int
-  element: <testLibraryFragment>::@extension::0::@method::+#element
+  element: <testLibrary>::@extension::0::@method::+
   staticInvokeType: int Function(int)
   staticType: int
 ''');
@@ -220,7 +220,7 @@
     literal: 3
     correspondingParameter: <testLibraryFragment>::@class::A::@method::>>>::@parameter::amount#element
     staticType: int
-  element: <testLibraryFragment>::@class::A::@method::>>>#element
+  element: <testLibrary>::@class::A::@method::>>>
   staticInvokeType: A Function(int)
   staticType: A
 ''');
@@ -635,7 +635,7 @@
     correspondingParameter: <testLibraryFragment>::@extensionType::Int::@method::+::@parameter::other#element
     element: <testLibraryFragment>::@function::f::@parameter::b#element
     staticType: int
-  element: <testLibraryFragment>::@extensionType::Int::@method::+#element
+  element: <testLibrary>::@extensionType::Int::@method::+
   staticInvokeType: Int Function(int)
   staticType: Int
 ''');
@@ -660,7 +660,7 @@
     correspondingParameter: dart:core::<fragment>::@class::num::@method::+::@parameter::other#element
     element: <testLibraryFragment>::@function::f::@parameter::b#element
     staticType: Never
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticInvokeType: num Function(num)
   staticType: num
 ''');
@@ -735,7 +735,7 @@
     literal: 0
     correspondingParameter: dart:core::<fragment>::@class::num::@method::+::@parameter::other#element
     staticType: int
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticInvokeType: num Function(num)
   staticType: int
 ''');
@@ -779,7 +779,7 @@
     rightBracket: }
     correspondingParameter: dart:core::<fragment>::@class::num::@method::+::@parameter::other#element
     staticType: int
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticInvokeType: num Function(num)
   staticType: int
 ''');
@@ -874,7 +874,7 @@
     correspondingParameter: dart:core::<fragment>::@class::num::@method::*::@parameter::other#element
     element: <null>
     staticType: InvalidType
-  element: dart:core::<fragment>::@class::num::@method::*#element
+  element: dart:core::@class::num::@method::*
   staticInvokeType: num Function(num)
   staticType: double
 ''');
@@ -906,7 +906,7 @@
     literal: 0
     correspondingParameter: <testLibraryFragment>::@class::A::@method::+::@parameter::other#element
     staticType: int
-  element: <testLibraryFragment>::@class::A::@method::+#element
+  element: <testLibrary>::@class::A::@method::+
   staticInvokeType: int Function(int)
   staticType: int
 ''');
@@ -934,7 +934,7 @@
     literal: 0
     correspondingParameter: <testLibraryFragment>::@class::A::@method::+::@parameter::other#element
     staticType: int
-  element: <testLibraryFragment>::@class::A::@method::+#element
+  element: <testLibrary>::@class::A::@method::+
   staticInvokeType: int Function(int)
   staticType: int
 ''');
@@ -961,7 +961,7 @@
     correspondingParameter: dart:core::<fragment>::@class::num::@method::==::@parameter::other#element
     element: <testLibraryFragment>::@function::f::@parameter::b#element
     staticType: int
-  element: dart:core::<fragment>::@class::num::@method::==#element
+  element: dart:core::@class::num::@method::==
   staticInvokeType: bool Function(Object)
   staticType: bool
 ''');
@@ -1053,7 +1053,7 @@
     literal: 0
     correspondingParameter: dart:core::<fragment>::@class::Object::@method::==::@parameter::other#element
     staticType: int
-  element: dart:core::<fragment>::@class::Object::@method::==#element
+  element: dart:core::@class::Object::@method::==
   staticInvokeType: bool Function(Object)
   staticType: bool
 ''');
@@ -1118,7 +1118,7 @@
     correspondingParameter: dart:core::<fragment>::@class::num::@method::==::@parameter::other#element
     element: <testLibraryFragment>::@function::f::@parameter::b#element
     staticType: int
-  element: dart:core::<fragment>::@class::num::@method::==#element
+  element: dart:core::@class::num::@method::==
   staticInvokeType: bool Function(Object)
   staticType: bool
 ''');
@@ -1146,7 +1146,7 @@
     literal: 0
     correspondingParameter: dart:core::<fragment>::@class::Object::@method::==::@parameter::other#element
     staticType: int
-  element: dart:core::<fragment>::@class::Object::@method::==#element
+  element: dart:core::@class::Object::@method::==
   staticInvokeType: bool Function(Object)
   staticType: bool
 ''');
@@ -1301,7 +1301,7 @@
     correspondingParameter: dart:core::<fragment>::@class::num::@method::-::@parameter::other#element
     element: <testLibraryFragment>::@function::f::@parameter::b#element
     staticType: double
-  element: dart:core::<fragment>::@class::num::@method::-#element
+  element: dart:core::@class::num::@method::-
   staticInvokeType: num Function(num)
   staticType: double
 ''');
@@ -1326,7 +1326,7 @@
     correspondingParameter: dart:core::<fragment>::@class::num::@method::-::@parameter::other#element
     element: <testLibraryFragment>::@function::f::@parameter::b#element
     staticType: int
-  element: dart:core::<fragment>::@class::num::@method::-#element
+  element: dart:core::@class::num::@method::-
   staticInvokeType: num Function(num)
   staticType: int
 ''');
@@ -1378,7 +1378,7 @@
     correspondingParameter: dart:core::<fragment>::@class::num::@method::%::@parameter::other#element
     element: <testLibraryFragment>::@function::f::@parameter::b#element
     staticType: double
-  element: dart:core::<fragment>::@class::num::@method::%#element
+  element: dart:core::@class::num::@method::%
   staticInvokeType: num Function(num)
   staticType: double
 ''');
@@ -1403,7 +1403,7 @@
     correspondingParameter: dart:core::<fragment>::@class::num::@method::%::@parameter::other#element
     element: <testLibraryFragment>::@function::f::@parameter::b#element
     staticType: int
-  element: dart:core::<fragment>::@class::num::@method::%#element
+  element: dart:core::@class::num::@method::%
   staticInvokeType: num Function(num)
   staticType: int
 ''');
@@ -1511,7 +1511,7 @@
     correspondingParameter: dart:core::<fragment>::@class::double::@method::+::@parameter::other#element
     element: <testLibraryFragment>::@function::f::@parameter::b#element
     staticType: dynamic
-  element: dart:core::<fragment>::@class::double::@method::+#element
+  element: dart:core::@class::double::@method::+
   staticInvokeType: double Function(num)
   staticType: double
 ''');
@@ -1676,7 +1676,7 @@
     correspondingParameter: dart:core::<fragment>::@class::num::@method::+::@parameter::other#element
     element: <testLibraryFragment>::@function::f::@parameter::b#element
     staticType: double
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticInvokeType: num Function(num)
   staticType: double
 ''');
@@ -1701,7 +1701,7 @@
     correspondingParameter: dart:core::<fragment>::@class::num::@method::+::@parameter::other#element
     element: <testLibraryFragment>::@function::f::@parameter::b#element
     staticType: dynamic
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticInvokeType: num Function(num)
   staticType: num
 ''');
@@ -1726,7 +1726,7 @@
     correspondingParameter: dart:core::<fragment>::@class::num::@method::+::@parameter::other#element
     element: <testLibraryFragment>::@function::f::@parameter::b#element
     staticType: int
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticInvokeType: num Function(num)
   staticType: int
 ''');
@@ -1758,7 +1758,7 @@
     correspondingParameter: dart:core::<fragment>::@class::num::@method::+::@parameter::other#element
     element: <testLibraryFragment>::@function::f::@parameter::b#element
     staticType: int
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticInvokeType: num Function(num)
   staticType: int
 ''');
@@ -1796,7 +1796,7 @@
     correspondingParameter: <testLibraryFragment>::@extension::E::@method::+::@parameter::other#element
     element: <testLibraryFragment>::@function::f::@parameter::b#element
     staticType: int
-  element: <testLibraryFragment>::@extension::E::@method::+#element
+  element: <testLibrary>::@extension::E::@method::+
   staticInvokeType: String Function(int)
   staticType: String
 ''');
@@ -1821,7 +1821,7 @@
     correspondingParameter: dart:core::<fragment>::@class::num::@method::+::@parameter::other#element
     element: <testLibraryFragment>::@function::f::@parameter::b#element
     staticType: num
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticInvokeType: num Function(num)
   staticType: num
 ''');
@@ -1849,7 +1849,7 @@
     correspondingParameter: root::@parameter::i#element
     staticType: int
   element: MethodMember
-    baseElement: <testLibraryFragment>::@extension::FooExtension::@method::+#element
+    baseElement: <testLibrary>::@extension::FooExtension::@method::+
     substitution: {F: F}
   staticInvokeType: F Function(int)
   staticType: F
@@ -2037,7 +2037,7 @@
     correspondingParameter: <testLibraryFragment>::@class::A::@method::+::@parameter::other#element
     element: <testLibraryFragment>::@function::f::@parameter::b#element
     staticType: double
-  element: <testLibraryFragment>::@class::A::@method::+#element
+  element: <testLibrary>::@class::A::@method::+
   staticInvokeType: String Function(double)
   staticType: String
 ''');
@@ -2076,7 +2076,7 @@
     correspondingParameter: <testLibraryFragment>::@extension::E::@method::+::@parameter::other#element
     element: <testLibraryFragment>::@function::f::@parameter::b#element
     staticType: int
-  element: <testLibraryFragment>::@extension::E::@method::+#element
+  element: <testLibrary>::@extension::E::@method::+
   staticInvokeType: String Function(int)
   staticType: String
 ''');
@@ -2105,7 +2105,7 @@
     correspondingParameter: <testLibraryFragment>::@extension::E::@method::+::@parameter::other#element
     element: <testLibraryFragment>::@function::f::@parameter::b#element
     staticType: int
-  element: <testLibraryFragment>::@extension::E::@method::+#element
+  element: <testLibrary>::@extension::E::@method::+
   staticInvokeType: String Function(int)
   staticType: String
 ''');
@@ -2153,7 +2153,7 @@
     literal: 0
     correspondingParameter: dart:core::<fragment>::@class::num::@method::+::@parameter::other#element
     staticType: int
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticInvokeType: num Function(num)
   staticType: num
 ''');
@@ -2178,7 +2178,7 @@
     correspondingParameter: dart:core::<fragment>::@class::num::@method::/::@parameter::other#element
     element: <testLibraryFragment>::@function::f::@parameter::b#element
     staticType: int
-  element: dart:core::<fragment>::@class::num::@method::/#element
+  element: dart:core::@class::num::@method::/
   staticInvokeType: double Function(num)
   staticType: double
 ''');
@@ -2230,7 +2230,7 @@
     correspondingParameter: dart:core::<fragment>::@class::num::@method::*::@parameter::other#element
     element: <testLibraryFragment>::@function::f::@parameter::b#element
     staticType: double
-  element: dart:core::<fragment>::@class::num::@method::*#element
+  element: dart:core::@class::num::@method::*
   staticInvokeType: num Function(num)
   staticType: double
 ''');
@@ -2255,7 +2255,7 @@
     correspondingParameter: dart:core::<fragment>::@class::num::@method::*::@parameter::other#element
     element: <testLibraryFragment>::@function::f::@parameter::b#element
     staticType: int
-  element: dart:core::<fragment>::@class::num::@method::*#element
+  element: dart:core::@class::num::@method::*
   staticInvokeType: num Function(num)
   staticType: int
 ''');
diff --git a/pkg/analyzer/test/src/dart/resolution/comment_test.dart b/pkg/analyzer/test/src/dart/resolution/comment_test.dart
index 2a7454a..1e09583 100644
--- a/pkg/analyzer/test/src/dart/resolution/comment_test.dart
+++ b/pkg/analyzer/test/src/dart/resolution/comment_test.dart
@@ -150,9 +150,9 @@
     period: .
     identifier: SimpleIdentifier
       token: foo
-      element: <testLibraryFragment>::@class::A::@method::foo#element
+      element: <testLibrary>::@class::A::@method::foo
       staticType: null
-    element: <testLibraryFragment>::@class::A::@method::foo#element
+    element: <testLibrary>::@class::A::@method::foo
     staticType: null
 ''');
   }
@@ -298,9 +298,9 @@
     period: .
     identifier: SimpleIdentifier
       token: foo
-      element: <testLibraryFragment>::@class::A::@method::foo#element
+      element: <testLibrary>::@class::A::@method::foo
       staticType: null
-    element: <testLibraryFragment>::@class::A::@method::foo#element
+    element: <testLibrary>::@class::A::@method::foo
     staticType: null
 ''');
   }
@@ -449,9 +449,9 @@
     period: .
     identifier: SimpleIdentifier
       token: foo
-      element: package:test/foo.dart::<fragment>::@class::A::@method::foo#element
+      element: package:test/foo.dart::@class::A::@method::foo
       staticType: null
-    element: package:test/foo.dart::<fragment>::@class::A::@method::foo#element
+    element: package:test/foo.dart::@class::A::@method::foo
     staticType: null
 ''');
   }
@@ -511,9 +511,9 @@
     period: .
     identifier: SimpleIdentifier
       token: foo
-      element: package:test/foo.dart::<fragment>::@class::A::@method::foo#element
+      element: package:test/foo.dart::@class::A::@method::foo
       staticType: null
-    element: package:test/foo.dart::<fragment>::@class::A::@method::foo#element
+    element: package:test/foo.dart::@class::A::@method::foo
     staticType: null
 ''');
   }
@@ -604,9 +604,9 @@
     period: .
     identifier: SimpleIdentifier
       token: foo
-      element: package:test/foo.dart::<fragment>::@extension::E::@method::foo#element
+      element: package:test/foo.dart::@extension::E::@method::foo
       staticType: null
-    element: package:test/foo.dart::<fragment>::@extension::E::@method::foo#element
+    element: package:test/foo.dart::@extension::E::@method::foo
     staticType: null
 ''');
   }
@@ -697,9 +697,9 @@
     period: .
     identifier: SimpleIdentifier
       token: foo
-      element: package:test/foo.dart::<fragment>::@extension::E::@method::foo#element
+      element: package:test/foo.dart::@extension::E::@method::foo
       staticType: null
-    element: package:test/foo.dart::<fragment>::@extension::E::@method::foo#element
+    element: package:test/foo.dart::@extension::E::@method::foo
     staticType: null
 ''');
   }
@@ -782,9 +782,9 @@
     period: .
     identifier: SimpleIdentifier
       token: foo
-      element: <testLibraryFragment>::@extension::E::@method::foo#element
+      element: <testLibrary>::@extension::E::@method::foo
       staticType: null
-    element: <testLibraryFragment>::@extension::E::@method::foo#element
+    element: <testLibrary>::@extension::E::@method::foo
     staticType: null
 ''');
   }
@@ -863,9 +863,9 @@
     period: .
     identifier: SimpleIdentifier
       token: foo
-      element: <testLibraryFragment>::@extension::E::@method::foo#element
+      element: <testLibrary>::@extension::E::@method::foo
       staticType: null
-    element: <testLibraryFragment>::@extension::E::@method::foo#element
+    element: <testLibrary>::@extension::E::@method::foo
     staticType: null
 ''');
   }
@@ -1071,7 +1071,7 @@
     operator: .
     propertyName: SimpleIdentifier
       token: foo
-      element: <testLibraryFragment>::@class::A::@method::foo#element
+      element: <testLibrary>::@class::A::@method::foo
       staticType: null
     staticType: null
 ''');
@@ -1212,7 +1212,7 @@
     operator: .
     propertyName: SimpleIdentifier
       token: foo
-      element: <testLibraryFragment>::@class::A::@method::foo#element
+      element: <testLibrary>::@class::A::@method::foo
       staticType: null
     staticType: null
 ''');
@@ -1317,7 +1317,7 @@
     operator: .
     propertyName: SimpleIdentifier
       token: foo
-      element: <testLibraryFragment>::@extension::E::@method::foo#element
+      element: <testLibrary>::@extension::E::@method::foo
       staticType: null
     staticType: null
 ''');
@@ -1422,7 +1422,7 @@
     operator: .
     propertyName: SimpleIdentifier
       token: foo
-      element: <testLibraryFragment>::@extension::E::@method::foo#element
+      element: <testLibrary>::@extension::E::@method::foo
       staticType: null
     staticType: null
 ''');
@@ -1518,7 +1518,7 @@
 CommentReference
   expression: SimpleIdentifier
     token: foo
-    element: <testLibraryFragment>::@class::A::@method::foo#element
+    element: <testLibrary>::@class::A::@method::foo
     staticType: null
 ''');
   }
@@ -2144,7 +2144,7 @@
 CommentReference
   expression: SimpleIdentifier
     token: foo
-    element: <testLibraryFragment>::@class::A::@method::foo#element
+    element: <testLibrary>::@class::A::@method::foo
     staticType: null
 ''');
   }
diff --git a/pkg/analyzer/test/src/dart/resolution/constructor_field_initializer_test.dart b/pkg/analyzer/test/src/dart/resolution/constructor_field_initializer_test.dart
index 9da78fe..139d3a6 100644
--- a/pkg/analyzer/test/src/dart/resolution/constructor_field_initializer_test.dart
+++ b/pkg/analyzer/test/src/dart/resolution/constructor_field_initializer_test.dart
@@ -115,7 +115,7 @@
                     literal: 1
                     correspondingParameter: dart:core::<fragment>::@class::num::@method::+::@parameter::other#element
                     staticType: int
-                  element: dart:core::<fragment>::@class::num::@method::+#element
+                  element: dart:core::@class::num::@method::+
                   staticInvokeType: num Function(num)
                   staticType: int
                 semicolon: ;
@@ -169,7 +169,7 @@
               literal: 1
               correspondingParameter: dart:core::<fragment>::@class::num::@method::+::@parameter::other#element
               staticType: int
-            element: dart:core::<fragment>::@class::num::@method::+#element
+            element: dart:core::@class::num::@method::+
             staticInvokeType: num Function(num)
             staticType: int
         declaredElement: null@null
diff --git a/pkg/analyzer/test/src/dart/resolution/dot_shorthand_constructor_invocation_test.dart b/pkg/analyzer/test/src/dart/resolution/dot_shorthand_constructor_invocation_test.dart
index 5f91b19..823c584 100644
--- a/pkg/analyzer/test/src/dart/resolution/dot_shorthand_constructor_invocation_test.dart
+++ b/pkg/analyzer/test/src/dart/resolution/dot_shorthand_constructor_invocation_test.dart
@@ -501,7 +501,7 @@
         period: .
         memberName: SimpleIdentifier
           token: member
-          element: <testLibraryFragment>::@class::C::@method::member#element
+          element: <testLibrary>::@class::C::@method::member
           staticType: C<dynamic> Function()
         argumentList: ArgumentList
           leftParenthesis: (
diff --git a/pkg/analyzer/test/src/dart/resolution/dot_shorthand_invocation_test.dart b/pkg/analyzer/test/src/dart/resolution/dot_shorthand_invocation_test.dart
index d4f53ef..fe8ed38 100644
--- a/pkg/analyzer/test/src/dart/resolution/dot_shorthand_invocation_test.dart
+++ b/pkg/analyzer/test/src/dart/resolution/dot_shorthand_invocation_test.dart
@@ -55,7 +55,7 @@
   period: .
   memberName: SimpleIdentifier
     token: member
-    element: <testLibraryFragment>::@class::C::@method::member#element
+    element: <testLibrary>::@class::C::@method::member
     staticType: C Function()
   argumentList: ArgumentList
     leftParenthesis: (
@@ -85,7 +85,7 @@
   period: .
   memberName: SimpleIdentifier
     token: member
-    element: <testLibraryFragment>::@class::C::@method::member#element
+    element: <testLibrary>::@class::C::@method::member
     staticType: C<dynamic> Function<U>(U)
   typeArguments: TypeArgumentList
     leftBracket: <
@@ -132,7 +132,7 @@
   period: .
   memberName: SimpleIdentifier
     token: member
-    element: <testLibraryFragment>::@class::C::@method::member#element
+    element: <testLibrary>::@class::C::@method::member
     staticType: C Function(int)
   argumentList: ArgumentList
     leftParenthesis: (
@@ -176,7 +176,7 @@
   argumentList: ArgumentList
     leftParenthesis: (
     rightParenthesis: )
-  element: <testLibraryFragment>::@class::C::@method::call#element
+  element: <testLibrary>::@class::C::@method::call
   staticInvokeType: C Function()
   staticType: C
 ''');
@@ -234,7 +234,7 @@
   argumentList: ArgumentList
     leftParenthesis: (
     rightParenthesis: )
-  element: <testLibraryFragment>::@class::C::@method::call#element
+  element: <testLibrary>::@class::C::@method::call
   staticInvokeType: C Function()
   staticType: C
 ''');
@@ -261,7 +261,7 @@
   period: .
   memberName: SimpleIdentifier
     token: member
-    element: <testLibraryFragment>::@class::C::@method::member#element
+    element: <testLibrary>::@class::C::@method::member
     staticType: C Function()
   argumentList: ArgumentList
     leftParenthesis: (
@@ -292,7 +292,7 @@
   period: .
   memberName: SimpleIdentifier
     token: member
-    element: <testLibraryFragment>::@class::C::@method::member#element
+    element: <testLibrary>::@class::C::@method::member
     staticType: C Function()
   argumentList: ArgumentList
     leftParenthesis: (
@@ -323,7 +323,7 @@
   period: .
   memberName: SimpleIdentifier
     token: member
-    element: <testLibraryFragment>::@class::C::@method::member#element
+    element: <testLibrary>::@class::C::@method::member
     staticType: C Function(int)
   argumentList: ArgumentList
     leftParenthesis: (
@@ -358,7 +358,7 @@
   period: .
   memberName: SimpleIdentifier
     token: instances
-    element: <testLibraryFragment>::@class::C::@method::instances#element
+    element: <testLibrary>::@class::C::@method::instances
     staticType: List<C> Function()
   argumentList: ArgumentList
     leftParenthesis: (
@@ -442,7 +442,7 @@
   period: .
   memberName: SimpleIdentifier
     token: one
-    element: <testLibraryFragment>::@extensionType::C::@method::one#element
+    element: <testLibrary>::@extensionType::C::@method::one
     staticType: C Function()
   argumentList: ArgumentList
     leftParenthesis: (
@@ -474,7 +474,7 @@
   period: .
   memberName: SimpleIdentifier
     token: member
-    element: <testLibraryFragment>::@class::C::@method::member#element
+    element: <testLibrary>::@class::C::@method::member
     staticType: C Function()
   argumentList: ArgumentList
     leftParenthesis: (
@@ -506,7 +506,7 @@
   period: .
   memberName: SimpleIdentifier
     token: member
-    element: <testLibraryFragment>::@class::C::@method::member#element
+    element: <testLibrary>::@class::C::@method::member
     staticType: C Function()
   argumentList: ArgumentList
     leftParenthesis: (
@@ -545,7 +545,7 @@
   period: .
   memberName: SimpleIdentifier
     token: mixinOne
-    element: <testLibraryFragment>::@mixin::CMixin::@method::mixinOne#element
+    element: <testLibrary>::@mixin::CMixin::@method::mixinOne
     staticType: CMixin Function()
   argumentList: ArgumentList
     leftParenthesis: (
@@ -576,7 +576,7 @@
   period: .
   memberName: SimpleIdentifier
     token: memberType
-    element: <testLibraryFragment>::@class::C::@method::memberType#element
+    element: <testLibrary>::@class::C::@method::memberType
     staticType: C<U> Function<U, V>(U)
   argumentList: ArgumentList
     leftParenthesis: (
@@ -596,7 +596,7 @@
               period: .
               memberName: SimpleIdentifier
                 token: member
-                element: <testLibraryFragment>::@class::C::@method::member#element
+                element: <testLibrary>::@class::C::@method::member
                 staticType: C<int> Function()
               argumentList: ArgumentList
                 leftParenthesis: (
@@ -698,7 +698,7 @@
   period: .
   memberName: SimpleIdentifier
     token: foo
-    element: <testLibraryFragment>::@class::C::@method::foo#element
+    element: <testLibrary>::@class::C::@method::foo
     staticType: C<X> Function<X>(X)
   argumentList: ArgumentList
     leftParenthesis: (
diff --git a/pkg/analyzer/test/src/dart/resolution/dot_shorthand_property_access_test.dart b/pkg/analyzer/test/src/dart/resolution/dot_shorthand_property_access_test.dart
index ea78ad2..47a1ea8 100644
--- a/pkg/analyzer/test/src/dart/resolution/dot_shorthand_property_access_test.dart
+++ b/pkg/analyzer/test/src/dart/resolution/dot_shorthand_property_access_test.dart
@@ -476,7 +476,7 @@
   period: .
   propertyName: SimpleIdentifier
     token: foo
-    element: <testLibraryFragment>::@class::C::@method::foo#element
+    element: <testLibrary>::@class::C::@method::foo
     staticType: String Function<X>()
   staticType: String Function<X>()
 ''');
diff --git a/pkg/analyzer/test/src/dart/resolution/extension_method_test.dart b/pkg/analyzer/test/src/dart/resolution/extension_method_test.dart
index da03031..861a0f4 100644
--- a/pkg/analyzer/test/src/dart/resolution/extension_method_test.dart
+++ b/pkg/analyzer/test/src/dart/resolution/extension_method_test.dart
@@ -689,7 +689,7 @@
         correspondingParameter: <testLibraryFragment>::@class::C::@method::call::@parameter::x#element
         staticType: int
     rightParenthesis: )
-  element: <testLibraryFragment>::@class::C::@method::call#element
+  element: <testLibrary>::@class::C::@method::call
   staticInvokeType: int Function(int)
   staticType: int
 ''');
@@ -722,7 +722,7 @@
         correspondingParameter: <testLibraryFragment>::@extension::E::@method::call::@parameter::x#element
         staticType: int
     rightParenthesis: )
-  element: <testLibraryFragment>::@extension::E::@method::call#element
+  element: <testLibrary>::@extension::E::@method::call
   staticInvokeType: int Function(int)
   staticType: int
 ''');
@@ -752,7 +752,7 @@
         correspondingParameter: <testLibraryFragment>::@extension::E::@method::call::@parameter::x#element
         staticType: int
     rightParenthesis: )
-  element: <testLibraryFragment>::@extension::E::@method::call#element
+  element: <testLibrary>::@extension::E::@method::call
   staticInvokeType: int Function(int)
   staticType: int
 ''');
@@ -786,7 +786,7 @@
   readType: C
   writeElement2: <testLibraryFragment>::@function::f::@parameter::c#element
   writeType: C
-  element: <testLibraryFragment>::@class::C::@method::+#element
+  element: <testLibrary>::@class::C::@method::+
   staticType: C
 ''');
   }
@@ -817,7 +817,7 @@
   readType: C
   writeElement2: <testLibraryFragment>::@function::f::@parameter::c#element
   writeType: C
-  element: <testLibraryFragment>::@extension::E::@method::+#element
+  element: <testLibrary>::@extension::E::@method::+
   staticType: C
 ''');
   }
@@ -1194,7 +1194,7 @@
 MethodInvocation
   methodName: SimpleIdentifier
     token: m
-    element: <testLibraryFragment>::@extension::E1::@method::m#element
+    element: <testLibrary>::@extension::E1::@method::m
     staticType: void Function()
   argumentList: ArgumentList
     leftParenthesis: (
@@ -1221,7 +1221,7 @@
 MethodInvocation
   methodName: SimpleIdentifier
     token: a
-    element: <testLibraryFragment>::@extension::E1::@method::a#element
+    element: <testLibrary>::@extension::E1::@method::a
     staticType: void Function()
   argumentList: ArgumentList
     leftParenthesis: (
@@ -1247,7 +1247,7 @@
 MethodInvocation
   methodName: SimpleIdentifier
     token: m
-    element: <testLibraryFragment>::@class::B::@method::m#element
+    element: <testLibrary>::@class::B::@method::m
     staticType: void Function()
   argumentList: ArgumentList
     leftParenthesis: (
@@ -1273,7 +1273,7 @@
 MethodInvocation
   methodName: SimpleIdentifier
     token: a
-    element: <testLibraryFragment>::@extension::E::@method::a#element
+    element: <testLibrary>::@extension::E::@method::a
     staticType: void Function()
   argumentList: ArgumentList
     leftParenthesis: (
@@ -1302,7 +1302,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: a
-    element: <testLibraryFragment>::@extension::E::@method::a#element
+    element: <testLibrary>::@extension::E::@method::a
     staticType: void Function()
   argumentList: ArgumentList
     leftParenthesis: (
@@ -1334,7 +1334,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: a
-    element: <testLibraryFragment>::@extension::A::@method::a#element
+    element: <testLibrary>::@extension::A::@method::a
     staticType: void Function()
   argumentList: ArgumentList
     leftParenthesis: (
@@ -1367,7 +1367,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: foo
-    element: <testLibraryFragment>::@extension::E::@method::foo#element
+    element: <testLibrary>::@extension::E::@method::foo
     staticType: void Function()
   argumentList: ArgumentList
     leftParenthesis: (
@@ -1408,7 +1408,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: foo
-    element: package:test/x.dart::<fragment>::@extension::E::@method::foo#element
+    element: package:test/x.dart::@extension::E::@method::foo
     staticType: void Function()
   argumentList: ArgumentList
     leftParenthesis: (
@@ -1475,7 +1475,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: foo
-    element: <testLibraryFragment>::@extension::E::@method::foo#element
+    element: <testLibrary>::@extension::E::@method::foo
     staticType: void Function()
   argumentList: ArgumentList
     leftParenthesis: (
@@ -1504,7 +1504,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: foo
-    element: <testLibraryFragment>::@extension::E::@method::foo#element
+    element: <testLibrary>::@extension::E::@method::foo
     staticType: void Function()
   argumentList: ArgumentList
     leftParenthesis: (
@@ -1534,7 +1534,7 @@
   operator: ?.
   methodName: SimpleIdentifier
     token: foo
-    element: <testLibraryFragment>::@extension::E::@method::foo#element
+    element: <testLibrary>::@extension::E::@method::foo
     staticType: void Function()
   argumentList: ArgumentList
     leftParenthesis: (
@@ -1563,7 +1563,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: foo
-    element: <testLibraryFragment>::@extension::E::@method::foo#element
+    element: <testLibrary>::@extension::E::@method::foo
     staticType: void Function()
   argumentList: ArgumentList
     leftParenthesis: (
@@ -1592,7 +1592,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: _foo
-    element: <testLibraryFragment>::@extension::E::@method::_foo#element
+    element: <testLibrary>::@extension::E::@method::_foo
     staticType: void Function()
   argumentList: ArgumentList
     leftParenthesis: (
@@ -1628,7 +1628,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: _foo
-    element: <testLibrary>::@fragment::package:test/a.dart::@extension::E::@method::_foo#element
+    element: <testLibrary>::@extension::E::@method::_foo
     staticType: void Function()
   argumentList: ArgumentList
     leftParenthesis: (
@@ -1665,7 +1665,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: a
-    element: <testLibraryFragment>::@extension::B_Ext::@method::a#element
+    element: <testLibrary>::@extension::B_Ext::@method::a
     staticType: void Function()
   argumentList: ArgumentList
     leftParenthesis: (
@@ -1706,7 +1706,7 @@
   methodName: SimpleIdentifier
     token: f
     element: MethodMember
-      baseElement: <testLibraryFragment>::@extension::B_Ext::@method::f#element
+      baseElement: <testLibrary>::@extension::B_Ext::@method::f
       substitution: {T: C}
     staticType: void Function(C)
   argumentList: ArgumentList
@@ -1747,7 +1747,7 @@
     literal: 2
     correspondingParameter: <testLibraryFragment>::@class::C::@method::+::@parameter::i#element
     staticType: int
-  element: <testLibraryFragment>::@class::C::@method::+#element
+  element: <testLibrary>::@class::C::@method::+
   staticInvokeType: void Function(int)
   staticType: void
 ''');
@@ -1774,7 +1774,7 @@
     literal: 2
     correspondingParameter: <testLibraryFragment>::@extension::E::@method::+::@parameter::i#element
     staticType: int
-  element: <testLibraryFragment>::@extension::E::@method::+#element
+  element: <testLibrary>::@extension::E::@method::+
   staticInvokeType: void Function(int)
   staticType: void
 ''');
@@ -1802,7 +1802,7 @@
     literal: 2
     correspondingParameter: <testLibraryFragment>::@extension::E::@method::+::@parameter::i#element
     staticType: int
-  element: <testLibraryFragment>::@extension::E::@method::+#element
+  element: <testLibrary>::@extension::E::@method::+
   staticInvokeType: void Function(int)
   staticType: void
 ''');
@@ -1832,7 +1832,7 @@
     literal: 1
     correspondingParameter: <testLibraryFragment>::@extension::E::@method::+::@parameter::_#element
     staticType: int
-  element: <testLibraryFragment>::@extension::E::@method::+#element
+  element: <testLibrary>::@extension::E::@method::+
   staticInvokeType: int Function(int)
   staticType: int
 ''');
@@ -1877,7 +1877,7 @@
     correspondingParameter: <testLibraryFragment>::@class::C::@method::[]::@parameter::index#element
     staticType: int
   rightBracket: ]
-  element: <testLibraryFragment>::@class::C::@method::[]#element
+  element: <testLibrary>::@class::C::@method::[]
   staticType: void
 ''');
   }
@@ -1904,7 +1904,7 @@
     correspondingParameter: <testLibraryFragment>::@extension::E::@method::[]::@parameter::index#element
     staticType: int
   rightBracket: ]
-  element: <testLibraryFragment>::@extension::E::@method::[]#element
+  element: <testLibrary>::@extension::E::@method::[]
   staticType: void
 ''');
   }
@@ -1932,7 +1932,7 @@
     correspondingParameter: <testLibraryFragment>::@extension::E::@method::[]::@parameter::index#element
     staticType: int
   rightBracket: ]
-  element: <testLibraryFragment>::@extension::E::@method::[]#element
+  element: <testLibrary>::@extension::E::@method::[]
   staticType: void
 ''');
   }
@@ -1960,7 +1960,7 @@
     correspondingParameter: <testLibraryFragment>::@extension::E::@method::[]::@parameter::index#element
     staticType: int
   rightBracket: ]
-  element: <testLibraryFragment>::@extension::E::@method::[]#element
+  element: <testLibrary>::@extension::E::@method::[]
   staticType: int
 ''');
   }
@@ -1989,7 +1989,7 @@
     correspondingParameter: <testLibraryFragment>::@extension::E::@method::[]::@parameter::index#element
     staticType: int
   rightBracket: ]
-  element: <testLibraryFragment>::@extension::E::@method::[]#element
+  element: <testLibrary>::@extension::E::@method::[]
   staticType: int?
 ''');
   }
@@ -2029,7 +2029,7 @@
     staticType: int
   readElement2: <null>
   readType: null
-  writeElement2: <testLibraryFragment>::@class::C::@method::[]=#element
+  writeElement2: <testLibrary>::@class::C::@method::[]=
   writeType: int
   element: <null>
   staticType: int
@@ -2068,7 +2068,7 @@
     staticType: int
   readElement2: <null>
   readType: null
-  writeElement2: <testLibraryFragment>::@extension::E::@method::[]=#element
+  writeElement2: <testLibrary>::@extension::E::@method::[]=
   writeType: int
   element: <null>
   staticType: int
@@ -2108,7 +2108,7 @@
     staticType: int
   readElement2: <null>
   readType: null
-  writeElement2: <testLibraryFragment>::@extension::E::@method::[]=#element
+  writeElement2: <testLibrary>::@extension::E::@method::[]=
   writeType: int
   element: <null>
   staticType: int
@@ -2139,7 +2139,7 @@
   readType: C
   writeElement2: <testLibraryFragment>::@function::f::@parameter::c#element
   writeType: C
-  element: <testLibraryFragment>::@class::C::@method::+#element
+  element: <testLibrary>::@class::C::@method::+
   staticType: C
 ''');
   }
@@ -2165,7 +2165,7 @@
   readType: int Function(int)
   writeElement2: <testLibraryFragment>::@function::g::@parameter::f#element
   writeType: int Function(int)
-  element: <testLibraryFragment>::@extension::E::@method::+#element
+  element: <testLibrary>::@extension::E::@method::+
   staticType: int Function(int)
 ''');
   }
@@ -2192,7 +2192,7 @@
   readType: C
   writeElement2: <testLibraryFragment>::@function::f::@parameter::c#element
   writeType: C
-  element: <testLibraryFragment>::@extension::E::@method::+#element
+  element: <testLibrary>::@extension::E::@method::+
   staticType: C
 ''');
   }
@@ -2221,7 +2221,7 @@
   readType: A?
   writeElement2: <testLibraryFragment>::@function::f::@parameter::a#element
   writeType: A?
-  element: <testLibraryFragment>::@extension::E::@method::+#element
+  element: <testLibrary>::@extension::E::@method::+
   staticType: A?
 ''');
   }
@@ -2250,7 +2250,7 @@
   readType: C
   writeElement2: <testLibraryFragment>::@function::f::@parameter::c#element
   writeType: C
-  element: <testLibraryFragment>::@class::C::@method::+#element
+  element: <testLibrary>::@class::C::@method::+
   staticType: C
 ''');
   }
@@ -2276,7 +2276,7 @@
   readType: int Function(int)
   writeElement2: <testLibraryFragment>::@function::g::@parameter::f#element
   writeType: int Function(int)
-  element: <testLibraryFragment>::@extension::E::@method::+#element
+  element: <testLibrary>::@extension::E::@method::+
   staticType: int Function(int)
 ''');
   }
@@ -2303,7 +2303,7 @@
   readType: C
   writeElement2: <testLibraryFragment>::@function::f::@parameter::c#element
   writeType: C
-  element: <testLibraryFragment>::@extension::E::@method::+#element
+  element: <testLibrary>::@extension::E::@method::+
   staticType: C
 ''');
   }
@@ -2332,7 +2332,7 @@
   readType: A?
   writeElement2: <testLibraryFragment>::@function::f::@parameter::a#element
   writeType: A?
-  element: <testLibraryFragment>::@extension::E::@method::+#element
+  element: <testLibrary>::@extension::E::@method::+
   staticType: A?
 ''');
   }
@@ -2357,7 +2357,7 @@
     token: c
     element: <testLibraryFragment>::@function::f::@parameter::c#element
     staticType: C
-  element: <testLibraryFragment>::@class::C::@method::unary-#element
+  element: <testLibrary>::@class::C::@method::unary-
   staticType: C
 ''');
   }
@@ -2379,7 +2379,7 @@
     token: f
     element: <testLibraryFragment>::@function::g::@parameter::f#element
     staticType: int Function(int)
-  element: <testLibraryFragment>::@extension::E::@method::unary-#element
+  element: <testLibrary>::@extension::E::@method::unary-
   staticType: void
 ''');
   }
@@ -2402,7 +2402,7 @@
     token: c
     element: <testLibraryFragment>::@function::f::@parameter::c#element
     staticType: C
-  element: <testLibraryFragment>::@extension::E::@method::unary-#element
+  element: <testLibrary>::@extension::E::@method::unary-
   staticType: C
 ''');
   }
@@ -2427,7 +2427,7 @@
     token: a
     element: <testLibraryFragment>::@function::f::@parameter::a#element
     staticType: A?
-  element: <testLibraryFragment>::@extension::E::@method::unary-#element
+  element: <testLibrary>::@extension::E::@method::unary-
   staticType: A?
 ''');
   }
@@ -2645,9 +2645,9 @@
   period: .
   identifier: SimpleIdentifier
     token: a
-    element: <testLibraryFragment>::@extension::E::@method::a#element
+    element: <testLibrary>::@extension::E::@method::a
     staticType: void Function(int)
-  element: <testLibraryFragment>::@extension::E::@method::a#element
+  element: <testLibrary>::@extension::E::@method::a
   staticType: void Function(int)
 ''');
   }
@@ -2672,9 +2672,9 @@
   period: .
   identifier: SimpleIdentifier
     token: a
-    element: <testLibraryFragment>::@extension::E::@method::a#element
+    element: <testLibrary>::@extension::E::@method::a
     staticType: void Function(int)
-  element: <testLibraryFragment>::@extension::E::@method::a#element
+  element: <testLibrary>::@extension::E::@method::a
   staticType: void Function(int)
 ''');
   }
@@ -2848,7 +2848,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: a
-    element: package:test/lib.dart::<fragment>::@extension::E::@method::a#element
+    element: package:test/lib.dart::@extension::E::@method::a
     staticType: void Function()
   argumentList: ArgumentList
     leftParenthesis: (
@@ -2880,7 +2880,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: a
-    element: <testLibraryFragment>::@extension::E::@method::a#element
+    element: <testLibrary>::@extension::E::@method::a
     staticType: void Function()
   argumentList: ArgumentList
     leftParenthesis: (
@@ -3002,9 +3002,9 @@
   period: .
   identifier: SimpleIdentifier
     token: a
-    element: <testLibraryFragment>::@extension::E::@method::a#element
+    element: <testLibrary>::@extension::E::@method::a
     staticType: void Function(int)
-  element: <testLibraryFragment>::@extension::E::@method::a#element
+  element: <testLibrary>::@extension::E::@method::a
   staticType: void Function(int)
 ''');
   }
@@ -3064,7 +3064,7 @@
         correspondingParameter: <testLibraryFragment>::@extension::E::@method::call::@parameter::x#element
         staticType: int
     rightParenthesis: )
-  element: <testLibraryFragment>::@extension::E::@method::call#element
+  element: <testLibrary>::@extension::E::@method::call
   staticInvokeType: int Function(int)
   staticType: int
 ''');
@@ -3193,7 +3193,7 @@
 MethodInvocation
   methodName: SimpleIdentifier
     token: a
-    element: <testLibraryFragment>::@extension::E::@method::a#element
+    element: <testLibrary>::@extension::E::@method::a
     staticType: void Function()
   argumentList: ArgumentList
     leftParenthesis: (
@@ -3222,7 +3222,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: a
-    element: <testLibraryFragment>::@class::C::@method::a#element
+    element: <testLibrary>::@class::C::@method::a
     staticType: void Function()
   argumentList: ArgumentList
     leftParenthesis: (
@@ -3249,7 +3249,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: a
-    element: <testLibraryFragment>::@extension::E::@method::a#element
+    element: <testLibrary>::@extension::E::@method::a
     staticType: void Function()
   argumentList: ArgumentList
     leftParenthesis: (
@@ -3280,7 +3280,7 @@
     literal: 2
     correspondingParameter: <testLibraryFragment>::@class::C::@method::+::@parameter::i#element
     staticType: int
-  element: <testLibraryFragment>::@class::C::@method::+#element
+  element: <testLibrary>::@class::C::@method::+
   staticInvokeType: void Function(int)
   staticType: void
 ''');
@@ -3305,7 +3305,7 @@
     literal: 2
     correspondingParameter: <testLibraryFragment>::@extension::E::@method::+::@parameter::i#element
     staticType: int
-  element: <testLibraryFragment>::@extension::E::@method::+#element
+  element: <testLibrary>::@extension::E::@method::+
   staticInvokeType: void Function(int)
   staticType: void
 ''');
@@ -3333,7 +3333,7 @@
     correspondingParameter: <testLibraryFragment>::@class::C::@method::[]::@parameter::index#element
     staticType: int
   rightBracket: ]
-  element: <testLibraryFragment>::@class::C::@method::[]#element
+  element: <testLibrary>::@class::C::@method::[]
   staticType: void
 ''');
   }
@@ -3358,7 +3358,7 @@
     correspondingParameter: <testLibraryFragment>::@extension::E::@method::[]::@parameter::index#element
     staticType: int
   rightBracket: ]
-  element: <testLibraryFragment>::@extension::E::@method::[]#element
+  element: <testLibrary>::@extension::E::@method::[]
   staticType: void
 ''');
   }
@@ -3395,7 +3395,7 @@
     staticType: int
   readElement2: <null>
   readType: null
-  writeElement2: <testLibraryFragment>::@class::C::@method::[]=#element
+  writeElement2: <testLibrary>::@class::C::@method::[]=
   writeType: int
   element: <null>
   staticType: int
@@ -3432,7 +3432,7 @@
     staticType: int
   readElement2: <null>
   readType: null
-  writeElement2: <testLibraryFragment>::@extension::E::@method::[]=#element
+  writeElement2: <testLibrary>::@extension::E::@method::[]=
   writeType: int
   element: <null>
   staticType: int
@@ -3456,7 +3456,7 @@
   operand: ThisExpression
     thisKeyword: this
     staticType: C
-  element: <testLibraryFragment>::@class::C::@method::unary-#element
+  element: <testLibrary>::@class::C::@method::unary-
   staticType: void
 ''');
   }
@@ -3476,7 +3476,7 @@
   operand: ThisExpression
     thisKeyword: this
     staticType: C
-  element: <testLibraryFragment>::@extension::E::@method::unary-#element
+  element: <testLibrary>::@extension::E::@method::unary-
   staticType: void
 ''');
   }
@@ -3631,7 +3631,7 @@
     assertResolvedNodeText(identifier, r'''
 SimpleIdentifier
   token: a
-  element: <testLibraryFragment>::@extension::E::@method::a#element
+  element: <testLibrary>::@extension::E::@method::a
   staticType: void Function(int)
 ''');
   }
@@ -3654,7 +3654,7 @@
   operator: .
   propertyName: SimpleIdentifier
     token: a
-    element: <testLibraryFragment>::@extension::E::@method::a#element
+    element: <testLibrary>::@extension::E::@method::a
     staticType: void Function(int)
   staticType: void Function(int)
 ''');
@@ -3745,7 +3745,7 @@
 MethodInvocation
   methodName: SimpleIdentifier
     token: a
-    element: <testLibraryFragment>::@extension::E::@method::a#element
+    element: <testLibrary>::@extension::E::@method::a
     staticType: void Function()
   argumentList: ArgumentList
     leftParenthesis: (
@@ -3768,7 +3768,7 @@
 MethodInvocation
   methodName: SimpleIdentifier
     token: a
-    element: <testLibraryFragment>::@extension::E::@method::a#element
+    element: <testLibrary>::@extension::E::@method::a
     staticType: void Function()
   argumentList: ArgumentList
     leftParenthesis: (
@@ -3855,7 +3855,7 @@
     assertResolvedNodeText(identifier, r'''
 SimpleIdentifier
   token: a
-  element: <testLibraryFragment>::@extension::E::@method::a#element
+  element: <testLibrary>::@extension::E::@method::a
   staticType: void Function(int)
 ''');
   }
@@ -3873,7 +3873,7 @@
     assertResolvedNodeText(identifier, r'''
 SimpleIdentifier
   token: a
-  element: <testLibraryFragment>::@extension::E::@method::a#element
+  element: <testLibrary>::@extension::E::@method::a
   staticType: void Function(int)
 ''');
   }
diff --git a/pkg/analyzer/test/src/dart/resolution/extension_override_test.dart b/pkg/analyzer/test/src/dart/resolution/extension_override_test.dart
index ca324fd..cc75176 100644
--- a/pkg/analyzer/test/src/dart/resolution/extension_override_test.dart
+++ b/pkg/analyzer/test/src/dart/resolution/extension_override_test.dart
@@ -51,7 +51,7 @@
       SimpleStringLiteral
         literal: ''
     rightParenthesis: )
-  element: <testLibraryFragment>::@extension::E::@method::call#element
+  element: <testLibrary>::@extension::E::@method::call
   staticInvokeType: int Function(String)
   staticType: int
 ''');
@@ -103,7 +103,7 @@
         literal: ''
     rightParenthesis: )
   element: MethodMember
-    baseElement: <testLibraryFragment>::@extension::E::@method::call#element
+    baseElement: <testLibrary>::@extension::E::@method::call
     substitution: {T: String}
   staticInvokeType: int Function(String)
   staticType: int
@@ -151,7 +151,7 @@
       SimpleStringLiteral
         literal: ''
     rightParenthesis: )
-  element: package:test/lib.dart::<fragment>::@extension::E::@method::call#element
+  element: package:test/lib.dart::@extension::E::@method::call
   staticInvokeType: int Function(String)
   staticType: int
 ''');
@@ -210,7 +210,7 @@
         literal: ''
     rightParenthesis: )
   element: MethodMember
-    baseElement: package:test/lib.dart::<fragment>::@extension::E::@method::call#element
+    baseElement: package:test/lib.dart::@extension::E::@method::call
     substitution: {T: String}
   staticInvokeType: int Function(String)
   staticType: int
@@ -484,7 +484,7 @@
     correspondingParameter: <testLibraryFragment>::@extension::E::@method::[]::@parameter::index#element
     staticType: int
   rightBracket: ]
-  element: <testLibraryFragment>::@extension::E::@method::[]#element
+  element: <testLibrary>::@extension::E::@method::[]
   staticType: int?
 ''');
   }
@@ -533,7 +533,7 @@
     staticType: int
   readElement2: <null>
   readType: null
-  writeElement2: <testLibraryFragment>::@extension::E::@method::[]=#element
+  writeElement2: <testLibrary>::@extension::E::@method::[]=
   writeType: int
   element: <null>
   staticType: int?
@@ -571,7 +571,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: m
-    element: <testLibraryFragment>::@extension::E::@method::m#element
+    element: <testLibrary>::@extension::E::@method::m
     staticType: void Function()
   argumentList: ArgumentList
     leftParenthesis: (
@@ -622,7 +622,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: m
-    element: <testLibraryFragment>::@extension::E::@method::m#element
+    element: <testLibrary>::@extension::E::@method::m
     staticType: void Function()
   argumentList: ArgumentList
     leftParenthesis: (
@@ -670,7 +670,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: m
-    element: package:test/lib.dart::<fragment>::@extension::E::@method::m#element
+    element: package:test/lib.dart::@extension::E::@method::m
     staticType: void Function()
   argumentList: ArgumentList
     leftParenthesis: (
@@ -728,7 +728,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: m
-    element: package:test/lib.dart::<fragment>::@extension::E::@method::m#element
+    element: package:test/lib.dart::@extension::E::@method::m
     staticType: void Function()
   argumentList: ArgumentList
     leftParenthesis: (
@@ -769,7 +769,7 @@
   operator: ?.
   methodName: SimpleIdentifier
     token: foo
-    element: <testLibraryFragment>::@extension::E::@method::foo#element
+    element: <testLibrary>::@extension::E::@method::foo
     staticType: int Function()
   argumentList: ArgumentList
     leftParenthesis: (
@@ -812,7 +812,7 @@
     literal: 1
     correspondingParameter: <testLibraryFragment>::@extension::E::@method::+::@parameter::offset#element
     staticType: int
-  element: <testLibraryFragment>::@extension::E::@method::+#element
+  element: <testLibrary>::@extension::E::@method::+
   staticInvokeType: void Function(int)
   staticType: void
 ''');
@@ -861,7 +861,7 @@
     literal: 1
     correspondingParameter: <testLibraryFragment>::@extension::E::@method::+::@parameter::offset#element
     staticType: int
-  element: <testLibraryFragment>::@extension::E::@method::+#element
+  element: <testLibrary>::@extension::E::@method::+
   staticInvokeType: void Function(int)
   staticType: void
 ''');
@@ -906,7 +906,7 @@
       staticType: null
     staticType: null
   operator: ++
-  readElement2: <testLibraryFragment>::@extension::E::@method::v#element
+  readElement2: <testLibrary>::@extension::E::@method::v
   readType: InvalidType
   writeElement2: <null>
   writeType: InvalidType
@@ -955,7 +955,7 @@
     literal: 1
     correspondingParameter: package:test/lib.dart::<fragment>::@extension::E::@method::+::@parameter::offset#element
     staticType: int
-  element: package:test/lib.dart::<fragment>::@extension::E::@method::+#element
+  element: package:test/lib.dart::@extension::E::@method::+
   staticInvokeType: void Function(int)
   staticType: void
 ''');
@@ -1011,7 +1011,7 @@
     literal: 1
     correspondingParameter: package:test/lib.dart::<fragment>::@extension::E::@method::+::@parameter::offset#element
     staticType: int
-  element: package:test/lib.dart::<fragment>::@extension::E::@method::+#element
+  element: package:test/lib.dart::@extension::E::@method::+
   staticInvokeType: void Function(int)
   staticType: void
 ''');
@@ -1365,7 +1365,7 @@
   readType: int
   writeElement2: <testLibraryFragment>::@extension::E::@setter::s#element
   writeType: int
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticType: int
 ''');
   }
@@ -1425,7 +1425,7 @@
   readType: int
   writeElement2: <testLibraryFragment>::@extension::E::@setter::s#element
   writeType: int
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticType: int
 ''');
   }
@@ -1482,7 +1482,7 @@
   readType: int
   writeElement2: package:test/lib.dart::<fragment>::@extension::E::@setter::s#element
   writeType: int
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticType: int
 ''');
   }
@@ -1549,7 +1549,7 @@
   readType: int
   writeElement2: package:test/lib.dart::<fragment>::@extension::E::@setter::s#element
   writeType: int
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticType: int
 ''');
   }
@@ -1585,7 +1585,7 @@
   operator: .
   propertyName: SimpleIdentifier
     token: a
-    element: <testLibraryFragment>::@extension::E::@method::a#element
+    element: <testLibrary>::@extension::E::@method::a
     staticType: void Function(int)
   staticType: void Function(int)
 ''');
diff --git a/pkg/analyzer/test/src/dart/resolution/field_promotion_test.dart b/pkg/analyzer/test/src/dart/resolution/field_promotion_test.dart
index 0035e20..00822e8 100644
--- a/pkg/analyzer/test/src/dart/resolution/field_promotion_test.dart
+++ b/pkg/analyzer/test/src/dart/resolution/field_promotion_test.dart
@@ -67,7 +67,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: toString
-    element: dart:core::<fragment>::@class::int::@method::toString#element
+    element: dart:core::@class::int::@method::toString
     staticType: String Function()
   argumentList: ArgumentList
     leftParenthesis: (
diff --git a/pkg/analyzer/test/src/dart/resolution/field_test.dart b/pkg/analyzer/test/src/dart/resolution/field_test.dart
index 7503873..8bcf4bf 100644
--- a/pkg/analyzer/test/src/dart/resolution/field_test.dart
+++ b/pkg/analyzer/test/src/dart/resolution/field_test.dart
@@ -191,7 +191,7 @@
         initializer: MethodInvocation
           methodName: SimpleIdentifier
             token: a
-            element: <testLibraryFragment>::@class::A::@method::a#element
+            element: <testLibrary>::@class::A::@method::a
             staticType: int Function()
           argumentList: ArgumentList
             leftParenthesis: (
diff --git a/pkg/analyzer/test/src/dart/resolution/for_element_test.dart b/pkg/analyzer/test/src/dart/resolution/for_element_test.dart
index 9eb0142..10f7627 100644
--- a/pkg/analyzer/test/src/dart/resolution/for_element_test.dart
+++ b/pkg/analyzer/test/src/dart/resolution/for_element_test.dart
@@ -812,7 +812,7 @@
         readType: int
         writeElement2: a@37
         writeType: int
-        element: dart:core::<fragment>::@class::num::@method::-#element
+        element: dart:core::@class::num::@method::-
         staticType: int
   rightParenthesis: )
   body: IntegerLiteral
diff --git a/pkg/analyzer/test/src/dart/resolution/for_statement_test.dart b/pkg/analyzer/test/src/dart/resolution/for_statement_test.dart
index f845324..87c81ba 100644
--- a/pkg/analyzer/test/src/dart/resolution/for_statement_test.dart
+++ b/pkg/analyzer/test/src/dart/resolution/for_statement_test.dart
@@ -1402,7 +1402,7 @@
         readType: int
         writeElement2: a@36
         writeType: int
-        element: dart:core::<fragment>::@class::num::@method::-#element
+        element: dart:core::@class::num::@method::-
         staticType: int
   rightParenthesis: )
   body: Block
diff --git a/pkg/analyzer/test/src/dart/resolution/function_expression_invocation_test.dart b/pkg/analyzer/test/src/dart/resolution/function_expression_invocation_test.dart
index 603ad54..2f09d10 100644
--- a/pkg/analyzer/test/src/dart/resolution/function_expression_invocation_test.dart
+++ b/pkg/analyzer/test/src/dart/resolution/function_expression_invocation_test.dart
@@ -43,7 +43,7 @@
           substitution: {T: int}
         staticType: int
     rightParenthesis: )
-  element: <testLibraryFragment>::@class::A::@method::call#element
+  element: <testLibrary>::@class::A::@method::call
   staticInvokeType: void Function(int)
   staticType: void
   typeArgumentTypes
@@ -86,7 +86,7 @@
           substitution: {T: int}
         staticType: List<int>
     rightParenthesis: )
-  element: <testLibraryFragment>::@class::A::@method::call#element
+  element: <testLibrary>::@class::A::@method::call
   staticInvokeType: List<int> Function(List<int>)
   staticType: List<int>
   typeArgumentTypes
@@ -117,7 +117,7 @@
   argumentList: ArgumentList
     leftParenthesis: (
     rightParenthesis: )
-  element: <testLibraryFragment>::@class::A::@method::call#element
+  element: <testLibrary>::@class::A::@method::call
   staticInvokeType: int Function()
   staticType: int
   typeArgumentTypes
@@ -156,7 +156,7 @@
   argumentList: ArgumentList
     leftParenthesis: (
     rightParenthesis: )
-  element: <testLibraryFragment>::@class::A::@method::call#element
+  element: <testLibrary>::@class::A::@method::call
   staticInvokeType: int Function()
   staticType: int
   typeArgumentTypes
@@ -277,7 +277,7 @@
   argumentList: ArgumentList
     leftParenthesis: (
     rightParenthesis: )
-  element: <testLibraryFragment>::@extension::0::@method::call#element
+  element: <testLibrary>::@extension::0::@method::call
   staticInvokeType: int Function()
   staticType: int
 ''');
@@ -303,7 +303,7 @@
   argumentList: ArgumentList
     leftParenthesis: (
     rightParenthesis: )
-  element: <testLibraryFragment>::@extension::0::@method::call#element
+  element: <testLibrary>::@extension::0::@method::call
   staticInvokeType: int Function()
   staticType: int
 ''');
@@ -607,7 +607,7 @@
           correspondingParameter: dart:core::<fragment>::@class::num::@method::+::@parameter::other#element
           staticType: int
         correspondingParameter: <null>
-        element: dart:core::<fragment>::@class::num::@method::+#element
+        element: dart:core::@class::num::@method::+
         staticInvokeType: num Function(num)
         staticType: int
     rightParenthesis: )
@@ -663,7 +663,7 @@
           correspondingParameter: dart:core::<fragment>::@class::num::@method::+::@parameter::other#element
           staticType: int
         correspondingParameter: <null>
-        element: dart:core::<fragment>::@class::num::@method::+#element
+        element: dart:core::@class::num::@method::+
         staticInvokeType: num Function(num)
         staticType: int
     rightParenthesis: )
diff --git a/pkg/analyzer/test/src/dart/resolution/function_reference_test.dart b/pkg/analyzer/test/src/dart/resolution/function_reference_test.dart
index 9f84ee6..ad8490e 100644
--- a/pkg/analyzer/test/src/dart/resolution/function_reference_test.dart
+++ b/pkg/analyzer/test/src/dart/resolution/function_reference_test.dart
@@ -565,7 +565,7 @@
 FunctionReference
   function: SimpleIdentifier
     token: foo
-    element: <testLibraryFragment>::@extension::E::@method::foo#element
+    element: <testLibrary>::@extension::E::@method::foo
     staticType: void Function<T>(T)
   typeArguments: TypeArgumentList
     leftBracket: <
@@ -604,7 +604,7 @@
     operator: .
     propertyName: SimpleIdentifier
       token: foo
-      element: <testLibraryFragment>::@extension::E::@method::foo#element
+      element: <testLibrary>::@extension::E::@method::foo
       staticType: void Function<T>(T)
     staticType: void Function<T>(T)
   typeArguments: TypeArgumentList
@@ -657,7 +657,7 @@
     operator: .
     propertyName: SimpleIdentifier
       token: foo
-      element: <testLibraryFragment>::@extension::E::@method::foo#element
+      element: <testLibrary>::@extension::E::@method::foo
       staticType: void Function<T>(T)
     staticType: void Function<T>(T)
   typeArguments: TypeArgumentList
@@ -699,7 +699,7 @@
     operator: ..
     propertyName: SimpleIdentifier
       token: foo
-      element: <testLibraryFragment>::@extension::E::@method::foo#element
+      element: <testLibrary>::@extension::E::@method::foo
       staticType: void Function<T>(T)
     staticType: void Function<T>(T)
   typeArguments: TypeArgumentList
@@ -759,7 +759,7 @@
     operator: .
     propertyName: SimpleIdentifier
       token: foo
-      element: <testLibraryFragment>::@extension::E::@method::foo#element
+      element: <testLibrary>::@extension::E::@method::foo
       staticType: void Function<T>(T)
     staticType: void Function<T>(T)
   typeArguments: TypeArgumentList
@@ -843,7 +843,7 @@
 FunctionReference
   function: SimpleIdentifier
     token: foo
-    element: <testLibraryFragment>::@extension::E::@method::foo#element
+    element: <testLibrary>::@extension::E::@method::foo
     staticType: void Function<T>(T)
   typeArguments: TypeArgumentList
     leftBracket: <
@@ -1087,9 +1087,9 @@
     period: .
     identifier: SimpleIdentifier
       token: m
-      element: <testLibraryFragment>::@extension::0::@method::m#element
+      element: <testLibrary>::@extension::0::@method::m
       staticType: null
-    element: <testLibraryFragment>::@extension::0::@method::m#element
+    element: <testLibrary>::@extension::0::@method::m
     staticType: void Function<T>(T)
   typeArguments: TypeArgumentList
     leftBracket: <
@@ -1180,7 +1180,7 @@
         element2: dart:core::@class::int
         type: int
     rightBracket: >
-  element: <testLibraryFragment>::@class::C::@method::call#element
+  element: <testLibrary>::@class::C::@method::call
   staticType: int Function(int)
   typeArgumentTypes
     int
@@ -1223,7 +1223,7 @@
         element2: dart:core::@class::int
         type: int
     rightBracket: >
-  element: <testLibraryFragment>::@class::C::@method::call#element
+  element: <testLibrary>::@class::C::@method::call
   staticType: int Function(int)
   typeArgumentTypes
     int
@@ -1261,7 +1261,7 @@
         element2: dart:core::@class::String
         type: String
     rightBracket: >
-  element: <testLibraryFragment>::@extension::E::@method::call#element
+  element: <testLibrary>::@extension::E::@method::call
   staticType: void Function(int, String)
   typeArgumentTypes
     int
@@ -1290,7 +1290,7 @@
     element: <testLibraryFragment>::@function::f::@parameter::a#element
     staticType: A
   correspondingParameter: <testLibraryFragment>::@function::g::@parameter::f#element
-  element: <testLibraryFragment>::@extensionType::A::@method::call#element
+  element: <testLibrary>::@extensionType::A::@method::call
   staticType: void Function()
 ''');
   }
@@ -1342,7 +1342,7 @@
         element2: dart:core::@class::int
         type: int
     rightBracket: >
-  element: package:test/a.dart::<fragment>::@class::C::@method::call#element
+  element: package:test/a.dart::@class::C::@method::call
   staticType: int Function(int)
   typeArgumentTypes
     int
@@ -1387,7 +1387,7 @@
         element2: dart:core::@class::int
         type: int
     rightBracket: >
-  element: package:test/a.dart::<fragment>::@class::C::@method::call#element
+  element: package:test/a.dart::@class::C::@method::call
   staticType: int Function(int)
   typeArgumentTypes
     int
@@ -1436,7 +1436,7 @@
         element2: dart:core::@class::int
         type: int
     rightBracket: >
-  element: <testLibraryFragment>::@class::C::@method::call#element
+  element: <testLibrary>::@class::C::@method::call
   staticType: void Function(dynamic, dynamic)
   typeArgumentTypes
     dynamic
@@ -1486,7 +1486,7 @@
         element2: dart:core::@class::int
         type: int
     rightBracket: >
-  element: <testLibraryFragment>::@class::C::@method::call#element
+  element: <testLibrary>::@class::C::@method::call
   staticType: int Function(int)
 ''');
   }
@@ -1706,7 +1706,7 @@
 FunctionReference
   function: SimpleIdentifier
     token: foo
-    element: <testLibraryFragment>::@class::A::@method::foo#element
+    element: <testLibrary>::@class::A::@method::foo
     staticType: void Function<T>(T)
   typeArguments: TypeArgumentList
     leftBracket: <
@@ -1742,7 +1742,7 @@
   function: PrefixedIdentifier
     prefix: SimpleIdentifier
       token: foo
-      element: <testLibraryFragment>::@class::C::@method::foo#element
+      element: <testLibrary>::@class::C::@method::foo
       staticType: void Function<T>(T)
     period: .
     identifier: SimpleIdentifier
@@ -1791,9 +1791,9 @@
       period: .
       identifier: SimpleIdentifier
         token: foo
-        element: <testLibraryFragment>::@class::C::@method::foo#element
+        element: <testLibrary>::@class::C::@method::foo
         staticType: void Function<T>(T)
-      element: <testLibraryFragment>::@class::C::@method::foo#element
+      element: <testLibrary>::@class::C::@method::foo
       staticType: void Function<T>(T)
     operator: .
     propertyName: SimpleIdentifier
@@ -1841,9 +1841,9 @@
     period: .
     identifier: SimpleIdentifier
       token: foo
-      element: <testLibraryFragment>::@class::A::@method::foo#element
+      element: <testLibrary>::@class::A::@method::foo
       staticType: null
-    element: <testLibraryFragment>::@class::A::@method::foo#element
+    element: <testLibrary>::@class::A::@method::foo
     staticType: void Function<T>(T)
   typeArguments: TypeArgumentList
     leftBracket: <
@@ -1947,7 +1947,7 @@
     operator: .
     propertyName: SimpleIdentifier
       token: foo
-      element: <testLibraryFragment>::@class::A::@method::foo#element
+      element: <testLibrary>::@class::A::@method::foo
       staticType: void Function<T>(T)
     staticType: void Function<T>(T)
   typeArguments: TypeArgumentList
@@ -1995,11 +1995,11 @@
     identifier: SimpleIdentifier
       token: expectStaticType
       element: MethodMember
-        baseElement: <testLibraryFragment>::@extension::StaticType::@method::expectStaticType#element
+        baseElement: <testLibrary>::@extension::StaticType::@method::expectStaticType
         substitution: {T: int, X: X}
       staticType: null
     element: MethodMember
-      baseElement: <testLibraryFragment>::@extension::StaticType::@method::expectStaticType#element
+      baseElement: <testLibrary>::@extension::StaticType::@method::expectStaticType
       substitution: {T: int, X: X}
     staticType: void Function<X extends int Function(int)>()
   typeArguments: TypeArgumentList
@@ -2054,7 +2054,7 @@
       operator: .
       propertyName: SimpleIdentifier
         token: foo
-        element: <testLibraryFragment>::@extension::0::@method::foo#element
+        element: <testLibrary>::@extension::0::@method::foo
         staticType: void Function<T>(T)
       staticType: void Function<T>(T)
     operator: .
@@ -2099,7 +2099,7 @@
     operator: .
     propertyName: SimpleIdentifier
       token: foo
-      element: <testLibraryFragment>::@class::A::@method::foo#element
+      element: <testLibrary>::@class::A::@method::foo
       staticType: void Function<T>(T)
     staticType: void Function<T>(T)
   typeArguments: TypeArgumentList
@@ -2211,9 +2211,9 @@
     period: .
     identifier: SimpleIdentifier
       token: foo
-      element: <testLibraryFragment>::@class::A::@method::foo#element
+      element: <testLibrary>::@class::A::@method::foo
       staticType: null
-    element: <testLibraryFragment>::@class::A::@method::foo#element
+    element: <testLibrary>::@class::A::@method::foo
     staticType: void Function<T>(T)
   typeArguments: TypeArgumentList
     leftBracket: <
@@ -2250,7 +2250,7 @@
     operator: .
     propertyName: SimpleIdentifier
       token: foo
-      element: <testLibraryFragment>::@class::A::@method::foo#element
+      element: <testLibrary>::@class::A::@method::foo
       staticType: void Function<T>(T)
     staticType: void Function<T>(T)
   typeArguments: TypeArgumentList
@@ -2290,9 +2290,9 @@
     period: .
     identifier: SimpleIdentifier
       token: foo
-      element: <testLibraryFragment>::@class::A::@method::foo#element
+      element: <testLibrary>::@class::A::@method::foo
       staticType: null
-    element: <testLibraryFragment>::@class::A::@method::foo#element
+    element: <testLibrary>::@class::A::@method::foo
     staticType: void Function<T>(T)
   typeArguments: TypeArgumentList
     leftBracket: <
@@ -2342,7 +2342,7 @@
     operator: .
     propertyName: SimpleIdentifier
       token: foo
-      element: package:test/a.dart::<fragment>::@class::A::@method::foo#element
+      element: package:test/a.dart::@class::A::@method::foo
       staticType: void Function<T>(T)
     staticType: void Function<T>(T)
   typeArguments: TypeArgumentList
@@ -2467,9 +2467,9 @@
     period: .
     identifier: SimpleIdentifier
       token: foo
-      element: <testLibraryFragment>::@class::A::@method::foo#element
+      element: <testLibrary>::@class::A::@method::foo
       staticType: null
-    element: <testLibraryFragment>::@class::A::@method::foo#element
+    element: <testLibrary>::@class::A::@method::foo
     staticType: void Function<T>(T)
   typeArguments: TypeArgumentList
     leftBracket: <
@@ -2503,7 +2503,7 @@
     operator: ..
     propertyName: SimpleIdentifier
       token: foo
-      element: <testLibraryFragment>::@class::A::@method::foo#element
+      element: <testLibrary>::@class::A::@method::foo
       staticType: void Function<T>(T)
     staticType: void Function<T>(T)
   typeArguments: TypeArgumentList
@@ -2551,11 +2551,11 @@
     identifier: SimpleIdentifier
       token: expectStaticType
       element: MethodMember
-        baseElement: <testLibraryFragment>::@extension::StaticType::@method::expectStaticType#element
+        baseElement: <testLibrary>::@extension::StaticType::@method::expectStaticType
         substitution: {T: int, X: X}
       staticType: null
     element: MethodMember
-      baseElement: <testLibraryFragment>::@extension::StaticType::@method::expectStaticType#element
+      baseElement: <testLibrary>::@extension::StaticType::@method::expectStaticType
       substitution: {T: int, X: X}
     staticType: void Function<X extends int Function(int)>()
   typeArguments: TypeArgumentList
@@ -2604,7 +2604,7 @@
 FunctionReference
   function: SimpleIdentifier
     token: foo
-    element: <testLibraryFragment>::@class::A::@method::foo#element
+    element: <testLibrary>::@class::A::@method::foo
     staticType: void Function<T>(T)
   typeArguments: TypeArgumentList
     leftBracket: <
@@ -2639,7 +2639,7 @@
 FunctionReference
   function: SimpleIdentifier
     token: foo
-    element: <testLibraryFragment>::@class::A::@method::foo#element
+    element: <testLibrary>::@class::A::@method::foo
     staticType: void Function<T>(T)
   typeArguments: TypeArgumentList
     leftBracket: <
@@ -3033,7 +3033,7 @@
 FunctionReference
   function: SimpleIdentifier
     token: foo
-    element: <testLibraryFragment>::@class::A::@method::foo#element
+    element: <testLibrary>::@class::A::@method::foo
     staticType: void Function()
   typeArguments: TypeArgumentList
     leftBracket: <
@@ -3201,7 +3201,7 @@
 FunctionReference
   function: SimpleIdentifier
     token: foo
-    element: <testLibraryFragment>::@class::A::@method::foo#element
+    element: <testLibrary>::@class::A::@method::foo
     staticType: void Function<T>(T)
   typeArguments: TypeArgumentList
     leftBracket: <
@@ -3238,9 +3238,9 @@
     period: .
     identifier: SimpleIdentifier
       token: foo
-      element: <testLibraryFragment>::@class::A::@method::foo#element
+      element: <testLibrary>::@class::A::@method::foo
       staticType: null
-    element: <testLibraryFragment>::@class::A::@method::foo#element
+    element: <testLibrary>::@class::A::@method::foo
     staticType: void Function<T>(T)
   typeArguments: TypeArgumentList
     leftBracket: <
@@ -3289,7 +3289,7 @@
     operator: .
     propertyName: SimpleIdentifier
       token: foo
-      element: package:test/a.dart::<fragment>::@class::A::@method::foo#element
+      element: package:test/a.dart::@class::A::@method::foo
       staticType: void Function<T>(T)
     staticType: void Function<T>(T)
   typeArguments: TypeArgumentList
@@ -3339,7 +3339,7 @@
     operator: .
     propertyName: SimpleIdentifier
       token: foo
-      element: package:test/a.dart::<fragment>::@class::A::@method::foo#element
+      element: package:test/a.dart::@class::A::@method::foo
       staticType: void Function<T>(T)
     staticType: void Function<T>(T)
   typeArguments: TypeArgumentList
@@ -3390,7 +3390,7 @@
     operator: .
     propertyName: SimpleIdentifier
       token: foo
-      element: package:test/a.dart::<fragment>::@class::A::@method::foo#element
+      element: package:test/a.dart::@class::A::@method::foo
       staticType: void Function<T>(T)
     staticType: void Function<T>(T)
   typeArguments: TypeArgumentList
@@ -3430,9 +3430,9 @@
     period: .
     identifier: SimpleIdentifier
       token: foo
-      element: <testLibraryFragment>::@class::A::@method::foo#element
+      element: <testLibrary>::@class::A::@method::foo
       staticType: null
-    element: <testLibraryFragment>::@class::A::@method::foo#element
+    element: <testLibrary>::@class::A::@method::foo
     staticType: void Function<T>(T)
   typeArguments: TypeArgumentList
     leftBracket: <
@@ -3478,7 +3478,7 @@
         element2: dart:core::@class::int
         type: int
     rightBracket: >
-  element: <testLibraryFragment>::@class::A::@method::call#element
+  element: <testLibrary>::@class::A::@method::call
   staticType: void Function()
   typeArgumentTypes
     int
@@ -3510,7 +3510,7 @@
 FunctionReference
   function: SimpleIdentifier
     token: foo
-    element: <testLibraryFragment>::@class::A::@method::foo#element
+    element: <testLibrary>::@class::A::@method::foo
     staticType: void Function<T, U>(T, U)
   typeArguments: TypeArgumentList
     leftBracket: <
@@ -3552,7 +3552,7 @@
 FunctionReference
   function: SimpleIdentifier
     token: foo
-    element: <testLibraryFragment>::@class::A::@method::foo#element
+    element: <testLibrary>::@class::A::@method::foo
     staticType: void Function<T>(T)
   typeArguments: TypeArgumentList
     leftBracket: <
@@ -4193,7 +4193,7 @@
     readType: void Function<T>(T)
     writeElement2: <testLibraryFragment>::@function::foo::@parameter::f#element
     writeType: void Function<T>(T)
-    element: <testLibraryFragment>::@extension::0::@method::+#element
+    element: <testLibrary>::@extension::0::@method::+
     staticType: void Function<T>(T)
   staticType: void Function(int)
   typeArgumentTypes
@@ -4248,7 +4248,7 @@
       literal: 1
       correspondingParameter: <testLibraryFragment>::@class::C::@method::+::@parameter::i#element
       staticType: int
-    element: <testLibraryFragment>::@class::C::@method::+#element
+    element: <testLibrary>::@class::C::@method::+
     staticInvokeType: void Function<T>(T) Function(int)
     staticType: void Function<T>(T)
   staticType: void Function(int)
@@ -4419,7 +4419,7 @@
     token: c
     element: <testLibraryFragment>::@function::foo::@parameter::c#element
     staticType: C
-  element: <testLibraryFragment>::@class::C::@method::call#element
+  element: <testLibrary>::@class::C::@method::call
   staticType: void Function(int)
   typeArgumentTypes
     int
@@ -4449,7 +4449,7 @@
       staticType: int
     rightBracket: ]
     element: MethodMember
-      baseElement: dart:core::<fragment>::@class::List::@method::[]#element
+      baseElement: dart:core::@class::List::@method::[]
       substitution: {E: void Function<T>(T)}
     staticType: void Function<T>(T)
   staticType: void Function(int)
@@ -4480,7 +4480,7 @@
     operator: .
     methodName: SimpleIdentifier
       token: m
-      element: <testLibraryFragment>::@class::C::@method::m#element
+      element: <testLibrary>::@class::C::@method::m
       staticType: void Function<T>(T) Function()
     argumentList: ArgumentList
       leftParenthesis: (
@@ -4518,7 +4518,7 @@
     readType: void Function<T>(T)
     writeElement2: <testLibraryFragment>::@function::foo::@parameter::f#element
     writeType: void Function<T>(T)
-    element: <testLibraryFragment>::@extension::0::@method::+#element
+    element: <testLibrary>::@extension::0::@method::+
     staticType: void Function<T>(T)
   staticType: void Function(int)
   typeArgumentTypes
@@ -4582,7 +4582,7 @@
     readType: void Function<T>(T)
     writeElement2: <testLibraryFragment>::@function::foo::@parameter::f#element
     writeType: void Function<T>(T)
-    element: <testLibraryFragment>::@extension::0::@method::+#element
+    element: <testLibrary>::@extension::0::@method::+
     staticType: void Function<T>(T)
   staticType: void Function(int)
   typeArgumentTypes
diff --git a/pkg/analyzer/test/src/dart/resolution/if_element_test.dart b/pkg/analyzer/test/src/dart/resolution/if_element_test.dart
index 42f6b70..96da3d9 100644
--- a/pkg/analyzer/test/src/dart/resolution/if_element_test.dart
+++ b/pkg/analyzer/test/src/dart/resolution/if_element_test.dart
@@ -147,7 +147,7 @@
               token: a
               element: a@56
               staticType: int
-            element2: dart:core::<fragment>::@class::Object::@method::==#element
+            element2: dart:core::@class::Object::@method::==
             matchedValueType: Object?
         rightBracket: ]
         matchedValueType: Object
@@ -164,7 +164,7 @@
             literal: 0
             correspondingParameter: dart:core::<fragment>::@class::num::@method::>::@parameter::other#element
             staticType: int
-          element: dart:core::<fragment>::@class::num::@method::>#element
+          element: dart:core::@class::num::@method::>
           staticInvokeType: bool Function(num)
           staticType: bool
   rightParenthesis: )
@@ -228,7 +228,7 @@
             literal: 0
             correspondingParameter: dart:core::<fragment>::@class::num::@method::>::@parameter::other#element
             staticType: int
-          element: dart:core::<fragment>::@class::num::@method::>#element
+          element: dart:core::@class::num::@method::>
           staticInvokeType: bool Function(num)
           staticType: bool
   rightParenthesis: )
diff --git a/pkg/analyzer/test/src/dart/resolution/if_statement_test.dart b/pkg/analyzer/test/src/dart/resolution/if_statement_test.dart
index c6dcd86d..5902961 100644
--- a/pkg/analyzer/test/src/dart/resolution/if_statement_test.dart
+++ b/pkg/analyzer/test/src/dart/resolution/if_statement_test.dart
@@ -109,7 +109,7 @@
             literal: 0
             correspondingParameter: dart:core::<fragment>::@class::num::@method::>::@parameter::other#element
             staticType: int
-          element: dart:core::<fragment>::@class::num::@method::>#element
+          element: dart:core::@class::num::@method::>
           staticInvokeType: bool Function(num)
           staticType: bool
   rightParenthesis: )
@@ -191,7 +191,7 @@
             literal: 0
             correspondingParameter: dart:core::<fragment>::@class::num::@method::>::@parameter::other#element
             staticType: int
-          element: dart:core::<fragment>::@class::num::@method::>#element
+          element: dart:core::@class::num::@method::>
           staticInvokeType: bool Function(num)
           staticType: bool
   rightParenthesis: )
@@ -278,7 +278,7 @@
             literal: 0
             correspondingParameter: dart:core::<fragment>::@class::num::@method::>::@parameter::other#element
             staticType: int
-          element: dart:core::<fragment>::@class::num::@method::>#element
+          element: dart:core::@class::num::@method::>
           staticInvokeType: bool Function(num)
           staticType: bool
   rightParenthesis: )
@@ -445,7 +445,7 @@
             literal: 0
             correspondingParameter: dart:core::<fragment>::@class::num::@method::>::@parameter::other#element
             staticType: int
-          element: dart:core::<fragment>::@class::num::@method::>#element
+          element: dart:core::@class::num::@method::>
           staticInvokeType: bool Function(num)
           staticType: bool
   rightParenthesis: )
@@ -527,7 +527,7 @@
             literal: 0
             correspondingParameter: dart:core::<fragment>::@class::num::@method::>::@parameter::other#element
             staticType: int
-          element: dart:core::<fragment>::@class::num::@method::>#element
+          element: dart:core::@class::num::@method::>
           staticInvokeType: bool Function(num)
           staticType: bool
   rightParenthesis: )
@@ -610,7 +610,7 @@
             literal: 0
             correspondingParameter: dart:core::<fragment>::@class::num::@method::>::@parameter::other#element
             staticType: int
-          element: dart:core::<fragment>::@class::num::@method::>#element
+          element: dart:core::@class::num::@method::>
           staticInvokeType: bool Function(num)
           staticType: bool
   rightParenthesis: )
@@ -692,7 +692,7 @@
             literal: 0
             correspondingParameter: dart:core::<fragment>::@class::num::@method::>::@parameter::other#element
             staticType: int
-          element: dart:core::<fragment>::@class::num::@method::>#element
+          element: dart:core::@class::num::@method::>
           staticInvokeType: bool Function(num)
           staticType: bool
   rightParenthesis: )
@@ -773,7 +773,7 @@
             literal: 0
             correspondingParameter: dart:core::<fragment>::@class::num::@method::>::@parameter::other#element
             staticType: int
-          element: dart:core::<fragment>::@class::num::@method::>#element
+          element: dart:core::@class::num::@method::>
           staticInvokeType: bool Function(num)
           staticType: bool
   rightParenthesis: )
@@ -855,7 +855,7 @@
             literal: 0
             correspondingParameter: dart:core::<fragment>::@class::num::@method::>::@parameter::other#element
             staticType: int
-          element: dart:core::<fragment>::@class::num::@method::>#element
+          element: dart:core::@class::num::@method::>
           staticInvokeType: bool Function(num)
           staticType: bool
   rightParenthesis: )
@@ -935,7 +935,7 @@
               token: a
               element: a@51
               staticType: int
-            element2: dart:core::<fragment>::@class::Object::@method::==#element
+            element2: dart:core::@class::Object::@method::==
             matchedValueType: Object?
         rightBracket: ]
         matchedValueType: Object?
@@ -952,7 +952,7 @@
             literal: 0
             correspondingParameter: dart:core::<fragment>::@class::num::@method::>::@parameter::other#element
             staticType: int
-          element: dart:core::<fragment>::@class::num::@method::>#element
+          element: dart:core::@class::num::@method::>
           staticInvokeType: bool Function(num)
           staticType: bool
   rightParenthesis: )
@@ -1106,7 +1106,7 @@
             literal: 0
             correspondingParameter: dart:core::<fragment>::@class::num::@method::>::@parameter::other#element
             staticType: int
-          element: dart:core::<fragment>::@class::num::@method::>#element
+          element: dart:core::@class::num::@method::>
           staticInvokeType: bool Function(num)
           staticType: bool
   rightParenthesis: )
@@ -1515,7 +1515,7 @@
       literal: null
       correspondingParameter: dart:core::<fragment>::@class::num::@method::==::@parameter::other#element
       staticType: Null
-    element: dart:core::<fragment>::@class::num::@method::==#element
+    element: dart:core::@class::num::@method::==
     staticInvokeType: bool Function(Object)
     staticType: bool
   rightParenthesis: )
@@ -1578,7 +1578,7 @@
       literal: null
       correspondingParameter: dart:core::<fragment>::@class::num::@method::==::@parameter::other#element
       staticType: Null
-    element: dart:core::<fragment>::@class::num::@method::==#element
+    element: dart:core::@class::num::@method::==
     staticInvokeType: bool Function(Object)
     staticType: bool
   rightParenthesis: )
diff --git a/pkg/analyzer/test/src/dart/resolution/index_expression_test.dart b/pkg/analyzer/test/src/dart/resolution/index_expression_test.dart
index 3b95b17..8a53a26 100644
--- a/pkg/analyzer/test/src/dart/resolution/index_expression_test.dart
+++ b/pkg/analyzer/test/src/dart/resolution/index_expression_test.dart
@@ -220,7 +220,7 @@
     correspondingParameter: <testLibraryFragment>::@class::A::@method::[]::@parameter::index#element
     staticType: int
   rightBracket: ]
-  element: <testLibraryFragment>::@class::A::@method::[]#element
+  element: <testLibrary>::@class::A::@method::[]
   staticType: bool
 ''');
   }
@@ -245,7 +245,7 @@
     correspondingParameter: <testLibraryFragment>::@class::A::@method::[]::@parameter::index#element
     staticType: int
   rightBracket: ]
-  element: <testLibraryFragment>::@class::A::@method::[]#element
+  element: <testLibrary>::@class::A::@method::[]
   staticType: bool
 ''');
 
@@ -258,7 +258,7 @@
     correspondingParameter: <testLibraryFragment>::@class::A::@method::[]::@parameter::index#element
     staticType: int
   rightBracket: ]
-  element: <testLibraryFragment>::@class::A::@method::[]#element
+  element: <testLibrary>::@class::A::@method::[]
   staticType: bool
 ''');
 
@@ -292,7 +292,7 @@
     staticType: int
   rightBracket: ]
   element: MethodMember
-    baseElement: <testLibraryFragment>::@class::A::@method::[]#element
+    baseElement: <testLibrary>::@class::A::@method::[]
     substitution: {T: double}
   staticType: double
 ''');
@@ -323,7 +323,7 @@
     superKeyword: super
     staticType: A
   rightBracket: ]
-  element: <testLibraryFragment>::@class::A::@method::[]#element
+  element: <testLibrary>::@class::A::@method::[]
   staticType: int
 ''');
   }
@@ -355,7 +355,7 @@
     staticType: InvalidType
   rightBracket: ]
   element: MethodMember
-    baseElement: dart:core::<fragment>::@class::List::@method::[]#element
+    baseElement: dart:core::@class::List::@method::[]
     substitution: {E: int}
   staticType: int
 ''');
@@ -386,7 +386,7 @@
     correspondingParameter: <testLibraryFragment>::@class::A::@method::[]::@parameter::index#element
     staticType: int
   rightBracket: ]
-  element: <testLibraryFragment>::@class::A::@method::[]#element
+  element: <testLibrary>::@class::A::@method::[]
   staticType: bool?
 ''');
   }
@@ -414,7 +414,7 @@
     correspondingParameter: <testLibraryFragment>::@extension::E::@method::[]::@parameter::index#element
     staticType: int
   rightBracket: ]
-  element: <testLibraryFragment>::@extension::E::@method::[]#element
+  element: <testLibrary>::@extension::E::@method::[]
   staticType: bool
 ''');
   }
@@ -508,7 +508,7 @@
     correspondingParameter: <testLibraryFragment>::@class::A::@method::[]::@parameter::index#element
     staticType: int
   rightBracket: ]
-  element: <testLibraryFragment>::@class::A::@method::[]#element
+  element: <testLibrary>::@class::A::@method::[]
   staticType: bool
 ''');
   }
@@ -599,11 +599,11 @@
     literal: 1.2
     correspondingParameter: dart:core::<fragment>::@class::num::@method::+::@parameter::other#element
     staticType: double
-  readElement2: <testLibraryFragment>::@class::A::@method::[]#element
+  readElement2: <testLibrary>::@class::A::@method::[]
   readType: num
-  writeElement2: <testLibraryFragment>::@class::A::@method::[]=#element
+  writeElement2: <testLibrary>::@class::A::@method::[]=
   writeType: num
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticType: double
 ''');
   }
@@ -645,14 +645,14 @@
     correspondingParameter: dart:core::<fragment>::@class::double::@method::+::@parameter::other#element
     staticType: double
   readElement2: MethodMember
-    baseElement: <testLibraryFragment>::@class::A::@method::[]#element
+    baseElement: <testLibrary>::@class::A::@method::[]
     substitution: {T: double}
   readType: double
   writeElement2: MethodMember
-    baseElement: <testLibraryFragment>::@class::A::@method::[]=#element
+    baseElement: <testLibrary>::@class::A::@method::[]=
     substitution: {T: double}
   writeType: double
-  element: dart:core::<fragment>::@class::double::@method::+#element
+  element: dart:core::@class::double::@method::+
   staticType: double
 ''');
   }
@@ -692,11 +692,11 @@
     literal: 1.2
     correspondingParameter: dart:core::<fragment>::@class::num::@method::+::@parameter::other#element
     staticType: double
-  readElement2: <testLibraryFragment>::@class::A::@method::[]#element
+  readElement2: <testLibrary>::@class::A::@method::[]
   readType: num
-  writeElement2: <testLibraryFragment>::@class::A::@method::[]=#element
+  writeElement2: <testLibrary>::@class::A::@method::[]=
   writeType: num
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticType: double?
 ''');
   }
@@ -732,7 +732,7 @@
       correspondingParameter: <testLibraryFragment>::@class::A::@method::[]::@parameter::i#element
       staticType: int
     rightBracket: ]
-    element: <testLibraryFragment>::@class::A::@method::[]#element
+    element: <testLibrary>::@class::A::@method::[]
     staticType: T Function<T>(T)
   staticType: int Function(int)?
   typeArgumentTypes
@@ -775,7 +775,7 @@
     staticType: double
   readElement2: <null>
   readType: null
-  writeElement2: <testLibraryFragment>::@class::A::@method::[]=#element
+  writeElement2: <testLibrary>::@class::A::@method::[]=
   writeType: num
   element: <null>
   staticType: double
@@ -820,7 +820,7 @@
         staticType: A
       readElement2: <null>
       readType: null
-      writeElement2: <testLibraryFragment>::@class::A::@method::[]=#element
+      writeElement2: <testLibrary>::@class::A::@method::[]=
       writeType: A
       element: <null>
       staticType: A
@@ -843,7 +843,7 @@
         staticType: A
       readElement2: <null>
       readType: null
-      writeElement2: <testLibraryFragment>::@class::A::@method::[]=#element
+      writeElement2: <testLibrary>::@class::A::@method::[]=
       writeType: A
       element: <null>
       staticType: A
@@ -891,7 +891,7 @@
   readElement2: <null>
   readType: null
   writeElement2: MethodMember
-    baseElement: <testLibraryFragment>::@class::A::@method::[]=#element
+    baseElement: <testLibrary>::@class::A::@method::[]=
     substitution: {T: double}
   writeType: double
   element: <null>
@@ -935,7 +935,7 @@
     staticType: double
   readElement2: <null>
   readType: null
-  writeElement2: <testLibraryFragment>::@class::A::@method::[]=#element
+  writeElement2: <testLibrary>::@class::A::@method::[]=
   writeType: num
   element: <null>
   staticType: double?
@@ -975,7 +975,7 @@
     staticType: double
   readElement2: <null>
   readType: null
-  writeElement2: <testLibraryFragment>::@extension::E::@method::[]=#element
+  writeElement2: <testLibrary>::@extension::E::@method::[]=
   writeType: num
   element: <null>
   staticType: double
@@ -1096,7 +1096,7 @@
     staticType: double
   readElement2: <null>
   readType: null
-  writeElement2: <testLibraryFragment>::@class::A::@method::[]=#element
+  writeElement2: <testLibrary>::@class::A::@method::[]=
   writeType: num
   element: <null>
   staticType: double
diff --git a/pkg/analyzer/test/src/dart/resolution/method_invocation_test.dart b/pkg/analyzer/test/src/dart/resolution/method_invocation_test.dart
index 6433e99..5835d5e 100644
--- a/pkg/analyzer/test/src/dart/resolution/method_invocation_test.dart
+++ b/pkg/analyzer/test/src/dart/resolution/method_invocation_test.dart
@@ -118,7 +118,7 @@
       operator: ..
       methodName: SimpleIdentifier
         token: foo
-        element: <testLibraryFragment>::@class::A::@method::foo#element
+        element: <testLibrary>::@class::A::@method::foo
         staticType: void Function()
       argumentList: ArgumentList
         leftParenthesis: (
@@ -129,7 +129,7 @@
       operator: ..
       methodName: SimpleIdentifier
         token: bar
-        element: <testLibraryFragment>::@class::A::@method::bar#element
+        element: <testLibrary>::@class::A::@method::bar
         staticType: void Function()
       argumentList: ArgumentList
         leftParenthesis: (
@@ -167,7 +167,7 @@
         operator: .
         methodName: SimpleIdentifier
           token: clamp
-          element: dart:core::<fragment>::@class::num::@method::clamp#element
+          element: dart:core::@class::num::@method::clamp
           staticType: num Function(num, num)
         argumentList: ArgumentList
           leftParenthesis: (
@@ -238,7 +238,7 @@
         operator: .
         methodName: SimpleIdentifier
           token: clamp
-          element: dart:core::<fragment>::@class::num::@method::clamp#element
+          element: dart:core::@class::num::@method::clamp
           staticType: num Function(num, num)
         argumentList: ArgumentList
           leftParenthesis: (
@@ -297,7 +297,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: clamp
-    element: dart:core::<fragment>::@class::num::@method::clamp#element
+    element: dart:core::@class::num::@method::clamp
     staticType: num Function(num, num)
   argumentList: ArgumentList
     leftParenthesis: (
@@ -351,7 +351,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: clamp
-    element: dart:core::<fragment>::@class::num::@method::clamp#element
+    element: dart:core::@class::num::@method::clamp
     staticType: num Function(num, num)
   argumentList: ArgumentList
     leftParenthesis: (
@@ -389,7 +389,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: clamp
-    element: dart:core::<fragment>::@class::num::@method::clamp#element
+    element: dart:core::@class::num::@method::clamp
     staticType: num Function(num, num)
   argumentList: ArgumentList
     leftParenthesis: (
@@ -427,7 +427,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: clamp
-    element: dart:core::<fragment>::@class::num::@method::clamp#element
+    element: dart:core::@class::num::@method::clamp
     staticType: num Function(num, num)
   argumentList: ArgumentList
     leftParenthesis: (
@@ -465,7 +465,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: clamp
-    element: dart:core::<fragment>::@class::num::@method::clamp#element
+    element: dart:core::@class::num::@method::clamp
     staticType: num Function(num, num)
   argumentList: ArgumentList
     leftParenthesis: (
@@ -516,7 +516,7 @@
         operator: .
         methodName: SimpleIdentifier
           token: clamp
-          element: dart:core::<fragment>::@class::num::@method::clamp#element
+          element: dart:core::@class::num::@method::clamp
           staticType: num Function(num, num)
         argumentList: ArgumentList
           leftParenthesis: (
@@ -584,7 +584,7 @@
         operator: .
         methodName: SimpleIdentifier
           token: clamp
-          element: dart:core::<fragment>::@class::num::@method::clamp#element
+          element: dart:core::@class::num::@method::clamp
           staticType: num Function(num, num)
         argumentList: ArgumentList
           leftParenthesis: (
@@ -643,7 +643,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: clamp
-    element: dart:core::<fragment>::@class::num::@method::clamp#element
+    element: dart:core::@class::num::@method::clamp
     staticType: num Function(num, num)
   argumentList: ArgumentList
     leftParenthesis: (
@@ -697,7 +697,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: clamp
-    element: dart:core::<fragment>::@class::num::@method::clamp#element
+    element: dart:core::@class::num::@method::clamp
     staticType: num Function(num, num)
   argumentList: ArgumentList
     leftParenthesis: (
@@ -735,7 +735,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: clamp
-    element: dart:core::<fragment>::@class::num::@method::clamp#element
+    element: dart:core::@class::num::@method::clamp
     staticType: num Function(num, num)
   argumentList: ArgumentList
     leftParenthesis: (
@@ -773,7 +773,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: clamp
-    element: dart:core::<fragment>::@class::num::@method::clamp#element
+    element: dart:core::@class::num::@method::clamp
     staticType: num Function(num, num)
   argumentList: ArgumentList
     leftParenthesis: (
@@ -811,7 +811,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: clamp
-    element: dart:core::<fragment>::@class::num::@method::clamp#element
+    element: dart:core::@class::num::@method::clamp
     staticType: num Function(num, num)
   argumentList: ArgumentList
     leftParenthesis: (
@@ -849,7 +849,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: clamp
-    element: dart:core::<fragment>::@class::num::@method::clamp#element
+    element: dart:core::@class::num::@method::clamp
     staticType: num Function(num, num)
   argumentList: ArgumentList
     leftParenthesis: (
@@ -887,7 +887,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: clamp
-    element: dart:core::<fragment>::@class::num::@method::clamp#element
+    element: dart:core::@class::num::@method::clamp
     staticType: num Function(num, num)
   argumentList: ArgumentList
     leftParenthesis: (
@@ -925,7 +925,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: clamp
-    element: dart:core::<fragment>::@class::num::@method::clamp#element
+    element: dart:core::@class::num::@method::clamp
     staticType: num Function(num, num)
   argumentList: ArgumentList
     leftParenthesis: (
@@ -963,7 +963,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: clamp
-    element: dart:core::<fragment>::@class::num::@method::clamp#element
+    element: dart:core::@class::num::@method::clamp
     staticType: num Function(num, num)
   argumentList: ArgumentList
     leftParenthesis: (
@@ -997,7 +997,7 @@
   operator: ..
   methodName: SimpleIdentifier
     token: clamp
-    element: dart:core::<fragment>::@class::num::@method::clamp#element
+    element: dart:core::@class::num::@method::clamp
     staticType: num Function(num, num)
   argumentList: ArgumentList
     leftParenthesis: (
@@ -1048,7 +1048,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: clamp
-    element: <testLibraryFragment>::@extension::E::@method::clamp#element
+    element: <testLibrary>::@extension::E::@method::clamp
     staticType: String Function(int, int)
   argumentList: ArgumentList
     leftParenthesis: (
@@ -1086,7 +1086,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: clamp
-    element: dart:core::<fragment>::@class::num::@method::clamp#element
+    element: dart:core::@class::num::@method::clamp
     staticType: num Function(num, num)
   argumentList: ArgumentList
     leftParenthesis: (
@@ -1127,7 +1127,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: clamp
-    element: dart:core::<fragment>::@class::num::@method::clamp#element
+    element: dart:core::@class::num::@method::clamp
     staticType: num Function(num, num)
   argumentList: ArgumentList
     leftParenthesis: (
@@ -1225,7 +1225,7 @@
         operator: .
         methodName: SimpleIdentifier
           token: clamp
-          element: <testLibraryFragment>::@class::A::@method::clamp#element
+          element: <testLibrary>::@class::A::@method::clamp
           staticType: num Function(String, String)
         argumentList: ArgumentList
           leftParenthesis: (
@@ -1286,7 +1286,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: clamp
-    element: <testLibraryFragment>::@class::A::@method::clamp#element
+    element: <testLibrary>::@class::A::@method::clamp
     staticType: String Function(int, int)
   argumentList: ArgumentList
     leftParenthesis: (
@@ -1338,7 +1338,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: clamp
-    element: <testLibraryFragment>::@extension::E::@method::clamp#element
+    element: <testLibrary>::@extension::E::@method::clamp
     staticType: String Function(int, int)
   argumentList: ArgumentList
     leftParenthesis: (
@@ -1380,7 +1380,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: clamp
-    element: <testLibraryFragment>::@extension::E::@method::clamp#element
+    element: <testLibrary>::@extension::E::@method::clamp
     staticType: String Function(int, int)
   argumentList: ArgumentList
     leftParenthesis: (
@@ -1746,7 +1746,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: foo
-    element: <testLibraryFragment>::@class::A::@method::foo#element
+    element: <testLibrary>::@class::A::@method::foo
     staticType: void Function(int)
   argumentList: ArgumentList
     leftParenthesis: (
@@ -2775,7 +2775,7 @@
 MethodInvocation
   methodName: SimpleIdentifier
     token: foo
-    element: <testLibraryFragment>::@class::A::@method::foo#element
+    element: <testLibrary>::@class::A::@method::foo
     staticType: void Function()
   argumentList: ArgumentList
     leftParenthesis: (
@@ -3216,7 +3216,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: call
-    element: <testLibraryFragment>::@class::C::@method::call#element
+    element: <testLibrary>::@class::C::@method::call
     staticType: double Function(int)
   argumentList: ArgumentList
     leftParenthesis: (
@@ -3251,7 +3251,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: foo
-    element: <testLibraryFragment>::@extensionType::A::@method::foo#element
+    element: <testLibrary>::@extensionType::A::@method::foo
     staticType: void Function()
   argumentList: ArgumentList
     leftParenthesis: (
@@ -3277,7 +3277,7 @@
 MethodInvocation
   methodName: SimpleIdentifier
     token: foo
-    element: <testLibraryFragment>::@extensionType::A::@method::foo#element
+    element: <testLibrary>::@extensionType::A::@method::foo
     staticType: void Function()
   argumentList: ArgumentList
     leftParenthesis: (
@@ -3347,7 +3347,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: foo
-    element: <testLibraryFragment>::@class::C::@method::foo#element
+    element: <testLibrary>::@class::C::@method::foo
     staticType: void Function(int)
   argumentList: ArgumentList
     leftParenthesis: (
@@ -3518,7 +3518,7 @@
           correspondingParameter: dart:core::<fragment>::@class::num::@method::+::@parameter::other#element
           staticType: int
         correspondingParameter: <null>
-        element: dart:core::<fragment>::@class::num::@method::+#element
+        element: dart:core::@class::num::@method::+
         staticInvokeType: num Function(num)
         staticType: int
     rightParenthesis: )
@@ -3668,7 +3668,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: foo
-    element: <testLibraryFragment>::@extension::A::@method::foo#element
+    element: <testLibrary>::@extension::A::@method::foo
     staticType: void Function(int)
   argumentList: ArgumentList
     leftParenthesis: (
@@ -3745,7 +3745,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: foo
-    element: <testLibraryFragment>::@extensionType::A::@method::foo#element
+    element: <testLibrary>::@extensionType::A::@method::foo
     staticType: void Function()
   argumentList: ArgumentList
     leftParenthesis: (
@@ -4131,7 +4131,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: foo
-    element: <testLibraryFragment>::@class::C::@method::foo#element
+    element: <testLibrary>::@class::C::@method::foo
     staticType: void Function(int)
   argumentList: ArgumentList
     leftParenthesis: (
@@ -4169,7 +4169,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: foo
-    element: <testLibraryFragment>::@class::C::@method::foo#element
+    element: <testLibrary>::@class::C::@method::foo
     staticType: T Function<T>(T)
   argumentList: ArgumentList
     leftParenthesis: (
@@ -4219,7 +4219,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: foo
-    element: <testLibraryFragment>::@class::I2::@method::foo#element
+    element: <testLibrary>::@class::I2::@method::foo
     staticType: void Function(Object)
   argumentList: ArgumentList
     leftParenthesis: (
@@ -4258,7 +4258,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: foo
-    element: <testLibraryFragment>::@class::A::@method::foo#element
+    element: <testLibrary>::@class::A::@method::foo
     staticType: void Function(int)
   argumentList: ArgumentList
     leftParenthesis: (
@@ -4359,7 +4359,7 @@
     operator: ?.
     methodName: SimpleIdentifier
       token: foo
-      element: <testLibraryFragment>::@class::C::@method::foo#element
+      element: <testLibrary>::@class::C::@method::foo
       staticType: C Function()
     argumentList: ArgumentList
       leftParenthesis: (
@@ -4369,7 +4369,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: bar
-    element: <testLibraryFragment>::@class::C::@method::bar#element
+    element: <testLibrary>::@class::C::@method::bar
     staticType: C Function()
   argumentList: ArgumentList
     leftParenthesis: (
@@ -4525,7 +4525,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: foo
-    element: <testLibraryFragment>::@enum::E::@method::foo#element
+    element: <testLibrary>::@enum::E::@method::foo
     staticType: void Function()
   argumentList: ArgumentList
     leftParenthesis: (
@@ -4560,7 +4560,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: foo
-    element: <testLibraryFragment>::@mixin::M::@method::foo#element
+    element: <testLibrary>::@mixin::M::@method::foo
     staticType: void Function()
   argumentList: ArgumentList
     leftParenthesis: (
@@ -4591,7 +4591,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: foo
-    element: <testLibraryFragment>::@extensionType::A::@method::foo#element
+    element: <testLibrary>::@extensionType::A::@method::foo
     staticType: void Function()
   argumentList: ArgumentList
     leftParenthesis: (
@@ -4622,7 +4622,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: foo
-    element: <testLibraryFragment>::@extensionType::A::@method::foo#element
+    element: <testLibrary>::@extensionType::A::@method::foo
     staticType: void Function()
   argumentList: ArgumentList
     leftParenthesis: (
@@ -4662,7 +4662,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: foo
-    element: <testLibraryFragment>::@extensionType::A::@method::foo#element
+    element: <testLibrary>::@extensionType::A::@method::foo
     staticType: int Function()
   argumentList: ArgumentList
     leftParenthesis: (
@@ -4693,7 +4693,7 @@
   operator: ?.
   methodName: SimpleIdentifier
     token: foo
-    element: <testLibraryFragment>::@extensionType::A::@method::foo#element
+    element: <testLibrary>::@extensionType::A::@method::foo
     staticType: int Function()
   argumentList: ArgumentList
     leftParenthesis: (
@@ -4728,7 +4728,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: foo
-    element: <testLibraryFragment>::@class::A::@method::foo#element
+    element: <testLibrary>::@class::A::@method::foo
     staticType: void Function()
   argumentList: ArgumentList
     leftParenthesis: (
@@ -4801,7 +4801,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: foo
-    element: <testLibraryFragment>::@extensionType::X::@method::foo#element
+    element: <testLibrary>::@extensionType::X::@method::foo
     staticType: void Function()
   argumentList: ArgumentList
     leftParenthesis: (
@@ -4835,7 +4835,7 @@
   methodName: SimpleIdentifier
     token: foo
     element: MethodMember
-      baseElement: <testLibraryFragment>::@class::A::@method::foo#element
+      baseElement: <testLibrary>::@class::A::@method::foo
       substitution: {T: int}
     staticType: int Function()
   argumentList: ArgumentList
@@ -4869,7 +4869,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: foo
-    element: <testLibraryFragment>::@class::A::@method::foo#element
+    element: <testLibrary>::@class::A::@method::foo
     staticType: double Function()
   argumentList: ArgumentList
     leftParenthesis: (
@@ -4983,7 +4983,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: foo
-    element: <testLibraryFragment>::@extension::E::@method::foo#element
+    element: <testLibrary>::@extension::E::@method::foo
     staticType: void Function()
   argumentList: ArgumentList
     leftParenthesis: (
@@ -5069,7 +5069,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: toString
-    element: dart:core::<fragment>::@class::int::@method::toString#element
+    element: dart:core::@class::int::@method::toString
     staticType: String Function()
   argumentList: ArgumentList
     leftParenthesis: (
@@ -5109,7 +5109,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: foo
-    element: <testLibraryFragment>::@class::A::@method::foo#element
+    element: <testLibrary>::@class::A::@method::foo
     staticType: void Function()
   argumentList: ArgumentList
     leftParenthesis: (
@@ -5153,7 +5153,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: foo
-    element: <testLibraryFragment>::@class::A::@method::foo#element
+    element: <testLibrary>::@class::A::@method::foo
     staticType: void Function()
   argumentList: ArgumentList
     leftParenthesis: (
@@ -5188,7 +5188,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: foo
-    element: <testLibraryFragment>::@extension::E::@method::foo#element
+    element: <testLibrary>::@extension::E::@method::foo
     staticType: void Function()
   argumentList: ArgumentList
     leftParenthesis: (
@@ -5220,7 +5220,7 @@
   methodName: SimpleIdentifier
     token: foo
     element: MethodMember
-      baseElement: <testLibraryFragment>::@extension::E::@method::foo#element
+      baseElement: <testLibrary>::@extension::E::@method::foo
       substitution: {T: int}
     staticType: int Function()
   argumentList: ArgumentList
@@ -5334,7 +5334,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: foo
-    element: <testLibraryFragment>::@extension::E::@method::foo#element
+    element: <testLibrary>::@extension::E::@method::foo
     staticType: void Function()
   argumentList: ArgumentList
     leftParenthesis: (
@@ -5428,7 +5428,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: foo
-    element: package:test/a.dart::<fragment>::@class::C::@method::foo#element
+    element: package:test/a.dart::@class::C::@method::foo
     staticType: void Function(int)
   argumentList: ArgumentList
     leftParenthesis: (
@@ -5464,7 +5464,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: foo
-    element: <testLibraryFragment>::@extension::E::@method::foo#element
+    element: <testLibrary>::@extension::E::@method::foo
     staticType: void Function(int)
   argumentList: ArgumentList
     leftParenthesis: (
@@ -5500,7 +5500,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: foo
-    element: <testLibraryFragment>::@extension::E::@method::foo#element
+    element: <testLibrary>::@extension::E::@method::foo
     staticType: void Function(int)
   argumentList: ArgumentList
     leftParenthesis: (
@@ -5580,7 +5580,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: foo
-    element: <testLibraryFragment>::@class::A::@method::foo#element
+    element: <testLibrary>::@class::A::@method::foo
     staticType: int Function()
   argumentList: ArgumentList
     leftParenthesis: (
@@ -5612,7 +5612,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: foo
-    element: <testLibraryFragment>::@class::A::@method::foo#element
+    element: <testLibrary>::@class::A::@method::foo
     staticType: void Function()
   argumentList: ArgumentList
     leftParenthesis: (
@@ -5775,7 +5775,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: foo
-    element: <testLibraryFragment>::@class::A::@method::foo#element
+    element: <testLibrary>::@class::A::@method::foo
     staticType: void Function(int)
   argumentList: ArgumentList
     leftParenthesis: (
@@ -5810,7 +5810,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: foo
-    element: <testLibraryFragment>::@class::A::@method::foo#element
+    element: <testLibrary>::@class::A::@method::foo
     staticType: int Function()
   argumentList: ArgumentList
     leftParenthesis: (
@@ -5842,7 +5842,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: foo
-    element: <testLibraryFragment>::@class::A::@method::foo#element
+    element: <testLibrary>::@class::A::@method::foo
     staticType: void Function()
   argumentList: ArgumentList
     leftParenthesis: (
@@ -5875,7 +5875,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: foo
-    element: <testLibraryFragment>::@class::A::@method::foo#element
+    element: <testLibrary>::@class::A::@method::foo
     staticType: void Function(int)
   argumentList: ArgumentList
     leftParenthesis: (
@@ -5913,7 +5913,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: foo
-    element: <testLibraryFragment>::@class::A::@method::foo#element
+    element: <testLibrary>::@class::A::@method::foo
     staticType: void Function(int)
   argumentList: ArgumentList
     leftParenthesis: (
@@ -5947,7 +5947,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: abs
-    element: dart:core::<fragment>::@class::int::@method::abs#element
+    element: dart:core::@class::int::@method::abs
     staticType: int Function()
   argumentList: ArgumentList
     leftParenthesis: (
@@ -5982,7 +5982,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: foo
-    element: <testLibraryFragment>::@class::B::@method::foo#element
+    element: <testLibrary>::@class::B::@method::foo
     staticType: void Function()
   argumentList: ArgumentList
     leftParenthesis: (
@@ -6263,7 +6263,7 @@
 MethodInvocation
   methodName: SimpleIdentifier
     token: foo
-    element: <testLibraryFragment>::@class::A::@method::foo#element
+    element: <testLibrary>::@class::A::@method::foo
     staticType: void Function(int)
   argumentList: ArgumentList
     leftParenthesis: (
@@ -6294,7 +6294,7 @@
 MethodInvocation
   methodName: SimpleIdentifier
     token: foo
-    element: <testLibraryFragment>::@class::A::@method::foo#element
+    element: <testLibrary>::@class::A::@method::foo
     staticType: E Function<E>(A<E>)
   argumentList: ArgumentList
     leftParenthesis: (
@@ -6448,7 +6448,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: foo
-    element: <testLibraryFragment>::@class::A::@method::foo#element
+    element: <testLibrary>::@class::A::@method::foo
     staticType: int Function(int)
   argumentList: ArgumentList
     leftParenthesis: (
@@ -6481,7 +6481,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: codeUnitAt
-    element: dart:core::<fragment>::@class::String::@method::codeUnitAt#element
+    element: dart:core::@class::String::@method::codeUnitAt
     staticType: int Function(int)
   argumentList: ArgumentList
     leftParenthesis: (
@@ -7063,7 +7063,7 @@
         correspondingParameter: <testLibraryFragment>::@class::C::@method::call::@parameter::_#element
         staticType: int
     rightParenthesis: )
-  element: <testLibraryFragment>::@class::C::@method::call#element
+  element: <testLibrary>::@class::C::@method::call
   staticInvokeType: void Function(int)
   staticType: void
 ''');
@@ -7118,7 +7118,7 @@
 MethodInvocation
   methodName: SimpleIdentifier
     token: foo
-    element: <testLibraryFragment>::@class::A::@method::foo#element
+    element: <testLibrary>::@class::A::@method::foo
     staticType: void Function(int)
   argumentList: ArgumentList
     leftParenthesis: (
@@ -7149,7 +7149,7 @@
 MethodInvocation
   methodName: SimpleIdentifier
     token: foo
-    element: <testLibraryFragment>::@class::C::@method::foo#element
+    element: <testLibrary>::@class::C::@method::foo
     staticType: void Function(int)
   argumentList: ArgumentList
     leftParenthesis: (
@@ -7366,7 +7366,7 @@
       operator: ?..
       methodName: SimpleIdentifier
         token: foo
-        element: <testLibraryFragment>::@class::A::@method::foo#element
+        element: <testLibrary>::@class::A::@method::foo
         staticType: int Function()
       argumentList: ArgumentList
         leftParenthesis: (
@@ -7377,7 +7377,7 @@
       operator: ..
       methodName: SimpleIdentifier
         token: bar
-        element: <testLibraryFragment>::@class::A::@method::bar#element
+        element: <testLibrary>::@class::A::@method::bar
         staticType: int Function()
       argumentList: ArgumentList
         leftParenthesis: (
@@ -7419,7 +7419,7 @@
       operator: ..
       methodName: SimpleIdentifier
         token: bar
-        element: <testLibraryFragment>::@class::A::@method::bar#element
+        element: <testLibrary>::@class::A::@method::bar
         staticType: int Function()
       argumentList: ArgumentList
         leftParenthesis: (
@@ -7462,7 +7462,7 @@
         operator: ..
         methodName: SimpleIdentifier
           token: foo
-          element: <testLibraryFragment>::@class::A::@method::foo#element
+          element: <testLibrary>::@class::A::@method::foo
           staticType: int? Function()
         argumentList: ArgumentList
           leftParenthesis: (
@@ -7472,7 +7472,7 @@
       operator: ?.
       methodName: SimpleIdentifier
         token: abs
-        element: dart:core::<fragment>::@class::int::@method::abs#element
+        element: dart:core::@class::int::@method::abs
         staticType: int Function()
       argumentList: ArgumentList
         leftParenthesis: (
@@ -7533,7 +7533,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: toString
-    element: dart:core::<fragment>::@class::Object::@method::toString#element
+    element: dart:core::@class::Object::@method::toString
     staticType: String Function()
   argumentList: ArgumentList
     leftParenthesis: (
@@ -7562,7 +7562,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: toString
-    element: dart:core::<fragment>::@class::Object::@method::toString#element
+    element: dart:core::@class::Object::@method::toString
     staticType: String Function()
   argumentList: ArgumentList
     leftParenthesis: (
@@ -7746,7 +7746,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: remainder
-    element: dart:core::<fragment>::@class::num::@method::remainder#element
+    element: dart:core::@class::num::@method::remainder
     staticType: num Function(num)
   argumentList: ArgumentList
     leftParenthesis: (
@@ -7779,7 +7779,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: remainder
-    element: dart:core::<fragment>::@class::num::@method::remainder#element
+    element: dart:core::@class::num::@method::remainder
     staticType: num Function(num)
   argumentList: ArgumentList
     leftParenthesis: (
@@ -7819,7 +7819,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: remainder
-    element: dart:core::<fragment>::@class::num::@method::remainder#element
+    element: dart:core::@class::num::@method::remainder
     staticType: num Function(num)
   argumentList: ArgumentList
     leftParenthesis: (
@@ -8042,7 +8042,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: foo
-    element: <testLibraryFragment>::@mixin::M::@method::foo#element
+    element: <testLibrary>::@mixin::M::@method::foo
     staticType: void Function()
   argumentList: ArgumentList
     leftParenthesis: (
@@ -8201,7 +8201,7 @@
           correspondingParameter: dart:core::<fragment>::@class::num::@method::+::@parameter::other#element
           staticType: int
         correspondingParameter: <null>
-        element: dart:core::<fragment>::@class::num::@method::+#element
+        element: dart:core::@class::num::@method::+
         staticInvokeType: num Function(num)
         staticType: int
       ListLiteral
diff --git a/pkg/analyzer/test/src/dart/resolution/mixin_test.dart b/pkg/analyzer/test/src/dart/resolution/mixin_test.dart
index 972fc89..d432084 100644
--- a/pkg/analyzer/test/src/dart/resolution/mixin_test.dart
+++ b/pkg/analyzer/test/src/dart/resolution/mixin_test.dart
@@ -376,7 +376,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: foo
-    element: <testLibraryFragment>::@class::A::@method::foo#element
+    element: <testLibrary>::@class::A::@method::foo
     staticType: void Function(int)
   argumentList: ArgumentList
     leftParenthesis: (
diff --git a/pkg/analyzer/test/src/dart/resolution/object_pattern_test.dart b/pkg/analyzer/test/src/dart/resolution/object_pattern_test.dart
index d5a32fb..132900a 100644
--- a/pkg/analyzer/test/src/dart/resolution/object_pattern_test.dart
+++ b/pkg/analyzer/test/src/dart/resolution/object_pattern_test.dart
@@ -303,7 +303,7 @@
         declaredElement: hasImplicitType y@83
           type: void Function()
         matchedValueType: void Function()
-      element2: <testLibraryFragment>::@class::A::@method::foo#element
+      element2: <testLibrary>::@class::A::@method::foo
   rightParenthesis: )
   matchedValueType: dynamic
 ''');
@@ -346,7 +346,7 @@
         declaredElement: hasImplicitType y@97
           type: void Function()
         matchedValueType: void Function()
-      element2: <testLibraryFragment>::@extension::E::@method::foo#element
+      element2: <testLibrary>::@extension::E::@method::foo
   rightParenthesis: )
   matchedValueType: dynamic
 ''');
diff --git a/pkg/analyzer/test/src/dart/resolution/postfix_expression_test.dart b/pkg/analyzer/test/src/dart/resolution/postfix_expression_test.dart
index baa9067..a1fc3f7 100644
--- a/pkg/analyzer/test/src/dart/resolution/postfix_expression_test.dart
+++ b/pkg/analyzer/test/src/dart/resolution/postfix_expression_test.dart
@@ -65,7 +65,7 @@
   readType: int
   writeElement2: <testLibraryFragment>::@function::f::@parameter::x#element
   writeType: int
-  element: dart:core::<fragment>::@class::num::@method::-#element
+  element: dart:core::@class::num::@method::-
   staticType: int
 ''');
   }
@@ -93,7 +93,7 @@
     readType: int
     writeElement2: <testLibraryFragment>::@function::f::@parameter::x#element
     writeType: int
-    element: dart:core::<fragment>::@class::num::@method::+#element
+    element: dart:core::@class::num::@method::+
     staticType: int
   operator: ++
   readElement2: <null>
@@ -182,7 +182,7 @@
     readType: int
     writeElement2: <testLibraryFragment>::@function::f::@parameter::x#element
     writeType: int
-    element: dart:core::<fragment>::@class::num::@method::+#element
+    element: dart:core::@class::num::@method::+
     staticType: int
   readElement2: <null>
   readType: InvalidType
@@ -222,11 +222,11 @@
     element: <null>
     staticType: null
   operator: ++
-  readElement2: <testLibraryFragment>::@class::A::@method::[]#element
+  readElement2: <testLibrary>::@class::A::@method::[]
   readType: int
-  writeElement2: <testLibraryFragment>::@class::A::@method::[]=#element
+  writeElement2: <testLibrary>::@class::A::@method::[]=
   writeType: num
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticType: int
 ''');
   }
@@ -261,11 +261,11 @@
     element: <null>
     staticType: null
   operator: ++
-  readElement2: <testLibraryFragment>::@class::A::@method::[]#element
+  readElement2: <testLibrary>::@class::A::@method::[]
   readType: int
-  writeElement2: <testLibraryFragment>::@class::A::@method::[]=#element
+  writeElement2: <testLibrary>::@class::A::@method::[]=
   writeType: num
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticType: int
 ''');
   }
@@ -298,11 +298,11 @@
     element: <null>
     staticType: null
   operator: ++
-  readElement2: <testLibraryFragment>::@class::A::@method::[]#element
+  readElement2: <testLibrary>::@class::A::@method::[]
   readType: int
-  writeElement2: <testLibraryFragment>::@class::A::@method::[]=#element
+  writeElement2: <testLibrary>::@class::A::@method::[]=
   writeType: num
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticType: int
 ''');
   }
@@ -423,7 +423,7 @@
   readType: int
   writeElement2: <testLibraryFragment>::@extensionType::A::@setter::foo#element
   writeType: int
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticType: int
 ''');
   }
@@ -459,7 +459,7 @@
   readType: int
   writeElement2: <testLibraryFragment>::@class::A::@setter::x#element
   writeType: int
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticType: int
 ''');
   }
@@ -496,7 +496,7 @@
   readType: int
   writeElement2: package:test/a.dart::<fragment>::@setter::x#element
   writeType: int
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticType: int
 ''');
   }
@@ -538,7 +538,7 @@
   readType: int
   writeElement2: <testLibraryFragment>::@class::A::@setter::x#element
   writeType: int
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticType: int
 ''');
   }
@@ -572,7 +572,7 @@
   readType: int
   writeElement2: <testLibraryFragment>::@class::A::@setter::foo#element
   writeType: int
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticType: int?
 ''');
   }
@@ -612,7 +612,7 @@
   readType: int
   writeElement2: <testLibraryFragment>::@class::A::@setter::x#element
   writeType: num
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticType: int
 ''');
   }
@@ -647,7 +647,7 @@
   readType: int
   writeElement2: <testLibraryFragment>::@class::A::@setter::x#element
   writeType: num
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticType: int
 ''');
   }
@@ -677,7 +677,7 @@
   readType: A
   writeElement2: <testLibraryFragment>::@function::f::@parameter::x#element
   writeType: Object
-  element: <testLibraryFragment>::@class::A::@method::+#element
+  element: <testLibrary>::@class::A::@method::+
   staticType: A
 ''');
 
@@ -703,7 +703,7 @@
   readType: double
   writeElement2: <testLibraryFragment>::@function::f::@parameter::x#element
   writeType: double
-  element: dart:core::<fragment>::@class::double::@method::+#element
+  element: dart:core::@class::double::@method::+
   staticType: double
 ''');
   }
@@ -727,7 +727,7 @@
   readType: int
   writeElement2: <testLibraryFragment>::@function::f::@parameter::x#element
   writeType: int
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticType: int
 ''');
   }
@@ -751,7 +751,7 @@
   readType: num
   writeElement2: <testLibraryFragment>::@function::f::@parameter::x#element
   writeType: num
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticType: num
 ''');
   }
@@ -782,7 +782,7 @@
   readType: int
   writeElement2: <testLibraryFragment>::@class::A::@setter::x#element
   writeType: num
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticType: int
 ''');
   }
@@ -810,7 +810,7 @@
   readType: int
   writeElement2: <testLibraryFragment>::@setter::x#element
   writeType: num
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticType: int
 ''');
   }
@@ -840,7 +840,7 @@
   readType: int
   writeElement2: <testLibraryFragment>::@setter::x#element
   writeType: num
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticType: int
 ''');
   }
@@ -992,7 +992,7 @@
     literal: 'foo'
   rightBracket: ]
   element: MethodMember
-    baseElement: dart:core::<fragment>::@class::Map::@method::[]#element
+    baseElement: dart:core::@class::Map::@method::[]
     substitution: {K: String, V: int}
   staticType: int?
 ''');
@@ -1009,7 +1009,7 @@
       literal: 'foo'
     rightBracket: ]
     element: MethodMember
-      baseElement: dart:core::<fragment>::@class::Map::@method::[]#element
+      baseElement: dart:core::@class::Map::@method::[]
       substitution: {K: String, V: int}
     staticType: int?
   operator: !
diff --git a/pkg/analyzer/test/src/dart/resolution/prefix_expression_test.dart b/pkg/analyzer/test/src/dart/resolution/prefix_expression_test.dart
index be5c6d9..07adcfb 100644
--- a/pkg/analyzer/test/src/dart/resolution/prefix_expression_test.dart
+++ b/pkg/analyzer/test/src/dart/resolution/prefix_expression_test.dart
@@ -177,7 +177,7 @@
     readType: int
     writeElement2: <testLibraryFragment>::@function::f::@parameter::x#element
     writeType: int
-    element: dart:core::<fragment>::@class::num::@method::+#element
+    element: dart:core::@class::num::@method::+
     staticType: int
   readElement2: <null>
   readType: InvalidType
@@ -246,11 +246,11 @@
     rightBracket: ]
     element: <null>
     staticType: null
-  readElement2: <testLibraryFragment>::@class::A::@method::[]#element
+  readElement2: <testLibrary>::@class::A::@method::[]
   readType: int
-  writeElement2: <testLibraryFragment>::@class::A::@method::[]=#element
+  writeElement2: <testLibrary>::@class::A::@method::[]=
   writeType: num
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticType: int
 ''');
   }
@@ -285,11 +285,11 @@
     rightBracket: ]
     element: <null>
     staticType: null
-  readElement2: <testLibraryFragment>::@class::A::@method::[]#element
+  readElement2: <testLibrary>::@class::A::@method::[]
   readType: int
-  writeElement2: <testLibraryFragment>::@class::A::@method::[]=#element
+  writeElement2: <testLibrary>::@class::A::@method::[]=
   writeType: num
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticType: int
 ''');
   }
@@ -322,11 +322,11 @@
     rightBracket: ]
     element: <null>
     staticType: null
-  readElement2: <testLibraryFragment>::@class::A::@method::[]#element
+  readElement2: <testLibrary>::@class::A::@method::[]
   readType: int
-  writeElement2: <testLibraryFragment>::@class::A::@method::[]=#element
+  writeElement2: <testLibrary>::@class::A::@method::[]=
   writeType: num
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticType: int
 ''');
   }
@@ -591,7 +591,7 @@
       element: <testLibraryFragment>::@class::A::@getter::foo#element
       staticType: int
     staticType: int?
-  element: dart:core::<fragment>::@class::int::@method::unary-#element
+  element: dart:core::@class::int::@method::unary-
   staticType: int
 ''');
   }
@@ -611,7 +611,7 @@
     token: x
     element: <testLibraryFragment>::@function::f::@parameter::x#element
     staticType: int
-  element: dart:core::<fragment>::@class::int::@method::unary-#element
+  element: dart:core::@class::int::@method::unary-
   staticType: int
 ''');
   }
@@ -640,7 +640,7 @@
   readType: A
   writeElement2: <testLibraryFragment>::@function::f::@parameter::x#element
   writeType: Object
-  element: <testLibraryFragment>::@class::A::@method::+#element
+  element: <testLibrary>::@class::A::@method::+
   staticType: Object
 ''');
   }
@@ -685,7 +685,7 @@
   readType: InvalidType
   writeElement2: <null>
   writeType: InvalidType
-  element: <testLibraryFragment>::@extension::Ext::@method::+#element
+  element: <testLibrary>::@extension::Ext::@method::+
   staticType: InvalidType
 ''');
   }
@@ -746,7 +746,7 @@
   readType: int
   writeElement2: <testLibraryFragment>::@class::A::@setter::foo#element
   writeType: int
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticType: int?
 ''');
   }
@@ -783,7 +783,7 @@
   readType: int
   writeElement2: <testLibraryFragment>::@extensionType::A::@setter::foo#element
   writeType: int
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticType: int
 ''');
   }
@@ -819,7 +819,7 @@
   readType: int
   writeElement2: <testLibraryFragment>::@class::A::@setter::x#element
   writeType: int
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticType: int
 ''');
   }
@@ -856,7 +856,7 @@
   readType: int
   writeElement2: package:test/a.dart::<fragment>::@setter::x#element
   writeType: int
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticType: int
 ''');
   }
@@ -898,7 +898,7 @@
   readType: int
   writeElement2: <testLibraryFragment>::@class::A::@setter::x#element
   writeType: int
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticType: int
 ''');
   }
@@ -938,7 +938,7 @@
   readType: int
   writeElement2: <testLibraryFragment>::@class::A::@setter::x#element
   writeType: num
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticType: int
 ''');
   }
@@ -973,7 +973,7 @@
   readType: int
   writeElement2: <testLibraryFragment>::@class::A::@setter::x#element
   writeType: num
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticType: int
 ''');
   }
@@ -997,7 +997,7 @@
   readType: double
   writeElement2: <testLibraryFragment>::@function::f::@parameter::x#element
   writeType: double
-  element: dart:core::<fragment>::@class::double::@method::+#element
+  element: dart:core::@class::double::@method::+
   staticType: double
 ''');
   }
@@ -1021,7 +1021,7 @@
   readType: int
   writeElement2: <testLibraryFragment>::@function::f::@parameter::x#element
   writeType: int
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticType: int
 ''');
   }
@@ -1045,7 +1045,7 @@
   readType: num
   writeElement2: <testLibraryFragment>::@function::f::@parameter::x#element
   writeType: num
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticType: num
 ''');
   }
@@ -1072,7 +1072,7 @@
   readType: T
   writeElement2: <testLibraryFragment>::@function::f::@parameter::x#element
   writeType: T
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticType: num
 ''');
   }
@@ -1103,7 +1103,7 @@
   readType: int
   writeElement2: <testLibraryFragment>::@class::A::@setter::x#element
   writeType: num
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticType: int
 ''');
   }
@@ -1131,7 +1131,7 @@
   readType: int
   writeElement2: <testLibraryFragment>::@class::A::@setter::x#element
   writeType: num
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticType: int
 ''');
   }
@@ -1159,7 +1159,7 @@
   readType: int
   writeElement2: <testLibraryFragment>::@setter::x#element
   writeType: num
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticType: int
 ''');
   }
@@ -1189,7 +1189,7 @@
   readType: int
   writeElement2: <testLibraryFragment>::@setter::x#element
   writeType: num
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticType: int
 ''');
   }
@@ -1291,7 +1291,7 @@
   readType: int
   writeElement2: <testLibraryFragment>::@setter::x#element
   writeType: int
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticType: int
 ''');
   }
@@ -1368,7 +1368,7 @@
       element: <testLibraryFragment>::@class::A::@getter::foo#element
       staticType: int
     staticType: int?
-  element: dart:core::<fragment>::@class::int::@method::~#element
+  element: dart:core::@class::int::@method::~
   staticType: int
 ''');
   }
@@ -1388,7 +1388,7 @@
     token: x
     element: <testLibraryFragment>::@function::f::@parameter::x#element
     staticType: int
-  element: dart:core::<fragment>::@class::int::@method::~#element
+  element: dart:core::@class::int::@method::~
   staticType: int
 ''');
   }
diff --git a/pkg/analyzer/test/src/dart/resolution/prefixed_identifier_test.dart b/pkg/analyzer/test/src/dart/resolution/prefixed_identifier_test.dart
index 2065658..aff6a21 100644
--- a/pkg/analyzer/test/src/dart/resolution/prefixed_identifier_test.dart
+++ b/pkg/analyzer/test/src/dart/resolution/prefixed_identifier_test.dart
@@ -64,9 +64,9 @@
   period: .
   identifier: SimpleIdentifier
     token: foo
-    element: <testLibraryFragment>::@class::A::@method::foo#element
+    element: <testLibrary>::@class::A::@method::foo
     staticType: void Function<U>(int, U)
-  element: <testLibraryFragment>::@class::A::@method::foo#element
+  element: <testLibrary>::@class::A::@method::foo
   staticType: void Function<U>(int, U)
 ''');
   }
@@ -92,9 +92,9 @@
   period: .
   identifier: SimpleIdentifier
     token: foo
-    element: <testLibraryFragment>::@class::A::@method::foo#element
+    element: <testLibrary>::@class::A::@method::foo
     staticType: void Function(int)
-  element: <testLibraryFragment>::@class::A::@method::foo#element
+  element: <testLibrary>::@class::A::@method::foo
   staticType: void Function(int)
 ''');
   }
@@ -164,7 +164,7 @@
   readType: int
   writeElement2: <testLibraryFragment>::@class::A::@setter::foo#element
   writeType: int
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticType: int
 ''');
   }
diff --git a/pkg/analyzer/test/src/dart/resolution/property_access_test.dart b/pkg/analyzer/test/src/dart/resolution/property_access_test.dart
index 22a2ee1..8a027bc 100644
--- a/pkg/analyzer/test/src/dart/resolution/property_access_test.dart
+++ b/pkg/analyzer/test/src/dart/resolution/property_access_test.dart
@@ -103,7 +103,7 @@
   readType: int
   writeElement2: <testLibraryFragment>::@extension::E::@setter::foo#element
   writeType: num
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticType: int
 ''');
   }
@@ -407,7 +407,7 @@
   operator: .
   propertyName: SimpleIdentifier
     token: foo
-    element: <testLibraryFragment>::@class::A::@method::foo#element
+    element: <testLibrary>::@class::A::@method::foo
     staticType: void Function(int)
   staticType: void Function(int)
 ''');
@@ -492,7 +492,7 @@
   operator: .
   propertyName: SimpleIdentifier
     token: foo
-    element: <testLibraryFragment>::@class::A::@method::foo#element
+    element: <testLibrary>::@class::A::@method::foo
     staticType: void Function(int)
   staticType: void Function(int)
 ''');
@@ -629,7 +629,7 @@
   readType: int
   writeElement2: <testLibraryFragment>::@class::A::@setter::foo#element
   writeType: int
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticType: int
 ''');
   }
@@ -1193,7 +1193,7 @@
   operator: .
   propertyName: SimpleIdentifier
     token: toString
-    element: dart:core::<fragment>::@class::Object::@method::toString#element
+    element: dart:core::@class::Object::@method::toString
     staticType: String Function()
   staticType: String Function()
 ''');
@@ -1596,7 +1596,7 @@
   readType: int
   writeElement2: <testLibraryFragment>::@extension::E::@setter::foo#element
   writeType: num
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticType: int
 ''');
   }
@@ -2497,7 +2497,7 @@
   readType: int
   writeElement2: <testLibraryFragment>::@class::A::@setter::foo#element
   writeType: int
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticType: int
 ''');
   }
@@ -2624,7 +2624,7 @@
     assertResolvedNodeText(identifier, r'''
 SimpleIdentifier
   token: foo
-  element: <testLibraryFragment>::@class::A::@method::foo#element
+  element: <testLibrary>::@class::A::@method::foo
   staticType: void Function(int)
 ''');
   }
diff --git a/pkg/analyzer/test/src/dart/resolution/record_literal_test.dart b/pkg/analyzer/test/src/dart/resolution/record_literal_test.dart
index 3de23de..479a6fb 100644
--- a/pkg/analyzer/test/src/dart/resolution/record_literal_test.dart
+++ b/pkg/analyzer/test/src/dart/resolution/record_literal_test.dart
@@ -131,7 +131,7 @@
           token: a
           element: <testLibraryFragment>::@getter::a#element
           staticType: A
-        element: <testLibraryFragment>::@class::A::@method::call#element
+        element: <testLibrary>::@class::A::@method::call
         staticType: void Function()
   rightParenthesis: )
   staticType: ({void Function() f1})
@@ -158,7 +158,7 @@
         token: a
         element: <testLibraryFragment>::@getter::a#element
         staticType: A
-      element: <testLibraryFragment>::@class::A::@method::call#element
+      element: <testLibrary>::@class::A::@method::call
       staticType: void Function()
   rightParenthesis: )
   staticType: (void Function(),)
diff --git a/pkg/analyzer/test/src/dart/resolution/relational_pattern_test.dart b/pkg/analyzer/test/src/dart/resolution/relational_pattern_test.dart
index 74d3c7c..31e1694 100644
--- a/pkg/analyzer/test/src/dart/resolution/relational_pattern_test.dart
+++ b/pkg/analyzer/test/src/dart/resolution/relational_pattern_test.dart
@@ -35,7 +35,7 @@
   operand: IntegerLiteral
     literal: 0
     staticType: int
-  element2: <testLibraryFragment>::@class::A::@method::==#element
+  element2: <testLibrary>::@class::A::@method::==
   matchedValueType: A
 ''');
   }
@@ -58,7 +58,7 @@
   operand: IntegerLiteral
     literal: 0
     staticType: int
-  element2: dart:core::<fragment>::@class::Object::@method::==#element
+  element2: dart:core::@class::Object::@method::==
   matchedValueType: A
 ''');
   }
@@ -83,7 +83,7 @@
   operand: IntegerLiteral
     literal: 0
     staticType: int
-  element2: <testLibraryFragment>::@class::A::@method::>#element
+  element2: <testLibrary>::@class::A::@method::>
   matchedValueType: A
 ''');
   }
@@ -110,7 +110,7 @@
   operand: IntegerLiteral
     literal: 0
     staticType: int
-  element2: <testLibraryFragment>::@extension::E::@method::>#element
+  element2: <testLibrary>::@extension::E::@method::>
   matchedValueType: A
 ''');
   }
@@ -161,7 +161,7 @@
   operand: IntegerLiteral
     literal: 0
     staticType: int
-  element2: <testLibraryFragment>::@class::A::@method::>=#element
+  element2: <testLibrary>::@class::A::@method::>=
   matchedValueType: A
 ''');
   }
@@ -188,7 +188,7 @@
   operand: IntegerLiteral
     literal: 0
     staticType: int
-  element2: <testLibraryFragment>::@extension::E::@method::>=#element
+  element2: <testLibrary>::@extension::E::@method::>=
   matchedValueType: A
 ''');
   }
@@ -236,7 +236,7 @@
   operand: IntegerLiteral
     literal: 0
     staticType: int
-  element2: <testLibraryFragment>::@class::A::@method::==#element
+  element2: <testLibrary>::@class::A::@method::==
   matchedValueType: A
 ''');
   }
@@ -261,7 +261,7 @@
   operand: IntegerLiteral
     literal: 0
     staticType: int
-  element2: <testLibraryFragment>::@class::A::@method::<#element
+  element2: <testLibrary>::@class::A::@method::<
   matchedValueType: A
 ''');
   }
@@ -288,7 +288,7 @@
   operand: IntegerLiteral
     literal: 0
     staticType: int
-  element2: <testLibraryFragment>::@extension::E::@method::<#element
+  element2: <testLibrary>::@extension::E::@method::<
   matchedValueType: A
 ''');
   }
@@ -339,7 +339,7 @@
   operand: IntegerLiteral
     literal: 0
     staticType: int
-  element2: <testLibraryFragment>::@class::A::@method::<=#element
+  element2: <testLibrary>::@class::A::@method::<=
   matchedValueType: A
 ''');
   }
@@ -366,7 +366,7 @@
   operand: IntegerLiteral
     literal: 0
     staticType: int
-  element2: <testLibraryFragment>::@extension::E::@method::<=#element
+  element2: <testLibrary>::@extension::E::@method::<=
   matchedValueType: A
 ''');
   }
@@ -417,7 +417,7 @@
   operand: IntegerLiteral
     literal: 0
     staticType: int
-  element2: <testLibraryFragment>::@class::A::@method::==#element
+  element2: <testLibrary>::@class::A::@method::==
   matchedValueType: A
 ''');
   }
@@ -440,7 +440,7 @@
   operand: IntegerLiteral
     literal: 0
     staticType: int
-  element2: dart:core::<fragment>::@class::Object::@method::==#element
+  element2: dart:core::@class::Object::@method::==
   matchedValueType: A
 ''');
   }
@@ -478,7 +478,7 @@
     element: <null>
     staticInvokeType: int Function()
     staticType: int
-  element2: dart:core::<fragment>::@class::Object::@method::==#element
+  element2: dart:core::@class::Object::@method::==
   matchedValueType: dynamic
 ''');
   }
@@ -503,7 +503,7 @@
   operand: IntegerLiteral
     literal: 0
     staticType: int
-  element2: <testLibraryFragment>::@class::A::@method::==#element
+  element2: <testLibrary>::@class::A::@method::==
   matchedValueType: A
 ''');
   }
diff --git a/pkg/analyzer/test/src/dart/resolution/simple_identifier_test.dart b/pkg/analyzer/test/src/dart/resolution/simple_identifier_test.dart
index 6154d40..8ba0b8f 100644
--- a/pkg/analyzer/test/src/dart/resolution/simple_identifier_test.dart
+++ b/pkg/analyzer/test/src/dart/resolution/simple_identifier_test.dart
@@ -784,7 +784,7 @@
     assertResolvedNodeText(identifier, r'''
 SimpleIdentifier
   token: foo
-  element: <testLibraryFragment>::@class::A::@method::foo#element
+  element: <testLibrary>::@class::A::@method::foo
   staticType: void Function(int)
 ''');
   }
diff --git a/pkg/analyzer/test/src/dart/resolution/switch_expression_test.dart b/pkg/analyzer/test/src/dart/resolution/switch_expression_test.dart
index f0224c9..4968f47 100644
--- a/pkg/analyzer/test/src/dart/resolution/switch_expression_test.dart
+++ b/pkg/analyzer/test/src/dart/resolution/switch_expression_test.dart
@@ -130,7 +130,7 @@
       expression: MethodInvocation
         methodName: SimpleIdentifier
           token: foo
-          element: <testLibraryFragment>::@class::A::@method::foo#element
+          element: <testLibrary>::@class::A::@method::foo
           staticType: T Function<T>()
         argumentList: ArgumentList
           leftParenthesis: (
@@ -654,7 +654,7 @@
                 token: a
                 element: a@58
                 staticType: int
-              element2: dart:core::<fragment>::@class::Object::@method::==#element
+              element2: dart:core::@class::Object::@method::==
               matchedValueType: Object?
           rightBracket: ]
           matchedValueType: Object?
@@ -671,7 +671,7 @@
               literal: 0
               correspondingParameter: dart:core::<fragment>::@class::num::@method::>::@parameter::other#element
               staticType: int
-            element: dart:core::<fragment>::@class::num::@method::>#element
+            element: dart:core::@class::num::@method::>
             staticInvokeType: bool Function(num)
             staticType: bool
       arrow: =>
@@ -741,7 +741,7 @@
               literal: 0
               correspondingParameter: dart:core::<fragment>::@class::num::@method::>::@parameter::other#element
               staticType: int
-            element: dart:core::<fragment>::@class::num::@method::>#element
+            element: dart:core::@class::num::@method::>
             staticInvokeType: bool Function(num)
             staticType: bool
       arrow: =>
diff --git a/pkg/analyzer/test/src/dart/resolution/switch_statement_test.dart b/pkg/analyzer/test/src/dart/resolution/switch_statement_test.dart
index 11edb58..2f456cc 100644
--- a/pkg/analyzer/test/src/dart/resolution/switch_statement_test.dart
+++ b/pkg/analyzer/test/src/dart/resolution/switch_statement_test.dart
@@ -321,7 +321,7 @@
               literal: 0
               correspondingParameter: dart:core::<fragment>::@class::num::@method::<::@parameter::other#element
               staticType: int
-            element: dart:core::<fragment>::@class::num::@method::<#element
+            element: dart:core::@class::num::@method::<
             staticInvokeType: bool Function(num)
             staticType: bool
       colon: :
@@ -349,7 +349,7 @@
               literal: 0
               correspondingParameter: dart:core::<fragment>::@class::num::@method::>::@parameter::other#element
               staticType: int
-            element: dart:core::<fragment>::@class::num::@method::>#element
+            element: dart:core::@class::num::@method::>
             staticInvokeType: bool Function(num)
             staticType: bool
       colon: :
@@ -412,7 +412,7 @@
               literal: 0
               correspondingParameter: dart:core::<fragment>::@class::num::@method::<::@parameter::other#element
               staticType: int
-            element: dart:core::<fragment>::@class::num::@method::<#element
+            element: dart:core::@class::num::@method::<
             staticInvokeType: bool Function(num)
             staticType: bool
       colon: :
@@ -441,7 +441,7 @@
               literal: 0
               correspondingParameter: dart:core::<fragment>::@class::num::@method::>::@parameter::other#element
               staticType: int
-            element: dart:core::<fragment>::@class::num::@method::>#element
+            element: dart:core::@class::num::@method::>
             staticInvokeType: bool Function(num)
             staticType: bool
       colon: :
@@ -521,7 +521,7 @@
               literal: 0
               correspondingParameter: dart:core::<fragment>::@class::num::@method::<::@parameter::other#element
               staticType: int
-            element: dart:core::<fragment>::@class::num::@method::<#element
+            element: dart:core::@class::num::@method::<
             staticInvokeType: bool Function(num)
             staticType: bool
       colon: :
@@ -567,7 +567,7 @@
               literal: 0
               correspondingParameter: dart:core::<fragment>::@class::num::@method::>::@parameter::other#element
               staticType: int
-            element: dart:core::<fragment>::@class::num::@method::>#element
+            element: dart:core::@class::num::@method::>
             staticInvokeType: bool Function(num)
             staticType: bool
       colon: :
@@ -640,7 +640,7 @@
               literal: 0
               correspondingParameter: dart:core::<fragment>::@class::num::@method::<::@parameter::other#element
               staticType: int
-            element: dart:core::<fragment>::@class::num::@method::<#element
+            element: dart:core::@class::num::@method::<
             staticInvokeType: bool Function(num)
             staticType: bool
       colon: :
@@ -668,7 +668,7 @@
               literal: 0
               correspondingParameter: dart:core::<fragment>::@class::num::@method::>::@parameter::other#element
               staticType: int
-            element: dart:core::<fragment>::@class::num::@method::>#element
+            element: dart:core::@class::num::@method::>
             staticInvokeType: bool Function(num)
             staticType: bool
       colon: :
@@ -741,7 +741,7 @@
               literal: 0
               correspondingParameter: dart:core::<fragment>::@class::num::@method::<::@parameter::other#element
               staticType: int
-            element: dart:core::<fragment>::@class::num::@method::<#element
+            element: dart:core::@class::num::@method::<
             staticInvokeType: bool Function(num)
             staticType: bool
       colon: :
@@ -769,7 +769,7 @@
               literal: 0
               correspondingParameter: dart:core::<fragment>::@class::num::@method::>::@parameter::other#element
               staticType: int
-            element: dart:core::<fragment>::@class::num::@method::>#element
+            element: dart:core::@class::num::@method::>
             staticInvokeType: bool Function(num)
             staticType: bool
       colon: :
@@ -841,7 +841,7 @@
               literal: 0
               correspondingParameter: dart:core::<fragment>::@class::num::@method::<::@parameter::other#element
               staticType: int
-            element: dart:core::<fragment>::@class::num::@method::<#element
+            element: dart:core::@class::num::@method::<
             staticInvokeType: bool Function(num)
             staticType: bool
       colon: :
@@ -869,7 +869,7 @@
               literal: 0
               correspondingParameter: dart:core::<fragment>::@class::num::@method::>::@parameter::other#element
               staticType: int
-            element: dart:core::<fragment>::@class::num::@method::>#element
+            element: dart:core::@class::num::@method::>
             staticInvokeType: bool Function(num)
             staticType: bool
       colon: :
@@ -949,7 +949,7 @@
               literal: 0
               correspondingParameter: dart:core::<fragment>::@class::num::@method::>::@parameter::other#element
               staticType: int
-            element: dart:core::<fragment>::@class::num::@method::>#element
+            element: dart:core::@class::num::@method::>
             staticInvokeType: bool Function(num)
             staticType: bool
       colon: :
@@ -1020,7 +1020,7 @@
               literal: 0
               correspondingParameter: dart:core::<fragment>::@class::num::@method::>::@parameter::other#element
               staticType: int
-            element: dart:core::<fragment>::@class::num::@method::>#element
+            element: dart:core::@class::num::@method::>
             staticInvokeType: bool Function(num)
             staticType: bool
       colon: :
@@ -1100,7 +1100,7 @@
               literal: 0
               correspondingParameter: dart:core::<fragment>::@class::num::@method::>::@parameter::other#element
               staticType: int
-            element: dart:core::<fragment>::@class::num::@method::>#element
+            element: dart:core::@class::num::@method::>
             staticInvokeType: bool Function(num)
             staticType: bool
       colon: :
@@ -1252,7 +1252,7 @@
               literal: 0
               correspondingParameter: dart:core::<fragment>::@class::num::@method::>::@parameter::other#element
               staticType: int
-            element: dart:core::<fragment>::@class::num::@method::>#element
+            element: dart:core::@class::num::@method::>
             staticInvokeType: bool Function(num)
             staticType: bool
       colon: :
@@ -1502,7 +1502,7 @@
                 token: a
                 element: a@62
                 staticType: int
-              element2: dart:core::<fragment>::@class::Object::@method::==#element
+              element2: dart:core::@class::Object::@method::==
               matchedValueType: Object?
           rightBracket: ]
           matchedValueType: Object?
@@ -1519,7 +1519,7 @@
               literal: 0
               correspondingParameter: dart:core::<fragment>::@class::num::@method::>::@parameter::other#element
               staticType: int
-            element: dart:core::<fragment>::@class::num::@method::>#element
+            element: dart:core::@class::num::@method::>
             staticInvokeType: bool Function(num)
             staticType: bool
       colon: :
@@ -1580,7 +1580,7 @@
               literal: 0
               correspondingParameter: dart:core::<fragment>::@class::num::@method::>::@parameter::other#element
               staticType: int
-            element: dart:core::<fragment>::@class::num::@method::>#element
+            element: dart:core::@class::num::@method::>
             staticInvokeType: bool Function(num)
             staticType: bool
       colon: :
diff --git a/pkg/analyzer/test/src/dart/resolution/type_inference/extension_methods_test.dart b/pkg/analyzer/test/src/dart/resolution/type_inference/extension_methods_test.dart
index 66053c2..972ff94 100644
--- a/pkg/analyzer/test/src/dart/resolution/type_inference/extension_methods_test.dart
+++ b/pkg/analyzer/test/src/dart/resolution/type_inference/extension_methods_test.dart
@@ -73,7 +73,7 @@
   methodName: SimpleIdentifier
     token: foo
     element: MethodMember
-      baseElement: <testLibraryFragment>::@extension::E::@method::foo#element
+      baseElement: <testLibrary>::@extension::E::@method::foo
       substitution: {T: int, U: U}
     staticType: Map<int, U> Function<U>(U)
   argumentList: ArgumentList
@@ -112,7 +112,7 @@
   methodName: SimpleIdentifier
     token: foo
     element: MethodMember
-      baseElement: <testLibraryFragment>::@extension::E::@method::foo#element
+      baseElement: <testLibrary>::@extension::E::@method::foo
       substitution: {T: T}
     staticType: List<T> Function()
   argumentList: ArgumentList
@@ -145,7 +145,7 @@
   methodName: SimpleIdentifier
     token: foo
     element: MethodMember
-      baseElement: <testLibraryFragment>::@extension::E::@method::foo#element
+      baseElement: <testLibrary>::@extension::E::@method::foo
       substitution: {T: String, U: U}
     staticType: Map<String, U> Function<U>(U)
   argumentList: ArgumentList
@@ -189,11 +189,11 @@
   identifier: SimpleIdentifier
     token: foo
     element: MethodMember
-      baseElement: <testLibraryFragment>::@extension::E::@method::foo#element
+      baseElement: <testLibrary>::@extension::E::@method::foo
       substitution: {T: int, U: U}
     staticType: Map<int, U> Function<U>(U)
   element: MethodMember
-    baseElement: <testLibraryFragment>::@extension::E::@method::foo#element
+    baseElement: <testLibrary>::@extension::E::@method::foo
     substitution: {T: int, U: U}
   staticType: Map<int, U> Function<U>(U)
 ''');
@@ -266,7 +266,7 @@
   methodName: SimpleIdentifier
     token: test
     element: MethodMember
-      baseElement: <testLibraryFragment>::@extension::Test::@method::test#element
+      baseElement: <testLibrary>::@extension::Test::@method::test
       substitution: {T: S}
     staticType: S Function(S) Function()
   argumentList: ArgumentList
@@ -514,7 +514,7 @@
   methodName: SimpleIdentifier
     token: foo
     element: MethodMember
-      baseElement: <testLibraryFragment>::@extension::E::@method::foo#element
+      baseElement: <testLibrary>::@extension::E::@method::foo
       substitution: {T: num, U: U}
     staticType: Map<num, U> Function<U>(U)
   argumentList: ArgumentList
@@ -578,7 +578,7 @@
   propertyName: SimpleIdentifier
     token: foo
     element: MethodMember
-      baseElement: <testLibraryFragment>::@extension::E::@method::foo#element
+      baseElement: <testLibrary>::@extension::E::@method::foo
       substitution: {T: num, U: U}
     staticType: Map<num, U> Function<U>(U)
   staticType: Map<num, U> Function<U>(U)
@@ -753,7 +753,7 @@
   methodName: SimpleIdentifier
     token: foo
     element: MethodMember
-      baseElement: <testLibraryFragment>::@extension::E::@method::foo#element
+      baseElement: <testLibrary>::@extension::E::@method::foo
       substitution: {T: int, U: U}
     staticType: Map<int, U> Function<U>(U)
   argumentList: ArgumentList
@@ -809,7 +809,7 @@
   propertyName: SimpleIdentifier
     token: foo
     element: MethodMember
-      baseElement: <testLibraryFragment>::@extension::E::@method::foo#element
+      baseElement: <testLibrary>::@extension::E::@method::foo
       substitution: {T: int, U: U}
     staticType: Map<int, U> Function<U>(U)
   staticType: Map<int, U> Function<U>(U)
diff --git a/pkg/analyzer/test/src/dart/resolution/type_inference/tear_off_test.dart b/pkg/analyzer/test/src/dart/resolution/type_inference/tear_off_test.dart
index a37eeac..f469e3f 100644
--- a/pkg/analyzer/test/src/dart/resolution/type_inference/tear_off_test.dart
+++ b/pkg/analyzer/test/src/dart/resolution/type_inference/tear_off_test.dart
@@ -91,7 +91,7 @@
     operator: .
     propertyName: SimpleIdentifier
       token: f
-      element: <testLibraryFragment>::@class::C::@method::f#element
+      element: <testLibrary>::@class::C::@method::f
       staticType: T Function<T>(T)
     staticType: T Function<T>(T)
   staticType: int Function(int)
@@ -143,9 +143,9 @@
     period: .
     identifier: SimpleIdentifier
       token: f
-      element: <testLibraryFragment>::@class::C::@method::f#element
+      element: <testLibrary>::@class::C::@method::f
       staticType: T Function<T>(T)
-    element: <testLibraryFragment>::@class::C::@method::f#element
+    element: <testLibrary>::@class::C::@method::f
     staticType: T Function<T>(T)
   staticType: int Function(int)
   typeArgumentTypes
@@ -176,7 +176,7 @@
     operator: .
     propertyName: SimpleIdentifier
       token: f
-      element: <testLibraryFragment>::@class::C::@method::f#element
+      element: <testLibrary>::@class::C::@method::f
       staticType: T Function<T>(T)
     staticType: T Function<T>(T)
   staticType: int Function(int)
diff --git a/pkg/analyzer/test/src/diagnostics/abstract_super_member_reference_test.dart b/pkg/analyzer/test/src/diagnostics/abstract_super_member_reference_test.dart
index 88faa5e..e78b904 100644
--- a/pkg/analyzer/test/src/diagnostics/abstract_super_member_reference_test.dart
+++ b/pkg/analyzer/test/src/diagnostics/abstract_super_member_reference_test.dart
@@ -40,7 +40,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: foo
-    element: <testLibraryFragment>::@class::A::@method::foo#element
+    element: <testLibrary>::@class::A::@method::foo
     staticType: void Function(int)
   argumentList: ArgumentList
     leftParenthesis: (
@@ -81,7 +81,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: foo
-    element: <testLibraryFragment>::@mixin::M::@method::foo#element
+    element: <testLibrary>::@mixin::M::@method::foo
     staticType: void Function()
   argumentList: ArgumentList
     leftParenthesis: (
@@ -116,7 +116,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: foo
-    element: <testLibraryFragment>::@mixin::A::@method::foo#element
+    element: <testLibrary>::@mixin::A::@method::foo
     staticType: void Function()
   argumentList: ArgumentList
     leftParenthesis: (
@@ -153,7 +153,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: foo
-    element: <testLibraryFragment>::@class::A::@method::foo#element
+    element: <testLibrary>::@class::A::@method::foo
     staticType: void Function(int)
   argumentList: ArgumentList
     leftParenthesis: (
@@ -194,7 +194,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: foo
-    element: <testLibraryFragment>::@class::A::@method::foo#element
+    element: <testLibrary>::@class::A::@method::foo
     staticType: void Function()
   argumentList: ArgumentList
     leftParenthesis: (
@@ -226,7 +226,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: foo
-    element: <testLibraryFragment>::@class::A::@method::foo#element
+    element: <testLibrary>::@class::A::@method::foo
     staticType: int Function()
   argumentList: ArgumentList
     leftParenthesis: (
@@ -262,7 +262,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: foo
-    element: <testLibraryFragment>::@class::A::@method::foo#element
+    element: <testLibrary>::@class::A::@method::foo
     staticType: void Function()
   argumentList: ArgumentList
     leftParenthesis: (
@@ -480,7 +480,7 @@
   operator: .
   propertyName: SimpleIdentifier
     token: foo
-    element: <testLibraryFragment>::@class::A::@method::foo#element
+    element: <testLibrary>::@class::A::@method::foo
     staticType: void Function()
   staticType: void Function()
 ''');
diff --git a/pkg/analyzer/test/src/diagnostics/extension_override_access_to_static_member_test.dart b/pkg/analyzer/test/src/diagnostics/extension_override_access_to_static_member_test.dart
index 663f5aa..761df6f 100644
--- a/pkg/analyzer/test/src/diagnostics/extension_override_access_to_static_member_test.dart
+++ b/pkg/analyzer/test/src/diagnostics/extension_override_access_to_static_member_test.dart
@@ -55,7 +55,7 @@
   argumentList: ArgumentList
     leftParenthesis: (
     rightParenthesis: )
-  element: <testLibraryFragment>::@extension::E::@method::call#element
+  element: <testLibrary>::@extension::E::@method::call
   staticInvokeType: void Function()
   staticType: void
 ''');
@@ -138,7 +138,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: empty
-    element: <testLibraryFragment>::@extension::E::@method::empty#element
+    element: <testLibrary>::@extension::E::@method::empty
     staticType: String Function()
   argumentList: ArgumentList
     leftParenthesis: (
diff --git a/pkg/analyzer/test/src/diagnostics/instance_access_to_static_member_test.dart b/pkg/analyzer/test/src/diagnostics/instance_access_to_static_member_test.dart
index e65c73f..83cd646 100644
--- a/pkg/analyzer/test/src/diagnostics/instance_access_to_static_member_test.dart
+++ b/pkg/analyzer/test/src/diagnostics/instance_access_to_static_member_test.dart
@@ -46,7 +46,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: a
-    element: <testLibraryFragment>::@class::C::@method::a#element
+    element: <testLibrary>::@class::C::@method::a
     staticType: void Function()
   argumentList: ArgumentList
     leftParenthesis: (
@@ -211,7 +211,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: a
-    element: <testLibraryFragment>::@mixin::A::@method::a#element
+    element: <testLibrary>::@mixin::A::@method::a
     staticType: void Function()
   argumentList: ArgumentList
     leftParenthesis: (
diff --git a/pkg/analyzer/test/src/diagnostics/receiver_of_type_never_test.dart b/pkg/analyzer/test/src/diagnostics/receiver_of_type_never_test.dart
index 9f47dc0..0a7617e 100644
--- a/pkg/analyzer/test/src/diagnostics/receiver_of_type_never_test.dart
+++ b/pkg/analyzer/test/src/diagnostics/receiver_of_type_never_test.dart
@@ -50,7 +50,7 @@
       correspondingParameter: dart:core::<fragment>::@class::num::@method::+::@parameter::other#element
       staticType: int
     correspondingParameter: <null>
-    element: dart:core::<fragment>::@class::num::@method::+#element
+    element: dart:core::@class::num::@method::+
     staticInvokeType: num Function(num)
     staticType: int
   element: <null>
@@ -89,7 +89,7 @@
       correspondingParameter: dart:core::<fragment>::@class::num::@method::+::@parameter::other#element
       staticType: int
     correspondingParameter: <null>
-    element: dart:core::<fragment>::@class::num::@method::+#element
+    element: dart:core::@class::num::@method::+
     staticInvokeType: num Function(num)
     staticType: int
   element: <null>
@@ -129,7 +129,7 @@
         literal: 2
         correspondingParameter: dart:core::<fragment>::@class::num::@method::+::@parameter::other#element
         staticType: int
-      element: dart:core::<fragment>::@class::num::@method::+#element
+      element: dart:core::@class::num::@method::+
       staticInvokeType: num Function(num)
       staticType: int
     rightParenthesis: )
@@ -165,10 +165,10 @@
       correspondingParameter: dart:core::<fragment>::@class::num::@method::+::@parameter::other#element
       staticType: int
     correspondingParameter: dart:core::<fragment>::@class::Object::@method::==::@parameter::other#element
-    element: dart:core::<fragment>::@class::num::@method::+#element
+    element: dart:core::@class::num::@method::+
     staticInvokeType: num Function(num)
     staticType: int
-  element: dart:core::<fragment>::@class::Object::@method::==#element
+  element: dart:core::@class::Object::@method::==
   staticInvokeType: bool Function(Object)
   staticType: bool
 ''');
@@ -208,7 +208,7 @@
         literal: 2
         correspondingParameter: dart:core::<fragment>::@class::num::@method::+::@parameter::other#element
         staticType: int
-      element: dart:core::<fragment>::@class::num::@method::+#element
+      element: dart:core::@class::num::@method::+
       staticInvokeType: num Function(num)
       staticType: int
     rightParenthesis: )
@@ -256,7 +256,7 @@
         literal: 2
         correspondingParameter: dart:core::<fragment>::@class::num::@method::+::@parameter::other#element
         staticType: int
-      element: dart:core::<fragment>::@class::num::@method::+#element
+      element: dart:core::@class::num::@method::+
       staticInvokeType: num Function(num)
       staticType: int
     rightParenthesis: )
@@ -387,7 +387,7 @@
       correspondingParameter: dart:core::<fragment>::@class::num::@method::+::@parameter::other#element
       staticType: int
     correspondingParameter: <null>
-    element: dart:core::<fragment>::@class::num::@method::+#element
+    element: dart:core::@class::num::@method::+
     staticInvokeType: num Function(num)
     staticType: int
   readElement2: <null>
@@ -438,7 +438,7 @@
       correspondingParameter: dart:core::<fragment>::@class::num::@method::+::@parameter::other#element
       staticType: int
     correspondingParameter: <null>
-    element: dart:core::<fragment>::@class::num::@method::+#element
+    element: dart:core::@class::num::@method::+
     staticInvokeType: num Function(num)
     staticType: int
   readElement2: <null>
@@ -526,7 +526,7 @@
       correspondingParameter: dart:core::<fragment>::@class::num::@method::+::@parameter::other#element
       staticType: int
     correspondingParameter: <null>
-    element: dart:core::<fragment>::@class::num::@method::+#element
+    element: dart:core::@class::num::@method::+
     staticInvokeType: num Function(num)
     staticType: int
   readElement2: <null>
@@ -580,7 +580,7 @@
       correspondingParameter: dart:core::<fragment>::@class::num::@method::+::@parameter::other#element
       staticType: int
     correspondingParameter: <null>
-    element: dart:core::<fragment>::@class::num::@method::+#element
+    element: dart:core::@class::num::@method::+
     staticInvokeType: num Function(num)
     staticType: int
   readElement2: <null>
@@ -638,7 +638,7 @@
           correspondingParameter: dart:core::<fragment>::@class::num::@method::+::@parameter::other#element
           staticType: int
         correspondingParameter: <null>
-        element: dart:core::<fragment>::@class::num::@method::+#element
+        element: dart:core::@class::num::@method::+
         staticInvokeType: num Function(num)
         staticType: int
     rightParenthesis: )
@@ -685,7 +685,7 @@
           correspondingParameter: dart:core::<fragment>::@class::num::@method::+::@parameter::other#element
           staticType: int
         correspondingParameter: <null>
-        element: dart:core::<fragment>::@class::num::@method::+#element
+        element: dart:core::@class::num::@method::+
         staticInvokeType: num Function(num)
         staticType: int
     rightParenthesis: )
@@ -714,7 +714,7 @@
   operator: .
   methodName: SimpleIdentifier
     token: toString
-    element: dart:core::<fragment>::@class::Object::@method::toString#element
+    element: dart:core::@class::Object::@method::toString
     staticType: String Function()
   argumentList: ArgumentList
     leftParenthesis: (
@@ -729,7 +729,7 @@
           correspondingParameter: dart:core::<fragment>::@class::num::@method::+::@parameter::other#element
           staticType: int
         correspondingParameter: <null>
-        element: dart:core::<fragment>::@class::num::@method::+#element
+        element: dart:core::@class::num::@method::+
         staticInvokeType: num Function(num)
         staticType: int
     rightParenthesis: )
@@ -1006,9 +1006,9 @@
   period: .
   identifier: SimpleIdentifier
     token: toString
-    element: dart:core::<fragment>::@class::Object::@method::toString#element
+    element: dart:core::@class::Object::@method::toString
     staticType: Never
-  element: dart:core::<fragment>::@class::Object::@method::toString#element
+  element: dart:core::@class::Object::@method::toString
   staticType: Never
 ''');
   }
@@ -1126,9 +1126,9 @@
   period: .
   identifier: SimpleIdentifier
     token: toString
-    element: dart:core::<fragment>::@class::Object::@method::toString#element
+    element: dart:core::@class::Object::@method::toString
     staticType: String Function()
-  element: dart:core::<fragment>::@class::Object::@method::toString#element
+  element: dart:core::@class::Object::@method::toString
   staticType: String Function()
 ''');
   }
@@ -1158,7 +1158,7 @@
   operator: .
   propertyName: SimpleIdentifier
     token: toString
-    element: dart:core::<fragment>::@class::Object::@method::toString#element
+    element: dart:core::@class::Object::@method::toString
     staticType: String Function()
   staticType: String Function()
 ''');
diff --git a/pkg/analyzer/test/src/diagnostics/refutable_pattern_in_irrefutable_context_test.dart b/pkg/analyzer/test/src/diagnostics/refutable_pattern_in_irrefutable_context_test.dart
index 7765da7..5a4fd86 100644
--- a/pkg/analyzer/test/src/diagnostics/refutable_pattern_in_irrefutable_context_test.dart
+++ b/pkg/analyzer/test/src/diagnostics/refutable_pattern_in_irrefutable_context_test.dart
@@ -161,7 +161,7 @@
       operand: IntegerLiteral
         literal: 0
         staticType: int
-      element2: dart:core::<fragment>::@class::num::@method::>#element
+      element2: dart:core::@class::num::@method::>
       matchedValueType: int
     rightParenthesis: )
     matchedValueType: int
diff --git a/pkg/analyzer/test/src/diagnostics/sdk_version_since_test.dart b/pkg/analyzer/test/src/diagnostics/sdk_version_since_test.dart
index 643f52a..236b529 100644
--- a/pkg/analyzer/test/src/diagnostics/sdk_version_since_test.dart
+++ b/pkg/analyzer/test/src/diagnostics/sdk_version_since_test.dart
@@ -527,9 +527,9 @@
   period: .
   identifier: SimpleIdentifier
     token: foo
-    element: dart:foo::<fragment>::@class::A::@method::foo#element
+    element: dart:foo::@class::A::@method::foo
     staticType: void Function()
-  element: dart:foo::<fragment>::@class::A::@method::foo#element
+  element: dart:foo::@class::A::@method::foo
   staticType: void Function()
 ''');
   }
@@ -570,7 +570,7 @@
   operator: .
   propertyName: SimpleIdentifier
     token: foo
-    element: dart:foo::<fragment>::@class::A::@method::foo#element
+    element: dart:foo::@class::A::@method::foo
     staticType: void Function()
   staticType: void Function()
 ''');
diff --git a/pkg/analyzer/test/src/diagnostics/use_of_nullable_value_test.dart b/pkg/analyzer/test/src/diagnostics/use_of_nullable_value_test.dart
index a770156..0acd2c2 100644
--- a/pkg/analyzer/test/src/diagnostics/use_of_nullable_value_test.dart
+++ b/pkg/analyzer/test/src/diagnostics/use_of_nullable_value_test.dart
@@ -680,7 +680,7 @@
   readType: int
   writeElement2: <testLibraryFragment>::@class::A::@setter::x#element
   writeType: int
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticType: int
 ''');
 
@@ -714,7 +714,7 @@
   readType: int?
   writeElement2: <testLibraryFragment>::@class::A::@setter::y#element
   writeType: int?
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticType: int
 ''');
   }
@@ -776,7 +776,7 @@
   readType: int
   writeElement2: <testLibraryFragment>::@class::A::@setter::x#element
   writeType: int
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticType: int?
 ''');
 
@@ -810,7 +810,7 @@
   readType: int
   writeElement2: <testLibraryFragment>::@class::A::@setter::x#element
   writeType: int
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticType: int
 ''');
   }
@@ -847,7 +847,7 @@
   readType: int
   writeElement2: <testLibraryFragment>::@function::m::@parameter::x#element
   writeType: int
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticType: int
 ''');
 
@@ -866,7 +866,7 @@
   readType: int?
   writeElement2: <testLibraryFragment>::@function::m::@parameter::y#element
   writeType: int?
-  element: dart:core::<fragment>::@class::num::@method::+#element
+  element: dart:core::@class::num::@method::+
   staticType: int
 ''');
   }
diff --git a/pkg/analyzer/test/src/summary/element_text.dart b/pkg/analyzer/test/src/summary/element_text.dart
index 577e1db..6305890 100644
--- a/pkg/analyzer/test/src/summary/element_text.dart
+++ b/pkg/analyzer/test/src/summary/element_text.dart
@@ -1398,8 +1398,7 @@
     });
 
     _sink.withIndent(() {
-      // TODO(scheglov): write after https://dart-review.googlesource.com/c/sdk/+/431940
-      // _writeReference(e);
+      _writeReference(e);
       _writeFragmentReference('firstFragment', e.firstFragment);
       // _writeElementReference(e.enclosingElement, label: 'enclosingElement');
       if (e.hasEnclosingTypeParameterReference) {
diff --git a/pkg/analyzer/test/src/summary/elements/class_test.dart b/pkg/analyzer/test/src/summary/elements/class_test.dart
index 8a3f827..c068a3a 100644
--- a/pkg/analyzer/test/src/summary/elements/class_test.dart
+++ b/pkg/analyzer/test/src/summary/elements/class_test.dart
@@ -1662,7 +1662,7 @@
                 rightOperand: IntegerLiteral
                   literal: 42 @41
                   staticType: int
-                element: dart:core::<fragment>::@class::num::@method::>=#element
+                element: dart:core::@class::num::@method::>=
                 staticInvokeType: bool Function(num)
                 staticType: bool
               rightParenthesis: ) @43
@@ -1717,7 +1717,7 @@
                 rightOperand: IntegerLiteral
                   literal: 42 @41
                   staticType: int
-                element: dart:core::<fragment>::@class::num::@method::>=#element
+                element: dart:core::@class::num::@method::>=
                 staticInvokeType: bool Function(num)
                 staticType: bool
               comma: , @43
@@ -2083,7 +2083,7 @@
                   token: p @48
                   element: <testLibraryFragment>::@class::C::@constructor::new::@parameter::p#element
                   staticType: int
-                element: dart:core::<fragment>::@class::num::@method::+#element
+                element: dart:core::@class::num::@method::+
                 staticInvokeType: num Function(num)
                 staticType: int
       getters
@@ -4812,7 +4812,7 @@
           methods
             B_ @70
               reference: <testLibraryFragment>::@class::B::@method::B_
-              element: <testLibraryFragment>::@class::B::@method::B_#element
+              element: <testLibrary>::@class::B::@method::B_
         class C @84
           reference: <testLibraryFragment>::@class::C
           element: <testLibrary>::@class::C
@@ -4851,6 +4851,7 @@
             substitution: {T: U, U: T}
       methods
         abstract B_
+          reference: <testLibrary>::@class::B::@method::B_
           firstFragment: <testLibraryFragment>::@class::B::@method::B_
           returnType: dynamic
     class C
@@ -10640,7 +10641,7 @@
           methods
             foo @16
               reference: <testLibraryFragment>::@class::A::@method::foo
-              element: <testLibraryFragment>::@class::A::@method::foo#element
+              element: <testLibrary>::@class::A::@method::foo
         class B @37
           reference: <testLibraryFragment>::@class::B
           element: <testLibrary>::@class::B
@@ -10675,6 +10676,7 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
       methods
         foo
+          reference: <testLibrary>::@class::A::@method::foo
           firstFragment: <testLibraryFragment>::@class::A::@method::foo
           returnType: int
     class B
@@ -11147,7 +11149,7 @@
           methods
             get @12
               reference: <testLibraryFragment>::@class::A::@method::get
-              element: <testLibraryFragment>::@class::A::@method::get#element
+              element: <testLibrary>::@class::A::@method::get
   classes
     class A
       reference: <testLibrary>::@class::A
@@ -11157,6 +11159,7 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
       methods
         get
+          reference: <testLibrary>::@class::A::@method::get
           firstFragment: <testLibraryFragment>::@class::A::@method::get
           returnType: dynamic
 ''');
@@ -11900,7 +11903,7 @@
           methods
             f @19
               reference: <testLibraryFragment>::@class::C::@method::f
-              element: <testLibraryFragment>::@class::C::@method::f#element
+              element: <testLibrary>::@class::C::@method::f
   classes
     abstract class C
       reference: <testLibrary>::@class::C
@@ -11910,6 +11913,7 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
       methods
         abstract f
+          reference: <testLibrary>::@class::C::@method::f
           firstFragment: <testLibraryFragment>::@class::C::@method::f
           returnType: dynamic
 ''');
@@ -11942,7 +11946,7 @@
           methods
             f @40 async
               reference: <testLibraryFragment>::@class::C::@method::f
-              element: <testLibraryFragment>::@class::C::@method::f#element
+              element: <testLibrary>::@class::C::@method::f
   classes
     class C
       reference: <testLibrary>::@class::C
@@ -11952,6 +11956,7 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
       methods
         f
+          reference: <testLibrary>::@class::C::@method::f
           firstFragment: <testLibraryFragment>::@class::C::@method::f
           returnType: Future<dynamic>
 ''');
@@ -11984,7 +11989,7 @@
           methods
             f @40 async*
               reference: <testLibraryFragment>::@class::C::@method::f
-              element: <testLibraryFragment>::@class::C::@method::f#element
+              element: <testLibrary>::@class::C::@method::f
   classes
     class C
       reference: <testLibrary>::@class::C
@@ -11994,6 +11999,7 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
       methods
         f
+          reference: <testLibrary>::@class::C::@method::f
           firstFragment: <testLibraryFragment>::@class::C::@method::f
           returnType: Stream<dynamic>
 ''');
@@ -12025,7 +12031,7 @@
           methods
             f @34
               reference: <testLibraryFragment>::@class::C::@method::f
-              element: <testLibraryFragment>::@class::C::@method::f#element
+              element: <testLibrary>::@class::C::@method::f
               documentationComment: /**\n   * Docs\n   */
   classes
     class C
@@ -12036,6 +12042,7 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
       methods
         f
+          reference: <testLibrary>::@class::C::@method::f
           firstFragment: <testLibraryFragment>::@class::C::@method::f
           documentationComment: /**\n   * Docs\n   */
           returnType: dynamic
@@ -12062,7 +12069,7 @@
           methods
             f @19
               reference: <testLibraryFragment>::@class::C::@method::f
-              element: <testLibraryFragment>::@class::C::@method::f#element
+              element: <testLibrary>::@class::C::@method::f
   classes
     class C
       reference: <testLibrary>::@class::C
@@ -12072,6 +12079,7 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
       methods
         external f
+          reference: <testLibrary>::@class::C::@method::f
           firstFragment: <testLibraryFragment>::@class::C::@method::f
           returnType: dynamic
 ''');
@@ -12122,7 +12130,7 @@
           methods
             f @25
               reference: <testLibraryFragment>::@class::C::@method::f
-              element: <testLibraryFragment>::@class::C::@method::f#element
+              element: <testLibrary>::@class::C::@method::f
               formalParameters
                 value @27
                   element: <testLibraryFragment>::@class::C::@method::f::@parameter::value#element
@@ -12137,7 +12145,7 @@
           methods
             f @63
               reference: <testLibraryFragment>::@class::D::@method::f
-              element: <testLibraryFragment>::@class::D::@method::f#element
+              element: <testLibrary>::@class::D::@method::f
               formalParameters
                 value @69
                   element: <testLibraryFragment>::@class::D::@method::f::@parameter::value#element
@@ -12152,6 +12160,7 @@
           superConstructor: <testLibraryFragment>::@class::D::@constructor::new#element
       methods
         f
+          reference: <testLibrary>::@class::C::@method::f
           firstFragment: <testLibraryFragment>::@class::C::@method::f
           formalParameters
             requiredPositional hasImplicitType value
@@ -12165,6 +12174,7 @@
           firstFragment: <testLibraryFragment>::@class::D::@constructor::new
       methods
         abstract f
+          reference: <testLibrary>::@class::D::@method::f
           firstFragment: <testLibraryFragment>::@class::D::@method::f
           formalParameters
             requiredPositional value
@@ -12200,7 +12210,7 @@
           methods
             f @22
               reference: <testLibraryFragment>::@class::C::@method::f
-              element: <testLibraryFragment>::@class::C::@method::f#element
+              element: <testLibrary>::@class::C::@method::f
         class D @52
           reference: <testLibraryFragment>::@class::D
           element: <testLibrary>::@class::D
@@ -12212,7 +12222,7 @@
           methods
             f @62
               reference: <testLibraryFragment>::@class::D::@method::f
-              element: <testLibraryFragment>::@class::D::@method::f#element
+              element: <testLibrary>::@class::D::@method::f
   classes
     class C
       reference: <testLibrary>::@class::C
@@ -12224,6 +12234,7 @@
           superConstructor: <testLibraryFragment>::@class::D::@constructor::new#element
       methods
         f
+          reference: <testLibrary>::@class::C::@method::f
           firstFragment: <testLibraryFragment>::@class::C::@method::f
           returnType: int
     abstract class D
@@ -12234,6 +12245,7 @@
           firstFragment: <testLibraryFragment>::@class::D::@constructor::new
       methods
         abstract f
+          reference: <testLibrary>::@class::D::@method::f
           firstFragment: <testLibraryFragment>::@class::D::@method::f
           returnType: int
 ''');
@@ -12265,7 +12277,7 @@
           methods
             foo @17 invokesSuperSelf
               reference: <testLibraryFragment>::@class::A::@method::foo
-              element: <testLibraryFragment>::@class::A::@method::foo#element
+              element: <testLibrary>::@class::A::@method::foo
   classes
     class A
       reference: <testLibrary>::@class::A
@@ -12275,6 +12287,7 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
       methods
         foo
+          reference: <testLibrary>::@class::A::@method::foo
           firstFragment: <testLibraryFragment>::@class::A::@method::foo
           returnType: void
 ''');
@@ -12304,7 +12317,7 @@
           methods
             <null-name> (offset=12)
               reference: <testLibraryFragment>::@class::A::@method::0
-              element: <testLibraryFragment>::@class::A::@method::0#element
+              element: <testLibrary>::@class::A::@method::0
   classes
     class A
       reference: <testLibrary>::@class::A
@@ -12314,6 +12327,7 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
       methods
         
+          reference: <testLibrary>::@class::A::@method::0
           firstFragment: <testLibraryFragment>::@class::A::@method::0
           returnType: dynamic
 ''');
@@ -12352,7 +12366,7 @@
           methods
             A @38
               reference: <testLibraryFragment>::@class::B::@method::A
-              element: <testLibraryFragment>::@class::B::@method::A#element
+              element: <testLibrary>::@class::B::@method::A
   classes
     class A
       reference: <testLibrary>::@class::A
@@ -12370,6 +12384,7 @@
           superConstructor: <testLibraryFragment>::@class::A::@constructor::new#element
       methods
         A
+          reference: <testLibrary>::@class::B::@method::A
           firstFragment: <testLibraryFragment>::@class::B::@method::A
           returnType: void
 ''');
@@ -12399,7 +12414,7 @@
           methods
             m @16
               reference: <testLibraryFragment>::@class::C::@method::m
-              element: <testLibraryFragment>::@class::C::@method::m#element
+              element: <testLibrary>::@class::C::@method::m
   classes
     class C
       reference: <testLibrary>::@class::C
@@ -12409,6 +12424,7 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
       methods
         external m
+          reference: <testLibrary>::@class::C::@method::m
           firstFragment: <testLibraryFragment>::@class::C::@method::m
           returnType: int
 ''');
@@ -12437,7 +12453,7 @@
           methods
             foo @20
               reference: <testLibraryFragment>::@class::C::@method::foo
-              element: <testLibraryFragment>::@class::C::@method::foo#element
+              element: <testLibrary>::@class::C::@method::foo
               typeParameters
                 T @24
                   element: T@24
@@ -12452,6 +12468,7 @@
         T
       methods
         foo
+          reference: <testLibrary>::@class::C::@method::foo
           firstFragment: <testLibraryFragment>::@class::C::@method::foo
           typeParameters
             T
@@ -12485,7 +12502,7 @@
           methods
             foo @20
               reference: <testLibraryFragment>::@class::C::@method::foo
-              element: <testLibraryFragment>::@class::C::@method::foo#element
+              element: <testLibrary>::@class::C::@method::foo
               formalParameters
                 _ @26
                   element: <testLibraryFragment>::@class::C::@method::foo::@parameter::_#element
@@ -12497,6 +12514,7 @@
         T
       methods
         foo
+          reference: <testLibrary>::@class::C::@method::foo
           firstFragment: <testLibraryFragment>::@class::C::@method::foo
           hasEnclosingTypeParameterReference: true
           formalParameters
@@ -12529,7 +12547,7 @@
           methods
             foo @20
               reference: <testLibraryFragment>::@class::C::@method::foo
-              element: <testLibraryFragment>::@class::C::@method::foo#element
+              element: <testLibrary>::@class::C::@method::foo
               formalParameters
                 _ @41
                   element: <testLibraryFragment>::@class::C::@method::foo::@parameter::_#element
@@ -12541,6 +12559,7 @@
         T
       methods
         foo
+          reference: <testLibrary>::@class::C::@method::foo
           firstFragment: <testLibraryFragment>::@class::C::@method::foo
           hasEnclosingTypeParameterReference: true
           formalParameters
@@ -12577,7 +12596,7 @@
           methods
             foo @17
               reference: <testLibraryFragment>::@class::A::@method::foo
-              element: <testLibraryFragment>::@class::A::@method::foo#element
+              element: <testLibrary>::@class::A::@method::foo
         class B @35
           reference: <testLibraryFragment>::@class::B
           element: <testLibrary>::@class::B
@@ -12587,7 +12606,7 @@
           methods
             foo @57
               reference: <testLibraryFragment>::@class::B::@method::foo
-              element: <testLibraryFragment>::@class::B::@method::foo#element
+              element: <testLibrary>::@class::B::@method::foo
   classes
     class A
       reference: <testLibrary>::@class::A
@@ -12596,6 +12615,7 @@
         U
       methods
         foo
+          reference: <testLibrary>::@class::A::@method::foo
           firstFragment: <testLibraryFragment>::@class::A::@method::foo
           hasEnclosingTypeParameterReference: true
           returnType: U
@@ -12607,6 +12627,7 @@
       supertype: A<T>
       methods
         foo
+          reference: <testLibrary>::@class::B::@method::foo
           firstFragment: <testLibraryFragment>::@class::B::@method::foo
           hasEnclosingTypeParameterReference: true
           returnType: T
@@ -12636,7 +12657,7 @@
           methods
             foo @17
               reference: <testLibraryFragment>::@class::C::@method::foo
-              element: <testLibraryFragment>::@class::C::@method::foo#element
+              element: <testLibrary>::@class::C::@method::foo
   classes
     class C
       reference: <testLibrary>::@class::C
@@ -12645,6 +12666,7 @@
         T
       methods
         foo
+          reference: <testLibrary>::@class::C::@method::foo
           firstFragment: <testLibraryFragment>::@class::C::@method::foo
           hasEnclosingTypeParameterReference: true
           returnType: T
@@ -12676,7 +12698,7 @@
           methods
             foo @49
               reference: <testLibraryFragment>::@class::C::@method::foo
-              element: <testLibraryFragment>::@class::C::@method::foo#element
+              element: <testLibrary>::@class::C::@method::foo
       typeAliases
         MyInt @8
           reference: <testLibraryFragment>::@typeAlias::MyInt
@@ -12692,6 +12714,7 @@
         T
       methods
         foo
+          reference: <testLibrary>::@class::C::@method::foo
           firstFragment: <testLibraryFragment>::@class::C::@method::foo
           hasEnclosingTypeParameterReference: true
           returnType: int
@@ -12730,7 +12753,7 @@
           methods
             foo @20
               reference: <testLibraryFragment>::@class::C::@method::foo
-              element: <testLibraryFragment>::@class::C::@method::foo#element
+              element: <testLibrary>::@class::C::@method::foo
               typeParameters
                 U @24
                   element: U@24
@@ -12742,6 +12765,7 @@
         T
       methods
         foo
+          reference: <testLibrary>::@class::C::@method::foo
           firstFragment: <testLibraryFragment>::@class::C::@method::foo
           hasEnclosingTypeParameterReference: true
           typeParameters
@@ -12771,7 +12795,7 @@
           methods
             f @10
               reference: <testLibraryFragment>::@class::C::@method::f
-              element: <testLibraryFragment>::@class::C::@method::f#element
+              element: <testLibrary>::@class::C::@method::f
               formalParameters
                 x @12
                   element: <testLibraryFragment>::@class::C::@method::f::@parameter::x#element
@@ -12786,6 +12810,7 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
       methods
         f
+          reference: <testLibrary>::@class::C::@method::f
           firstFragment: <testLibraryFragment>::@class::C::@method::f
           formalParameters
             requiredPositional hasImplicitType x
@@ -12816,7 +12841,7 @@
           methods
             f @17
               reference: <testLibraryFragment>::@class::C::@method::f
-              element: <testLibraryFragment>::@class::C::@method::f#element
+              element: <testLibrary>::@class::C::@method::f
   classes
     class C
       reference: <testLibrary>::@class::C
@@ -12826,6 +12851,7 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
       methods
         static f
+          reference: <testLibrary>::@class::C::@method::f
           firstFragment: <testLibraryFragment>::@class::C::@method::f
           returnType: dynamic
 ''');
@@ -12857,7 +12883,7 @@
           methods
             f @26 sync*
               reference: <testLibraryFragment>::@class::C::@method::f
-              element: <testLibraryFragment>::@class::C::@method::f#element
+              element: <testLibrary>::@class::C::@method::f
   classes
     class C
       reference: <testLibrary>::@class::C
@@ -12867,6 +12893,7 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
       methods
         f
+          reference: <testLibrary>::@class::C::@method::f
           firstFragment: <testLibraryFragment>::@class::C::@method::f
           returnType: Iterable<int>
 ''');
@@ -12892,7 +12919,7 @@
           methods
             f @12
               reference: <testLibraryFragment>::@class::C::@method::f
-              element: <testLibraryFragment>::@class::C::@method::f#element
+              element: <testLibrary>::@class::C::@method::f
               typeParameters
                 T @14
                   element: T@14
@@ -12910,6 +12937,7 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
       methods
         f
+          reference: <testLibrary>::@class::C::@method::f
           firstFragment: <testLibraryFragment>::@class::C::@method::f
           typeParameters
             T
@@ -12950,7 +12978,7 @@
           methods
             f @20
               reference: <testLibraryFragment>::@class::C::@method::f
-              element: <testLibraryFragment>::@class::C::@method::f#element
+              element: <testLibrary>::@class::C::@method::f
               typeParameters
                 V @22
                   element: V@22
@@ -12975,6 +13003,7 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
       methods
         f
+          reference: <testLibrary>::@class::C::@method::f
           firstFragment: <testLibraryFragment>::@class::C::@method::f
           hasEnclosingTypeParameterReference: true
           typeParameters
@@ -13011,7 +13040,7 @@
           methods
             f @15
               reference: <testLibraryFragment>::@class::C::@method::f
-              element: <testLibraryFragment>::@class::C::@method::f#element
+              element: <testLibrary>::@class::C::@method::f
               typeParameters
                 T @17
                   element: T@17
@@ -13029,6 +13058,7 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
       methods
         f
+          reference: <testLibrary>::@class::C::@method::f
           firstFragment: <testLibraryFragment>::@class::C::@method::f
           typeParameters
             T
@@ -13063,10 +13093,10 @@
           methods
             f @10
               reference: <testLibraryFragment>::@class::C::@method::f
-              element: <testLibraryFragment>::@class::C::@method::f#element
+              element: <testLibrary>::@class::C::@method::f
             g @17
               reference: <testLibraryFragment>::@class::C::@method::g
-              element: <testLibraryFragment>::@class::C::@method::g#element
+              element: <testLibrary>::@class::C::@method::g
   classes
     class C
       reference: <testLibrary>::@class::C
@@ -13076,9 +13106,11 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
       methods
         f
+          reference: <testLibrary>::@class::C::@method::f
           firstFragment: <testLibraryFragment>::@class::C::@method::f
           returnType: dynamic
         g
+          reference: <testLibrary>::@class::C::@method::g
           firstFragment: <testLibraryFragment>::@class::C::@method::g
           returnType: dynamic
 ''');
@@ -14423,7 +14455,7 @@
           methods
             + @20
               reference: <testLibraryFragment>::@class::C::@method::+
-              element: <testLibraryFragment>::@class::C::@method::+#element
+              element: <testLibrary>::@class::C::@method::+
               formalParameters
                 other @24
                   element: <testLibraryFragment>::@class::C::@method::+::@parameter::other#element
@@ -14436,6 +14468,7 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
       methods
         +
+          reference: <testLibrary>::@class::C::@method::+
           firstFragment: <testLibraryFragment>::@class::C::@method::+
           formalParameters
             requiredPositional other
@@ -14468,7 +14501,7 @@
           methods
             == @25
               reference: <testLibraryFragment>::@class::C::@method::==
-              element: <testLibraryFragment>::@class::C::@method::==#element
+              element: <testLibrary>::@class::C::@method::==
               formalParameters
                 other @35
                   element: <testLibraryFragment>::@class::C::@method::==::@parameter::other#element
@@ -14481,6 +14514,7 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
       methods
         ==
+          reference: <testLibrary>::@class::C::@method::==
           firstFragment: <testLibraryFragment>::@class::C::@method::==
           formalParameters
             requiredPositional other
@@ -14511,7 +14545,7 @@
           methods
             + @29
               reference: <testLibraryFragment>::@class::C::@method::+
-              element: <testLibraryFragment>::@class::C::@method::+#element
+              element: <testLibrary>::@class::C::@method::+
               formalParameters
                 other @33
                   element: <testLibraryFragment>::@class::C::@method::+::@parameter::other#element
@@ -14524,6 +14558,7 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
       methods
         external +
+          reference: <testLibrary>::@class::C::@method::+
           firstFragment: <testLibraryFragment>::@class::C::@method::+
           formalParameters
             requiredPositional other
@@ -14556,7 +14591,7 @@
           methods
             >= @25
               reference: <testLibraryFragment>::@class::C::@method::>=
-              element: <testLibraryFragment>::@class::C::@method::>=#element
+              element: <testLibrary>::@class::C::@method::>=
               formalParameters
                 other @30
                   element: <testLibraryFragment>::@class::C::@method::>=::@parameter::other#element
@@ -14569,6 +14604,7 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
       methods
         >=
+          reference: <testLibrary>::@class::C::@method::>=
           firstFragment: <testLibraryFragment>::@class::C::@method::>=
           formalParameters
             requiredPositional other
@@ -14599,7 +14635,7 @@
           methods
             [] @23
               reference: <testLibraryFragment>::@class::C::@method::[]
-              element: <testLibraryFragment>::@class::C::@method::[]#element
+              element: <testLibrary>::@class::C::@method::[]
               formalParameters
                 i @30
                   element: <testLibraryFragment>::@class::C::@method::[]::@parameter::i#element
@@ -14612,6 +14648,7 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
       methods
         []
+          reference: <testLibrary>::@class::C::@method::[]
           firstFragment: <testLibraryFragment>::@class::C::@method::[]
           formalParameters
             requiredPositional i
@@ -14644,7 +14681,7 @@
           methods
             []= @25
               reference: <testLibraryFragment>::@class::C::@method::[]=
-              element: <testLibraryFragment>::@class::C::@method::[]=#element
+              element: <testLibrary>::@class::C::@method::[]=
               formalParameters
                 i @33
                   element: <testLibraryFragment>::@class::C::@method::[]=::@parameter::i#element
@@ -14659,6 +14696,7 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
       methods
         []=
+          reference: <testLibrary>::@class::C::@method::[]=
           firstFragment: <testLibraryFragment>::@class::C::@method::[]=
           formalParameters
             requiredPositional i
@@ -14693,7 +14731,7 @@
           methods
             <= @25
               reference: <testLibraryFragment>::@class::C::@method::<=
-              element: <testLibraryFragment>::@class::C::@method::<=#element
+              element: <testLibrary>::@class::C::@method::<=
               formalParameters
                 other @30
                   element: <testLibraryFragment>::@class::C::@method::<=::@parameter::other#element
@@ -14706,6 +14744,7 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
       methods
         <=
+          reference: <testLibrary>::@class::C::@method::<=
           firstFragment: <testLibraryFragment>::@class::C::@method::<=
           formalParameters
             requiredPositional other
@@ -14738,7 +14777,7 @@
           methods
             - @25
               reference: <testLibraryFragment>::@class::A::@method::-
-              element: <testLibraryFragment>::@class::A::@method::-#element
+              element: <testLibrary>::@class::A::@method::-
               formalParameters
                 other @31
                   element: <testLibraryFragment>::@class::A::@method::-::@parameter::other#element
@@ -14751,6 +14790,7 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
       methods
         -
+          reference: <testLibrary>::@class::A::@method::-
           firstFragment: <testLibraryFragment>::@class::A::@method::-
           formalParameters
             requiredPositional other
@@ -14783,7 +14823,7 @@
           methods
             - @25
               reference: <testLibraryFragment>::@class::A::@method::unary-
-              element: <testLibraryFragment>::@class::A::@method::unary-#element
+              element: <testLibrary>::@class::A::@method::unary-
   classes
     class A
       reference: <testLibrary>::@class::A
@@ -14793,6 +14833,7 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
       methods
         unary-
+          reference: <testLibrary>::@class::A::@method::unary-
           firstFragment: <testLibraryFragment>::@class::A::@method::unary-
           returnType: int
 ''');
@@ -16216,7 +16257,7 @@
           methods
             set @12
               reference: <testLibraryFragment>::@class::A::@method::set
-              element: <testLibraryFragment>::@class::A::@method::set#element
+              element: <testLibrary>::@class::A::@method::set
               formalParameters
                 _ @21
                   element: <testLibraryFragment>::@class::A::@method::set::@parameter::_#element
@@ -16229,6 +16270,7 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
       methods
         set
+          reference: <testLibrary>::@class::A::@method::set
           firstFragment: <testLibraryFragment>::@class::A::@method::set
           formalParameters
             requiredPositional _
@@ -20113,7 +20155,7 @@
           methods
             f @92
               reference: <testLibraryFragment>::@class::E::@method::f
-              element: <testLibraryFragment>::@class::E::@method::f#element
+              element: <testLibrary>::@class::E::@method::f
   classes
     class alias C
       reference: <testLibrary>::@class::C
@@ -20180,6 +20222,7 @@
           returnType: void
       methods
         f
+          reference: <testLibrary>::@class::E::@method::f
           firstFragment: <testLibraryFragment>::@class::E::@method::f
           returnType: void
 ''');
@@ -20498,7 +20541,7 @@
           methods
             f @20
               reference: <testLibraryFragment>::@class::C::@method::f
-              element: <testLibraryFragment>::@class::C::@method::f#element
+              element: <testLibrary>::@class::C::@method::f
       topLevelVariables
         c @36
           reference: <testLibraryFragment>::@topLevelVariable::c
@@ -20541,6 +20584,7 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
       methods
         f
+          reference: <testLibrary>::@class::C::@method::f
           firstFragment: <testLibraryFragment>::@class::C::@method::f
           returnType: void
   topLevelVariables
diff --git a/pkg/analyzer/test/src/summary/elements/const_test.dart b/pkg/analyzer/test/src/summary/elements/const_test.dart
index cf674db..c14349c 100644
--- a/pkg/analyzer/test/src/summary/elements/const_test.dart
+++ b/pkg/analyzer/test/src/summary/elements/const_test.dart
@@ -128,7 +128,7 @@
                 readType: int
                 writeElement2: <testLibraryFragment>::@getter::a#element
                 writeType: InvalidType
-                element: dart:core::<fragment>::@class::num::@method::+#element
+                element: dart:core::@class::num::@method::+
                 staticType: int
               rightParenthesis: ) @30
               staticType: int
@@ -198,7 +198,7 @@
                   operator: .. @19
                   methodName: SimpleIdentifier
                     token: abs @21
-                    element: dart:core::<fragment>::@class::int::@method::abs#element
+                    element: dart:core::@class::int::@method::abs
                     staticType: int Function()
                   argumentList: ArgumentList
                     leftParenthesis: ( @24
@@ -1068,7 +1068,7 @@
                 staticType: int
               rightBracket: ] @41
               element: MethodMember
-                baseElement: dart:core::<fragment>::@class::List::@method::[]#element
+                baseElement: dart:core::@class::List::@method::[]
                 substitution: {E: int}
               staticType: int
           getter2: <testLibraryFragment>::@getter::c
@@ -1313,7 +1313,7 @@
                       rightParenthesis: ) @37
                     staticInvokeType: int Function()
                     staticType: int
-                  element: dart:core::<fragment>::@class::num::@method::+#element
+                  element: dart:core::@class::num::@method::+
                   staticInvokeType: num Function(num)
                   staticType: int
               getter2: <testLibraryFragment>::@class::C::@getter::f
@@ -1820,7 +1820,7 @@
               operator: . @15
               methodName: SimpleIdentifier
                 token: codeUnitAt @16
-                element: dart:core::<fragment>::@class::String::@method::codeUnitAt#element
+                element: dart:core::@class::String::@method::codeUnitAt
                 staticType: int Function(int)
               argumentList: ArgumentList
                 leftParenthesis: ( @26
@@ -1923,7 +1923,7 @@
                   rightParenthesis: ) @18
                 staticInvokeType: int Function()
                 staticType: int
-              element: dart:core::<fragment>::@class::num::@method::+#element
+              element: dart:core::@class::num::@method::+
               staticInvokeType: num Function(num)
               staticType: int
           getter2: <testLibraryFragment>::@getter::v
@@ -2029,7 +2029,7 @@
               rightOperand: IntegerLiteral
                 literal: 5 @36
                 staticType: int
-              element: dart:core::<fragment>::@class::num::@method::+#element
+              element: dart:core::@class::num::@method::+
               staticInvokeType: num Function(num)
               staticType: int
           getter2: <testLibraryFragment>::@getter::b
@@ -4326,7 +4326,7 @@
           methods
             length @23
               reference: <testLibraryFragment>::@class::C::@method::length
-              element: <testLibraryFragment>::@class::C::@method::length#element
+              element: <testLibrary>::@class::C::@method::length
       topLevelVariables
         hasInitializer v @47
           reference: <testLibraryFragment>::@topLevelVariable::v
@@ -4340,9 +4340,9 @@
               period: . @52
               identifier: SimpleIdentifier
                 token: length @53
-                element: <testLibraryFragment>::@class::C::@method::length#element
+                element: <testLibrary>::@class::C::@method::length
                 staticType: int Function()
-              element: <testLibraryFragment>::@class::C::@method::length#element
+              element: <testLibrary>::@class::C::@method::length
               staticType: int Function()
           getter2: <testLibraryFragment>::@getter::v
       getters
@@ -4358,6 +4358,7 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
       methods
         static length
+          reference: <testLibrary>::@class::C::@method::length
           firstFragment: <testLibraryFragment>::@class::C::@method::length
           returnType: int
   topLevelVariables
@@ -5173,7 +5174,7 @@
                       rightOperand: IntegerLiteral
                         literal: 2 @44
                         staticType: int
-                      element: dart:core::<fragment>::@class::num::@method::+#element
+                      element: dart:core::@class::num::@method::+
                       staticInvokeType: num Function(num)
                       staticType: int
           getters
@@ -5246,7 +5247,7 @@
                       rightOperand: IntegerLiteral
                         literal: 2 @45
                         staticType: int
-                      element: dart:core::<fragment>::@class::num::@method::+#element
+                      element: dart:core::@class::num::@method::+
                       staticInvokeType: num Function(num)
                       staticType: int
           getters
@@ -5317,7 +5318,7 @@
                       rightOperand: IntegerLiteral
                         literal: 2 @40
                         staticType: int
-                      element: dart:core::<fragment>::@class::num::@method::+#element
+                      element: dart:core::@class::num::@method::+
                       staticInvokeType: num Function(num)
                       staticType: int
             const named @55
@@ -5339,13 +5340,13 @@
                       rightOperand: IntegerLiteral
                         literal: 2 @69
                         staticType: int
-                      element: dart:core::<fragment>::@class::num::@method::+#element
+                      element: dart:core::@class::num::@method::+
                       staticInvokeType: num Function(num)
                       staticType: int
           methods
             methodPositional @81
               reference: <testLibraryFragment>::@class::C::@method::methodPositional
-              element: <testLibraryFragment>::@class::C::@method::methodPositional#element
+              element: <testLibrary>::@class::C::@method::methodPositional
               formalParameters
                 default p @99
                   element: <testLibraryFragment>::@class::C::@method::methodPositional::@parameter::p#element
@@ -5358,18 +5359,18 @@
                       rightOperand: IntegerLiteral
                         literal: 2 @107
                         staticType: int
-                      element: dart:core::<fragment>::@class::num::@method::+#element
+                      element: dart:core::@class::num::@method::+
                       staticInvokeType: num Function(num)
                       staticType: int
             methodPositionalWithoutDefault @121
               reference: <testLibraryFragment>::@class::C::@method::methodPositionalWithoutDefault
-              element: <testLibraryFragment>::@class::C::@method::methodPositionalWithoutDefault#element
+              element: <testLibrary>::@class::C::@method::methodPositionalWithoutDefault
               formalParameters
                 default p @153
                   element: <testLibraryFragment>::@class::C::@method::methodPositionalWithoutDefault::@parameter::p#element
             methodNamed @167
               reference: <testLibraryFragment>::@class::C::@method::methodNamed
-              element: <testLibraryFragment>::@class::C::@method::methodNamed#element
+              element: <testLibrary>::@class::C::@method::methodNamed
               formalParameters
                 default p @180
                   reference: <testLibraryFragment>::@class::C::@method::methodNamed::@parameter::p
@@ -5383,12 +5384,12 @@
                       rightOperand: IntegerLiteral
                         literal: 2 @187
                         staticType: int
-                      element: dart:core::<fragment>::@class::num::@method::+#element
+                      element: dart:core::@class::num::@method::+
                       staticInvokeType: num Function(num)
                       staticType: int
             methodNamedWithoutDefault @201
               reference: <testLibraryFragment>::@class::C::@method::methodNamedWithoutDefault
-              element: <testLibraryFragment>::@class::C::@method::methodNamedWithoutDefault#element
+              element: <testLibrary>::@class::C::@method::methodNamedWithoutDefault
               formalParameters
                 default p @228
                   reference: <testLibraryFragment>::@class::C::@method::methodNamedWithoutDefault::@parameter::p
@@ -5416,6 +5417,7 @@
                 expression: expression_1
       methods
         methodPositional
+          reference: <testLibrary>::@class::C::@method::methodPositional
           firstFragment: <testLibraryFragment>::@class::C::@method::methodPositional
           formalParameters
             optionalPositional hasImplicitType p
@@ -5424,12 +5426,14 @@
                 expression: expression_2
           returnType: void
         methodPositionalWithoutDefault
+          reference: <testLibrary>::@class::C::@method::methodPositionalWithoutDefault
           firstFragment: <testLibraryFragment>::@class::C::@method::methodPositionalWithoutDefault
           formalParameters
             optionalPositional hasImplicitType p
               type: dynamic
           returnType: void
         methodNamed
+          reference: <testLibrary>::@class::C::@method::methodNamed
           firstFragment: <testLibraryFragment>::@class::C::@method::methodNamed
           formalParameters
             optionalNamed hasImplicitType p
@@ -5440,6 +5444,7 @@
                 expression: expression_3
           returnType: void
         methodNamedWithoutDefault
+          reference: <testLibrary>::@class::C::@method::methodNamedWithoutDefault
           firstFragment: <testLibraryFragment>::@class::C::@method::methodNamedWithoutDefault
           formalParameters
             optionalNamed hasImplicitType p
@@ -5483,7 +5488,7 @@
               readType: int
               writeElement2: <testLibraryFragment>::@getter::a#element
               writeType: InvalidType
-              element: dart:core::<fragment>::@class::num::@method::+#element
+              element: dart:core::@class::num::@method::+
               staticType: int
           getter2: <testLibraryFragment>::@getter::b
       getters
@@ -5617,7 +5622,7 @@
                 token: a @24
                 element: <testLibraryFragment>::@getter::a#element
                 staticType: int
-              element: dart:core::<fragment>::@class::int::@method::unary-#element
+              element: dart:core::@class::int::@method::unary-
               staticType: int
           getter2: <testLibraryFragment>::@getter::b
       getters
@@ -5684,7 +5689,7 @@
                 token: a @28
                 element: package:test/a.dart::<fragment>::@getter::a#element
                 staticType: Object
-              element: package:test/a.dart::<fragment>::@extension::E::@method::unary-#element
+              element: package:test/a.dart::@extension::E::@method::unary-
               staticType: int
           getter2: <testLibraryFragment>::@getter::b
       getters
@@ -5741,7 +5746,7 @@
               readType: int
               writeElement2: <testLibraryFragment>::@getter::a#element
               writeType: InvalidType
-              element: dart:core::<fragment>::@class::num::@method::+#element
+              element: dart:core::@class::num::@method::+
               staticType: int
           getter2: <testLibraryFragment>::@getter::b
       getters
@@ -6176,7 +6181,7 @@
           methods
             m @23
               reference: <testLibraryFragment>::@class::C::@method::m
-              element: <testLibraryFragment>::@class::C::@method::m#element
+              element: <testLibrary>::@class::C::@method::m
               formalParameters
                 a @29
                   element: <testLibraryFragment>::@class::C::@method::m::@parameter::a#element
@@ -6195,9 +6200,9 @@
               period: . @62
               identifier: SimpleIdentifier
                 token: m @63
-                element: <testLibraryFragment>::@class::C::@method::m#element
+                element: <testLibrary>::@class::C::@method::m
                 staticType: int Function(int, String)
-              element: <testLibraryFragment>::@class::C::@method::m#element
+              element: <testLibrary>::@class::C::@method::m
               staticType: int Function(int, String)
           getter2: <testLibraryFragment>::@getter::V
       getters
@@ -6213,6 +6218,7 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
       methods
         static m
+          reference: <testLibrary>::@class::C::@method::m
           firstFragment: <testLibraryFragment>::@class::C::@method::m
           formalParameters
             requiredPositional a
@@ -6267,9 +6273,9 @@
               period: . @28
               identifier: SimpleIdentifier
                 token: m @29
-                element: package:test/a.dart::<fragment>::@class::C::@method::m#element
+                element: package:test/a.dart::@class::C::@method::m
                 staticType: int Function(int, String)
-              element: package:test/a.dart::<fragment>::@class::C::@method::m#element
+              element: package:test/a.dart::@class::C::@method::m
               staticType: int Function(int, String)
           getter2: <testLibraryFragment>::@getter::V
       getters
@@ -6334,7 +6340,7 @@
               operator: . @35
               propertyName: SimpleIdentifier
                 token: m @36
-                element: package:test/a.dart::<fragment>::@class::C::@method::m#element
+                element: package:test/a.dart::@class::C::@method::m
                 staticType: int Function(int, String)
               staticType: int Function(int, String)
           getter2: <testLibraryFragment>::@getter::V
@@ -6388,7 +6394,7 @@
           methods
             f @44
               reference: <testLibraryFragment>::@extension::E::@method::f
-              element: <testLibraryFragment>::@extension::E::@method::f#element
+              element: <testLibrary>::@extension::E::@method::f
       topLevelVariables
         hasInitializer x @59
           reference: <testLibraryFragment>::@topLevelVariable::x
@@ -6402,9 +6408,9 @@
               period: . @64
               identifier: SimpleIdentifier
                 token: f @65
-                element: <testLibraryFragment>::@extension::E::@method::f#element
+                element: <testLibrary>::@extension::E::@method::f
                 staticType: void Function()
-              element: <testLibraryFragment>::@extension::E::@method::f#element
+              element: <testLibrary>::@extension::E::@method::f
               staticType: void Function()
           getter2: <testLibraryFragment>::@getter::x
       getters
@@ -6424,6 +6430,7 @@
       firstFragment: <testLibraryFragment>::@extension::E
       methods
         static f
+          reference: <testLibrary>::@extension::E::@method::f
           firstFragment: <testLibraryFragment>::@extension::E::@method::f
           returnType: void
   topLevelVariables
@@ -6692,7 +6699,7 @@
               rightOperand: IntegerLiteral
                 literal: 2 @27
                 staticType: int
-              element: dart:core::<fragment>::@class::num::@method::+#element
+              element: dart:core::@class::num::@method::+
               staticInvokeType: num Function(num)
               staticType: int
           getter2: <testLibraryFragment>::@getter::B
@@ -6760,7 +6767,7 @@
               rightOperand: IntegerLiteral
                 literal: 2 @31
                 staticType: int
-              element: dart:core::<fragment>::@class::num::@method::+#element
+              element: dart:core::@class::num::@method::+
               staticInvokeType: num Function(num)
               staticType: int
           getter2: <testLibraryFragment>::@getter::B
@@ -6825,7 +6832,7 @@
               rightOperand: IntegerLiteral
                 literal: 2 @38
                 staticType: int
-              element: dart:core::<fragment>::@class::num::@method::+#element
+              element: dart:core::@class::num::@method::+
               staticInvokeType: num Function(num)
               staticType: int
           getter2: <testLibraryFragment>::@getter::B
@@ -8015,7 +8022,7 @@
               rightOperand: IntegerLiteral
                 literal: 2 @20
                 staticType: int
-              element: dart:core::<fragment>::@class::num::@method::==#element
+              element: dart:core::@class::num::@method::==
               staticInvokeType: bool Function(Object)
               staticType: bool
           getter2: <testLibraryFragment>::@getter::vEqual
@@ -8063,7 +8070,7 @@
               rightOperand: IntegerLiteral
                 literal: 2 @98
                 staticType: int
-              element: dart:core::<fragment>::@class::int::@method::^#element
+              element: dart:core::@class::int::@method::^
               staticInvokeType: int Function(int)
               staticType: int
           getter2: <testLibraryFragment>::@getter::vBitXor
@@ -8079,7 +8086,7 @@
               rightOperand: IntegerLiteral
                 literal: 2 @121
                 staticType: int
-              element: dart:core::<fragment>::@class::int::@method::&#element
+              element: dart:core::@class::int::@method::&
               staticInvokeType: int Function(int)
               staticType: int
           getter2: <testLibraryFragment>::@getter::vBitAnd
@@ -8095,7 +8102,7 @@
               rightOperand: IntegerLiteral
                 literal: 2 @143
                 staticType: int
-              element: dart:core::<fragment>::@class::int::@method::|#element
+              element: dart:core::@class::int::@method::|
               staticInvokeType: int Function(int)
               staticType: int
           getter2: <testLibraryFragment>::@getter::vBitOr
@@ -8111,7 +8118,7 @@
               rightOperand: IntegerLiteral
                 literal: 2 @173
                 staticType: int
-              element: dart:core::<fragment>::@class::int::@method::<<#element
+              element: dart:core::@class::int::@method::<<
               staticInvokeType: int Function(int)
               staticType: int
           getter2: <testLibraryFragment>::@getter::vBitShiftLeft
@@ -8127,7 +8134,7 @@
               rightOperand: IntegerLiteral
                 literal: 2 @204
                 staticType: int
-              element: dart:core::<fragment>::@class::int::@method::>>#element
+              element: dart:core::@class::int::@method::>>
               staticInvokeType: int Function(int)
               staticType: int
           getter2: <testLibraryFragment>::@getter::vBitShiftRight
@@ -8143,7 +8150,7 @@
               rightOperand: IntegerLiteral
                 literal: 2 @224
                 staticType: int
-              element: dart:core::<fragment>::@class::num::@method::+#element
+              element: dart:core::@class::num::@method::+
               staticInvokeType: num Function(num)
               staticType: int
           getter2: <testLibraryFragment>::@getter::vAdd
@@ -8159,7 +8166,7 @@
               rightOperand: IntegerLiteral
                 literal: 2 @249
                 staticType: int
-              element: dart:core::<fragment>::@class::num::@method::-#element
+              element: dart:core::@class::num::@method::-
               staticInvokeType: num Function(num)
               staticType: int
           getter2: <testLibraryFragment>::@getter::vSubtract
@@ -8175,7 +8182,7 @@
               rightOperand: IntegerLiteral
                 literal: 2 @274
                 staticType: int
-              element: dart:core::<fragment>::@class::num::@method::*#element
+              element: dart:core::@class::num::@method::*
               staticInvokeType: num Function(num)
               staticType: int
           getter2: <testLibraryFragment>::@getter::vMiltiply
@@ -8191,7 +8198,7 @@
               rightOperand: IntegerLiteral
                 literal: 2 @297
                 staticType: int
-              element: dart:core::<fragment>::@class::num::@method::/#element
+              element: dart:core::@class::num::@method::/
               staticInvokeType: double Function(num)
               staticType: double
           getter2: <testLibraryFragment>::@getter::vDivide
@@ -8207,7 +8214,7 @@
               rightOperand: IntegerLiteral
                 literal: 2 @326
                 staticType: int
-              element: dart:core::<fragment>::@class::num::@method::~/#element
+              element: dart:core::@class::num::@method::~/
               staticInvokeType: int Function(num)
               staticType: int
           getter2: <testLibraryFragment>::@getter::vFloorDivide
@@ -8223,7 +8230,7 @@
               rightOperand: IntegerLiteral
                 literal: 2 @349
                 staticType: int
-              element: dart:core::<fragment>::@class::num::@method::%#element
+              element: dart:core::@class::num::@method::%
               staticInvokeType: num Function(num)
               staticType: int
           getter2: <testLibraryFragment>::@getter::vModulo
@@ -8239,7 +8246,7 @@
               rightOperand: IntegerLiteral
                 literal: 2 @373
                 staticType: int
-              element: dart:core::<fragment>::@class::num::@method::>#element
+              element: dart:core::@class::num::@method::>
               staticInvokeType: bool Function(num)
               staticType: bool
           getter2: <testLibraryFragment>::@getter::vGreater
@@ -8255,7 +8262,7 @@
               rightOperand: IntegerLiteral
                 literal: 2 @403
                 staticType: int
-              element: dart:core::<fragment>::@class::num::@method::>=#element
+              element: dart:core::@class::num::@method::>=
               staticInvokeType: bool Function(num)
               staticType: bool
           getter2: <testLibraryFragment>::@getter::vGreaterEqual
@@ -8271,7 +8278,7 @@
               rightOperand: IntegerLiteral
                 literal: 2 @424
                 staticType: int
-              element: dart:core::<fragment>::@class::num::@method::<#element
+              element: dart:core::@class::num::@method::<
               staticInvokeType: bool Function(num)
               staticType: bool
           getter2: <testLibraryFragment>::@getter::vLess
@@ -8287,7 +8294,7 @@
               rightOperand: IntegerLiteral
                 literal: 2 @451
                 staticType: int
-              element: dart:core::<fragment>::@class::num::@method::<=#element
+              element: dart:core::@class::num::@method::<=
               staticInvokeType: bool Function(num)
               staticType: bool
           getter2: <testLibraryFragment>::@getter::vLessEqual
@@ -8575,7 +8582,7 @@
                   rightOperand: IntegerLiteral
                     literal: 2 @27
                     staticType: int
-                  element: dart:core::<fragment>::@class::num::@method::==#element
+                  element: dart:core::@class::num::@method::==
                   staticInvokeType: bool Function(Object)
                   staticType: bool
                 rightParenthesis: ) @28
@@ -8636,7 +8643,7 @@
                   rightOperand: IntegerLiteral
                     literal: 2 @25
                     staticType: int
-                  element: dart:core::<fragment>::@class::num::@method::==#element
+                  element: dart:core::@class::num::@method::==
                   staticInvokeType: bool Function(Object)
                   staticType: bool
                 rightParenthesis: ) @26
@@ -8782,7 +8789,7 @@
               operand: IntegerLiteral
                 literal: 2 @116
                 staticType: int
-              element: dart:core::<fragment>::@class::int::@method::unary-#element
+              element: dart:core::@class::int::@method::unary-
               staticType: int
           getter2: <testLibraryFragment>::@getter::vIntNegative
         hasInitializer vIntLong1 @125
@@ -9098,7 +9105,7 @@
               operator: ?. @29
               methodName: SimpleIdentifier
                 token: toString @31
-                element: dart:core::<fragment>::@class::int::@method::toString#element
+                element: dart:core::@class::int::@method::toString
                 staticType: String Function()
               argumentList: ArgumentList
                 leftParenthesis: ( @39
@@ -9174,7 +9181,7 @@
                   operator: ?.. @29
                   methodName: SimpleIdentifier
                     token: toString @32
-                    element: dart:core::<fragment>::@class::int::@method::toString#element
+                    element: dart:core::@class::int::@method::toString
                     staticType: String Function()
                   argumentList: ArgumentList
                     leftParenthesis: ( @40
@@ -9322,7 +9329,7 @@
                   rightOperand: IntegerLiteral
                     literal: 2 @20
                     staticType: int
-                  element: dart:core::<fragment>::@class::num::@method::+#element
+                  element: dart:core::@class::num::@method::+
                   staticInvokeType: num Function(num)
                   staticType: int
                 rightParenthesis: ) @21
@@ -9331,7 +9338,7 @@
               rightOperand: IntegerLiteral
                 literal: 3 @25
                 staticType: int
-              element: dart:core::<fragment>::@class::num::@method::*#element
+              element: dart:core::@class::num::@method::*
               staticInvokeType: num Function(num)
               staticType: int
           getter2: <testLibraryFragment>::@getter::v1
@@ -9351,12 +9358,12 @@
                   rightOperand: IntegerLiteral
                     literal: 2 @49
                     staticType: int
-                  element: dart:core::<fragment>::@class::num::@method::+#element
+                  element: dart:core::@class::num::@method::+
                   staticInvokeType: num Function(num)
                   staticType: int
                 rightParenthesis: ) @50
                 staticType: int
-              element: dart:core::<fragment>::@class::int::@method::unary-#element
+              element: dart:core::@class::int::@method::unary-
               staticType: int
           getter2: <testLibraryFragment>::@getter::v2
         hasInitializer v3 @63
@@ -9372,7 +9379,7 @@
                   operator: + @75
                   rightOperand: SimpleStringLiteral
                     literal: 'bbb' @77
-                  element: dart:core::<fragment>::@class::String::@method::+#element
+                  element: dart:core::@class::String::@method::+
                   staticInvokeType: String Function(String)
                   staticType: String
                 rightParenthesis: ) @82
@@ -9458,7 +9465,7 @@
               rightOperand: IntegerLiteral
                 literal: 2 @23
                 staticType: int
-              element: dart:core::<fragment>::@class::num::@method::==#element
+              element: dart:core::@class::num::@method::==
               staticInvokeType: bool Function(Object)
               staticType: bool
           getter2: <testLibraryFragment>::@getter::vNotEqual
@@ -9483,7 +9490,7 @@
               operand: IntegerLiteral
                 literal: 1 @63
                 staticType: int
-              element: dart:core::<fragment>::@class::int::@method::unary-#element
+              element: dart:core::@class::int::@method::unary-
               staticType: int
           getter2: <testLibraryFragment>::@getter::vNegate
         hasInitializer vComplement @72
@@ -9495,7 +9502,7 @@
               operand: IntegerLiteral
                 literal: 1 @87
                 staticType: int
-              element: dart:core::<fragment>::@class::int::@method::~#element
+              element: dart:core::@class::int::@method::~
               staticType: int
           getter2: <testLibraryFragment>::@getter::vComplement
       getters
@@ -11054,7 +11061,7 @@
               initializer: expression_0
                 SimpleIdentifier
                   token: m @29
-                  element: <testLibraryFragment>::@class::C::@method::m#element
+                  element: <testLibrary>::@class::C::@method::m
                   staticType: dynamic Function()
               getter2: <testLibraryFragment>::@class::C::@getter::a
           constructors
@@ -11069,7 +11076,7 @@
           methods
             m @41
               reference: <testLibraryFragment>::@class::C::@method::m
-              element: <testLibraryFragment>::@class::C::@method::m#element
+              element: <testLibrary>::@class::C::@method::m
   classes
     class C
       reference: <testLibrary>::@class::C
@@ -11091,6 +11098,7 @@
           returnType: dynamic Function()
       methods
         static m
+          reference: <testLibrary>::@class::C::@method::m
           firstFragment: <testLibraryFragment>::@class::C::@method::m
           returnType: dynamic
 ''');
diff --git a/pkg/analyzer/test/src/summary/elements/default_value_test.dart b/pkg/analyzer/test/src/summary/elements/default_value_test.dart
index 52ec5d5..0a9cb50 100644
--- a/pkg/analyzer/test/src/summary/elements/default_value_test.dart
+++ b/pkg/analyzer/test/src/summary/elements/default_value_test.dart
@@ -43,7 +43,7 @@
           methods
             X @21
               reference: <testLibraryFragment>::@class::A::@method::X
-              element: <testLibraryFragment>::@class::A::@method::X#element
+              element: <testLibrary>::@class::A::@method::X
               formalParameters
                 default a @32
                   reference: <testLibraryFragment>::@class::A::@method::X::@parameter::a
@@ -65,6 +65,7 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
       methods
         abstract X
+          reference: <testLibrary>::@class::A::@method::X
           firstFragment: <testLibraryFragment>::@class::A::@method::X
           hasEnclosingTypeParameterReference: true
           formalParameters
@@ -234,7 +235,7 @@
           methods
             foo @45
               reference: <testLibraryFragment>::@class::B::@method::foo
-              element: <testLibraryFragment>::@class::B::@method::foo#element
+              element: <testLibrary>::@class::B::@method::foo
               formalParameters
                 default a @50
                   reference: <testLibraryFragment>::@class::B::@method::foo::@parameter::a
@@ -285,6 +286,7 @@
           firstFragment: <testLibraryFragment>::@class::B::@constructor::new
       methods
         foo
+          reference: <testLibrary>::@class::B::@method::foo
           firstFragment: <testLibraryFragment>::@class::B::@method::foo
           formalParameters
             optionalNamed hasImplicitType a
@@ -354,9 +356,9 @@
                   period: . @42
                   identifier: SimpleIdentifier
                     token: compare @43
-                    element: dart:core::<fragment>::@class::Comparable::@method::compare#element
+                    element: dart:core::@class::Comparable::@method::compare
                     staticType: int Function(Comparable<dynamic>, Comparable<dynamic>)
-                  element: dart:core::<fragment>::@class::Comparable::@method::compare#element
+                  element: dart:core::@class::Comparable::@method::compare
                   staticType: int Function(Comparable<dynamic>, Comparable<dynamic>)
   functions
     f
@@ -614,17 +616,17 @@
           methods
             f @44
               reference: <testLibraryFragment>::@extension::E::@method::f
-              element: <testLibraryFragment>::@extension::E::@method::f#element
+              element: <testLibrary>::@extension::E::@method::f
             g @65
               reference: <testLibraryFragment>::@extension::E::@method::g
-              element: <testLibraryFragment>::@extension::E::@method::g#element
+              element: <testLibrary>::@extension::E::@method::g
               formalParameters
                 default p @75
                   element: <testLibraryFragment>::@extension::E::@method::g::@parameter::p#element
                   initializer: expression_0
                     SimpleIdentifier
                       token: f @79
-                      element: <testLibraryFragment>::@extension::E::@method::f#element
+                      element: <testLibrary>::@extension::E::@method::f
                       staticType: void Function()
   classes
     class A
@@ -639,9 +641,11 @@
       firstFragment: <testLibraryFragment>::@extension::E
       methods
         static f
+          reference: <testLibrary>::@extension::E::@method::f
           firstFragment: <testLibraryFragment>::@extension::E::@method::f
           returnType: void
         static g
+          reference: <testLibrary>::@extension::E::@method::g
           firstFragment: <testLibraryFragment>::@extension::E::@method::g
           formalParameters
             optionalPositional p
@@ -693,7 +697,7 @@
           methods
             foo @50
               reference: <testLibraryFragment>::@class::C::@method::foo
-              element: <testLibraryFragment>::@class::C::@method::foo#element
+              element: <testLibrary>::@class::C::@method::foo
               formalParameters
                 default b @70
                   element: <testLibraryFragment>::@class::C::@method::foo::@parameter::b#element
@@ -730,6 +734,7 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
       methods
         foo
+          reference: <testLibrary>::@class::C::@method::foo
           firstFragment: <testLibraryFragment>::@class::C::@method::foo
           formalParameters
             optionalPositional b
@@ -1044,7 +1049,7 @@
           methods
             foo @45
               reference: <testLibraryFragment>::@class::C::@method::foo
-              element: <testLibraryFragment>::@class::C::@method::foo#element
+              element: <testLibrary>::@class::C::@method::foo
               typeParameters
                 T @49
                   element: T@49
@@ -1083,6 +1088,7 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
       methods
         foo
+          reference: <testLibrary>::@class::C::@method::foo
           firstFragment: <testLibraryFragment>::@class::C::@method::foo
           typeParameters
             T
@@ -1139,7 +1145,7 @@
           methods
             foo @54
               reference: <testLibraryFragment>::@class::C::@method::foo
-              element: <testLibraryFragment>::@class::C::@method::foo#element
+              element: <testLibrary>::@class::C::@method::foo
               typeParameters
                 E2 @58
                   element: E2@58
@@ -1181,6 +1187,7 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
       methods
         foo
+          reference: <testLibrary>::@class::C::@method::foo
           firstFragment: <testLibraryFragment>::@class::C::@method::foo
           hasEnclosingTypeParameterReference: true
           typeParameters
@@ -1236,7 +1243,7 @@
           methods
             foo @48
               reference: <testLibraryFragment>::@class::C::@method::foo
-              element: <testLibraryFragment>::@class::C::@method::foo#element
+              element: <testLibrary>::@class::C::@method::foo
               formalParameters
                 default b @58
                   element: <testLibraryFragment>::@class::C::@method::foo::@parameter::b#element
@@ -1274,6 +1281,7 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
       methods
         foo
+          reference: <testLibrary>::@class::C::@method::foo
           firstFragment: <testLibraryFragment>::@class::C::@method::foo
           hasEnclosingTypeParameterReference: true
           formalParameters
diff --git a/pkg/analyzer/test/src/summary/elements/duplicate_declaration_test.dart b/pkg/analyzer/test/src/summary/elements/duplicate_declaration_test.dart
index 0cb6025..cdd55a1 100644
--- a/pkg/analyzer/test/src/summary/elements/duplicate_declaration_test.dart
+++ b/pkg/analyzer/test/src/summary/elements/duplicate_declaration_test.dart
@@ -392,10 +392,10 @@
           methods
             foo @17
               reference: <testLibraryFragment>::@class::A::@method::foo::@def::0
-              element: <testLibraryFragment>::@class::A::@method::foo::@def::0#element
+              element: <testLibrary>::@class::A::@method::foo::@def::0
             foo @33
               reference: <testLibraryFragment>::@class::A::@method::foo::@def::1
-              element: <testLibraryFragment>::@class::A::@method::foo::@def::1#element
+              element: <testLibrary>::@class::A::@method::foo::@def::1
   classes
     class A
       reference: <testLibrary>::@class::A
@@ -405,9 +405,11 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
       methods
         foo
+          reference: <testLibrary>::@class::A::@method::foo::@def::0
           firstFragment: <testLibraryFragment>::@class::A::@method::foo::@def::0
           returnType: void
         foo
+          reference: <testLibrary>::@class::A::@method::foo::@def::1
           firstFragment: <testLibraryFragment>::@class::A::@method::foo::@def::1
           returnType: void
 ''');
diff --git a/pkg/analyzer/test/src/summary/elements/enum_test.dart b/pkg/analyzer/test/src/summary/elements/enum_test.dart
index 9a699e2..5876e68 100644
--- a/pkg/analyzer/test/src/summary/elements/enum_test.dart
+++ b/pkg/analyzer/test/src/summary/elements/enum_test.dart
@@ -1247,7 +1247,7 @@
                       rightOperand: IntegerLiteral
                         literal: 2 @53
                         staticType: int
-                      element: dart:core::<fragment>::@class::num::@method::+#element
+                      element: dart:core::@class::num::@method::+
                       staticInvokeType: num Function(num)
                       staticType: int
           getters
@@ -2916,7 +2916,7 @@
           methods
             foo @23
               reference: <testLibraryFragment>::@enum::E::@method::foo
-              element: <testLibraryFragment>::@enum::E::@method::foo#element
+              element: <testLibrary>::@enum::E::@method::foo
               typeParameters
                 U @27
                   element: U@27
@@ -2959,6 +2959,7 @@
           returnType: List<E<dynamic>>
       methods
         foo
+          reference: <testLibrary>::@enum::E::@method::foo
           firstFragment: <testLibraryFragment>::@enum::E::@method::foo
           hasEnclosingTypeParameterReference: true
           typeParameters
@@ -3035,7 +3036,7 @@
           methods
             toString @23
               reference: <testLibraryFragment>::@enum::E::@method::toString
-              element: <testLibraryFragment>::@enum::E::@method::toString#element
+              element: <testLibrary>::@enum::E::@method::toString
   enums
     enum E
       reference: <testLibrary>::@enum::E
@@ -3068,6 +3069,7 @@
           returnType: List<E>
       methods
         toString
+          reference: <testLibrary>::@enum::E::@method::toString
           firstFragment: <testLibraryFragment>::@enum::E::@method::toString
           returnType: String
 ''');
@@ -5031,7 +5033,7 @@
           methods
             foo @52
               reference: <testLibraryFragment>::@class::A::@method::foo
-              element: <testLibraryFragment>::@class::A::@method::foo#element
+              element: <testLibrary>::@class::A::@method::foo
         class B @70
           reference: <testLibraryFragment>::@class::B
           element: <testLibrary>::@class::B
@@ -5043,7 +5045,7 @@
           methods
             foo @92
               reference: <testLibraryFragment>::@class::B::@method::foo
-              element: <testLibraryFragment>::@class::B::@method::foo#element
+              element: <testLibrary>::@class::B::@method::foo
         class C @110
           reference: <testLibraryFragment>::@class::C
           element: <testLibrary>::@class::C
@@ -5055,7 +5057,7 @@
           methods
             foo @141
               reference: <testLibraryFragment>::@class::C::@method::foo
-              element: <testLibraryFragment>::@class::C::@method::foo#element
+              element: <testLibrary>::@class::C::@method::foo
         class D @159
           reference: <testLibraryFragment>::@class::D
           element: <testLibrary>::@class::D
@@ -5172,6 +5174,7 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
       methods
         foo
+          reference: <testLibrary>::@class::A::@method::foo
           firstFragment: <testLibraryFragment>::@class::A::@method::foo
           returnType: dynamic
     class B
@@ -5184,6 +5187,7 @@
           firstFragment: <testLibraryFragment>::@class::B::@constructor::new
       methods
         foo
+          reference: <testLibrary>::@class::B::@method::foo
           firstFragment: <testLibraryFragment>::@class::B::@method::foo
           returnType: dynamic
     class C
@@ -5197,6 +5201,7 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
       methods
         foo
+          reference: <testLibrary>::@class::C::@method::foo
           firstFragment: <testLibraryFragment>::@class::C::@method::foo
           returnType: dynamic
     class alias D
@@ -5884,7 +5889,7 @@
           methods
             foo @40
               reference: <testLibraryFragment>::@enum::E::@method::foo
-              element: <testLibraryFragment>::@enum::E::@method::foo#element
+              element: <testLibrary>::@enum::E::@method::foo
               metadata
                 Annotation
                   atSign: @ @30
@@ -5938,6 +5943,7 @@
           returnType: List<E>
       methods
         foo
+          reference: <testLibrary>::@enum::E::@method::foo
           firstFragment: <testLibraryFragment>::@enum::E::@method::foo
           metadata
             Annotation
@@ -6056,7 +6062,7 @@
           methods
             bar @81
               reference: <testLibraryFragment>::@enum::E::@method::bar
-              element: <testLibraryFragment>::@enum::E::@method::bar#element
+              element: <testLibrary>::@enum::E::@method::bar
               metadata
                 Annotation
                   atSign: @ @69
@@ -6130,6 +6136,7 @@
           returnType: int
       methods
         bar
+          reference: <testLibrary>::@enum::E::@method::bar
           firstFragment: <testLibraryFragment>::@enum::E::@method::bar
           metadata
             Annotation
diff --git a/pkg/analyzer/test/src/summary/elements/extension_test.dart b/pkg/analyzer/test/src/summary/elements/extension_test.dart
index 578356b..71d236c 100644
--- a/pkg/analyzer/test/src/summary/elements/extension_test.dart
+++ b/pkg/analyzer/test/src/summary/elements/extension_test.dart
@@ -287,7 +287,7 @@
           methods
             bar @88
               reference: <testLibraryFragment>::@extension::E::@method::bar
-              element: <testLibraryFragment>::@extension::E::@method::bar#element
+              element: <testLibrary>::@extension::E::@method::bar
               metadata
                 Annotation
                   atSign: @ @76
@@ -337,6 +337,7 @@
           returnType: int
       methods
         bar
+          reference: <testLibrary>::@extension::E::@method::bar
           firstFragment: <testLibraryFragment>::@extension::E::@method::bar
           metadata
             Annotation
@@ -452,7 +453,7 @@
           methods
             foo @35
               reference: <testLibraryFragment>::@extension::E::@method::foo
-              element: <testLibraryFragment>::@extension::E::@method::foo#element
+              element: <testLibrary>::@extension::E::@method::foo
   extensions
     extension E
       reference: <testLibrary>::@extension::E
@@ -461,6 +462,7 @@
         T
       methods
         foo
+          reference: <testLibrary>::@extension::E::@method::foo
           firstFragment: <testLibraryFragment>::@extension::E::@method::foo
           returnType: void
 ''');
@@ -489,7 +491,7 @@
           methods
             foo @35
               reference: <testLibraryFragment>::@extension::E::@method::foo
-              element: <testLibraryFragment>::@extension::E::@method::foo#element
+              element: <testLibrary>::@extension::E::@method::foo
               formalParameters
                 _ @41
                   element: <testLibraryFragment>::@extension::E::@method::foo::@parameter::_#element
@@ -501,6 +503,7 @@
         T
       methods
         foo
+          reference: <testLibrary>::@extension::E::@method::foo
           firstFragment: <testLibraryFragment>::@extension::E::@method::foo
           hasEnclosingTypeParameterReference: true
           formalParameters
diff --git a/pkg/analyzer/test/src/summary/elements/extension_type_test.dart b/pkg/analyzer/test/src/summary/elements/extension_type_test.dart
index 56da5ee..4f768ed5 100644
--- a/pkg/analyzer/test/src/summary/elements/extension_type_test.dart
+++ b/pkg/analyzer/test/src/summary/elements/extension_type_test.dart
@@ -1496,7 +1496,7 @@
           methods
             foo @34
               reference: <testLibraryFragment>::@extensionType::A::@method::foo
-              element: <testLibraryFragment>::@extensionType::A::@method::foo#element
+              element: <testLibrary>::@extensionType::A::@method::foo
               formalParameters
                 a @42
                   element: <testLibraryFragment>::@extensionType::A::@method::foo::@parameter::a#element
@@ -1518,6 +1518,7 @@
           returnType: int
       methods
         foo
+          reference: <testLibrary>::@extensionType::A::@method::foo
           firstFragment: <testLibraryFragment>::@extensionType::A::@method::foo
           formalParameters
             requiredPositional a
@@ -1556,7 +1557,7 @@
           methods
             foo @34
               reference: <testLibraryFragment>::@extensionType::A::@method::foo
-              element: <testLibraryFragment>::@extensionType::A::@method::foo#element
+              element: <testLibrary>::@extensionType::A::@method::foo
               formalParameters
                 default a @43
                   reference: <testLibraryFragment>::@extensionType::A::@method::foo::@parameter::a
@@ -1583,6 +1584,7 @@
           returnType: int
       methods
         foo
+          reference: <testLibrary>::@extensionType::A::@method::foo
           firstFragment: <testLibraryFragment>::@extensionType::A::@method::foo
           formalParameters
             optionalNamed a
diff --git a/pkg/analyzer/test/src/summary/elements/formal_parameter_test.dart b/pkg/analyzer/test/src/summary/elements/formal_parameter_test.dart
index ae6cd1e..cef1216 100644
--- a/pkg/analyzer/test/src/summary/elements/formal_parameter_test.dart
+++ b/pkg/analyzer/test/src/summary/elements/formal_parameter_test.dart
@@ -66,7 +66,7 @@
           methods
             m @17
               reference: <testLibraryFragment>::@class::A::@method::m
-              element: <testLibraryFragment>::@class::A::@method::m#element
+              element: <testLibrary>::@class::A::@method::m
               formalParameters
                 default a @32
                   reference: <testLibraryFragment>::@class::A::@method::m::@parameter::a
@@ -80,6 +80,7 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
       methods
         m
+          reference: <testLibrary>::@class::A::@method::m
           firstFragment: <testLibraryFragment>::@class::A::@method::m
           formalParameters
             optionalNamed covariant a
@@ -113,7 +114,7 @@
           methods
             m @17
               reference: <testLibraryFragment>::@class::A::@method::m
-              element: <testLibraryFragment>::@class::A::@method::m#element
+              element: <testLibrary>::@class::A::@method::m
               formalParameters
                 default a @32
                   element: <testLibraryFragment>::@class::A::@method::m::@parameter::a#element
@@ -126,6 +127,7 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
       methods
         m
+          reference: <testLibrary>::@class::A::@method::m
           firstFragment: <testLibraryFragment>::@class::A::@method::m
           formalParameters
             optionalPositional covariant a
@@ -158,7 +160,7 @@
           methods
             m @17
               reference: <testLibraryFragment>::@class::A::@method::m
-              element: <testLibraryFragment>::@class::A::@method::m#element
+              element: <testLibrary>::@class::A::@method::m
               formalParameters
                 a @31
                   element: <testLibraryFragment>::@class::A::@method::m::@parameter::a#element
@@ -171,6 +173,7 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
       methods
         m
+          reference: <testLibrary>::@class::A::@method::m
           firstFragment: <testLibraryFragment>::@class::A::@method::m
           formalParameters
             requiredPositional covariant a
@@ -209,7 +212,7 @@
           methods
             f @20
               reference: <testLibraryFragment>::@class::A::@method::f
-              element: <testLibraryFragment>::@class::A::@method::f#element
+              element: <testLibrary>::@class::A::@method::f
               formalParameters
                 t @34
                   element: <testLibraryFragment>::@class::A::@method::f::@parameter::t#element
@@ -227,7 +230,7 @@
           methods
             f @75
               reference: <testLibraryFragment>::@class::B::@method::f
-              element: <testLibraryFragment>::@class::B::@method::f#element
+              element: <testLibrary>::@class::B::@method::f
               formalParameters
                 t @79
                   element: <testLibraryFragment>::@class::B::@method::f::@parameter::t#element
@@ -242,6 +245,7 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
       methods
         f
+          reference: <testLibrary>::@class::A::@method::f
           firstFragment: <testLibraryFragment>::@class::A::@method::f
           hasEnclosingTypeParameterReference: true
           formalParameters
@@ -260,6 +264,7 @@
           superConstructor: <testLibraryFragment>::@class::A::@constructor::new#element
       methods
         f
+          reference: <testLibrary>::@class::B::@method::f
           firstFragment: <testLibraryFragment>::@class::B::@method::f
           hasEnclosingTypeParameterReference: true
           formalParameters
@@ -296,7 +301,7 @@
           methods
             m @17
               reference: <testLibraryFragment>::@class::A::@method::m
-              element: <testLibraryFragment>::@class::A::@method::m#element
+              element: <testLibrary>::@class::A::@method::m
               formalParameters
                 default a @32
                   reference: <testLibraryFragment>::@class::A::@method::m::@parameter::a
@@ -312,7 +317,7 @@
           methods
             m @68
               reference: <testLibraryFragment>::@class::B::@method::m
-              element: <testLibraryFragment>::@class::B::@method::m#element
+              element: <testLibrary>::@class::B::@method::m
               formalParameters
                 default a @73
                   reference: <testLibraryFragment>::@class::B::@method::m::@parameter::a
@@ -326,6 +331,7 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
       methods
         m
+          reference: <testLibrary>::@class::A::@method::m
           firstFragment: <testLibraryFragment>::@class::A::@method::m
           formalParameters
             optionalNamed covariant a
@@ -342,6 +348,7 @@
           superConstructor: <testLibraryFragment>::@class::A::@constructor::new#element
       methods
         m
+          reference: <testLibrary>::@class::B::@method::m
           firstFragment: <testLibraryFragment>::@class::B::@method::m
           formalParameters
             optionalNamed covariant a
@@ -371,7 +378,7 @@
           methods
             f @10
               reference: <testLibraryFragment>::@class::C::@method::f
-              element: <testLibraryFragment>::@class::C::@method::f#element
+              element: <testLibrary>::@class::C::@method::f
               formalParameters
                 g @12
                   element: <testLibraryFragment>::@class::C::@method::f::@parameter::g#element
@@ -384,6 +391,7 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
       methods
         f
+          reference: <testLibrary>::@class::C::@method::f
           firstFragment: <testLibraryFragment>::@class::C::@method::f
           formalParameters
             requiredPositional g
@@ -422,7 +430,7 @@
           methods
             f @16
               reference: <testLibraryFragment>::@class::C::@method::f
-              element: <testLibraryFragment>::@class::C::@method::f#element
+              element: <testLibrary>::@class::C::@method::f
               formalParameters
                 g @20
                   element: <testLibraryFragment>::@class::C::@method::f::@parameter::g#element
@@ -438,6 +446,7 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
       methods
         f
+          reference: <testLibrary>::@class::C::@method::f
           firstFragment: <testLibraryFragment>::@class::C::@method::f
           hasEnclosingTypeParameterReference: true
           formalParameters
@@ -470,7 +479,7 @@
           methods
             f @10
               reference: <testLibraryFragment>::@class::C::@method::f
-              element: <testLibraryFragment>::@class::C::@method::f#element
+              element: <testLibrary>::@class::C::@method::f
               formalParameters
                 g @16
                   element: <testLibraryFragment>::@class::C::@method::f::@parameter::g#element
@@ -483,6 +492,7 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
       methods
         f
+          reference: <testLibrary>::@class::C::@method::f
           firstFragment: <testLibraryFragment>::@class::C::@method::f
           formalParameters
             requiredPositional g
@@ -511,7 +521,7 @@
           methods
             f @10
               reference: <testLibraryFragment>::@class::C::@method::f
-              element: <testLibraryFragment>::@class::C::@method::f#element
+              element: <testLibrary>::@class::C::@method::f
               formalParameters
                 g @17
                   element: <testLibraryFragment>::@class::C::@method::f::@parameter::g#element
@@ -524,6 +534,7 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
       methods
         f
+          reference: <testLibrary>::@class::C::@method::f
           firstFragment: <testLibraryFragment>::@class::C::@method::f
           formalParameters
             requiredPositional g
@@ -767,7 +778,7 @@
           methods
             positional @24
               reference: <testLibraryFragment>::@class::C::@method::positional
-              element: <testLibraryFragment>::@class::C::@method::positional#element
+              element: <testLibrary>::@class::C::@method::positional
               formalParameters
                 default x @36
                   element: <testLibraryFragment>::@class::C::@method::positional::@parameter::x#element
@@ -777,7 +788,7 @@
                       staticType: int
             named @61
               reference: <testLibraryFragment>::@class::C::@method::named
-              element: <testLibraryFragment>::@class::C::@method::named#element
+              element: <testLibrary>::@class::C::@method::named
               formalParameters
                 default x @68
                   reference: <testLibraryFragment>::@class::C::@method::named::@parameter::x
@@ -795,6 +806,7 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
       methods
         static positional
+          reference: <testLibrary>::@class::C::@method::positional
           firstFragment: <testLibraryFragment>::@class::C::@method::positional
           formalParameters
             optionalPositional hasImplicitType x
@@ -803,6 +815,7 @@
                 expression: expression_0
           returnType: void
         static named
+          reference: <testLibrary>::@class::C::@method::named
           firstFragment: <testLibraryFragment>::@class::C::@method::named
           formalParameters
             optionalNamed hasImplicitType x
diff --git a/pkg/analyzer/test/src/summary/elements/function_type_annotation_test.dart b/pkg/analyzer/test/src/summary/elements/function_type_annotation_test.dart
index 55d12f5..70721f3 100644
--- a/pkg/analyzer/test/src/summary/elements/function_type_annotation_test.dart
+++ b/pkg/analyzer/test/src/summary/elements/function_type_annotation_test.dart
@@ -210,7 +210,7 @@
           methods
             m @42
               reference: <testLibraryFragment>::@class::C::@method::m
-              element: <testLibraryFragment>::@class::C::@method::m#element
+              element: <testLibrary>::@class::C::@method::m
   classes
     class C
       reference: <testLibrary>::@class::C
@@ -220,6 +220,7 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
       methods
         m
+          reference: <testLibrary>::@class::C::@method::m
           firstFragment: <testLibraryFragment>::@class::C::@method::m
           returnType: int Function(int, String)
 ''');
diff --git a/pkg/analyzer/test/src/summary/elements/local_declarations_test.dart b/pkg/analyzer/test/src/summary/elements/local_declarations_test.dart
index 532fe12..8af7987 100644
--- a/pkg/analyzer/test/src/summary/elements/local_declarations_test.dart
+++ b/pkg/analyzer/test/src/summary/elements/local_declarations_test.dart
@@ -103,7 +103,7 @@
           methods
             m @12
               reference: <testLibraryFragment>::@class::C::@method::m
-              element: <testLibraryFragment>::@class::C::@method::m#element
+              element: <testLibrary>::@class::C::@method::m
   classes
     class C
       reference: <testLibrary>::@class::C
@@ -113,6 +113,7 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
       methods
         m
+          reference: <testLibrary>::@class::C::@method::m
           firstFragment: <testLibraryFragment>::@class::C::@method::m
           returnType: dynamic
 ''');
@@ -220,7 +221,7 @@
           methods
             m @12
               reference: <testLibraryFragment>::@class::C::@method::m
-              element: <testLibraryFragment>::@class::C::@method::m#element
+              element: <testLibrary>::@class::C::@method::m
   classes
     class C
       reference: <testLibrary>::@class::C
@@ -230,6 +231,7 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
       methods
         m
+          reference: <testLibrary>::@class::C::@method::m
           firstFragment: <testLibraryFragment>::@class::C::@method::m
           returnType: dynamic
 ''');
diff --git a/pkg/analyzer/test/src/summary/elements/metadata_test.dart b/pkg/analyzer/test/src/summary/elements/metadata_test.dart
index f63397f..8695c55 100644
--- a/pkg/analyzer/test/src/summary/elements/metadata_test.dart
+++ b/pkg/analyzer/test/src/summary/elements/metadata_test.dart
@@ -354,7 +354,7 @@
           methods
             bar @77
               reference: <testLibraryFragment>::@class::C::@method::bar
-              element: <testLibraryFragment>::@class::C::@method::bar#element
+              element: <testLibrary>::@class::C::@method::bar
               metadata
                 Annotation
                   atSign: @ @65
@@ -407,6 +407,7 @@
           returnType: int
       methods
         bar
+          reference: <testLibrary>::@class::C::@method::bar
           firstFragment: <testLibraryFragment>::@class::C::@method::bar
           metadata
             Annotation
@@ -3011,7 +3012,7 @@
           methods
             m @54
               reference: <testLibraryFragment>::@class::C::@method::m
-              element: <testLibraryFragment>::@class::C::@method::m#element
+              element: <testLibrary>::@class::C::@method::m
               metadata
                 Annotation
                   atSign: @ @44
@@ -3060,6 +3061,7 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
       methods
         m
+          reference: <testLibrary>::@class::C::@method::m
           firstFragment: <testLibraryFragment>::@class::C::@method::m
           metadata
             Annotation
@@ -3127,7 +3129,7 @@
           methods
             m @54
               reference: <testLibraryFragment>::@mixin::M::@method::m
-              element: <testLibraryFragment>::@mixin::M::@method::m#element
+              element: <testLibrary>::@mixin::M::@method::m
               metadata
                 Annotation
                   atSign: @ @44
@@ -3175,6 +3177,7 @@
         Object
       methods
         m
+          reference: <testLibrary>::@mixin::M::@method::m
           firstFragment: <testLibraryFragment>::@mixin::M::@method::m
           metadata
             Annotation
@@ -3366,7 +3369,7 @@
           methods
             bar @77
               reference: <testLibraryFragment>::@mixin::M::@method::bar
-              element: <testLibraryFragment>::@mixin::M::@method::bar#element
+              element: <testLibrary>::@mixin::M::@method::bar
               metadata
                 Annotation
                   atSign: @ @65
@@ -3418,6 +3421,7 @@
           returnType: int
       methods
         bar
+          reference: <testLibrary>::@mixin::M::@method::bar
           firstFragment: <testLibraryFragment>::@mixin::M::@method::bar
           metadata
             Annotation
@@ -3817,7 +3821,7 @@
           methods
             method @40
               reference: <testLibraryFragment>::@class::A::@method::method
-              element: <testLibraryFragment>::@class::A::@method::method#element
+              element: <testLibrary>::@class::A::@method::method
               metadata
                 Annotation
                   atSign: @ @28
@@ -3870,6 +3874,7 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
       methods
         method
+          reference: <testLibrary>::@class::A::@method::method
           firstFragment: <testLibraryFragment>::@class::A::@method::method
           metadata
             Annotation
@@ -5812,7 +5817,7 @@
           methods
             m @29
               reference: <testLibraryFragment>::@class::C::@method::m
-              element: <testLibraryFragment>::@class::C::@method::m#element
+              element: <testLibrary>::@class::C::@method::m
               formalParameters
                 x @34
                   element: <testLibraryFragment>::@class::C::@method::m::@parameter::x#element
@@ -5846,6 +5851,7 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
       methods
         m
+          reference: <testLibrary>::@class::C::@method::m
           firstFragment: <testLibraryFragment>::@class::C::@method::m
           formalParameters
             requiredPositional hasImplicitType x
diff --git a/pkg/analyzer/test/src/summary/elements/mixin_test.dart b/pkg/analyzer/test/src/summary/elements/mixin_test.dart
index 5afc33d..e786dc7 100644
--- a/pkg/analyzer/test/src/summary/elements/mixin_test.dart
+++ b/pkg/analyzer/test/src/summary/elements/mixin_test.dart
@@ -119,7 +119,7 @@
           methods
             m @144
               reference: <testLibraryFragment>::@mixin::M::@method::m
-              element: <testLibraryFragment>::@mixin::M::@method::m#element
+              element: <testLibrary>::@mixin::M::@method::m
               formalParameters
                 v @153
                   element: <testLibraryFragment>::@mixin::M::@method::m::@parameter::v#element
@@ -203,6 +203,7 @@
           returnType: void
       methods
         m
+          reference: <testLibrary>::@mixin::M::@method::m
           firstFragment: <testLibraryFragment>::@mixin::M::@method::m
           formalParameters
             requiredPositional v
@@ -1269,7 +1270,7 @@
           methods
             foo @22 invokesSuperSelf
               reference: <testLibraryFragment>::@mixin::M::@method::foo
-              element: <testLibraryFragment>::@mixin::M::@method::foo#element
+              element: <testLibrary>::@mixin::M::@method::foo
   mixins
     mixin M
       reference: <testLibrary>::@mixin::M
@@ -1278,6 +1279,7 @@
         Object
       methods
         foo
+          reference: <testLibrary>::@mixin::M::@method::foo
           firstFragment: <testLibraryFragment>::@mixin::M::@method::foo
           returnType: void
 ''');
@@ -1312,7 +1314,7 @@
           methods
             A @33
               reference: <testLibraryFragment>::@mixin::B::@method::A
-              element: <testLibraryFragment>::@mixin::B::@method::A#element
+              element: <testLibrary>::@mixin::B::@method::A
   classes
     class A
       reference: <testLibrary>::@class::A
@@ -1328,6 +1330,7 @@
         A
       methods
         A
+          reference: <testLibrary>::@mixin::B::@method::A
           firstFragment: <testLibraryFragment>::@mixin::B::@method::A
           returnType: void
 ''');
@@ -1356,7 +1359,7 @@
           methods
             foo @20
               reference: <testLibraryFragment>::@mixin::M::@method::foo
-              element: <testLibraryFragment>::@mixin::M::@method::foo#element
+              element: <testLibrary>::@mixin::M::@method::foo
   mixins
     mixin M
       reference: <testLibrary>::@mixin::M
@@ -1367,6 +1370,7 @@
         Object
       methods
         foo
+          reference: <testLibrary>::@mixin::M::@method::foo
           firstFragment: <testLibraryFragment>::@mixin::M::@method::foo
           returnType: void
 ''');
@@ -1395,7 +1399,7 @@
           methods
             foo @20
               reference: <testLibraryFragment>::@mixin::M::@method::foo
-              element: <testLibraryFragment>::@mixin::M::@method::foo#element
+              element: <testLibrary>::@mixin::M::@method::foo
               formalParameters
                 _ @26
                   element: <testLibraryFragment>::@mixin::M::@method::foo::@parameter::_#element
@@ -1409,6 +1413,7 @@
         Object
       methods
         foo
+          reference: <testLibrary>::@mixin::M::@method::foo
           firstFragment: <testLibraryFragment>::@mixin::M::@method::foo
           hasEnclosingTypeParameterReference: true
           formalParameters
diff --git a/pkg/analyzer/test/src/summary/elements/offsets_test.dart b/pkg/analyzer/test/src/summary/elements/offsets_test.dart
index 731037c..95c7bb4 100644
--- a/pkg/analyzer/test/src/summary/elements/offsets_test.dart
+++ b/pkg/analyzer/test/src/summary/elements/offsets_test.dart
@@ -1635,18 +1635,18 @@
           methods
             raw @17
               reference: <testLibraryFragment>::@class::C::@method::raw
-              element: <testLibraryFragment>::@class::C::@method::raw#element
+              element: <testLibrary>::@class::C::@method::raw
               codeOffset: 12
               codeLength: 13
             hasDocComment @68
               reference: <testLibraryFragment>::@class::C::@method::hasDocComment
-              element: <testLibraryFragment>::@class::C::@method::hasDocComment#element
+              element: <testLibrary>::@class::C::@method::hasDocComment
               documentationComment: /// Comment 1.\n/// Comment 2.
               codeOffset: 29
               codeLength: 57
             hasAnnotation @107
               reference: <testLibraryFragment>::@class::C::@method::hasAnnotation
-              element: <testLibraryFragment>::@class::C::@method::hasAnnotation#element
+              element: <testLibrary>::@class::C::@method::hasAnnotation
               metadata
                 Annotation
                   atSign: @ @90
@@ -1662,7 +1662,7 @@
               codeLength: 35
             annotationThenComment @180
               reference: <testLibraryFragment>::@class::C::@method::annotationThenComment
-              element: <testLibraryFragment>::@class::C::@method::annotationThenComment#element
+              element: <testLibrary>::@class::C::@method::annotationThenComment
               documentationComment: /// Comment 1.\n/// Comment 2.
               metadata
                 Annotation
@@ -1679,7 +1679,7 @@
               codeLength: 77
             commentThenAnnotation @261
               reference: <testLibraryFragment>::@class::C::@method::commentThenAnnotation
-              element: <testLibraryFragment>::@class::C::@method::commentThenAnnotation#element
+              element: <testLibrary>::@class::C::@method::commentThenAnnotation
               documentationComment: /// Comment 1.\n/// Comment 2.
               metadata
                 Annotation
@@ -1696,7 +1696,7 @@
               codeLength: 77
             commentAroundAnnotation @342
               reference: <testLibraryFragment>::@class::C::@method::commentAroundAnnotation
-              element: <testLibraryFragment>::@class::C::@method::commentAroundAnnotation#element
+              element: <testLibrary>::@class::C::@method::commentAroundAnnotation
               documentationComment: /// Comment 2.
               metadata
                 Annotation
@@ -1720,13 +1720,16 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
       methods
         raw
+          reference: <testLibrary>::@class::C::@method::raw
           firstFragment: <testLibraryFragment>::@class::C::@method::raw
           returnType: void
         hasDocComment
+          reference: <testLibrary>::@class::C::@method::hasDocComment
           firstFragment: <testLibraryFragment>::@class::C::@method::hasDocComment
           documentationComment: /// Comment 1.\n/// Comment 2.
           returnType: void
         hasAnnotation
+          reference: <testLibrary>::@class::C::@method::hasAnnotation
           firstFragment: <testLibraryFragment>::@class::C::@method::hasAnnotation
           metadata
             Annotation
@@ -1741,6 +1744,7 @@
               element2: dart:core::<fragment>::@class::Object::@constructor::new#element
           returnType: void
         annotationThenComment
+          reference: <testLibrary>::@class::C::@method::annotationThenComment
           firstFragment: <testLibraryFragment>::@class::C::@method::annotationThenComment
           documentationComment: /// Comment 1.\n/// Comment 2.
           metadata
@@ -1756,6 +1760,7 @@
               element2: dart:core::<fragment>::@class::Object::@constructor::new#element
           returnType: void
         commentThenAnnotation
+          reference: <testLibrary>::@class::C::@method::commentThenAnnotation
           firstFragment: <testLibraryFragment>::@class::C::@method::commentThenAnnotation
           documentationComment: /// Comment 1.\n/// Comment 2.
           metadata
@@ -1771,6 +1776,7 @@
               element2: dart:core::<fragment>::@class::Object::@constructor::new#element
           returnType: void
         commentAroundAnnotation
+          reference: <testLibrary>::@class::C::@method::commentAroundAnnotation
           firstFragment: <testLibraryFragment>::@class::C::@method::commentAroundAnnotation
           documentationComment: /// Comment 2.
           metadata
@@ -2885,7 +2891,7 @@
           methods
             foo @17
               reference: <testLibraryFragment>::@class::A::@method::foo
-              element: <testLibraryFragment>::@class::A::@method::foo#element
+              element: <testLibrary>::@class::A::@method::foo
               typeParameters
                 T @21
                   element: T@21
@@ -2901,6 +2907,7 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
       methods
         foo
+          reference: <testLibrary>::@class::A::@method::foo
           firstFragment: <testLibraryFragment>::@class::A::@method::foo
           typeParameters
             T
diff --git a/pkg/analyzer/test/src/summary/elements/record_type_test.dart b/pkg/analyzer/test/src/summary/elements/record_type_test.dart
index 43623f3..c0d069c 100644
--- a/pkg/analyzer/test/src/summary/elements/record_type_test.dart
+++ b/pkg/analyzer/test/src/summary/elements/record_type_test.dart
@@ -138,7 +138,7 @@
           methods
             foo @17
               reference: <testLibraryFragment>::@class::A::@method::foo
-              element: <testLibraryFragment>::@class::A::@method::foo#element
+              element: <testLibrary>::@class::A::@method::foo
               formalParameters
                 a @35
                   element: <testLibraryFragment>::@class::A::@method::foo::@parameter::a#element
@@ -151,6 +151,7 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
       methods
         foo
+          reference: <testLibrary>::@class::A::@method::foo
           firstFragment: <testLibraryFragment>::@class::A::@method::foo
           formalParameters
             requiredPositional a
@@ -183,7 +184,7 @@
           methods
             foo @26
               reference: <testLibraryFragment>::@class::A::@method::foo
-              element: <testLibraryFragment>::@class::A::@method::foo#element
+              element: <testLibrary>::@class::A::@method::foo
   classes
     class A
       reference: <testLibrary>::@class::A
@@ -193,6 +194,7 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
       methods
         foo
+          reference: <testLibrary>::@class::A::@method::foo
           firstFragment: <testLibraryFragment>::@class::A::@method::foo
           returnType: (int, String)
 ''');
diff --git a/pkg/analyzer/test/src/summary/elements/since_sdk_version_test.dart b/pkg/analyzer/test/src/summary/elements/since_sdk_version_test.dart
index 6dbf74e..798d315 100644
--- a/pkg/analyzer/test/src/summary/elements/since_sdk_version_test.dart
+++ b/pkg/analyzer/test/src/summary/elements/since_sdk_version_test.dart
@@ -220,7 +220,7 @@
           methods
             foo @58
               reference: dart:foo::<fragment>::@class::A::@method::foo
-              element: dart:foo::<fragment>::@class::A::@method::foo#element
+              element: dart:foo::@class::A::@method::foo
   classes
     class A
       reference: dart:foo::@class::A
@@ -228,6 +228,7 @@
       sinceSdkVersion: 2.15.0
       methods
         foo
+          reference: dart:foo::@class::A::@method::foo
           firstFragment: dart:foo::<fragment>::@class::A::@method::foo
           sinceSdkVersion: 2.15.0
           returnType: void
@@ -258,7 +259,7 @@
           methods
             foo @75
               reference: dart:foo::<fragment>::@class::A::@method::foo
-              element: dart:foo::<fragment>::@class::A::@method::foo#element
+              element: dart:foo::@class::A::@method::foo
   classes
     class A
       reference: dart:foo::@class::A
@@ -266,6 +267,7 @@
       sinceSdkVersion: 2.15.0
       methods
         foo
+          reference: dart:foo::@class::A::@method::foo
           firstFragment: dart:foo::<fragment>::@class::A::@method::foo
           sinceSdkVersion: 2.16.0
           returnType: void
@@ -296,7 +298,7 @@
           methods
             foo @75
               reference: dart:foo::<fragment>::@class::A::@method::foo
-              element: dart:foo::<fragment>::@class::A::@method::foo#element
+              element: dart:foo::@class::A::@method::foo
   classes
     class A
       reference: dart:foo::@class::A
@@ -304,6 +306,7 @@
       sinceSdkVersion: 2.15.0
       methods
         foo
+          reference: dart:foo::@class::A::@method::foo
           firstFragment: dart:foo::<fragment>::@class::A::@method::foo
           sinceSdkVersion: 2.15.0
           returnType: void
@@ -550,7 +553,7 @@
           methods
             foo @62
               reference: dart:foo::<fragment>::@enum::E::@method::foo
-              element: dart:foo::<fragment>::@enum::E::@method::foo#element
+              element: dart:foo::@enum::E::@method::foo
   enums
     enum E
       reference: dart:foo::@enum::E
@@ -585,6 +588,7 @@
           returnType: List<E>
       methods
         foo
+          reference: dart:foo::@enum::E::@method::foo
           firstFragment: dart:foo::<fragment>::@enum::E::@method::foo
           sinceSdkVersion: 2.15.0
           returnType: void
@@ -614,7 +618,7 @@
           methods
             foo @69
               reference: dart:foo::<fragment>::@extension::E::@method::foo
-              element: dart:foo::<fragment>::@extension::E::@method::foo#element
+              element: dart:foo::@extension::E::@method::foo
   extensions
     extension E
       reference: dart:foo::@extension::E
@@ -622,6 +626,7 @@
       sinceSdkVersion: 2.15.0
       methods
         foo
+          reference: dart:foo::@extension::E::@method::foo
           firstFragment: dart:foo::<fragment>::@extension::E::@method::foo
           sinceSdkVersion: 2.15.0
           returnType: void
@@ -651,7 +656,7 @@
           methods
             foo @58
               reference: dart:foo::<fragment>::@mixin::M::@method::foo
-              element: dart:foo::<fragment>::@mixin::M::@method::foo#element
+              element: dart:foo::@mixin::M::@method::foo
   mixins
     mixin M
       reference: dart:foo::@mixin::M
@@ -661,6 +666,7 @@
         Object
       methods
         foo
+          reference: dart:foo::@mixin::M::@method::foo
           firstFragment: dart:foo::<fragment>::@mixin::M::@method::foo
           sinceSdkVersion: 2.15.0
           returnType: void
diff --git a/pkg/analyzer/test/src/summary/elements/top_level_variable_test.dart b/pkg/analyzer/test/src/summary/elements/top_level_variable_test.dart
index 6bed6cc..d42ad62 100644
--- a/pkg/analyzer/test/src/summary/elements/top_level_variable_test.dart
+++ b/pkg/analyzer/test/src/summary/elements/top_level_variable_test.dart
@@ -1617,7 +1617,7 @@
           methods
             f @43
               reference: <testLibraryFragment>::@extension::E::@method::f
-              element: <testLibraryFragment>::@extension::E::@method::f#element
+              element: <testLibrary>::@extension::E::@method::f
       topLevelVariables
         hasInitializer x @59
           reference: <testLibraryFragment>::@topLevelVariable::x
@@ -1648,6 +1648,7 @@
       firstFragment: <testLibraryFragment>::@extension::E
       methods
         static f
+          reference: <testLibrary>::@extension::E::@method::f
           firstFragment: <testLibraryFragment>::@extension::E::@method::f
           returnType: int
   topLevelVariables
diff --git a/pkg/analyzer/test/src/summary/elements/type_inference_test.dart b/pkg/analyzer/test/src/summary/elements/type_inference_test.dart
index 75d724a..d9ac8cb 100644
--- a/pkg/analyzer/test/src/summary/elements/type_inference_test.dart
+++ b/pkg/analyzer/test/src/summary/elements/type_inference_test.dart
@@ -1173,7 +1173,7 @@
           methods
             f @15
               reference: <testLibraryFragment>::@class::C::@method::f
-              element: <testLibraryFragment>::@class::C::@method::f#element
+              element: <testLibrary>::@class::C::@method::f
               typeParameters
                 U @17
                   element: U@17
@@ -1190,6 +1190,7 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
       methods
         f
+          reference: <testLibrary>::@class::C::@method::f
           firstFragment: <testLibraryFragment>::@class::C::@method::f
           typeParameters
             U
@@ -1460,7 +1461,7 @@
           methods
             baz @100
               reference: <testLibraryFragment>::@class::A::@method::baz
-              element: <testLibraryFragment>::@class::A::@method::baz#element
+              element: <testLibrary>::@class::A::@method::baz
   classes
     class A
       reference: <testLibrary>::@class::A
@@ -1486,6 +1487,7 @@
           returnType: int Function(double)
       methods
         static baz
+          reference: <testLibrary>::@class::A::@method::baz
           firstFragment: <testLibraryFragment>::@class::A::@method::baz
           returnType: int Function(double)
 ''');
@@ -2405,7 +2407,7 @@
           methods
             f @41
               reference: <testLibraryFragment>::@class::C::@method::f
-              element: <testLibraryFragment>::@class::C::@method::f#element
+              element: <testLibrary>::@class::C::@method::f
               formalParameters
                 x @47
                   element: <testLibraryFragment>::@class::C::@method::f::@parameter::x#element
@@ -2427,7 +2429,7 @@
           methods
             f @90
               reference: <testLibraryFragment>::@class::D::@method::f
-              element: <testLibraryFragment>::@class::D::@method::f#element
+              element: <testLibrary>::@class::D::@method::f
               formalParameters
                 x @96
                   element: <testLibraryFragment>::@class::D::@method::f::@parameter::x#element
@@ -2447,6 +2449,7 @@
           superConstructor: <testLibraryFragment>::@class::D::@constructor::new#element
       methods
         f
+          reference: <testLibrary>::@class::C::@method::f
           firstFragment: <testLibraryFragment>::@class::C::@method::f
           hasEnclosingTypeParameterReference: true
           formalParameters
@@ -2466,6 +2469,7 @@
           firstFragment: <testLibraryFragment>::@class::D::@constructor::new
       methods
         abstract f
+          reference: <testLibrary>::@class::D::@method::f
           firstFragment: <testLibraryFragment>::@class::D::@method::f
           hasEnclosingTypeParameterReference: true
           formalParameters
@@ -2516,7 +2520,7 @@
           methods
             f @44
               reference: <testLibraryFragment>::@class::C::@method::f
-              element: <testLibraryFragment>::@class::C::@method::f#element
+              element: <testLibrary>::@class::C::@method::f
               formalParameters
                 x @50
                   element: <testLibraryFragment>::@class::C::@method::f::@parameter::x#element
@@ -2533,6 +2537,7 @@
           superConstructor: package:test/a.dart::<fragment>::@class::D::@constructor::new#element
       methods
         f
+          reference: <testLibrary>::@class::C::@method::f
           firstFragment: <testLibraryFragment>::@class::C::@method::f
           formalParameters
             requiredPositional x
@@ -2566,7 +2571,7 @@
           methods
             f @25
               reference: <testLibraryFragment>::@class::C::@method::f
-              element: <testLibraryFragment>::@class::C::@method::f#element
+              element: <testLibrary>::@class::C::@method::f
               formalParameters
                 x @31
                   element: <testLibraryFragment>::@class::C::@method::f::@parameter::x#element
@@ -2583,7 +2588,7 @@
           methods
             f @66
               reference: <testLibraryFragment>::@class::D::@method::f
-              element: <testLibraryFragment>::@class::D::@method::f#element
+              element: <testLibrary>::@class::D::@method::f
               formalParameters
                 x @72
                   element: <testLibraryFragment>::@class::D::@method::f::@parameter::x#element
@@ -2600,6 +2605,7 @@
           superConstructor: <testLibraryFragment>::@class::D::@constructor::new#element
       methods
         f
+          reference: <testLibrary>::@class::C::@method::f
           firstFragment: <testLibraryFragment>::@class::C::@method::f
           formalParameters
             requiredPositional x
@@ -2615,6 +2621,7 @@
           firstFragment: <testLibraryFragment>::@class::D::@constructor::new
       methods
         abstract f
+          reference: <testLibrary>::@class::D::@method::f
           firstFragment: <testLibraryFragment>::@class::D::@method::f
           formalParameters
             requiredPositional x
@@ -2898,7 +2905,7 @@
           methods
             m @39
               reference: <testLibraryFragment>::@class::B::@method::m
-              element: <testLibraryFragment>::@class::B::@method::m#element
+              element: <testLibrary>::@class::B::@method::m
               formalParameters
                 p @41
                   element: <testLibraryFragment>::@class::B::@method::m::@parameter::p#element
@@ -2913,6 +2920,7 @@
           superConstructor: package:test/a.dart::<fragment>::@class::A::@constructor::new#element
       methods
         m
+          reference: <testLibrary>::@class::B::@method::m
           firstFragment: <testLibraryFragment>::@class::B::@method::m
           formalParameters
             requiredPositional hasImplicitType p
@@ -3248,7 +3256,7 @@
           methods
             m @25
               reference: <testLibraryFragment>::@class::A::@method::m
-              element: <testLibraryFragment>::@class::A::@method::m#element
+              element: <testLibrary>::@class::A::@method::m
         class B @48
           reference: <testLibraryFragment>::@class::B
           element: <testLibrary>::@class::B
@@ -3260,7 +3268,7 @@
           methods
             m @61
               reference: <testLibraryFragment>::@class::B::@method::m
-              element: <testLibraryFragment>::@class::B::@method::m#element
+              element: <testLibrary>::@class::B::@method::m
         class C @84
           reference: <testLibraryFragment>::@class::C
           element: <testLibrary>::@class::C
@@ -3303,6 +3311,7 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
       methods
         abstract m
+          reference: <testLibrary>::@class::A::@method::m
           firstFragment: <testLibraryFragment>::@class::A::@method::m
           returnType: int
     abstract class B
@@ -3313,6 +3322,7 @@
           firstFragment: <testLibraryFragment>::@class::B::@constructor::new
       methods
         abstract m
+          reference: <testLibrary>::@class::B::@method::m
           firstFragment: <testLibraryFragment>::@class::B::@method::m
           returnType: String
     abstract class C
@@ -3380,7 +3390,7 @@
           methods
             call @19
               reference: <testLibraryFragment>::@class::A::@method::call
-              element: <testLibraryFragment>::@class::A::@method::call#element
+              element: <testLibrary>::@class::A::@method::call
         class B @42
           reference: <testLibraryFragment>::@class::B
           element: <testLibrary>::@class::B
@@ -3432,6 +3442,7 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
       methods
         call
+          reference: <testLibrary>::@class::A::@method::call
           firstFragment: <testLibraryFragment>::@class::A::@method::call
           returnType: double
     class B
@@ -5307,7 +5318,7 @@
           methods
             m @15
               reference: <testLibraryFragment>::@class::C::@method::m
-              element: <testLibraryFragment>::@class::C::@method::m#element
+              element: <testLibrary>::@class::C::@method::m
               formalParameters
                 p @21
                   element: <testLibraryFragment>::@class::C::@method::m::@parameter::p#element
@@ -5322,6 +5333,7 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
       methods
         m
+          reference: <testLibrary>::@class::C::@method::m
           firstFragment: <testLibraryFragment>::@class::C::@method::m
           formalParameters
             requiredPositional p
diff --git a/pkg/analyzer/test/src/summary/elements/types_test.dart b/pkg/analyzer/test/src/summary/elements/types_test.dart
index 5a1f521..9c7a686 100644
--- a/pkg/analyzer/test/src/summary/elements/types_test.dart
+++ b/pkg/analyzer/test/src/summary/elements/types_test.dart
@@ -311,7 +311,7 @@
           methods
             m @30
               reference: <testLibraryFragment>::@class::C::@method::m
-              element: <testLibraryFragment>::@class::C::@method::m#element
+              element: <testLibrary>::@class::C::@method::m
               typeParameters
                 V @32
                   element: V@32
@@ -334,6 +334,7 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
       methods
         static m
+          reference: <testLibrary>::@class::C::@method::m
           firstFragment: <testLibraryFragment>::@class::C::@method::m
           typeParameters
             V
@@ -377,7 +378,7 @@
           methods
             call @17
               reference: <testLibraryFragment>::@class::C::@method::call
-              element: <testLibraryFragment>::@class::C::@method::call#element
+              element: <testLibrary>::@class::C::@method::call
         class D @36
           reference: <testLibraryFragment>::@class::D
           element: <testLibrary>::@class::D
@@ -408,6 +409,7 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
       methods
         call
+          reference: <testLibrary>::@class::C::@method::call
           firstFragment: <testLibraryFragment>::@class::C::@method::call
           returnType: void
     class D
@@ -435,7 +437,7 @@
                       token: c @68
                       element: <testLibraryFragment>::@class::D::@constructor::new::@parameter::c#element
                       staticType: C
-                    element: <testLibraryFragment>::@class::C::@method::call#element
+                    element: <testLibrary>::@class::C::@method::call
                     staticType: void Function()
                 rightParenthesis: ) @69
               element: <testLibraryFragment>::@class::D::@constructor::named#element
@@ -828,7 +830,7 @@
           methods
             == @74
               reference: <testLibraryFragment>::@class::X1::@method::==
-              element: <testLibraryFragment>::@class::X1::@method::==#element
+              element: <testLibrary>::@class::X1::@method::==
               formalParameters
                 other @77
                   element: <testLibraryFragment>::@class::X1::@method::==::@parameter::other#element
@@ -843,7 +845,7 @@
           methods
             == @145
               reference: <testLibraryFragment>::@class::X2::@method::==
-              element: <testLibraryFragment>::@class::X2::@method::==#element
+              element: <testLibrary>::@class::X2::@method::==
               formalParameters
                 other @148
                   element: <testLibraryFragment>::@class::X2::@method::==::@parameter::other#element
@@ -858,7 +860,7 @@
           methods
             == @213
               reference: <testLibraryFragment>::@class::X3::@method::==
-              element: <testLibraryFragment>::@class::X3::@method::==#element
+              element: <testLibrary>::@class::X3::@method::==
               formalParameters
                 other @216
                   element: <testLibraryFragment>::@class::X3::@method::==::@parameter::other#element
@@ -873,6 +875,7 @@
           superConstructor: package:test/nullSafe.dart::<fragment>::@class::NullSafeDefault::@constructor::new#element
       methods
         ==
+          reference: <testLibrary>::@class::X1::@method::==
           firstFragment: <testLibraryFragment>::@class::X1::@method::==
           formalParameters
             requiredPositional hasImplicitType other
@@ -888,6 +891,7 @@
           superConstructor: package:test/nullSafe.dart::<fragment>::@class::NullSafeObject::@constructor::new#element
       methods
         ==
+          reference: <testLibrary>::@class::X2::@method::==
           firstFragment: <testLibraryFragment>::@class::X2::@method::==
           formalParameters
             requiredPositional hasImplicitType other
@@ -903,6 +907,7 @@
           superConstructor: package:test/nullSafe.dart::<fragment>::@class::NullSafeInt::@constructor::new#element
       methods
         ==
+          reference: <testLibrary>::@class::X3::@method::==
           firstFragment: <testLibraryFragment>::@class::X3::@method::==
           formalParameters
             requiredPositional hasImplicitType other
@@ -1247,7 +1252,7 @@
           methods
             f @31
               reference: <testLibraryFragment>::@class::C::@method::f
-              element: <testLibraryFragment>::@class::C::@method::f#element
+              element: <testLibrary>::@class::C::@method::f
   classes
     class C
       reference: <testLibrary>::@class::C
@@ -1257,6 +1262,7 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
       methods
         f
+          reference: <testLibrary>::@class::C::@method::f
           firstFragment: <testLibraryFragment>::@class::C::@method::f
           returnType: O Function(O)
             alias: package:test/a.dart::@typeAlias::F
@@ -2097,7 +2103,7 @@
           methods
             g @23
               reference: <testLibraryFragment>::@class::C::@method::g
-              element: <testLibraryFragment>::@class::C::@method::g#element
+              element: <testLibrary>::@class::C::@method::g
               typeParameters
                 V @25
                   element: V@25
@@ -2115,6 +2121,7 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
       methods
         g
+          reference: <testLibrary>::@class::C::@method::g
           firstFragment: <testLibraryFragment>::@class::C::@method::g
           typeParameters
             V
@@ -2161,7 +2168,7 @@
           methods
             g @23
               reference: <testLibraryFragment>::@class::C::@method::g
-              element: <testLibraryFragment>::@class::C::@method::g#element
+              element: <testLibrary>::@class::C::@method::g
               typeParameters
                 V @25
                   element: V@25
@@ -2179,6 +2186,7 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
       methods
         g
+          reference: <testLibrary>::@class::C::@method::g
           firstFragment: <testLibraryFragment>::@class::C::@method::g
           typeParameters
             V
diff --git a/pkg/analyzer/test/src/summary/top_level_inference_test.dart b/pkg/analyzer/test/src/summary/top_level_inference_test.dart
index c4729be..aff3a15 100644
--- a/pkg/analyzer/test/src/summary/top_level_inference_test.dart
+++ b/pkg/analyzer/test/src/summary/top_level_inference_test.dart
@@ -1692,7 +1692,7 @@
           methods
             m @26
               reference: <testLibraryFragment>::@class::A::@method::m
-              element: <testLibraryFragment>::@class::A::@method::m#element
+              element: <testLibrary>::@class::A::@method::m
       topLevelVariables
         hasInitializer vSetField @39
           reference: <testLibraryFragment>::@topLevelVariable::vSetField
@@ -1764,6 +1764,7 @@
           returnType: void
       methods
         m
+          reference: <testLibrary>::@class::A::@method::m
           firstFragment: <testLibraryFragment>::@class::A::@method::m
           returnType: void
   topLevelVariables
@@ -3724,7 +3725,7 @@
           methods
             foo @16
               reference: <testLibraryFragment>::@class::A::@method::foo
-              element: <testLibraryFragment>::@class::A::@method::foo#element
+              element: <testLibrary>::@class::A::@method::foo
         class B @36
           reference: <testLibraryFragment>::@class::B
           element: <testLibrary>::@class::B
@@ -3736,7 +3737,7 @@
           methods
             foo @52
               reference: <testLibraryFragment>::@class::B::@method::foo
-              element: <testLibraryFragment>::@class::B::@method::foo#element
+              element: <testLibrary>::@class::B::@method::foo
       topLevelVariables
         hasInitializer x @70
           reference: <testLibraryFragment>::@topLevelVariable::x
@@ -3777,6 +3778,7 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
       methods
         foo
+          reference: <testLibrary>::@class::A::@method::foo
           firstFragment: <testLibraryFragment>::@class::A::@method::foo
           returnType: int
     class B
@@ -3789,6 +3791,7 @@
           superConstructor: <testLibraryFragment>::@class::A::@constructor::new#element
       methods
         foo
+          reference: <testLibrary>::@class::B::@method::foo
           firstFragment: <testLibraryFragment>::@class::B::@method::foo
           returnType: int
   topLevelVariables
@@ -4326,13 +4329,13 @@
           methods
             staticClassMethod @195
               reference: <testLibraryFragment>::@class::A::@method::staticClassMethod
-              element: <testLibraryFragment>::@class::A::@method::staticClassMethod#element
+              element: <testLibrary>::@class::A::@method::staticClassMethod
               formalParameters
                 p @217
                   element: <testLibraryFragment>::@class::A::@method::staticClassMethod::@parameter::p#element
             instanceClassMethod @238
               reference: <testLibraryFragment>::@class::A::@method::instanceClassMethod
-              element: <testLibraryFragment>::@class::A::@method::instanceClassMethod#element
+              element: <testLibrary>::@class::A::@method::instanceClassMethod
               formalParameters
                 p @262
                   element: <testLibraryFragment>::@class::A::@method::instanceClassMethod::@parameter::p#element
@@ -4512,12 +4515,14 @@
           returnType: void
       methods
         static staticClassMethod
+          reference: <testLibrary>::@class::A::@method::staticClassMethod
           firstFragment: <testLibraryFragment>::@class::A::@method::staticClassMethod
           formalParameters
             requiredPositional p
               type: int
           returnType: String
         instanceClassMethod
+          reference: <testLibrary>::@class::A::@method::instanceClassMethod
           firstFragment: <testLibraryFragment>::@class::A::@method::instanceClassMethod
           formalParameters
             requiredPositional p
@@ -6190,7 +6195,7 @@
           methods
             m @19
               reference: <testLibraryFragment>::@class::A::@method::m
-              element: <testLibraryFragment>::@class::A::@method::m#element
+              element: <testLibrary>::@class::A::@method::m
               formalParameters
                 p @25
                   element: <testLibraryFragment>::@class::A::@method::m::@parameter::p#element
@@ -6248,6 +6253,7 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
       methods
         m
+          reference: <testLibrary>::@class::A::@method::m
           firstFragment: <testLibraryFragment>::@class::A::@method::m
           formalParameters
             requiredPositional p
@@ -11893,7 +11899,7 @@
           methods
             m @17
               reference: <testLibraryFragment>::@class::A::@method::m
-              element: <testLibraryFragment>::@class::A::@method::m#element
+              element: <testLibrary>::@class::A::@method::m
               formalParameters
                 a @23
                   element: <testLibraryFragment>::@class::A::@method::m::@parameter::a#element
@@ -11908,7 +11914,7 @@
           methods
             m @58
               reference: <testLibraryFragment>::@class::B::@method::m
-              element: <testLibraryFragment>::@class::B::@method::m#element
+              element: <testLibrary>::@class::B::@method::m
               formalParameters
                 a @60
                   element: <testLibraryFragment>::@class::B::@method::m::@parameter::a#element
@@ -11923,6 +11929,7 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
       methods
         m
+          reference: <testLibrary>::@class::A::@method::m
           firstFragment: <testLibraryFragment>::@class::A::@method::m
           formalParameters
             requiredPositional a
@@ -11938,6 +11945,7 @@
           superConstructor: <testLibraryFragment>::@class::A::@constructor::new#element
       methods
         m
+          reference: <testLibrary>::@class::B::@method::m
           firstFragment: <testLibraryFragment>::@class::B::@method::m
           formalParameters
             requiredPositional hasImplicitType a
@@ -11978,7 +11986,7 @@
           methods
             m @17
               reference: <testLibraryFragment>::@class::A::@method::m
-              element: <testLibraryFragment>::@class::A::@method::m#element
+              element: <testLibrary>::@class::A::@method::m
               formalParameters
                 a @23
                   element: <testLibraryFragment>::@class::A::@method::m::@parameter::a#element
@@ -11993,7 +12001,7 @@
           methods
             m @48
               reference: <testLibraryFragment>::@class::B::@method::m
-              element: <testLibraryFragment>::@class::B::@method::m#element
+              element: <testLibrary>::@class::B::@method::m
               formalParameters
                 a @57
                   element: <testLibraryFragment>::@class::B::@method::m::@parameter::a#element
@@ -12008,7 +12016,7 @@
           methods
             m @100
               reference: <testLibraryFragment>::@class::C::@method::m
-              element: <testLibraryFragment>::@class::C::@method::m#element
+              element: <testLibrary>::@class::C::@method::m
               formalParameters
                 a @102
                   element: <testLibraryFragment>::@class::C::@method::m::@parameter::a#element
@@ -12021,6 +12029,7 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
       methods
         m
+          reference: <testLibrary>::@class::A::@method::m
           firstFragment: <testLibraryFragment>::@class::A::@method::m
           formalParameters
             requiredPositional a
@@ -12034,6 +12043,7 @@
           firstFragment: <testLibraryFragment>::@class::B::@constructor::new
       methods
         m
+          reference: <testLibrary>::@class::B::@method::m
           firstFragment: <testLibraryFragment>::@class::B::@method::m
           formalParameters
             requiredPositional a
@@ -12051,6 +12061,7 @@
           superConstructor: <testLibraryFragment>::@class::A::@constructor::new#element
       methods
         m
+          reference: <testLibrary>::@class::C::@method::m
           firstFragment: <testLibraryFragment>::@class::C::@method::m
           formalParameters
             requiredPositional hasImplicitType a
@@ -12091,7 +12102,7 @@
           methods
             foo @25
               reference: <testLibraryFragment>::@class::A::@method::foo
-              element: <testLibraryFragment>::@class::A::@method::foo#element
+              element: <testLibrary>::@class::A::@method::foo
               formalParameters
                 x @33
                   element: <testLibraryFragment>::@class::A::@method::foo::@parameter::x#element
@@ -12106,7 +12117,7 @@
           methods
             foo @68
               reference: <testLibraryFragment>::@class::B::@method::foo
-              element: <testLibraryFragment>::@class::B::@method::foo#element
+              element: <testLibrary>::@class::B::@method::foo
               formalParameters
                 x @76
                   element: <testLibraryFragment>::@class::B::@method::foo::@parameter::x#element
@@ -12121,7 +12132,7 @@
           methods
             foo @126
               reference: <testLibraryFragment>::@class::C::@method::foo
-              element: <testLibraryFragment>::@class::C::@method::foo#element
+              element: <testLibrary>::@class::C::@method::foo
               formalParameters
                 x @130
                   element: <testLibraryFragment>::@class::C::@method::foo::@parameter::x#element
@@ -12134,6 +12145,7 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
       methods
         abstract foo
+          reference: <testLibrary>::@class::A::@method::foo
           firstFragment: <testLibraryFragment>::@class::A::@method::foo
           formalParameters
             requiredPositional x
@@ -12147,6 +12159,7 @@
           firstFragment: <testLibraryFragment>::@class::B::@constructor::new
       methods
         abstract foo
+          reference: <testLibrary>::@class::B::@method::foo
           firstFragment: <testLibraryFragment>::@class::B::@method::foo
           formalParameters
             requiredPositional x
@@ -12163,6 +12176,7 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
       methods
         abstract foo
+          reference: <testLibrary>::@class::C::@method::foo
           firstFragment: <testLibraryFragment>::@class::C::@method::foo
           formalParameters
             requiredPositional hasImplicitType x
@@ -12202,7 +12216,7 @@
           methods
             m @16
               reference: <testLibraryFragment>::@class::A::@method::m
-              element: <testLibraryFragment>::@class::A::@method::m#element
+              element: <testLibrary>::@class::A::@method::m
         class B @31
           reference: <testLibraryFragment>::@class::B
           element: <testLibrary>::@class::B
@@ -12214,7 +12228,7 @@
           methods
             m @44
               reference: <testLibraryFragment>::@class::B::@method::m
-              element: <testLibraryFragment>::@class::B::@method::m#element
+              element: <testLibrary>::@class::B::@method::m
         class C @59
           reference: <testLibraryFragment>::@class::C
           element: <testLibrary>::@class::C
@@ -12226,7 +12240,7 @@
           methods
             m @88
               reference: <testLibraryFragment>::@class::C::@method::m
-              element: <testLibraryFragment>::@class::C::@method::m#element
+              element: <testLibrary>::@class::C::@method::m
   classes
     class A
       reference: <testLibrary>::@class::A
@@ -12236,6 +12250,7 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
       methods
         m
+          reference: <testLibrary>::@class::A::@method::m
           firstFragment: <testLibraryFragment>::@class::A::@method::m
           returnType: int
     class B
@@ -12246,6 +12261,7 @@
           firstFragment: <testLibraryFragment>::@class::B::@constructor::new
       methods
         m
+          reference: <testLibrary>::@class::B::@method::m
           firstFragment: <testLibraryFragment>::@class::B::@method::m
           returnType: String
     class C
@@ -12260,6 +12276,7 @@
           superConstructor: <testLibraryFragment>::@class::A::@constructor::new#element
       methods
         m
+          reference: <testLibrary>::@class::C::@method::m
           firstFragment: <testLibraryFragment>::@class::C::@method::m
           returnType: dynamic
 ''');
@@ -12298,7 +12315,7 @@
           methods
             m @20
               reference: <testLibraryFragment>::@class::A::@method::m
-              element: <testLibraryFragment>::@class::A::@method::m#element
+              element: <testLibrary>::@class::A::@method::m
               formalParameters
                 a @24
                   element: <testLibraryFragment>::@class::A::@method::m::@parameter::a#element
@@ -12316,7 +12333,7 @@
           methods
             m @52
               reference: <testLibraryFragment>::@class::B::@method::m
-              element: <testLibraryFragment>::@class::B::@method::m#element
+              element: <testLibrary>::@class::B::@method::m
               formalParameters
                 a @56
                   element: <testLibraryFragment>::@class::B::@method::m::@parameter::a#element
@@ -12331,7 +12348,7 @@
           methods
             m @112
               reference: <testLibraryFragment>::@class::C::@method::m
-              element: <testLibraryFragment>::@class::C::@method::m#element
+              element: <testLibrary>::@class::C::@method::m
               formalParameters
                 a @114
                   element: <testLibraryFragment>::@class::C::@method::m::@parameter::a#element
@@ -12346,6 +12363,7 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
       methods
         m
+          reference: <testLibrary>::@class::A::@method::m
           firstFragment: <testLibraryFragment>::@class::A::@method::m
           hasEnclosingTypeParameterReference: true
           formalParameters
@@ -12362,6 +12380,7 @@
           firstFragment: <testLibraryFragment>::@class::B::@constructor::new
       methods
         m
+          reference: <testLibrary>::@class::B::@method::m
           firstFragment: <testLibraryFragment>::@class::B::@method::m
           hasEnclosingTypeParameterReference: true
           formalParameters
@@ -12380,6 +12399,7 @@
           superConstructor: <testLibraryFragment>::@class::A::@constructor::new#element
       methods
         m
+          reference: <testLibrary>::@class::C::@method::m
           firstFragment: <testLibraryFragment>::@class::C::@method::m
           formalParameters
             requiredPositional hasImplicitType a
@@ -12423,7 +12443,7 @@
           methods
             m @20
               reference: <testLibraryFragment>::@class::A::@method::m
-              element: <testLibraryFragment>::@class::A::@method::m#element
+              element: <testLibrary>::@class::A::@method::m
               formalParameters
                 a @24
                   element: <testLibraryFragment>::@class::A::@method::m::@parameter::a#element
@@ -12441,7 +12461,7 @@
           methods
             m @49
               reference: <testLibraryFragment>::@class::B::@method::m
-              element: <testLibraryFragment>::@class::B::@method::m#element
+              element: <testLibrary>::@class::B::@method::m
               formalParameters
                 a @55
                   element: <testLibraryFragment>::@class::B::@method::m::@parameter::a#element
@@ -12456,7 +12476,7 @@
           methods
             m @119
               reference: <testLibraryFragment>::@class::C::@method::m
-              element: <testLibraryFragment>::@class::C::@method::m#element
+              element: <testLibrary>::@class::C::@method::m
               formalParameters
                 a @121
                   element: <testLibraryFragment>::@class::C::@method::m::@parameter::a#element
@@ -12472,6 +12492,7 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
       methods
         m
+          reference: <testLibrary>::@class::A::@method::m
           firstFragment: <testLibraryFragment>::@class::A::@method::m
           hasEnclosingTypeParameterReference: true
           formalParameters
@@ -12488,6 +12509,7 @@
           firstFragment: <testLibraryFragment>::@class::B::@constructor::new
       methods
         m
+          reference: <testLibrary>::@class::B::@method::m
           firstFragment: <testLibraryFragment>::@class::B::@method::m
           hasEnclosingTypeParameterReference: true
           formalParameters
@@ -12506,6 +12528,7 @@
           superConstructor: <testLibraryFragment>::@class::A::@constructor::new#element
       methods
         m
+          reference: <testLibrary>::@class::C::@method::m
           firstFragment: <testLibraryFragment>::@class::C::@method::m
           formalParameters
             requiredPositional hasImplicitType a
@@ -12541,7 +12564,7 @@
           methods
             m @17
               reference: <testLibraryFragment>::@class::A::@method::m
-              element: <testLibraryFragment>::@class::A::@method::m#element
+              element: <testLibrary>::@class::A::@method::m
               formalParameters
                 a @23
                   element: <testLibraryFragment>::@class::A::@method::m::@parameter::a#element
@@ -12556,7 +12579,7 @@
           methods
             m @53
               reference: <testLibraryFragment>::@class::B::@method::m
-              element: <testLibraryFragment>::@class::B::@method::m#element
+              element: <testLibrary>::@class::B::@method::m
               formalParameters
                 a @55
                   element: <testLibraryFragment>::@class::B::@method::m::@parameter::a#element
@@ -12572,6 +12595,7 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
       methods
         m
+          reference: <testLibrary>::@class::A::@method::m
           firstFragment: <testLibraryFragment>::@class::A::@method::m
           formalParameters
             requiredPositional a
@@ -12587,6 +12611,7 @@
           superConstructor: <testLibraryFragment>::@class::A::@constructor::new#element
       methods
         m
+          reference: <testLibrary>::@class::B::@method::m
           firstFragment: <testLibraryFragment>::@class::B::@method::m
           formalParameters
             requiredPositional hasImplicitType a
@@ -12625,7 +12650,7 @@
           methods
             m @17
               reference: <testLibraryFragment>::@class::A::@method::m
-              element: <testLibraryFragment>::@class::A::@method::m#element
+              element: <testLibrary>::@class::A::@method::m
               formalParameters
                 a @23
                   element: <testLibraryFragment>::@class::A::@method::m::@parameter::a#element
@@ -12640,7 +12665,7 @@
           methods
             m @53
               reference: <testLibraryFragment>::@class::B::@method::m
-              element: <testLibraryFragment>::@class::B::@method::m#element
+              element: <testLibrary>::@class::B::@method::m
               formalParameters
                 a @55
                   element: <testLibraryFragment>::@class::B::@method::m::@parameter::a#element
@@ -12655,6 +12680,7 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
       methods
         m
+          reference: <testLibrary>::@class::A::@method::m
           firstFragment: <testLibraryFragment>::@class::A::@method::m
           formalParameters
             requiredPositional a
@@ -12670,6 +12696,7 @@
           superConstructor: <testLibraryFragment>::@class::A::@constructor::new#element
       methods
         m
+          reference: <testLibrary>::@class::B::@method::m
           firstFragment: <testLibraryFragment>::@class::B::@method::m
           formalParameters
             requiredPositional hasImplicitType a
@@ -12707,7 +12734,7 @@
           methods
             m @12
               reference: <testLibraryFragment>::@class::A::@method::m
-              element: <testLibraryFragment>::@class::A::@method::m#element
+              element: <testLibrary>::@class::A::@method::m
               formalParameters
                 a @14
                   element: <testLibraryFragment>::@class::A::@method::m::@parameter::a#element
@@ -12722,7 +12749,7 @@
           methods
             m @44
               reference: <testLibraryFragment>::@class::B::@method::m
-              element: <testLibraryFragment>::@class::B::@method::m#element
+              element: <testLibrary>::@class::B::@method::m
               formalParameters
                 a @46
                   element: <testLibraryFragment>::@class::B::@method::m::@parameter::a#element
@@ -12735,6 +12762,7 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
       methods
         m
+          reference: <testLibrary>::@class::A::@method::m
           firstFragment: <testLibraryFragment>::@class::A::@method::m
           formalParameters
             requiredPositional hasImplicitType a
@@ -12750,6 +12778,7 @@
           superConstructor: <testLibraryFragment>::@class::A::@constructor::new#element
       methods
         m
+          reference: <testLibrary>::@class::B::@method::m
           firstFragment: <testLibraryFragment>::@class::B::@method::m
           formalParameters
             requiredPositional hasImplicitType a
@@ -12785,7 +12814,7 @@
           methods
             foo @16
               reference: <testLibraryFragment>::@class::A::@method::foo
-              element: <testLibraryFragment>::@class::A::@method::foo#element
+              element: <testLibrary>::@class::A::@method::foo
               formalParameters
                 a @27
                   element: <testLibraryFragment>::@class::A::@method::foo::@parameter::a#element
@@ -12800,7 +12829,7 @@
           methods
             m @63
               reference: <testLibraryFragment>::@class::B::@method::m
-              element: <testLibraryFragment>::@class::B::@method::m#element
+              element: <testLibrary>::@class::B::@method::m
               formalParameters
                 a @65
                   element: <testLibraryFragment>::@class::B::@method::m::@parameter::a#element
@@ -12813,6 +12842,7 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
       methods
         foo
+          reference: <testLibrary>::@class::A::@method::foo
           firstFragment: <testLibraryFragment>::@class::A::@method::foo
           formalParameters
             requiredPositional a
@@ -12828,6 +12858,7 @@
           superConstructor: <testLibraryFragment>::@class::A::@constructor::new#element
       methods
         m
+          reference: <testLibrary>::@class::B::@method::m
           firstFragment: <testLibraryFragment>::@class::B::@method::m
           formalParameters
             requiredPositional hasImplicitType a
@@ -12888,7 +12919,7 @@
           methods
             m @48
               reference: <testLibraryFragment>::@class::B::@method::m
-              element: <testLibraryFragment>::@class::B::@method::m#element
+              element: <testLibrary>::@class::B::@method::m
               formalParameters
                 a @50
                   element: <testLibraryFragment>::@class::B::@method::m::@parameter::a#element
@@ -12926,6 +12957,7 @@
           superConstructor: <testLibraryFragment>::@class::A::@constructor::new#element
       methods
         m
+          reference: <testLibrary>::@class::B::@method::m
           firstFragment: <testLibraryFragment>::@class::B::@method::m
           formalParameters
             requiredPositional hasImplicitType a
@@ -12967,7 +12999,7 @@
           methods
             m @20
               reference: <testLibraryFragment>::@class::A::@method::m
-              element: <testLibraryFragment>::@class::A::@method::m#element
+              element: <testLibrary>::@class::A::@method::m
               formalParameters
                 a @24
                   element: <testLibraryFragment>::@class::A::@method::m::@parameter::a#element
@@ -12993,7 +13025,7 @@
           methods
             m @94
               reference: <testLibraryFragment>::@class::C::@method::m
-              element: <testLibraryFragment>::@class::C::@method::m#element
+              element: <testLibrary>::@class::C::@method::m
               formalParameters
                 a @96
                   element: <testLibraryFragment>::@class::C::@method::m::@parameter::a#element
@@ -13009,6 +13041,7 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
       methods
         m
+          reference: <testLibrary>::@class::A::@method::m
           firstFragment: <testLibraryFragment>::@class::A::@method::m
           hasEnclosingTypeParameterReference: true
           formalParameters
@@ -13035,6 +13068,7 @@
           superConstructor: <testLibraryFragment>::@class::B::@constructor::new#element
       methods
         m
+          reference: <testLibrary>::@class::C::@method::m
           firstFragment: <testLibraryFragment>::@class::C::@method::m
           formalParameters
             requiredPositional hasImplicitType a
@@ -13073,7 +13107,7 @@
           methods
             m @19
               reference: <testLibraryFragment>::@class::A::@method::m
-              element: <testLibraryFragment>::@class::A::@method::m#element
+              element: <testLibrary>::@class::A::@method::m
               formalParameters
                 a @25
                   element: <testLibraryFragment>::@class::A::@method::m::@parameter::a#element
@@ -13088,7 +13122,7 @@
           methods
             m @55
               reference: <testLibraryFragment>::@class::B::@method::m
-              element: <testLibraryFragment>::@class::B::@method::m#element
+              element: <testLibrary>::@class::B::@method::m
               formalParameters
                 a @57
                   element: <testLibraryFragment>::@class::B::@method::m::@parameter::a#element
@@ -13103,7 +13137,7 @@
           methods
             m @87
               reference: <testLibraryFragment>::@class::C::@method::m
-              element: <testLibraryFragment>::@class::C::@method::m#element
+              element: <testLibrary>::@class::C::@method::m
               formalParameters
                 a @89
                   element: <testLibraryFragment>::@class::C::@method::m::@parameter::a#element
@@ -13116,6 +13150,7 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
       methods
         m
+          reference: <testLibrary>::@class::A::@method::m
           firstFragment: <testLibraryFragment>::@class::A::@method::m
           formalParameters
             requiredPositional a
@@ -13131,6 +13166,7 @@
           superConstructor: <testLibraryFragment>::@class::A::@constructor::new#element
       methods
         m
+          reference: <testLibrary>::@class::B::@method::m
           firstFragment: <testLibraryFragment>::@class::B::@method::m
           formalParameters
             requiredPositional hasImplicitType a
@@ -13146,6 +13182,7 @@
           superConstructor: <testLibraryFragment>::@class::B::@constructor::new#element
       methods
         m
+          reference: <testLibrary>::@class::C::@method::m
           firstFragment: <testLibraryFragment>::@class::C::@method::m
           formalParameters
             requiredPositional hasImplicitType a
@@ -13184,7 +13221,7 @@
           methods
             m @19
               reference: <testLibraryFragment>::@class::A::@method::m
-              element: <testLibraryFragment>::@class::A::@method::m#element
+              element: <testLibrary>::@class::A::@method::m
               formalParameters
                 a @25
                   element: <testLibraryFragment>::@class::A::@method::m::@parameter::a#element
@@ -13199,7 +13236,7 @@
           methods
             m @58
               reference: <testLibraryFragment>::@class::B::@method::m
-              element: <testLibraryFragment>::@class::B::@method::m#element
+              element: <testLibrary>::@class::B::@method::m
               formalParameters
                 a @60
                   element: <testLibraryFragment>::@class::B::@method::m::@parameter::a#element
@@ -13214,7 +13251,7 @@
           methods
             m @90
               reference: <testLibraryFragment>::@class::C::@method::m
-              element: <testLibraryFragment>::@class::C::@method::m#element
+              element: <testLibrary>::@class::C::@method::m
               formalParameters
                 a @92
                   element: <testLibraryFragment>::@class::C::@method::m::@parameter::a#element
@@ -13227,6 +13264,7 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
       methods
         m
+          reference: <testLibrary>::@class::A::@method::m
           firstFragment: <testLibraryFragment>::@class::A::@method::m
           formalParameters
             requiredPositional a
@@ -13242,6 +13280,7 @@
           firstFragment: <testLibraryFragment>::@class::B::@constructor::new
       methods
         m
+          reference: <testLibrary>::@class::B::@method::m
           firstFragment: <testLibraryFragment>::@class::B::@method::m
           formalParameters
             requiredPositional hasImplicitType a
@@ -13257,6 +13296,7 @@
           superConstructor: <testLibraryFragment>::@class::B::@constructor::new#element
       methods
         m
+          reference: <testLibrary>::@class::C::@method::m
           firstFragment: <testLibraryFragment>::@class::C::@method::m
           formalParameters
             requiredPositional hasImplicitType a
@@ -13295,7 +13335,7 @@
           methods
             m @19
               reference: <testLibraryFragment>::@class::A::@method::m
-              element: <testLibraryFragment>::@class::A::@method::m#element
+              element: <testLibrary>::@class::A::@method::m
               formalParameters
                 a @25
                   element: <testLibraryFragment>::@class::A::@method::m::@parameter::a#element
@@ -13310,7 +13350,7 @@
           methods
             m @67
               reference: <testLibraryFragment>::@class::B::@method::m
-              element: <testLibraryFragment>::@class::B::@method::m#element
+              element: <testLibrary>::@class::B::@method::m
               formalParameters
                 a @69
                   element: <testLibraryFragment>::@class::B::@method::m::@parameter::a#element
@@ -13325,7 +13365,7 @@
           methods
             m @99
               reference: <testLibraryFragment>::@class::C::@method::m
-              element: <testLibraryFragment>::@class::C::@method::m#element
+              element: <testLibrary>::@class::C::@method::m
               formalParameters
                 a @101
                   element: <testLibraryFragment>::@class::C::@method::m::@parameter::a#element
@@ -13338,6 +13378,7 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
       methods
         m
+          reference: <testLibrary>::@class::A::@method::m
           firstFragment: <testLibraryFragment>::@class::A::@method::m
           formalParameters
             requiredPositional a
@@ -13354,6 +13395,7 @@
           firstFragment: <testLibraryFragment>::@class::B::@constructor::new
       methods
         m
+          reference: <testLibrary>::@class::B::@method::m
           firstFragment: <testLibraryFragment>::@class::B::@method::m
           formalParameters
             requiredPositional hasImplicitType a
@@ -13369,6 +13411,7 @@
           superConstructor: <testLibraryFragment>::@class::B::@constructor::new#element
       methods
         m
+          reference: <testLibrary>::@class::C::@method::m
           firstFragment: <testLibraryFragment>::@class::C::@method::m
           formalParameters
             requiredPositional hasImplicitType a
@@ -13409,7 +13452,7 @@
           methods
             m @20
               reference: <testLibraryFragment>::@class::A::@method::m
-              element: <testLibraryFragment>::@class::A::@method::m#element
+              element: <testLibrary>::@class::A::@method::m
               formalParameters
                 a @24
                   element: <testLibraryFragment>::@class::A::@method::m::@parameter::a#element
@@ -13426,7 +13469,7 @@
           methods
             m @77
               reference: <testLibraryFragment>::@class::B::@method::m
-              element: <testLibraryFragment>::@class::B::@method::m#element
+              element: <testLibrary>::@class::B::@method::m
               formalParameters
                 a @79
                   element: <testLibraryFragment>::@class::B::@method::m::@parameter::a#element
@@ -13444,6 +13487,7 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
       methods
         m
+          reference: <testLibrary>::@class::A::@method::m
           firstFragment: <testLibraryFragment>::@class::A::@method::m
           hasEnclosingTypeParameterReference: true
           formalParameters
@@ -13462,6 +13506,7 @@
           superConstructor: <testLibraryFragment>::@class::A::@constructor::new#element
       methods
         m
+          reference: <testLibrary>::@class::B::@method::m
           firstFragment: <testLibraryFragment>::@class::B::@method::m
           formalParameters
             requiredPositional hasImplicitType a
@@ -13499,7 +13544,7 @@
           methods
             m @19
               reference: <testLibraryFragment>::@class::A::@method::m
-              element: <testLibraryFragment>::@class::A::@method::m#element
+              element: <testLibrary>::@class::A::@method::m
               formalParameters
                 a @25
                   element: <testLibraryFragment>::@class::A::@method::m::@parameter::a#element
@@ -13514,7 +13559,7 @@
           methods
             m @55
               reference: <testLibraryFragment>::@class::B::@method::m
-              element: <testLibraryFragment>::@class::B::@method::m#element
+              element: <testLibrary>::@class::B::@method::m
               formalParameters
                 a @57
                   element: <testLibraryFragment>::@class::B::@method::m::@parameter::a#element
@@ -13527,6 +13572,7 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
       methods
         m
+          reference: <testLibrary>::@class::A::@method::m
           firstFragment: <testLibraryFragment>::@class::A::@method::m
           formalParameters
             requiredPositional a
@@ -13542,6 +13588,7 @@
           superConstructor: <testLibraryFragment>::@class::A::@constructor::new#element
       methods
         m
+          reference: <testLibrary>::@class::B::@method::m
           firstFragment: <testLibraryFragment>::@class::B::@method::m
           formalParameters
             requiredPositional hasImplicitType a
@@ -13577,7 +13624,7 @@
           methods
             m @19
               reference: <testLibraryFragment>::@class::A::@method::m
-              element: <testLibraryFragment>::@class::A::@method::m#element
+              element: <testLibrary>::@class::A::@method::m
               formalParameters
                 a @25
                   element: <testLibraryFragment>::@class::A::@method::m::@parameter::a#element
@@ -13595,7 +13642,7 @@
           methods
             m @67
               reference: <testLibraryFragment>::@class::B::@method::m
-              element: <testLibraryFragment>::@class::B::@method::m#element
+              element: <testLibrary>::@class::B::@method::m
               formalParameters
                 a @69
                   element: <testLibraryFragment>::@class::B::@method::m::@parameter::a#element
@@ -13611,6 +13658,7 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
       methods
         m
+          reference: <testLibrary>::@class::A::@method::m
           firstFragment: <testLibraryFragment>::@class::A::@method::m
           formalParameters
             requiredPositional a
@@ -13629,6 +13677,7 @@
           superConstructor: <testLibraryFragment>::@class::A::@constructor::new#element
       methods
         m
+          reference: <testLibrary>::@class::B::@method::m
           firstFragment: <testLibraryFragment>::@class::B::@method::m
           formalParameters
             requiredPositional hasImplicitType a
@@ -13667,7 +13716,7 @@
           methods
             m @19
               reference: <testLibraryFragment>::@class::A::@method::m
-              element: <testLibraryFragment>::@class::A::@method::m#element
+              element: <testLibrary>::@class::A::@method::m
               formalParameters
                 a @25
                   element: <testLibraryFragment>::@class::A::@method::m::@parameter::a#element
@@ -13684,7 +13733,7 @@
           methods
             m @67
               reference: <testLibraryFragment>::@class::B::@method::m
-              element: <testLibraryFragment>::@class::B::@method::m#element
+              element: <testLibrary>::@class::B::@method::m
               formalParameters
                 a @69
                   element: <testLibraryFragment>::@class::B::@method::m::@parameter::a#element
@@ -13699,6 +13748,7 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
       methods
         m
+          reference: <testLibrary>::@class::A::@method::m
           firstFragment: <testLibraryFragment>::@class::A::@method::m
           formalParameters
             requiredPositional a
@@ -13716,6 +13766,7 @@
           superConstructor: <testLibraryFragment>::@class::A::@constructor::new#element
       methods
         m
+          reference: <testLibrary>::@class::B::@method::m
           firstFragment: <testLibraryFragment>::@class::B::@method::m
           formalParameters
             requiredPositional hasImplicitType a
@@ -13759,7 +13810,7 @@
           methods
             m @20
               reference: <testLibraryFragment>::@class::A::@method::m
-              element: <testLibraryFragment>::@class::A::@method::m#element
+              element: <testLibrary>::@class::A::@method::m
               formalParameters
                 a @24
                   element: <testLibraryFragment>::@class::A::@method::m::@parameter::a#element
@@ -13785,7 +13836,7 @@
           methods
             m @94
               reference: <testLibraryFragment>::@class::C::@method::m
-              element: <testLibraryFragment>::@class::C::@method::m#element
+              element: <testLibrary>::@class::C::@method::m
               formalParameters
                 a @96
                   element: <testLibraryFragment>::@class::C::@method::m::@parameter::a#element
@@ -13801,6 +13852,7 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
       methods
         m
+          reference: <testLibrary>::@class::A::@method::m
           firstFragment: <testLibraryFragment>::@class::A::@method::m
           hasEnclosingTypeParameterReference: true
           formalParameters
@@ -13827,6 +13879,7 @@
           superConstructor: <testLibraryFragment>::@class::B::@constructor::new#element
       methods
         m
+          reference: <testLibrary>::@class::C::@method::m
           firstFragment: <testLibraryFragment>::@class::C::@method::m
           formalParameters
             requiredPositional hasImplicitType a
@@ -13867,7 +13920,7 @@
           methods
             m @29
               reference: <testLibraryFragment>::@class::A::@method::m
-              element: <testLibraryFragment>::@class::A::@method::m#element
+              element: <testLibrary>::@class::A::@method::m
               formalParameters
                 a @33
                   element: <testLibraryFragment>::@class::A::@method::m::@parameter::a#element
@@ -13882,7 +13935,7 @@
           methods
             m @77
               reference: <testLibraryFragment>::@class::B::@method::m
-              element: <testLibraryFragment>::@class::B::@method::m#element
+              element: <testLibrary>::@class::B::@method::m
               formalParameters
                 a @79
                   element: <testLibraryFragment>::@class::B::@method::m::@parameter::a#element
@@ -13898,6 +13951,7 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
       methods
         abstract m
+          reference: <testLibrary>::@class::A::@method::m
           firstFragment: <testLibraryFragment>::@class::A::@method::m
           hasEnclosingTypeParameterReference: true
           formalParameters
@@ -13914,6 +13968,7 @@
           firstFragment: <testLibraryFragment>::@class::B::@constructor::new
       methods
         m
+          reference: <testLibrary>::@class::B::@method::m
           firstFragment: <testLibraryFragment>::@class::B::@method::m
           formalParameters
             requiredPositional hasImplicitType a
@@ -13949,7 +14004,7 @@
           methods
             m @28
               reference: <testLibraryFragment>::@class::A::@method::m
-              element: <testLibraryFragment>::@class::A::@method::m#element
+              element: <testLibrary>::@class::A::@method::m
               formalParameters
                 a @34
                   element: <testLibraryFragment>::@class::A::@method::m::@parameter::a#element
@@ -13964,7 +14019,7 @@
           methods
             m @65
               reference: <testLibraryFragment>::@class::B::@method::m
-              element: <testLibraryFragment>::@class::B::@method::m#element
+              element: <testLibrary>::@class::B::@method::m
               formalParameters
                 a @67
                   element: <testLibraryFragment>::@class::B::@method::m::@parameter::a#element
@@ -13977,6 +14032,7 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
       methods
         abstract m
+          reference: <testLibrary>::@class::A::@method::m
           firstFragment: <testLibraryFragment>::@class::A::@method::m
           formalParameters
             requiredPositional a
@@ -13992,6 +14048,7 @@
           firstFragment: <testLibraryFragment>::@class::B::@constructor::new
       methods
         m
+          reference: <testLibrary>::@class::B::@method::m
           firstFragment: <testLibraryFragment>::@class::B::@method::m
           formalParameters
             requiredPositional hasImplicitType a
@@ -14033,7 +14090,7 @@
           methods
             m @29
               reference: <testLibraryFragment>::@class::A::@method::m
-              element: <testLibraryFragment>::@class::A::@method::m#element
+              element: <testLibrary>::@class::A::@method::m
               formalParameters
                 a @33
                   element: <testLibraryFragment>::@class::A::@method::m::@parameter::a#element
@@ -14061,7 +14118,7 @@
           methods
             m @123
               reference: <testLibraryFragment>::@class::C::@method::m
-              element: <testLibraryFragment>::@class::C::@method::m#element
+              element: <testLibrary>::@class::C::@method::m
               formalParameters
                 a @125
                   element: <testLibraryFragment>::@class::C::@method::m::@parameter::a#element
@@ -14077,6 +14134,7 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
       methods
         abstract m
+          reference: <testLibrary>::@class::A::@method::m
           firstFragment: <testLibraryFragment>::@class::A::@method::m
           hasEnclosingTypeParameterReference: true
           formalParameters
@@ -14104,6 +14162,7 @@
           firstFragment: <testLibraryFragment>::@class::C::@constructor::new
       methods
         m
+          reference: <testLibrary>::@class::C::@method::m
           firstFragment: <testLibraryFragment>::@class::C::@method::m
           formalParameters
             requiredPositional hasImplicitType a
@@ -14146,7 +14205,7 @@
           methods
             _foo @38
               reference: <testLibraryFragment>::@class::A1::@method::_foo
-              element: <testLibraryFragment>::@class::A1::@method::_foo#element
+              element: <testLibrary>::@class::A1::@method::_foo
         class A2 @59
           reference: <testLibraryFragment>::@class::A2
           element: <testLibrary>::@class::A2
@@ -14158,7 +14217,7 @@
           methods
             _foo @77
               reference: <testLibraryFragment>::@class::A2::@method::_foo
-              element: <testLibraryFragment>::@class::A2::@method::_foo#element
+              element: <testLibrary>::@class::A2::@method::_foo
   classes
     class A1
       reference: <testLibrary>::@class::A1
@@ -14168,6 +14227,7 @@
           firstFragment: <testLibraryFragment>::@class::A1::@constructor::new
       methods
         _foo
+          reference: <testLibrary>::@class::A1::@method::_foo
           firstFragment: <testLibraryFragment>::@class::A1::@method::_foo
           returnType: int
     class A2
@@ -14180,6 +14240,7 @@
           superConstructor: <testLibraryFragment>::@class::A1::@constructor::new#element
       methods
         _foo
+          reference: <testLibrary>::@class::A2::@method::_foo
           firstFragment: <testLibraryFragment>::@class::A2::@method::_foo
           returnType: int
 ''');
@@ -14212,7 +14273,7 @@
           methods
             m @19
               reference: <testLibraryFragment>::@class::A::@method::m
-              element: <testLibraryFragment>::@class::A::@method::m#element
+              element: <testLibrary>::@class::A::@method::m
               formalParameters
                 a @25
                   element: <testLibraryFragment>::@class::A::@method::m::@parameter::a#element
@@ -14227,7 +14288,7 @@
           methods
             m @67
               reference: <testLibraryFragment>::@class::B::@method::m
-              element: <testLibraryFragment>::@class::B::@method::m#element
+              element: <testLibrary>::@class::B::@method::m
               formalParameters
                 a @69
                   element: <testLibraryFragment>::@class::B::@method::m::@parameter::a#element
@@ -14240,6 +14301,7 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
       methods
         m
+          reference: <testLibrary>::@class::A::@method::m
           firstFragment: <testLibraryFragment>::@class::A::@method::m
           formalParameters
             requiredPositional a
@@ -14256,6 +14318,7 @@
           firstFragment: <testLibraryFragment>::@class::B::@constructor::new
       methods
         m
+          reference: <testLibrary>::@class::B::@method::m
           firstFragment: <testLibraryFragment>::@class::B::@method::m
           formalParameters
             requiredPositional hasImplicitType a
@@ -14299,7 +14362,7 @@
           methods
             m @20
               reference: <testLibraryFragment>::@class::A::@method::m
-              element: <testLibraryFragment>::@class::A::@method::m#element
+              element: <testLibrary>::@class::A::@method::m
               formalParameters
                 a @24
                   element: <testLibraryFragment>::@class::A::@method::m::@parameter::a#element
@@ -14317,7 +14380,7 @@
           methods
             m @49
               reference: <testLibraryFragment>::@class::B::@method::m
-              element: <testLibraryFragment>::@class::B::@method::m#element
+              element: <testLibrary>::@class::B::@method::m
               formalParameters
                 a @55
                   element: <testLibraryFragment>::@class::B::@method::m::@parameter::a#element
@@ -14332,7 +14395,7 @@
           methods
             m @119
               reference: <testLibraryFragment>::@class::C::@method::m
-              element: <testLibraryFragment>::@class::C::@method::m#element
+              element: <testLibrary>::@class::C::@method::m
               formalParameters
                 a @121
                   element: <testLibraryFragment>::@class::C::@method::m::@parameter::a#element
@@ -14348,6 +14411,7 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
       methods
         m
+          reference: <testLibrary>::@class::A::@method::m
           firstFragment: <testLibraryFragment>::@class::A::@method::m
           hasEnclosingTypeParameterReference: true
           formalParameters
@@ -14364,6 +14428,7 @@
           firstFragment: <testLibraryFragment>::@class::B::@constructor::new
       methods
         m
+          reference: <testLibrary>::@class::B::@method::m
           firstFragment: <testLibraryFragment>::@class::B::@method::m
           hasEnclosingTypeParameterReference: true
           formalParameters
@@ -14382,6 +14447,7 @@
           superConstructor: <testLibraryFragment>::@class::A::@constructor::new#element
       methods
         m
+          reference: <testLibrary>::@class::C::@method::m
           firstFragment: <testLibraryFragment>::@class::C::@method::m
           formalParameters
             requiredPositional hasImplicitType a
@@ -14420,7 +14486,7 @@
           methods
             m @19
               reference: <testLibraryFragment>::@class::A::@method::m
-              element: <testLibraryFragment>::@class::A::@method::m#element
+              element: <testLibrary>::@class::A::@method::m
               formalParameters
                 a @25
                   element: <testLibraryFragment>::@class::A::@method::m::@parameter::a#element
@@ -14435,7 +14501,7 @@
           methods
             m @52
               reference: <testLibraryFragment>::@class::B::@method::m
-              element: <testLibraryFragment>::@class::B::@method::m#element
+              element: <testLibrary>::@class::B::@method::m
               formalParameters
                 a @58
                   element: <testLibraryFragment>::@class::B::@method::m::@parameter::a#element
@@ -14450,7 +14516,7 @@
           methods
             m @101
               reference: <testLibraryFragment>::@class::C::@method::m
-              element: <testLibraryFragment>::@class::C::@method::m#element
+              element: <testLibrary>::@class::C::@method::m
               formalParameters
                 a @103
                   element: <testLibraryFragment>::@class::C::@method::m::@parameter::a#element
@@ -14463,6 +14529,7 @@
           firstFragment: <testLibraryFragment>::@class::A::@constructor::new
       methods
         m
+          reference: <testLibrary>::@class::A::@method::m
           firstFragment: <testLibraryFragment>::@class::A::@method::m
           formalParameters
             requiredPositional a
@@ -14476,6 +14543,7 @@
           firstFragment: <testLibraryFragment>::@class::B::@constructor::new
       methods
         m
+          reference: <testLibrary>::@class::B::@method::m
           firstFragment: <testLibraryFragment>::@class::B::@method::m
           formalParameters
             requiredPositional a
@@ -14493,6 +14561,7 @@
           superConstructor: <testLibraryFragment>::@class::A::@constructor::new#element
       methods
         m
+          reference: <testLibrary>::@class::C::@method::m
           firstFragment: <testLibraryFragment>::@class::C::@method::m
           formalParameters
             requiredPositional hasImplicitType a
diff --git a/pkg/analyzer/test/util/element_printer.dart b/pkg/analyzer/test/util/element_printer.dart
index d4a4278..c04db2b 100644
--- a/pkg/analyzer/test/util/element_printer.dart
+++ b/pkg/analyzer/test/util/element_printer.dart
@@ -85,12 +85,7 @@
       case TopLevelFunctionElementImpl element:
         writelnReference(element.reference);
       case MethodElementImpl2 element:
-        var firstFragment = element.firstFragment as FragmentImpl;
-        var reference = firstFragment.reference;
-        writeReference(reference!);
-        _sink.writeln('#element');
-      // TODO(scheglov): use after https://dart-review.googlesource.com/c/sdk/+/431940
-      // writelnReference(element.reference);
+        writelnReference(element.reference);
       case FragmentedElementMixin element:
         var firstFragment = element.firstFragment as FragmentImpl;
         var reference = firstFragment.reference!;