diff --git a/pkg/analysis_server/lib/plugin/protocol/protocol_dart.dart b/pkg/analysis_server/lib/plugin/protocol/protocol_dart.dart
index f3e8e95a85d..706f4bd7450 100644
--- a/pkg/analysis_server/lib/plugin/protocol/protocol_dart.dart
+++ b/pkg/analysis_server/lib/plugin/protocol/protocol_dart.dart
@@ -13,7 +13,7 @@ import 'package:analyzer/src/dart/element/element.dart';
 import 'package:analyzer/src/utilities/extensions/element.dart';
 import 'package:path/path.dart' as path;
 
-Element convertElement(engine.Element2 element) {
+Element convertElement(engine.Element element) {
   var kind = convertElementToElementKind(element);
   var name = getElementDisplayName(element);
   var elementTypeParameters = _getTypeParametersString(element);
@@ -120,14 +120,14 @@ ElementKind convertElementKind(engine.ElementKind kind) {
   return ElementKind.UNKNOWN;
 }
 
-/// Return an [ElementKind] corresponding to the given [engine.Element2].
-ElementKind convertElementToElementKind(engine.Element2 element) {
-  if (element is engine.EnumElement2) {
+/// Return an [ElementKind] corresponding to the given [engine.Element].
+ElementKind convertElementToElementKind(engine.Element element) {
+  if (element is engine.EnumElement) {
     return ElementKind.ENUM;
-  } else if (element is engine.MixinElement2) {
+  } else if (element is engine.MixinElement) {
     return ElementKind.MIXIN;
   }
-  if (element is engine.FieldElement2 && element.isEnumConstant) {
+  if (element is engine.FieldElement && element.isEnumConstant) {
     return ElementKind.ENUM_CONSTANT;
   }
   return convertElementKind(element.kind);
@@ -145,7 +145,7 @@ Element convertLibraryFragment(CompilationUnitElementImpl fragment) {
   );
 }
 
-String getElementDisplayName(engine.Element2 element) {
+String getElementDisplayName(engine.Element element) {
   if (element is engine.LibraryFragment) {
     return path.basename((element as engine.LibraryFragment).source.fullName);
   } else {
@@ -153,17 +153,17 @@ String getElementDisplayName(engine.Element2 element) {
   }
 }
 
-String? getParametersString(engine.Element2 element) {
+String? getParametersString(engine.Element element) {
   // TODO(scheglov): expose the corresponding feature from ExecutableElement
   List<engine.FormalParameterElement> parameters;
-  if (element is engine.ExecutableElement2) {
+  if (element is engine.ExecutableElement) {
     // valid getters don't have parameters
     if (element.kind == engine.ElementKind.GETTER &&
         element.formalParameters.isEmpty) {
       return null;
     }
     parameters = element.formalParameters.toList();
-  } else if (element is engine.TypeAliasElement2) {
+  } else if (element is engine.TypeAliasElement) {
     var aliasedType = element.aliasedType;
     if (aliasedType is FunctionType) {
       parameters = aliasedType.formalParameters.toList();
@@ -202,11 +202,11 @@ String? getParametersString(engine.Element2 element) {
   return '($sb)';
 }
 
-String? _getTypeParametersString(engine.Element2 element) {
-  List<engine.TypeParameterElement2>? typeParameters;
-  if (element is engine.InterfaceElement2) {
+String? _getTypeParametersString(engine.Element element) {
+  List<engine.TypeParameterElement>? typeParameters;
+  if (element is engine.InterfaceElement) {
     typeParameters = element.typeParameters2;
-  } else if (element is engine.TypeAliasElement2) {
+  } else if (element is engine.TypeAliasElement) {
     typeParameters = element.typeParameters2;
   }
   if (typeParameters == null || typeParameters.isEmpty) {
@@ -215,41 +215,41 @@ String? _getTypeParametersString(engine.Element2 element) {
   return '<${typeParameters.join(', ')}>';
 }
 
-bool _isAbstract(engine.Element2 element) {
-  if (element is engine.ClassElement2) {
+bool _isAbstract(engine.Element element) {
+  if (element is engine.ClassElement) {
     return element.isAbstract;
   }
-  if (element is engine.MethodElement2) {
+  if (element is engine.MethodElement) {
     return element.isAbstract;
   }
-  if (element is engine.MixinElement2) {
+  if (element is engine.MixinElement) {
     return true;
   }
   return false;
 }
 
-bool _isConst(engine.Element2 element) {
-  if (element is engine.ConstructorElement2) {
+bool _isConst(engine.Element element) {
+  if (element is engine.ConstructorElement) {
     return element.isConst;
   }
-  if (element is engine.VariableElement2) {
+  if (element is engine.VariableElement) {
     return element.isConst;
   }
   return false;
 }
 
-bool _isFinal(engine.Element2 element) {
-  if (element is engine.VariableElement2) {
+bool _isFinal(engine.Element element) {
+  if (element is engine.VariableElement) {
     return element.isFinal;
   }
   return false;
 }
 
-bool _isStatic(engine.Element2 element) {
-  if (element is engine.ExecutableElement2) {
+bool _isStatic(engine.Element element) {
+  if (element is engine.ExecutableElement) {
     return element.isStatic;
   }
-  if (element is engine.PropertyInducingElement2) {
+  if (element is engine.PropertyInducingElement) {
     return element.isStatic;
   }
   return false;
diff --git a/pkg/analysis_server/lib/src/analysis_server.dart b/pkg/analysis_server/lib/src/analysis_server.dart
index bec7c09259d..db7e3fd1629 100644
--- a/pkg/analysis_server/lib/src/analysis_server.dart
+++ b/pkg/analysis_server/lib/src/analysis_server.dart
@@ -639,10 +639,10 @@ abstract class AnalysisServer {
   /// Gets the current version number of a document (if known).
   int? getDocumentVersion(String path);
 
-  /// Return a [Future] that completes with the [Element2] at the given
+  /// Return a [Future] that completes with the [Element] at the given
   /// [offset] of the given [file], or with `null` if there is no node at the
   /// [offset] or the node does not have an element.
-  Future<Element2?> getElementAtOffset(String file, int offset) async {
+  Future<Element?> getElementAtOffset(String file, int offset) async {
     var unitResult = await getResolvedUnit(file);
     if (unitResult == null) {
       return null;
diff --git a/pkg/analysis_server/lib/src/cider/completion.dart b/pkg/analysis_server/lib/src/cider/completion.dart
index fb44d008575..cbe296fdf29 100644
--- a/pkg/analysis_server/lib/src/cider/completion.dart
+++ b/pkg/analysis_server/lib/src/cider/completion.dart
@@ -190,7 +190,7 @@ class CiderCompletionComputer {
   /// Return cached, or compute unprefixed suggestions for all elements
   /// exported from the library.
   List<CompletionSuggestionBuilder> _importedLibrarySuggestions({
-    required LibraryElement2 element,
+    required LibraryElement element,
     required OperationPerformanceImpl performance,
   }) {
     performance.getDataInt('libraryCount').increment();
@@ -212,7 +212,7 @@ class CiderCompletionComputer {
   /// Compute all unprefixed suggestions for all elements exported from
   /// the library.
   List<CompletionSuggestionBuilder> _librarySuggestions(
-    LibraryElement2 element,
+    LibraryElement element,
   ) {
     var suggestionBuilder = SuggestionBuilder(
       _dartCompletionRequest,
diff --git a/pkg/analysis_server/lib/src/cider/fixes.dart b/pkg/analysis_server/lib/src/cider/fixes.dart
index f58343f43a6..f88db999ad6 100644
--- a/pkg/analysis_server/lib/src/cider/fixes.dart
+++ b/pkg/analysis_server/lib/src/cider/fixes.dart
@@ -83,10 +83,10 @@ class _CiderDartFixContextImpl extends DartFixContext {
   }) : super(instrumentationService: InstrumentationService.NULL_SERVICE);
 
   @override
-  Future<Map<LibraryElement2, Element2>> getTopLevelDeclarations(
+  Future<Map<LibraryElement, Element>> getTopLevelDeclarations(
     String name,
   ) async {
-    var result = <LibraryElement2, Element2>{};
+    var result = <LibraryElement, Element>{};
     var files = _fileResolver.getFilesWithTopLevelDeclarations(name);
     for (var file in files) {
       var kind = file.kind;
@@ -101,5 +101,5 @@ class _CiderDartFixContextImpl extends DartFixContext {
   }
 
   @override
-  Stream<LibraryElement2> librariesWithExtensions(Name memberName) async* {}
+  Stream<LibraryElement> librariesWithExtensions(Name memberName) async* {}
 }
diff --git a/pkg/analysis_server/lib/src/cider/local_library_contributor.dart b/pkg/analysis_server/lib/src/cider/local_library_contributor.dart
index a3e7cb53c98..7ec4b9e682a 100644
--- a/pkg/analysis_server/lib/src/cider/local_library_contributor.dart
+++ b/pkg/analysis_server/lib/src/cider/local_library_contributor.dart
@@ -29,7 +29,7 @@ class LibraryElementSuggestionBuilder
   final String? prefix;
 
   /// The set of libraries that have been, or are currently being, visited.
-  final Set<LibraryElement2> visitedLibraries = <LibraryElement2>{};
+  final Set<LibraryElement> visitedLibraries = <LibraryElement>{};
 
   factory LibraryElementSuggestionBuilder(
     DartCompletionRequest request,
@@ -59,7 +59,7 @@ class LibraryElementSuggestionBuilder
   );
 
   @override
-  void visitClassElement(ClassElement2 element) {
+  void visitClassElement(ClassElement element) {
     AstNode node = request.target.containingNode;
     var libraryElement = request.libraryElement;
     if (node is ExtendsClause && !element.isExtendableIn2(libraryElement)) {
@@ -74,17 +74,17 @@ class LibraryElementSuggestionBuilder
   }
 
   @override
-  void visitElement(Element2 element) {
+  void visitElement(Element element) {
     // ignored
   }
 
   @override
-  visitEnumElement(EnumElement2 element) {
+  visitEnumElement(EnumElement element) {
     _visitInterfaceElement(element);
   }
 
   @override
-  void visitExtensionElement(ExtensionElement2 element) {
+  void visitExtensionElement(ExtensionElement element) {
     if (opType.includeReturnValueSuggestions) {
       if (element.name3 != null) {
         builder.suggestExtension(element, kind: kind, prefix: prefix);
@@ -93,7 +93,7 @@ class LibraryElementSuggestionBuilder
   }
 
   @override
-  void visitExtensionTypeElement(ExtensionTypeElement2 element) {
+  void visitExtensionTypeElement(ExtensionTypeElement element) {
     _visitInterfaceElement(element);
   }
 
@@ -105,9 +105,9 @@ class LibraryElementSuggestionBuilder
             variable != null &&
             variable.isConst)) {
       var parent = element.enclosingElement2;
-      if (parent is InterfaceElement2 || parent is ExtensionElement2) {
+      if (parent is InterfaceElement || parent is ExtensionElement) {
         if (element.isSynthetic) {
-          if (variable is FieldElement2) {
+          if (variable is FieldElement) {
             builder.suggestField(variable, inheritanceDistance: 0.0);
           }
         } else {
@@ -120,14 +120,14 @@ class LibraryElementSuggestionBuilder
   }
 
   @override
-  void visitLibraryElement(LibraryElement2 element) {
+  void visitLibraryElement(LibraryElement element) {
     if (visitedLibraries.add(element)) {
       element.visitChildren2(this);
     }
   }
 
   @override
-  visitMixinElement(MixinElement2 element) {
+  visitMixinElement(MixinElement element) {
     AstNode node = request.target.containingNode;
     if (node is ImplementsClause &&
         !element.isImplementableIn2(request.libraryElement)) {
@@ -144,7 +144,7 @@ class LibraryElementSuggestionBuilder
             variable != null &&
             variable.isConst)) {
       var parent = element.enclosingElement2;
-      if (parent is InterfaceElement2 || parent is ExtensionElement2) {
+      if (parent is InterfaceElement || parent is ExtensionElement) {
         if (!element.isSynthetic) {
           builder.suggestSetter(element, inheritanceDistance: 0.0);
         }
@@ -169,14 +169,14 @@ class LibraryElementSuggestionBuilder
   }
 
   @override
-  void visitTopLevelVariableElement(TopLevelVariableElement2 element) {
+  void visitTopLevelVariableElement(TopLevelVariableElement element) {
     if (opType.includeReturnValueSuggestions && !element.isSynthetic) {
       builder.suggestTopLevelVariable(element, prefix: prefix);
     }
   }
 
   @override
-  void visitTypeAliasElement(TypeAliasElement2 element) {
+  void visitTypeAliasElement(TypeAliasElement element) {
     if (opType.includeTypeNameSuggestions) {
       builder.suggestTypeAlias(element, prefix: prefix);
     }
@@ -186,10 +186,10 @@ class LibraryElementSuggestionBuilder
   ///
   /// If [onlyConst] is `true`, only `const` constructors will be suggested.
   void _addConstructorSuggestions(
-    ClassElement2 element, {
+    ClassElement element, {
     bool onlyConst = false,
   }) {
-    if (element is EnumElement2) {
+    if (element is EnumElement) {
       return;
     }
 
@@ -207,11 +207,11 @@ class LibraryElementSuggestionBuilder
     }
   }
 
-  void _visitInterfaceElement(InterfaceElement2 element) {
+  void _visitInterfaceElement(InterfaceElement element) {
     if (opType.includeTypeNameSuggestions) {
       builder.suggestInterface(element, prefix: prefix);
     }
-    if (element is ClassElement2) {
+    if (element is ClassElement) {
       if (opType.includeConstructorSuggestions) {
         _addConstructorSuggestions(element);
       } else if (opType.includeAnnotationSuggestions) {
diff --git a/pkg/analysis_server/lib/src/cider/rename.dart b/pkg/analysis_server/lib/src/cider/rename.dart
index b408051aa77..45be0869927 100644
--- a/pkg/analysis_server/lib/src/cider/rename.dart
+++ b/pkg/analysis_server/lib/src/cider/rename.dart
@@ -43,21 +43,21 @@ class CanRenameResponse {
     RefactoringStatus? status;
     if (element is FormalParameterElement) {
       status = validateParameterName(name);
-    } else if (element is VariableElement2) {
+    } else if (element is VariableElement) {
       status = validateVariableName(name);
     } else if (element is LocalFunctionElement ||
         element is TopLevelFunctionElement) {
       status = validateFunctionName(name);
-    } else if (element is FieldElement2) {
+    } else if (element is FieldElement) {
       status = validateFieldName(name);
-    } else if (element is MethodElement2) {
+    } else if (element is MethodElement) {
       status = validateMethodName(name);
-    } else if (element is TypeAliasElement2) {
+    } else if (element is TypeAliasElement) {
       status = validateTypeAliasName(name);
-    } else if (element is InterfaceElement2) {
+    } else if (element is InterfaceElement) {
       status = validateClassName(name);
       _flutterWidgetState = _findFlutterStateClass(element, name);
-    } else if (element is ConstructorElement2) {
+    } else if (element is ConstructorElement) {
       status = validateConstructorName(name);
       _analyzePossibleConflicts(element, status, name);
     } else if (element is MockLibraryImportElement) {
@@ -71,7 +71,7 @@ class CanRenameResponse {
   }
 
   void _analyzePossibleConflicts(
-    ConstructorElement2 element,
+    ConstructorElement element,
     RefactoringStatus result,
     String newName,
   ) {
@@ -95,8 +95,8 @@ class CanRenameResponse {
     }
   }
 
-  FlutterWidgetState? _findFlutterStateClass(Element2 element, String newName) {
-    if (element is ClassElement2 && element.isStatefulWidgetDeclaration) {
+  FlutterWidgetState? _findFlutterStateClass(Element element, String newName) {
+    if (element is ClassElement && element.isStatefulWidgetDeclaration) {
       var oldStateName = '${element.displayName}State';
       var library = element.library2;
       var state =
@@ -128,9 +128,9 @@ class CheckNameResponse {
   String get oldName => canRename.refactoringElement.element.displayName;
 
   Future<RenameResponse?> computeRenameRanges2() async {
-    var elements = <Element2>[];
+    var elements = <Element>[];
     var element = canRename.refactoringElement.element;
-    if (element is PropertyInducingElement2 && element.isSynthetic) {
+    if (element is PropertyInducingElement && element.isSynthetic) {
       var property = element;
       var getter = property.getter2;
       var setter = property.setter2;
@@ -149,7 +149,7 @@ class CheckNameResponse {
       flutterRename = await _computeFlutterStateName();
     }
     var replaceMatches = <CiderReplaceMatch>[];
-    if (element is ConstructorElement2) {
+    if (element is ConstructorElement) {
       for (var match in matches) {
         var replaceInfo = <ReplaceInfo>[];
         for (var ref in match.references) {
@@ -231,11 +231,11 @@ class CheckNameResponse {
   }
 
   Future<List<ReplaceInfo>> _addElementDeclaration(
-    Element2 element,
+    Element element,
     String sourcePath,
   ) async {
     var infos = <ReplaceInfo>[];
-    if (element is PropertyInducingElement2 && element.isSynthetic) {
+    if (element is PropertyInducingElement && element.isSynthetic) {
       var getter = element.getter2;
       if (getter != null) {
         infos.add(
@@ -433,10 +433,10 @@ class CiderRenameComputer {
     if (element.library2?.isInSdk == true) {
       return null;
     }
-    if (element is MethodElement2 && element.isOperator) {
+    if (element is MethodElement && element.isOperator) {
       return null;
     }
-    if (element is PropertyAccessorElement2) {
+    if (element is PropertyAccessorElement) {
       element = element.variable3;
       if (element == null) {
         return null;
@@ -452,20 +452,20 @@ class CiderRenameComputer {
     return null;
   }
 
-  bool _canRenameElement(Element2 element) {
+  bool _canRenameElement(Element element) {
     var enclosingElement = element.enclosingElement2;
-    if (element is ConstructorElement2) {
+    if (element is ConstructorElement) {
       return true;
     }
     if (element is MockLibraryImportElement) {
       return true;
     }
-    if (element is LabelElement2 || element is LocalElement2) {
+    if (element is LabelElement || element is LocalElement) {
       return true;
     }
-    if (enclosingElement is InterfaceElement2 ||
-        enclosingElement is ExtensionElement2 ||
-        enclosingElement is LibraryElement2) {
+    if (enclosingElement is InterfaceElement ||
+        enclosingElement is ExtensionElement ||
+        enclosingElement is LibraryElement) {
       return true;
     }
     return false;
@@ -492,7 +492,7 @@ class FlutterWidgetRename {
 
 /// The corresponding `State` declaration of a  Flutter `StatefulWidget`.
 class FlutterWidgetState {
-  ClassElement2 state;
+  ClassElement state;
   String newName;
 
   FlutterWidgetState(this.state, this.newName);
diff --git a/pkg/analysis_server/lib/src/computer/computer_call_hierarchy.dart b/pkg/analysis_server/lib/src/computer/computer_call_hierarchy.dart
index 28506ee64b4..015b5162720 100644
--- a/pkg/analysis_server/lib/src/computer/computer_call_hierarchy.dart
+++ b/pkg/analysis_server/lib/src/computer/computer_call_hierarchy.dart
@@ -19,7 +19,7 @@ import 'package:analyzer/utilities/extensions/ast.dart';
 ///
 /// This is used to construct (and group calls by) a [CallHierarchyItem] that
 /// contains calls and also locate their containers for additional labelling.
-Element2? _getContainer(Element2 element) {
+Element? _getContainer(Element element) {
   // TODO(brianwilkerson): This used to use the compilation unit as a container
   //  which allowed users to see the path to the containing file, but that's
   //  been lost. Consider trying to restore that behavior.
@@ -42,9 +42,9 @@ Element2? _getContainer(Element2 element) {
 }
 
 /// Gets a user-friendly display name for [element].
-String _getDisplayName(Element2 element) {
+String _getDisplayName(Element element) {
   return switch (element) {
-    LibraryElement2() => element.firstFragment.source.shortName,
+    LibraryElement() => element.firstFragment.source.shortName,
     GetterElement() => 'get ${element.displayName}',
     SetterElement() => 'set ${element.displayName}',
     _ => element.displayName,
@@ -102,7 +102,7 @@ class CallHierarchyItem {
     required this.codeRange,
   });
 
-  CallHierarchyItem.forElement(Element2 element)
+  CallHierarchyItem.forElement(Element element)
     : displayName = _getDisplayName(element),
       nameRange = _nameRangeForElement(element),
       codeRange = _codeRangeForElement(element),
@@ -117,7 +117,7 @@ class CallHierarchyItem {
   }
 
   /// Returns the [SourceRange] of the code for [element].
-  static SourceRange _codeRangeForElement(Element2 element) {
+  static SourceRange _codeRangeForElement(Element element) {
     // For synthetic items (like implicit constructors), use the nonSynthetic
     // element for the location.
     element = _nonSynthetic(element);
@@ -130,7 +130,7 @@ class CallHierarchyItem {
   }
 
   /// Returns the [SourceRange] of the name for [element].
-  static SourceRange _nameRangeForElement(Element2 element) {
+  static SourceRange _nameRangeForElement(Element element) {
     // For synthetic items (like implicit constructors), use the nonSynthetic
     // element for the location.
     element = _nonSynthetic(element);
@@ -143,7 +143,7 @@ class CallHierarchyItem {
         : SourceRange(fragment.nameOffset, fragment.nameLength);
   }
 
-  static Element2 _nonSynthetic(Element2 element) {
+  static Element _nonSynthetic(Element element) {
     element = element.nonSynthetic2;
     if (element.isSynthetic) {
       element = element.enclosingElement2 ?? element;
@@ -177,7 +177,7 @@ enum CallHierarchyKind {
     ElementKind.SETTER: property,
   };
 
-  static CallHierarchyKind forElement(Element2 element) =>
+  static CallHierarchyKind forElement(Element element) =>
       _elementMapping[element.kind] ?? unknown;
 }
 
@@ -224,14 +224,14 @@ class DartCallHierarchyComputer {
     // implicit constructors do not have.
     // Here, we map them back to the synthetic constructor element.
     var isImplicitConstructor =
-        element is InterfaceElement2 &&
+        element is InterfaceElement &&
         target.kind == CallHierarchyKind.constructor;
     if (isImplicitConstructor) {
       element = element.unnamedConstructor2;
     }
 
     // We only find incoming calls to executable elements.
-    if (element is! ExecutableElement2) {
+    if (element is! ExecutableElement) {
       return [];
     }
 
@@ -240,7 +240,7 @@ class DartCallHierarchyComputer {
 
     // Group results by their container, since we only want to return a single
     // entry for a body, with a set of ranges within.
-    var resultsByContainer = <Element2, CallHierarchyCalls>{};
+    var resultsByContainer = <Element, CallHierarchyCalls>{};
     // We may need to fetch parsed results for the other files, reuse them
     // across calls.
     var parsedUnits = <String, SomeParsedUnitResult?>{};
@@ -293,7 +293,7 @@ class DartCallHierarchyComputer {
 
     // Group results by their target, since we only want to return a single
     // entry for each target, with a set of ranges that call it.
-    var resultsByTarget = <Element2, CallHierarchyCalls>{};
+    var resultsByTarget = <Element, CallHierarchyCalls>{};
     for (var referenceNode in referenceNodes) {
       var target = _getElementOfNode(referenceNode);
       if (target == null) {
@@ -316,14 +316,14 @@ class DartCallHierarchyComputer {
 
   /// Finds a target for starting call hierarchy navigation at [offset].
   ///
-  /// If [offset] is an invocation, returns information about the [Element2] it
+  /// If [offset] is an invocation, returns information about the [Element] it
   /// refers to.
   CallHierarchyItem? findTarget(int offset) {
     var node = _findTargetNode(offset);
     var element = _getElementOfNode(node);
 
     // We only return targets that are executable elements.
-    return element is ExecutableElement2
+    return element is ExecutableElement
         ? CallHierarchyItem.forElement(element)
         : null;
   }
@@ -359,10 +359,10 @@ class DartCallHierarchyComputer {
     return node;
   }
 
-  /// Return the [Element2] of the given [node], or `null` if [node] is `null`,
+  /// Return the [Element] of the given [node], or `null` if [node] is `null`,
   /// does not have an element, or the element is not a valid target for call
   /// hierarchy.
-  Element2? _getElementOfNode(AstNode? node) {
+  Element? _getElementOfNode(AstNode? node) {
     if (node == null) {
       return null;
     }
@@ -382,7 +382,7 @@ class DartCallHierarchyComputer {
 
     // Don't consider synthetic getter/setter for a field to be executable
     // since they don't contain any executable code.
-    if (element is PropertyAccessorElement2 && element.isSynthetic) {
+    if (element is PropertyAccessorElement && element.isSynthetic) {
       return null;
     }
 
@@ -394,7 +394,7 @@ class DartCallHierarchyComputer {
   /// This is used to ensure calls are only returned for the expected target
   /// if source code has changed since the earlier request that provided
   /// [target] to the client.
-  bool _isMatchingElement(Element2 element, CallHierarchyItem target) {
+  bool _isMatchingElement(Element element, CallHierarchyItem target) {
     return _getDisplayName(element) == target.displayName;
   }
 
diff --git a/pkg/analysis_server/lib/src/computer/computer_color.dart b/pkg/analysis_server/lib/src/computer/computer_color.dart
index f1e0f8d2ee4..e5ae3dffd59 100644
--- a/pkg/analysis_server/lib/src/computer/computer_color.dart
+++ b/pkg/analysis_server/lib/src/computer/computer_color.dart
@@ -225,15 +225,15 @@ class ColorComputer {
   }
 
   /// Checks whether this elements library is dart:ui.
-  bool _isDartUi(Element2? element) => element?.library2?.name3 == 'dart.ui';
+  bool _isDartUi(Element? element) => element?.library2?.name3 == 'dart.ui';
 
   /// Checks whether this elements library is Flutter Material colors.
-  bool _isFlutterMaterial(Element2? element) =>
+  bool _isFlutterMaterial(Element? element) =>
       element?.library2?.identifier ==
       'package:flutter/src/material/colors.dart';
 
   /// Checks whether this elements library is Flutter Painting colors.
-  bool _isFlutterPainting(Element2? element) =>
+  bool _isFlutterPainting(Element? element) =>
       element?.library2?.identifier ==
       'package:flutter/src/painting/colors.dart';
 
diff --git a/pkg/analysis_server/lib/src/computer/computer_documentation.dart b/pkg/analysis_server/lib/src/computer/computer_documentation.dart
index 37b46dec05d..18e2419c30b 100644
--- a/pkg/analysis_server/lib/src/computer/computer_documentation.dart
+++ b/pkg/analysis_server/lib/src/computer/computer_documentation.dart
@@ -7,18 +7,18 @@ import 'package:analysis_server/src/utilities/extensions/element.dart';
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/src/dartdoc/dartdoc_directive_info.dart';
 
-/// Computes documentation for an [Element2].
+/// Computes documentation for an [Element].
 class DartDocumentationComputer {
   final DartdocDirectiveInfo dartdocInfo;
 
   DartDocumentationComputer(this.dartdocInfo);
 
   Documentation? compute(
-    Element2 elementBeingDocumented, {
+    Element elementBeingDocumented, {
     bool includeSummary = false,
   }) {
     var element = switch (elementBeingDocumented) {
-      FieldFormalParameterElement2() => elementBeingDocumented.field2,
+      FieldFormalParameterElement() => elementBeingDocumented.field2,
       FormalParameterElement() => elementBeingDocumented.enclosingElement2,
       _ => elementBeingDocumented,
     };
@@ -28,8 +28,8 @@ class DartDocumentationComputer {
       return null;
     }
 
-    Element2? documentedElement;
-    Element2? documentedGetter;
+    Element? documentedElement;
+    Element? documentedGetter;
 
     // Look for documentation comments of overridden members
     var overridden = findOverriddenElements(element);
@@ -37,7 +37,7 @@ class DartDocumentationComputer {
       element,
       ...overridden.superElements,
       ...overridden.interfaceElements,
-      if (element case PropertyAccessorElement2(variable3: var variable?))
+      if (element case PropertyAccessorElement(variable3: var variable?))
         variable,
     ];
     for (var candidate in candidates) {
@@ -81,7 +81,7 @@ class DartDocumentationComputer {
   /// Compute documentation for [element] and return either the summary or full
   /// docs (or `null`) depending on `preference`.
   String? computePreferred(
-    Element2 element,
+    Element element,
     DocumentationPreference preference,
   ) {
     if (preference == DocumentationPreference.none) {
diff --git a/pkg/analysis_server/lib/src/computer/computer_highlights.dart b/pkg/analysis_server/lib/src/computer/computer_highlights.dart
index 48ce0202bdd..f7f2a4646c3 100644
--- a/pkg/analysis_server/lib/src/computer/computer_highlights.dart
+++ b/pkg/analysis_server/lib/src/computer/computer_highlights.dart
@@ -102,7 +102,7 @@ class DartUnitHighlightsComputer {
   void _addIdentifierRegion({
     required AstNode parent,
     required Token nameToken,
-    required Element2? element,
+    required Element? element,
   }) {
     if (_addIdentifierRegion_keyword(nameToken)) {
       return;
@@ -177,9 +177,9 @@ class DartUnitHighlightsComputer {
   bool _addIdentifierRegion_class(
     AstNode parent,
     Token nameToken,
-    Element2? element,
+    Element? element,
   ) {
-    if (element is! InterfaceElement2) {
+    if (element is! InterfaceElement) {
       return false;
     }
     // prepare type
@@ -194,9 +194,9 @@ class DartUnitHighlightsComputer {
       type = HighlightRegionType.CONSTRUCTOR;
       semanticType = SemanticTokenTypes.class_;
       semanticModifiers = {CustomSemanticTokenModifiers.constructor};
-    } else if (element is EnumElement2) {
+    } else if (element is EnumElement) {
       type = HighlightRegionType.ENUM;
-    } else if (element is ExtensionTypeElement2) {
+    } else if (element is ExtensionTypeElement) {
       type = HighlightRegionType.EXTENSION_TYPE;
     } else {
       type = HighlightRegionType.CLASS;
@@ -224,9 +224,9 @@ class DartUnitHighlightsComputer {
   bool _addIdentifierRegion_constructor(
     AstNode parent,
     Token nameToken,
-    Element2? element,
+    Element? element,
   ) {
-    if (element is! ConstructorElement2) {
+    if (element is! ConstructorElement) {
       return false;
     }
     return _addRegion_token(
@@ -243,8 +243,8 @@ class DartUnitHighlightsComputer {
     );
   }
 
-  bool _addIdentifierRegion_extension(Token nameToken, Element2? element) {
-    if (element is! ExtensionElement2) {
+  bool _addIdentifierRegion_extension(Token nameToken, Element? element) {
+    if (element is! ExtensionElement) {
       return false;
     }
 
@@ -254,11 +254,11 @@ class DartUnitHighlightsComputer {
   bool _addIdentifierRegion_field(
     AstNode parent,
     Token nameToken,
-    Element2? element,
+    Element? element,
   ) {
     // Compute the type of the identifier.
     HighlightRegionType? type;
-    if (element is FieldElement2) {
+    if (element is FieldElement) {
       if (element.isEnumConstant) {
         type = HighlightRegionType.ENUM_CONSTANT;
       } else if (element.isStatic) {
@@ -266,14 +266,14 @@ class DartUnitHighlightsComputer {
       } else {
         type = HighlightRegionType.INSTANCE_FIELD_REFERENCE;
       }
-    } else if (element is TopLevelVariableElement2) {
+    } else if (element is TopLevelVariableElement) {
       type = HighlightRegionType.TOP_LEVEL_VARIABLE_DECLARATION;
     } else if (element is GetterElement) {
       var accessor = element;
       var variable = accessor.variable3;
-      if (variable is TopLevelVariableElement2) {
+      if (variable is TopLevelVariableElement) {
         type = HighlightRegionType.TOP_LEVEL_GETTER_REFERENCE;
-      } else if (variable is FieldElement2 && variable.isEnumConstant) {
+      } else if (variable is FieldElement && variable.isEnumConstant) {
         type = HighlightRegionType.ENUM_CONSTANT;
       } else if (accessor.isStatic) {
         type = HighlightRegionType.STATIC_GETTER_REFERENCE;
@@ -283,9 +283,9 @@ class DartUnitHighlightsComputer {
     } else if (element is SetterElement) {
       var accessor = element;
       var variable = accessor.variable3;
-      if (variable is TopLevelVariableElement2) {
+      if (variable is TopLevelVariableElement) {
         type = HighlightRegionType.TOP_LEVEL_SETTER_REFERENCE;
-      } else if (variable is FieldElement2 && variable.isEnumConstant) {
+      } else if (variable is FieldElement && variable.isEnumConstant) {
         type = HighlightRegionType.ENUM_CONSTANT;
       } else if (accessor.isStatic) {
         type = HighlightRegionType.STATIC_SETTER_REFERENCE;
@@ -321,7 +321,7 @@ class DartUnitHighlightsComputer {
   bool _addIdentifierRegion_function(
     AstNode parent,
     Token nameToken,
-    Element2? element,
+    Element? element,
   ) {
     if (element is! TopLevelFunctionElement &&
         element is! LocalFunctionElement) {
@@ -345,7 +345,7 @@ class DartUnitHighlightsComputer {
   bool _addIdentifierRegion_getterSetterDeclaration(
     AstNode parent,
     Token nameToken,
-    Element2? element,
+    Element? element,
   ) {
     // should be declaration
     if (!(parent is MethodDeclaration || parent is FunctionDeclaration)) {
@@ -376,8 +376,8 @@ class DartUnitHighlightsComputer {
     return _addRegion_token(nameToken, type);
   }
 
-  bool _addIdentifierRegion_importPrefix(Token nameToken, Element2? element) {
-    if (element is! PrefixElement2) {
+  bool _addIdentifierRegion_importPrefix(Token nameToken, Element? element) {
+    if (element is! PrefixElement) {
       return false;
     }
     return _addRegion_token(nameToken, HighlightRegionType.IMPORT_PREFIX);
@@ -395,15 +395,15 @@ class DartUnitHighlightsComputer {
     return false;
   }
 
-  bool _addIdentifierRegion_label(Token nameToken, Element2? element) {
-    if (element is! LabelElement2) {
+  bool _addIdentifierRegion_label(Token nameToken, Element? element) {
+    if (element is! LabelElement) {
       return false;
     }
     return _addRegion_token(nameToken, HighlightRegionType.LABEL);
   }
 
-  bool _addIdentifierRegion_localVariable(Token nameToken, Element2? element) {
-    if (element is! LocalVariableElement2) {
+  bool _addIdentifierRegion_localVariable(Token nameToken, Element? element) {
+    if (element is! LocalVariableElement) {
       return false;
     }
     // OK
@@ -417,9 +417,9 @@ class DartUnitHighlightsComputer {
   bool _addIdentifierRegion_method(
     AstNode parent,
     Token nameToken,
-    Element2? element,
+    Element? element,
   ) {
-    if (element is! MethodElement2) {
+    if (element is! MethodElement) {
       return false;
     }
     var isStatic = element.isStatic;
@@ -444,7 +444,7 @@ class DartUnitHighlightsComputer {
   bool _addIdentifierRegion_parameter(
     AstNode parent,
     Token nameToken,
-    Element2? element,
+    Element? element,
   ) {
     if (element is! FormalParameterElement) {
       return false;
@@ -458,8 +458,8 @@ class DartUnitHighlightsComputer {
     return _addRegion_token(nameToken, type, semanticTokenModifiers: modifiers);
   }
 
-  bool _addIdentifierRegion_typeAlias(Token nameToken, Element2? element) {
-    if (element is TypeAliasElement2) {
+  bool _addIdentifierRegion_typeAlias(Token nameToken, Element? element) {
+    if (element is TypeAliasElement) {
       var type =
           element.aliasedType is FunctionType
               ? HighlightRegionType.FUNCTION_TYPE_ALIAS
@@ -469,8 +469,8 @@ class DartUnitHighlightsComputer {
     return false;
   }
 
-  bool _addIdentifierRegion_typeParameter(Token nameToken, Element2? element) {
-    if (element is! TypeParameterElement2) {
+  bool _addIdentifierRegion_typeParameter(Token nameToken, Element? element) {
+    if (element is! TypeParameterElement) {
       return false;
     }
     return _addRegion_token(
@@ -483,7 +483,7 @@ class DartUnitHighlightsComputer {
   bool _addIdentifierRegion_unresolvedInstanceMemberReference(
     AstNode parent,
     Token nameToken,
-    Element2? element,
+    Element? element,
   ) {
     // unresolved
     if (element != null) {
@@ -518,7 +518,7 @@ class DartUnitHighlightsComputer {
   /// Returns a set of additional semantic token modifiers that apply to
   /// [element].
   Set<SemanticTokenModifiers>? _additionalModifiersForElement(
-    Element2? element,
+    Element? element,
   ) {
     return (element?.isWildcardVariable ?? false)
         ? {CustomSemanticTokenModifiers.wildcard}
@@ -1507,7 +1507,7 @@ class _DartUnitHighlightsComputerVisitor extends RecursiveAstVisitor<void> {
       // Patterns can be method tear-offs as well as getters:
       // https://github.com/dart-lang/sdk/issues/59976#issuecomment-2613558317
       var type = switch (node.element2) {
-        MethodElement2() => HighlightRegionType.INSTANCE_METHOD_TEAR_OFF,
+        MethodElement() => HighlightRegionType.INSTANCE_METHOD_TEAR_OFF,
         _ => HighlightRegionType.INSTANCE_GETTER_REFERENCE,
       };
 
@@ -1794,14 +1794,14 @@ class _DartUnitHighlightsComputerVisitor extends RecursiveAstVisitor<void> {
   @override
   void visitVariableDeclaration(VariableDeclaration node) {
     var element = node.declaredFragment?.element ?? node.declaredElement2;
-    if (element is FieldElement2) {
+    if (element is FieldElement) {
       computer._addRegion_token(
         node.name,
         element.isStatic
             ? HighlightRegionType.STATIC_FIELD_DECLARATION
             : HighlightRegionType.INSTANCE_FIELD_DECLARATION,
       );
-    } else if (element is LocalVariableElement2) {
+    } else if (element is LocalVariableElement) {
       computer._addRegion_token(
         node.name,
         element.type is DynamicType
@@ -1811,7 +1811,7 @@ class _DartUnitHighlightsComputerVisitor extends RecursiveAstVisitor<void> {
           element,
         ),
       );
-    } else if (element is TopLevelVariableElement2) {
+    } else if (element is TopLevelVariableElement) {
       computer._addRegion_token(
         node.name,
         HighlightRegionType.TOP_LEVEL_VARIABLE_DECLARATION,
@@ -1888,7 +1888,7 @@ class _DartUnitHighlightsComputerVisitor extends RecursiveAstVisitor<void> {
   /// Returns a set of additional semantic token modifiers that apply to
   /// [element].
   Set<SemanticTokenModifiers>? _additionalModifiersForElement(
-    Element2? element,
+    Element? element,
   ) {
     return computer._additionalModifiersForElement(element);
   }
diff --git a/pkg/analysis_server/lib/src/computer/computer_hover.dart b/pkg/analysis_server/lib/src/computer/computer_hover.dart
index 6c82c152ab9..bc82f016333 100644
--- a/pkg/analysis_server/lib/src/computer/computer_hover.dart
+++ b/pkg/analysis_server/lib/src/computer/computer_hover.dart
@@ -72,7 +72,7 @@ class DartUnitHoverComputer {
           hover.isDeprecated = a.metadata2.hasDeprecated;
         }
         // not local element
-        if (element.enclosingElement2 is! ExecutableElement2) {
+        if (element.enclosingElement2 is! ExecutableElement) {
           // containing class
           hover.containingClassDescription = _containingClass(element);
           // containing library
@@ -98,8 +98,8 @@ class DartUnitHoverComputer {
   }
 
   /// Gets the name of the containing class of [element].
-  String? _containingClass(Element2 element) {
-    var containingClass = element.thisOrAncestorOfType2<InterfaceElement2>();
+  String? _containingClass(Element element) {
+    var containingClass = element.thisOrAncestorOfType2<InterfaceElement>();
     return containingClass != null && containingClass != element
         ? containingClass.displayName
         : null;
@@ -110,7 +110,7 @@ class DartUnitHoverComputer {
   /// This is usually `element.getDisplayString()` but may contain additional
   /// information to disambiguate things like constructors from types (and
   /// whether they are const).
-  String? _elementDisplayString(AstNode node, Element2? element) {
+  String? _elementDisplayString(AstNode node, Element? element) {
     var displayString = element?.displayString2(multiline: true);
 
     if (displayString != null &&
@@ -146,7 +146,7 @@ class DartUnitHoverComputer {
   }
 
   /// Returns information about the library that contains [element].
-  _LibraryInfo _libraryInfo(Element2 element) {
+  _LibraryInfo _libraryInfo(Element element) {
     var library = element.library2;
     if (library == null) {
       return null;
@@ -218,7 +218,7 @@ class DartUnitHoverComputer {
       // hovers because information about those functions are already available
       // by hovering over the function name or the operator.
       SetterElement() => null,
-      MethodElement2 method when method.isOperator => null,
+      MethodElement method when method.isOperator => null,
       _ => _elementDisplayString(node, parameter),
     };
   }
@@ -243,16 +243,16 @@ class DartUnitHoverComputer {
   }
 
   /// Returns information about the static type of [node].
-  String? _typeDisplayString(AstNode node, Element2? element) {
+  String? _typeDisplayString(AstNode node, Element? element) {
     var parent = node.parent;
     DartType? staticType;
     if (node is Expression &&
         (element == null ||
-            element is VariableElement2 ||
+            element is VariableElement ||
             element is GetterElement ||
             element is SetterElement)) {
       staticType = _getTypeOfDeclarationOrReference(node);
-    } else if (element is VariableElement2) {
+    } else if (element is VariableElement) {
       staticType = element.type;
     } else if (parent is MethodInvocation && parent.methodName == node) {
       staticType = parent.staticInvokeType;
@@ -270,7 +270,7 @@ class DartUnitHoverComputer {
   static DartType? _getTypeOfDeclarationOrReference(Expression node) {
     if (node is SimpleIdentifier) {
       var element = node.element;
-      if (element is VariableElement2) {
+      if (element is VariableElement) {
         if (node.inDeclarationContext()) {
           return element.type;
         }
diff --git a/pkg/analysis_server/lib/src/computer/computer_inlay_hint.dart b/pkg/analysis_server/lib/src/computer/computer_inlay_hint.dart
index e2f105bcb32..ab04556ea84 100644
--- a/pkg/analysis_server/lib/src/computer/computer_inlay_hint.dart
+++ b/pkg/analysis_server/lib/src/computer/computer_inlay_hint.dart
@@ -203,7 +203,7 @@ class DartInlayHintComputer {
     }
   }
 
-  Location? _locationForElement(Element2? element) {
+  Location? _locationForElement(Element? element) {
     if (element == null) {
       return null;
     }
@@ -272,7 +272,7 @@ class _DartInlayHintComputerVisitor extends GeneralizingAstVisitor<void> {
     }
 
     var declaration = node.declaredElement2;
-    if (declaration is LocalVariableElement2) {
+    if (declaration is LocalVariableElement) {
       _computer._addTypePrefix(node.name, declaration.type);
     }
   }
diff --git a/pkg/analysis_server/lib/src/computer/computer_lazy_type_hierarchy.dart b/pkg/analysis_server/lib/src/computer/computer_lazy_type_hierarchy.dart
index 364a3497949..7d5724b0f06 100644
--- a/pkg/analysis_server/lib/src/computer/computer_lazy_type_hierarchy.dart
+++ b/pkg/analysis_server/lib/src/computer/computer_lazy_type_hierarchy.dart
@@ -35,20 +35,20 @@ class DartLazyTypeHierarchyComputer {
 
   DartLazyTypeHierarchyComputer(this._result);
 
-  /// Finds subtypes for the [Element2] at [location].
+  /// Finds subtypes for the [Element] at [location].
   Future<List<TypeHierarchyRelatedItem>?> findSubtypes(
     ElementLocation location,
     SearchEngine searchEngine,
   ) async {
     var targetElement = await _findTargetElement(location);
-    if (targetElement is! InterfaceElement2) {
+    if (targetElement is! InterfaceElement) {
       return null;
     }
 
     return _getSubtypes(targetElement, searchEngine);
   }
 
-  /// Finds supertypes for the [Element2] at [location].
+  /// Finds supertypes for the [Element] at [location].
   Future<List<TypeHierarchyRelatedItem>?> findSupertypes(
     ElementLocation location,
   ) async {
@@ -76,7 +76,7 @@ class DartLazyTypeHierarchyComputer {
         (node) => _isValidTargetDeclaration(node),
       );
       var element = declaration?.declaredFragment?.element;
-      if (element is InterfaceElement2) {
+      if (element is InterfaceElement) {
         type = element.thisType;
       }
     }
@@ -86,22 +86,20 @@ class DartLazyTypeHierarchyComputer {
         : null;
   }
 
-  /// Locate the [Element2] referenced by [location].
-  Future<InterfaceElement2?> _findTargetElement(
-    ElementLocation location,
-  ) async {
+  /// Locate the [Element] referenced by [location].
+  Future<InterfaceElement?> _findTargetElement(ElementLocation location) async {
     var element = await location.locateIn(_result.session);
-    return element is InterfaceElement2 ? element : null;
+    return element is InterfaceElement ? element : null;
   }
 
   /// Gets immediate subtypes for the class/mixin [target].
   Future<List<TypeHierarchyRelatedItem>> _getSubtypes(
-    InterfaceElement2 target,
+    InterfaceElement target,
     SearchEngine searchEngine,
   ) async {
     /// Helper to convert a [SearchMatch] to a [TypeHierarchyRelatedItem].
     TypeHierarchyRelatedItem? toHierarchyItem(SearchMatch match) {
-      var element = match.element as InterfaceElement2;
+      var element = match.element as InterfaceElement;
       var type = element.thisType;
       switch (match.kind) {
         case MatchKind.REFERENCE_IN_EXTENDS_CLAUSE:
@@ -122,7 +120,7 @@ class DartLazyTypeHierarchyComputer {
       target,
       SearchEngineCache(),
     );
-    var seenElements = <Element2>{};
+    var seenElements = <Element>{};
     return matches
         .where((match) => seenElements.add(match.element))
         .map(toHierarchyItem)
@@ -202,14 +200,14 @@ class TypeHierarchyItem {
   });
 
   TypeHierarchyItem._forElement({
-    required InterfaceElement2 element,
+    required InterfaceElement element,
     required this.location,
   }) : displayName = _displayNameForElement(element),
        nameRange = _nameRangeForElement(element),
        codeRange = _codeRangeForElement(element),
        file = element.firstFragment.libraryFragment.source.fullName;
 
-  static TypeHierarchyItem? forElement(InterfaceElement2 element) {
+  static TypeHierarchyItem? forElement(InterfaceElement element) {
     var location = ElementLocation.forElement(element);
     if (location == null) return null;
 
@@ -217,19 +215,19 @@ class TypeHierarchyItem {
   }
 
   /// Returns the [SourceRange] of the code for [element].
-  static SourceRange _codeRangeForElement(Element2 element) {
+  static SourceRange _codeRangeForElement(Element element) {
     // Non-synthetic elements should always have code locations.
     var firstFragment = element.nonSynthetic2.firstFragment as ElementImpl;
     return SourceRange(firstFragment.codeOffset!, firstFragment.codeLength!);
   }
 
   /// Returns a name to display in the hierarchy for [element].
-  static String _displayNameForElement(InterfaceElement2 element) {
+  static String _displayNameForElement(InterfaceElement element) {
     return element.baseElement.thisType.getDisplayString();
   }
 
   /// Returns the [SourceRange] of the name for [element].
-  static SourceRange _nameRangeForElement(Element2 element) {
+  static SourceRange _nameRangeForElement(Element element) {
     var fragment = element.nonSynthetic2.firstFragment;
 
     // Some non-synthetic items can still have invalid nameOffsets (for example
@@ -288,7 +286,7 @@ class TypeHierarchyRelatedItem extends TypeHierarchyItem {
   );
 
   static TypeHierarchyRelatedItem? _forElement(
-    InterfaceElement2 element, {
+    InterfaceElement element, {
     required TypeHierarchyItemRelationship relationship,
   }) {
     var location = ElementLocation.forElement(element);
diff --git a/pkg/analysis_server/lib/src/computer/computer_outline.dart b/pkg/analysis_server/lib/src/computer/computer_outline.dart
index 5e79c35a938..9497efa2dd2 100644
--- a/pkg/analysis_server/lib/src/computer/computer_outline.dart
+++ b/pkg/analysis_server/lib/src/computer/computer_outline.dart
@@ -534,7 +534,7 @@ class _FunctionBodyOutlinesVisitor extends RecursiveAstVisitor<void> {
 
   /// Return `true` if the given [element] is the method 'group' defined in the
   /// test package.
-  bool isGroup(engine.ExecutableElement2? element) {
+  bool isGroup(engine.ExecutableElement? element) {
     if (element != null && element.metadata2.hasIsTestGroup) {
       return true;
     }
@@ -545,7 +545,7 @@ class _FunctionBodyOutlinesVisitor extends RecursiveAstVisitor<void> {
 
   /// Return `true` if the given [element] is the method 'test' defined in the
   /// test package.
-  bool isTest(engine.ExecutableElement2? element) {
+  bool isTest(engine.ExecutableElement? element) {
     if (element != null && element.metadata2.hasIsTest) {
       return true;
     }
@@ -597,7 +597,7 @@ class _FunctionBodyOutlinesVisitor extends RecursiveAstVisitor<void> {
     var nameNode = node.methodName;
 
     var nameElement = nameNode.element;
-    if (nameElement is! engine.ExecutableElement2) {
+    if (nameElement is! engine.ExecutableElement) {
       return;
     }
 
diff --git a/pkg/analysis_server/lib/src/computer/computer_overrides.dart b/pkg/analysis_server/lib/src/computer/computer_overrides.dart
index a9105751116..5f83e2dbcb3 100644
--- a/pkg/analysis_server/lib/src/computer/computer_overrides.dart
+++ b/pkg/analysis_server/lib/src/computer/computer_overrides.dart
@@ -10,11 +10,11 @@ import 'package:analyzer/dart/element/element.dart';
 import 'package:collection/collection.dart';
 
 /// Return the elements that the given [element] overrides.
-OverriddenElements findOverriddenElements(Element2 element) {
-  if (element.enclosingElement2 is InterfaceElement2) {
+OverriddenElements findOverriddenElements(Element element) {
+  if (element.enclosingElement2 is InterfaceElement) {
     return _OverriddenElementsFinder(element).find();
   }
-  return OverriddenElements(element, <Element2>[], <Element2>[]);
+  return OverriddenElements(element, <Element>[], <Element>[]);
 }
 
 /// A computer for class member overrides in a Dart [CompilationUnit].
@@ -42,7 +42,7 @@ class DartUnitOverridesComputer {
 
   /// Add a new [proto.Override] for the declaration with the given name
   /// [token].
-  void _addOverride(Token token, Element2? element) {
+  void _addOverride(Token token, Element? element) {
     if (element != null) {
       var overridesResult = _OverriddenElementsFinder(element).find();
       var superElements = overridesResult.superElements;
@@ -98,38 +98,38 @@ class DartUnitOverridesComputer {
 /// The container with elements that a class member overrides.
 class OverriddenElements {
   /// The element that overrides other class members.
-  final Element2 element;
+  final Element element;
 
   /// The elements that [element] overrides and which is defined in a class that
   /// is a superclass of the class that defines [element].
-  final List<Element2> superElements;
+  final List<Element> superElements;
 
   /// The elements that [element] overrides and which is defined in a class that
   /// which is implemented by the class that defines [element].
-  final List<Element2> interfaceElements;
+  final List<Element> interfaceElements;
 
   OverriddenElements(this.element, this.superElements, this.interfaceElements);
 }
 
 class _OverriddenElementsFinder {
-  Element2 _seed;
-  LibraryElement2 _library;
-  InterfaceElement2 _class;
+  Element _seed;
+  LibraryElement _library;
+  InterfaceElement _class;
   String _name;
   List<ElementKind> _kinds;
 
-  final List<Element2> _superElements = <Element2>[];
-  final List<Element2> _interfaceElements = <Element2>[];
-  final Set<InterfaceElement2> _visited = {};
+  final List<Element> _superElements = <Element>[];
+  final List<Element> _interfaceElements = <Element>[];
+  final Set<InterfaceElement> _visited = {};
 
-  factory _OverriddenElementsFinder(Element2 seed) {
-    var class_ = seed.enclosingElement2 as InterfaceElement2;
+  factory _OverriddenElementsFinder(Element seed) {
+    var class_ = seed.enclosingElement2 as InterfaceElement;
     var library = class_.library2;
     var name = seed.displayName;
     List<ElementKind> kinds;
-    if (seed is FieldElement2) {
+    if (seed is FieldElement) {
       kinds = [ElementKind.GETTER, if (!seed.isFinal) ElementKind.SETTER];
-    } else if (seed is MethodElement2) {
+    } else if (seed is MethodElement) {
       kinds = const [ElementKind.METHOD];
     } else if (seed is GetterElement) {
       kinds = const [ElementKind.GETTER];
@@ -159,7 +159,7 @@ class _OverriddenElementsFinder {
     return OverriddenElements(_seed, _superElements, _interfaceElements);
   }
 
-  void _addInterfaceOverrides(InterfaceElement2? class_, bool checkType) {
+  void _addInterfaceOverrides(InterfaceElement? class_, bool checkType) {
     if (class_ == null) {
       return;
     }
@@ -179,7 +179,7 @@ class _OverriddenElementsFinder {
     }
     // super
     _addInterfaceOverrides(class_.supertype?.element3, checkType);
-    if (class_ is MixinElement2) {
+    if (class_ is MixinElement) {
       for (var constraint in class_.superclassConstraints) {
         _addInterfaceOverrides(constraint.element3, true);
       }
@@ -187,7 +187,7 @@ class _OverriddenElementsFinder {
   }
 
   void _addSuperOverrides(
-    InterfaceElement2? class_, {
+    InterfaceElement? class_, {
     bool withThisType = true,
   }) {
     if (class_ == null) {
@@ -208,16 +208,16 @@ class _OverriddenElementsFinder {
     for (var mixin_ in class_.mixins) {
       _addSuperOverrides(mixin_.element3);
     }
-    if (class_ is MixinElement2) {
+    if (class_ is MixinElement) {
       for (var constraint in class_.superclassConstraints) {
         _addSuperOverrides(constraint.element3);
       }
     }
   }
 
-  Element2? _lookupMember(InterfaceElement2 classElement) {
-    Element2? findMatchingElement(Iterable<Element2> elements) {
-      return elements.firstWhereOrNull((Element2 element) {
+  Element? _lookupMember(InterfaceElement classElement) {
+    Element? findMatchingElement(Iterable<Element> elements) {
+      return elements.firstWhereOrNull((Element element) {
         if (!identical(element.library2, _library) && _name.startsWith('_')) {
           return false;
         }
diff --git a/pkg/analysis_server/lib/src/computer/computer_signature.dart b/pkg/analysis_server/lib/src/computer/computer_signature.dart
index 112e68e2dd5..b9831611949 100644
--- a/pkg/analysis_server/lib/src/computer/computer_signature.dart
+++ b/pkg/analysis_server/lib/src/computer/computer_signature.dart
@@ -38,14 +38,14 @@ class DartUnitSignatureComputer {
     }
     var (argumentList, argument) = argumentAndList;
     String? name;
-    Element2? element;
+    Element? element;
     List<FormalParameterElement>? parameters;
     var parent = argumentList.parent;
     if (parent is MethodInvocation) {
       name = parent.methodName.name;
       element = ElementLocator.locate2(parent);
       parameters =
-          element is FunctionTypedElement2 ? element.formalParameters : null;
+          element is FunctionTypedElement ? element.formalParameters : null;
     } else if (parent is InstanceCreationExpression) {
       name = parent.constructorName.type.qualifiedName;
       var constructorName = parent.constructorName.name;
@@ -54,7 +54,7 @@ class DartUnitSignatureComputer {
       }
       element = ElementLocator.locate2(parent);
       parameters =
-          element is FunctionTypedElement2 ? element.formalParameters : null;
+          element is FunctionTypedElement ? element.formalParameters : null;
     } else if (parent case FunctionExpressionInvocation(
       function: Identifier function,
     )) {
@@ -64,7 +64,7 @@ class DartUnitSignatureComputer {
         // Standard function expression.
         element = function.element;
         parameters = functionType.formalParameters;
-      } else if (parent.element case ExecutableElement2 executableElement) {
+      } else if (parent.element case ExecutableElement executableElement) {
         // Callable class instance (where we'll look at the `call` method).
         element = executableElement;
         parameters = executableElement.formalParameters;
diff --git a/pkg/analysis_server/lib/src/computer/computer_type_arguments_signature.dart b/pkg/analysis_server/lib/src/computer/computer_type_arguments_signature.dart
index a649d2d5864..044348a2e05 100644
--- a/pkg/analysis_server/lib/src/computer/computer_type_arguments_signature.dart
+++ b/pkg/analysis_server/lib/src/computer/computer_type_arguments_signature.dart
@@ -43,13 +43,13 @@ class DartTypeArgumentsSignatureComputer {
       return null;
     }
     var parent = argumentList.parent;
-    Element2? element;
+    Element? element;
     if (parent is NamedType) {
       element = parent.element2;
     } else if (parent is MethodInvocation) {
       element = ElementLocator.locate2(parent.methodName);
     }
-    if (element is! TypeParameterizedElement2 ||
+    if (element is! TypeParameterizedElement ||
         element.typeParameters2.isEmpty) {
       return null;
     }
@@ -87,7 +87,7 @@ class DartTypeArgumentsSignatureComputer {
   lsp.SignatureHelp? _toSignatureHelp(
     String label,
     String? documentation,
-    List<TypeParameterElement2> typeParameters,
+    List<TypeParameterElement> typeParameters,
   ) {
     var parameters =
         typeParameters
diff --git a/pkg/analysis_server/lib/src/computer/import_elements_computer.dart b/pkg/analysis_server/lib/src/computer/import_elements_computer.dart
index f8655b8cf0c..16a6464a43e 100644
--- a/pkg/analysis_server/lib/src/computer/import_elements_computer.dart
+++ b/pkg/analysis_server/lib/src/computer/import_elements_computer.dart
@@ -342,7 +342,7 @@ class ImportElementsComputer {
   /// Computes the best URI to import [what] into [from].
   ///
   /// Copied from DartFileEditBuilderImpl.
-  String _getLibrarySourceUri(LibraryElement2 from, Source what) {
+  String _getLibrarySourceUri(LibraryElement from, Source what) {
     var whatPath = what.fullName;
     // check if an absolute URI (such as 'dart:' or 'package:')
     var whatUri = what.uri;
@@ -362,7 +362,7 @@ class ImportElementsComputer {
 
     if (prefix.isNotEmpty) {
       var prefixElement = scope.lookup(prefix).getter2;
-      if (prefixElement is PrefixElement2) {
+      if (prefixElement is PrefixElement) {
         scope = prefixElement.scope;
       } else {
         return false;
diff --git a/pkg/analysis_server/lib/src/computer/imported_elements_computer.dart b/pkg/analysis_server/lib/src/computer/imported_elements_computer.dart
index 1c65943844a..503829e43e8 100644
--- a/pkg/analysis_server/lib/src/computer/imported_elements_computer.dart
+++ b/pkg/analysis_server/lib/src/computer/imported_elements_computer.dart
@@ -108,14 +108,14 @@ class _Visitor extends UnifyingAstVisitor<void> {
     }
   }
 
-  void _addElement(String prefix, Element2? element) {
+  void _addElement(String prefix, Element? element) {
     if (element == null) {
       return;
     }
-    if (element is PrefixElement2) {
+    if (element is PrefixElement) {
       return;
     }
-    if (element.enclosingElement2 is! LibraryElement2) {
+    if (element.enclosingElement2 is! LibraryElement) {
       return;
     }
 
@@ -139,7 +139,7 @@ class _Visitor extends UnifyingAstVisitor<void> {
   String _getPrefixFrom(SimpleIdentifier identifier) {
     if (identifier.offset <= endOffset && identifier.end >= startOffset) {
       var prefixElement = identifier.element;
-      if (prefixElement is PrefixElement2) {
+      if (prefixElement is PrefixElement) {
         return prefixElement.name3 ?? '';
       }
     }
diff --git a/pkg/analysis_server/lib/src/domains/analysis/implemented_dart.dart b/pkg/analysis_server/lib/src/domains/analysis/implemented_dart.dart
index d8b94545b81..33426420c20 100644
--- a/pkg/analysis_server/lib/src/domains/analysis/implemented_dart.dart
+++ b/pkg/analysis_server/lib/src/domains/analysis/implemented_dart.dart
@@ -32,7 +32,7 @@ class ImplementedComputer {
     }
   }
 
-  void _addImplementedClass(InterfaceElement2 element) {
+  void _addImplementedClass(InterfaceElement element) {
     for (var fragment in element.fragments) {
       var offset = fragment.nameOffset2;
       var name = fragment.name2;
@@ -42,7 +42,7 @@ class ImplementedComputer {
     }
   }
 
-  void _addImplementedMember(Element2 element) {
+  void _addImplementedMember(Element element) {
     for (var fragment in element.fragments) {
       var offset = fragment.nameOffset2;
       var name = fragment.name2;
@@ -52,7 +52,7 @@ class ImplementedComputer {
     }
   }
 
-  void _addMemberIfImplemented(Element2 element) {
+  void _addMemberIfImplemented(Element element) {
     if (element.isSynthetic || _isStatic(element)) {
       return;
     }
@@ -61,9 +61,9 @@ class ImplementedComputer {
     }
   }
 
-  Future<void> _computeForInterfaceElement(InterfaceElement2 element) async {
+  Future<void> _computeForInterfaceElement(InterfaceElement element) async {
     // Always include Object and its members.
-    if (element is ClassElement2 && element.isDartCoreObject) {
+    if (element is ClassElement && element.isDartCoreObject) {
       _addImplementedClass(element);
       element.getters2.forEach(_addImplementedMember);
       element.setters2.forEach(_addImplementedMember);
@@ -83,16 +83,16 @@ class ImplementedComputer {
     }
   }
 
-  bool _hasOverride(Element2 element) {
+  bool _hasOverride(Element element) {
     var name = element.displayName;
     return subtypeMembers!.contains(name);
   }
 
   /// Return `true` if the given [element] is a static element.
-  static bool _isStatic(Element2 element) {
-    if (element is ExecutableElement2) {
+  static bool _isStatic(Element element) {
+    if (element is ExecutableElement) {
       return element.isStatic;
-    } else if (element is PropertyInducingElement2) {
+    } else if (element is PropertyInducingElement) {
       return element.isStatic;
     }
     return false;
diff --git a/pkg/analysis_server/lib/src/domains/analysis/occurrences_dart.dart b/pkg/analysis_server/lib/src/domains/analysis/occurrences_dart.dart
index afd58838ac5..a3aa099bdbb 100644
--- a/pkg/analysis_server/lib/src/domains/analysis/occurrences_dart.dart
+++ b/pkg/analysis_server/lib/src/domains/analysis/occurrences_dart.dart
@@ -35,7 +35,7 @@ void addDartOccurrences(OccurrencesCollector collector, CompilationUnit unit) {
 }
 
 class DartUnitOccurrencesComputerVisitor extends RecursiveAstVisitor<void> {
-  final Map<Element2, List<(int, int)>> elementsOffsetLengths = {};
+  final Map<Element, List<(int, int)>> elementsOffsetLengths = {};
 
   @override
   void visitAssignedVariablePattern(AssignedVariablePattern node) {
@@ -100,7 +100,7 @@ class DartUnitOccurrencesComputerVisitor extends RecursiveAstVisitor<void> {
 
   @override
   void visitDeclaredVariablePattern(DeclaredVariablePattern node) {
-    if (node.declaredElement2 case BindPatternVariableElement2(:var join2?)) {
+    if (node.declaredElement2 case BindPatternVariableElement(:var join2?)) {
       _addOccurrence(join2.baseElement, node.name);
     } else {
       _addOccurrence(node.declaredElement2!, node.name);
@@ -149,7 +149,7 @@ class DartUnitOccurrencesComputerVisitor extends RecursiveAstVisitor<void> {
   @override
   void visitFieldFormalParameter(FieldFormalParameter node) {
     var declaredElement = node.declaredFragment?.element;
-    if (declaredElement is FieldFormalParameterElement2) {
+    if (declaredElement is FieldFormalParameterElement) {
       var field = declaredElement.field2;
       if (field != null) {
         _addOccurrence(field, node.name);
@@ -285,11 +285,11 @@ class DartUnitOccurrencesComputerVisitor extends RecursiveAstVisitor<void> {
     super.visitVariableDeclaration(node);
   }
 
-  void _addOccurrence(Element2 element, Token token) {
+  void _addOccurrence(Element element, Token token) {
     _addOccurrenceAt(element, token.offset, token.length);
   }
 
-  void _addOccurrenceAt(Element2 element, int offset, int length) {
+  void _addOccurrenceAt(Element element, int offset, int length) {
     var canonicalElement = _canonicalizeElement(element);
     if (canonicalElement == null) {
       return;
@@ -302,11 +302,11 @@ class DartUnitOccurrencesComputerVisitor extends RecursiveAstVisitor<void> {
     offsetLengths.add((offset, length));
   }
 
-  Element2? _canonicalizeElement(Element2 element) {
-    Element2? canonicalElement = element;
-    if (canonicalElement is FieldFormalParameterElement2) {
+  Element? _canonicalizeElement(Element element) {
+    Element? canonicalElement = element;
+    if (canonicalElement is FieldFormalParameterElement) {
       canonicalElement = canonicalElement.field2;
-    } else if (canonicalElement is PropertyAccessorElement2) {
+    } else if (canonicalElement is PropertyAccessorElement) {
       canonicalElement = canonicalElement.variable3;
     }
     return canonicalElement?.baseElement;
diff --git a/pkg/analysis_server/lib/src/handler/legacy/edit_get_available_refactorings.dart b/pkg/analysis_server/lib/src/handler/legacy/edit_get_available_refactorings.dart
index 96648691cc8..5ac43bb11a5 100644
--- a/pkg/analysis_server/lib/src/handler/legacy/edit_get_available_refactorings.dart
+++ b/pkg/analysis_server/lib/src/handler/legacy/edit_get_available_refactorings.dart
@@ -80,7 +80,7 @@ class EditGetAvailableRefactoringsHandler extends LegacyHandler {
       if (element != null) {
         var refactoringWorkspace = server.refactoringWorkspace;
         // try CONVERT_METHOD_TO_GETTER
-        if (element is ExecutableElement2) {
+        if (element is ExecutableElement) {
           if (ConvertMethodToGetterRefactoring(
             refactoringWorkspace,
             resolvedUnit.session,
diff --git a/pkg/analysis_server/lib/src/handler/legacy/search_find_element_references.dart b/pkg/analysis_server/lib/src/handler/legacy/search_find_element_references.dart
index e2d4295bbaa..0fc15e0d2c3 100644
--- a/pkg/analysis_server/lib/src/handler/legacy/search_find_element_references.dart
+++ b/pkg/analysis_server/lib/src/handler/legacy/search_find_element_references.dart
@@ -32,10 +32,10 @@ class SearchFindElementReferencesHandler extends LegacyHandler {
     var file = params.file;
     // prepare element
     var element = await server.getElementAtOffset(file, params.offset);
-    if (element is FieldFormalParameterElement2) {
+    if (element is FieldFormalParameterElement) {
       element = element.field2;
     }
-    if (element is PropertyAccessorElement2) {
+    if (element is PropertyAccessorElement) {
       element = element.variable3;
     }
     // respond
diff --git a/pkg/analysis_server/lib/src/lsp/completion_utils.dart b/pkg/analysis_server/lib/src/lsp/completion_utils.dart
index 0d7a4041dde..40356378c9b 100644
--- a/pkg/analysis_server/lib/src/lsp/completion_utils.dart
+++ b/pkg/analysis_server/lib/src/lsp/completion_utils.dart
@@ -129,10 +129,10 @@ Future<lsp.CompletionItem?> toLspCompletionItem(
           : null;
   var isCallable =
       element != null &&
-      (element is ConstructorElement2 ||
+      (element is ConstructorElement ||
           element is LocalFunctionElement ||
           element is TopLevelFunctionElement ||
-          element is MethodElement2);
+          element is MethodElement);
   var isInvocation =
       (suggestion is ExecutableSuggestion &&
           suggestion.kind == server.CompletionSuggestionKind.INVOCATION) ||
@@ -236,7 +236,7 @@ Future<lsp.CompletionItem?> toLspCompletionItem(
   if (suggestion is ElementBasedSuggestion) {
     var element = (suggestion as ElementBasedSuggestion).element;
 
-    if (element is ExecutableElement2 && element is! PropertyAccessorElement2) {
+    if (element is ExecutableElement && element is! PropertyAccessorElement) {
       parameterNames =
           element.formalParameters.map((parameter) {
             return parameter.displayName;
@@ -440,28 +440,28 @@ lsp.CompletionItemKind? _candidateToCompletionItemKind(
   return getCompletionKind().firstWhereOrNull(isSupported);
 }
 
-/// Get the [lsp.CompletionItemKind] based on the [Element2] for
+/// Get the [lsp.CompletionItemKind] based on the [Element] for
 /// an [ElementBasedSuggestion].
 List<lsp.CompletionItemKind> _elementToCompletionItemKind(
-  Element2 element,
+  Element element,
   Set<lsp.CompletionItemKind> supportedCompletionKinds,
 ) {
-  if (element is ClassElement2) {
+  if (element is ClassElement) {
     return const [lsp.CompletionItemKind.Class];
   }
-  if (element is ConstructorElement2) {
+  if (element is ConstructorElement) {
     return const [lsp.CompletionItemKind.Constructor];
   }
-  if (element is EnumElement2) {
+  if (element is EnumElement) {
     return const [lsp.CompletionItemKind.Enum];
   }
-  if (element is ExtensionElement2) {
+  if (element is ExtensionElement) {
     return const [lsp.CompletionItemKind.Method];
   }
-  if (element is ExtensionTypeElement2) {
+  if (element is ExtensionTypeElement) {
     return const [lsp.CompletionItemKind.Class];
   }
-  if (element is FieldElement2) {
+  if (element is FieldElement) {
     if (element.isEnumConstant) {
       return const [
         lsp.CompletionItemKind.EnumMember,
@@ -476,37 +476,37 @@ List<lsp.CompletionItemKind> _elementToCompletionItemKind(
   if (element is TopLevelFunctionElement) {
     return const [lsp.CompletionItemKind.Function];
   }
-  if (element is LabelElement2) {
+  if (element is LabelElement) {
     return const [lsp.CompletionItemKind.Text];
   }
-  if (element is LibraryElement2) {
+  if (element is LibraryElement) {
     return const [lsp.CompletionItemKind.Module];
   }
-  if (element is LocalVariableElement2) {
+  if (element is LocalVariableElement) {
     return const [lsp.CompletionItemKind.Variable];
   }
-  if (element is MethodElement2) {
+  if (element is MethodElement) {
     return const [lsp.CompletionItemKind.Method];
   }
-  if (element is MixinElement2) {
+  if (element is MixinElement) {
     return const [lsp.CompletionItemKind.Class];
   }
   if (element is FormalParameterElement) {
     return const [lsp.CompletionItemKind.Variable];
   }
-  if (element is PrefixElement2) {
+  if (element is PrefixElement) {
     return const [lsp.CompletionItemKind.Variable];
   }
-  if (element is PropertyAccessorElement2) {
+  if (element is PropertyAccessorElement) {
     return const [lsp.CompletionItemKind.Property];
   }
-  if (element is TopLevelVariableElement2) {
+  if (element is TopLevelVariableElement) {
     return const [lsp.CompletionItemKind.Variable];
   }
-  if (element is TypeAliasElement2) {
+  if (element is TypeAliasElement) {
     return const [lsp.CompletionItemKind.Class];
   }
-  if (element is TypeParameterElement2) {
+  if (element is TypeParameterElement) {
     return const [
       lsp.CompletionItemKind.TypeParameter,
       lsp.CompletionItemKind.Variable,
@@ -666,7 +666,7 @@ String _getDisplayText(
 
 /// If the [element] has a documentation comment, return it.
 _ElementDocumentation? _getDocsFromComputer(
-  Element2 element,
+  Element element,
   DartCompletionRequest request,
 ) {
   var doc = request.documentationComputer.compute(
@@ -684,7 +684,7 @@ _ElementDocumentation? _getDocsFromComputer(
 
 /// If the [element] has a documentation comment, return it.
 String? _getDocumentation(
-  Element2 element,
+  Element element,
   DartCompletionRequest request,
   DocumentationPreference includeDocumentation,
 ) {
diff --git a/pkg/analysis_server/lib/src/lsp/handlers/code_actions/dart.dart b/pkg/analysis_server/lib/src/lsp/handlers/code_actions/dart.dart
index 4c44998f083..95e1fb3c0b6 100644
--- a/pkg/analysis_server/lib/src/lsp/handlers/code_actions/dart.dart
+++ b/pkg/analysis_server/lib/src/lsp/handlers/code_actions/dart.dart
@@ -425,7 +425,7 @@ class DartCodeActionsProducer extends AbstractCodeActionsProducer {
         );
 
         // Method to Getter
-        if (element is ExecutableElement2 &&
+        if (element is ExecutableElement &&
             ConvertMethodToGetterRefactoring(
               server.refactoringWorkspace,
               unitResult.session,
diff --git a/pkg/analysis_server/lib/src/lsp/handlers/commands/abstract_refactor.dart b/pkg/analysis_server/lib/src/lsp/handlers/commands/abstract_refactor.dart
index 8b1ff6b44d0..bdfe5098119 100644
--- a/pkg/analysis_server/lib/src/lsp/handlers/commands/abstract_refactor.dart
+++ b/pkg/analysis_server/lib/src/lsp/handlers/commands/abstract_refactor.dart
@@ -144,7 +144,7 @@ abstract class AbstractRefactorCommandHandler extends SimpleEditCommandHandler
       case RefactoringKind.CONVERT_METHOD_TO_GETTER:
         var node = result.unit.nodeCovering(offset: offset);
         var element = node?.getElement();
-        if (element is ExecutableElement2) {
+        if (element is ExecutableElement) {
           var refactor = ConvertMethodToGetterRefactoring(
             server.refactoringWorkspace,
             result.session,
diff --git a/pkg/analysis_server/lib/src/lsp/handlers/custom/editable_arguments/editable_arguments_mixin.dart b/pkg/analysis_server/lib/src/lsp/handlers/custom/editable_arguments/editable_arguments_mixin.dart
index be394218145..6fe68326c17 100644
--- a/pkg/analysis_server/lib/src/lsp/handlers/custom/editable_arguments/editable_arguments_mixin.dart
+++ b/pkg/analysis_server/lib/src/lsp/handlers/custom/editable_arguments/editable_arguments_mixin.dart
@@ -29,7 +29,7 @@ typedef EditableInvocationInfo =
 mixin EditableArgumentsMixin {
   DartdocDirectiveInfo getDartdocDirectiveInfoFor(ResolvedUnitResult result);
 
-  String? getDocumentation(ResolvedUnitResult result, Element2 element) {
+  String? getDocumentation(ResolvedUnitResult result, Element element) {
     var dartDocInfo = getDartdocDirectiveInfoFor(result);
     var dartDocComputer = DartDocumentationComputer(dartDocInfo);
     var dartDoc = dartDocComputer.compute(element);
@@ -76,7 +76,7 @@ mixin EditableArgumentsMixin {
         invocation.argumentList,
       ),
       MethodInvocation(
-        methodName: Identifier(element: ExecutableElement2 element),
+        methodName: Identifier(element: ExecutableElement element),
       ) =>
         (element.formalParameters, invocation.argumentList),
       _ => (null, null),
@@ -160,11 +160,11 @@ mixin EditableArgumentsMixin {
 
   /// Returns a list of the constants of an enum constant prefixed with the enum
   /// name.
-  List<String> getQualifiedEnumConstantNames(EnumElement2 element3) =>
+  List<String> getQualifiedEnumConstantNames(EnumElement element3) =>
       element3.constants2.map(getQualifiedEnumConstantName).nonNulls.toList();
 
   /// Returns the name of an enum constant prefixed with the enum name.
-  static String? getQualifiedEnumConstantName(FieldElement2 enumConstant) {
+  static String? getQualifiedEnumConstantName(FieldElement enumConstant) {
     var enumName = enumConstant.enclosingElement2.name3;
     var name = enumConstant.name3;
     return enumName != null && name != null ? '$enumName.$name' : null;
@@ -183,7 +183,7 @@ extension on InvocationExpressionImpl {
     // We only support @widgetFactory on extension methods.
     var element = switch (function) {
       Identifier(:var element)
-          when element?.enclosingElement2 is ExtensionElement2 =>
+          when element?.enclosingElement2 is ExtensionElement =>
         element,
       _ => null,
     };
diff --git a/pkg/analysis_server/lib/src/lsp/handlers/custom/editable_arguments/handler_edit_argument.dart b/pkg/analysis_server/lib/src/lsp/handlers/custom/editable_arguments/handler_edit_argument.dart
index db4f8d13069..8a6efb28728 100644
--- a/pkg/analysis_server/lib/src/lsp/handlers/custom/editable_arguments/handler_edit_argument.dart
+++ b/pkg/analysis_server/lib/src/lsp/handlers/custom/editable_arguments/handler_edit_argument.dart
@@ -210,7 +210,7 @@ class EditArgumentHandler extends SharedMessageHandler<EditArgumentParams, Null>
         ),
       );
     } else if (parameter.type case InterfaceType(
-      :EnumElement2 element3,
+      :EnumElement element3,
     ) when value is String?) {
       var allowedValues = getQualifiedEnumConstantNames(element3);
       if (allowedValues.contains(value)) {
diff --git a/pkg/analysis_server/lib/src/lsp/handlers/custom/editable_arguments/handler_editable_arguments.dart b/pkg/analysis_server/lib/src/lsp/handlers/custom/editable_arguments/handler_editable_arguments.dart
index b03c26cada6..8c124fab710 100644
--- a/pkg/analysis_server/lib/src/lsp/handlers/custom/editable_arguments/handler_editable_arguments.dart
+++ b/pkg/analysis_server/lib/src/lsp/handlers/custom/editable_arguments/handler_editable_arguments.dart
@@ -201,7 +201,7 @@ class EditableArgumentsHandler
       type = 'string';
       value = values.argumentValue?.toStringValue();
       defaultValue = values.parameterValue?.toStringValue();
-    } else if (parameter.type case InterfaceType(:EnumElement2 element3)) {
+    } else if (parameter.type case InterfaceType(:EnumElement element3)) {
       type = 'enum';
       options = getQualifiedEnumConstantNames(element3);
       value = values.argumentValue?.toEnumStringValue(element3);
@@ -253,10 +253,10 @@ class EditableArgumentsHandler
 }
 
 extension on DartObject? {
-  Object? toEnumStringValue(EnumElement2 element3) {
+  Object? toEnumStringValue(EnumElement element3) {
     var valueObject = this;
     if (valueObject?.type case InterfaceType(
-      element3: EnumElement2 valueElement,
+      element3: EnumElement valueElement,
     ) when element3 == valueElement) {
       var index = valueObject?.getField('index')?.toIntValue();
       if (index != null) {
diff --git a/pkg/analysis_server/lib/src/lsp/handlers/custom/handler_imports.dart b/pkg/analysis_server/lib/src/lsp/handlers/custom/handler_imports.dart
index 7896ef88746..8563578dbb8 100644
--- a/pkg/analysis_server/lib/src/lsp/handlers/custom/handler_imports.dart
+++ b/pkg/analysis_server/lib/src/lsp/handlers/custom/handler_imports.dart
@@ -84,7 +84,7 @@ class ImportsHandler
       }
 
       var enclosingElement = element.enclosingElement2;
-      if (enclosingElement is ExtensionElement2) {
+      if (enclosingElement is ExtensionElement) {
         element = enclosingElement;
       }
 
@@ -99,7 +99,7 @@ class ImportsHandler
   List<Location> _getImportLocations(
     ResolvedLibraryResult libraryResult,
     ResolvedUnitResult? unitResult,
-    Element2 element,
+    Element element,
     String? prefix,
   ) {
     var elementName = element.name3;
@@ -132,7 +132,7 @@ class ImportsHandler
   /// [unit].
   List<Location> _getImportsInUnit(
     CompilationUnit unit,
-    Element2 element, {
+    Element element, {
     required String? prefix,
     required String elementName,
   }) {
@@ -149,7 +149,7 @@ class ImportsHandler
               : import.namespace.getPrefixed2(prefix, elementName);
 
       var isMatch =
-          element is MultiplyDefinedElement2
+          element is MultiplyDefinedElement
               ? element.conflictingElements2.contains(importedElement)
               : element == importedElement;
 
diff --git a/pkg/analysis_server/lib/src/lsp/handlers/custom/handler_super.dart b/pkg/analysis_server/lib/src/lsp/handlers/custom/handler_super.dart
index 00179f3aa1d..80316d28047 100644
--- a/pkg/analysis_server/lib/src/lsp/handlers/custom/handler_super.dart
+++ b/pkg/analysis_server/lib/src/lsp/handlers/custom/handler_super.dart
@@ -77,26 +77,26 @@ class SuperHandler
 }
 
 class _SuperComputer {
-  Fragment? computeSuper(Element2 element) {
+  Fragment? computeSuper(Element element) {
     return switch (element) {
-      ConstructorElement2 element => _findSuperConstructor(element),
-      InterfaceElement2 element => _findSuperClass(element),
+      ConstructorElement element => _findSuperConstructor(element),
+      InterfaceElement element => _findSuperClass(element),
       _ => _findSuperMember(element),
     };
   }
 
-  Fragment? _findSuperClass(InterfaceElement2 element) {
+  Fragment? _findSuperClass(InterfaceElement element) {
     // For super classes, we use the first fragment (the original declaration).
     // This differs from methods/getters because we jump to the end of the
     // augmentation chain for those.
     return element.supertype?.element3.firstFragment;
   }
 
-  Fragment? _findSuperConstructor(ConstructorElement2 element) {
+  Fragment? _findSuperConstructor(ConstructorElement element) {
     return _lastFragment(element.superConstructor2);
   }
 
-  Fragment? _findSuperMember(Element2 element) {
+  Fragment? _findSuperMember(Element element) {
     var session = element.session;
     if (session is! AnalysisSessionImpl) {
       return null;
@@ -104,7 +104,7 @@ class _SuperComputer {
 
     var inheritanceManager = session.inheritanceManager;
 
-    if (element is! ExecutableElement2 && element is! FieldElement2) {
+    if (element is! ExecutableElement && element is! FieldElement) {
       return null;
     }
 
@@ -113,7 +113,7 @@ class _SuperComputer {
       return null;
     }
 
-    var interfaceElement = element.thisOrAncestorOfType2<InterfaceElement2>();
+    var interfaceElement = element.thisOrAncestorOfType2<InterfaceElement>();
     if (interfaceElement == null) {
       return null;
     }
@@ -122,7 +122,7 @@ class _SuperComputer {
     return _lastFragment(member);
   }
 
-  Fragment? _lastFragment(Element2? element) {
+  Fragment? _lastFragment(Element? element) {
     Fragment? fragment = element?.firstFragment;
     while (fragment?.nextFragment != null) {
       fragment = fragment?.nextFragment;
diff --git a/pkg/analysis_server/lib/src/lsp/handlers/handler_definition.dart b/pkg/analysis_server/lib/src/lsp/handlers/handler_definition.dart
index 6ac112931f9..8078ddd3425 100644
--- a/pkg/analysis_server/lib/src/lsp/handlers/handler_definition.dart
+++ b/pkg/analysis_server/lib/src/lsp/handlers/handler_definition.dart
@@ -226,7 +226,7 @@ class DefinitionHandler
     // for the code range because otherwise previews will just show `(int a)`
     // which is not what the user expects.
     if (codeFragment.element.enclosingElement2
-        case ExtensionTypeElement2 enclosingElement
+        case ExtensionTypeElement enclosingElement
         when enclosingElement.primaryConstructor2 == codeFragment.element) {
       codeFragment = codeFragment.enclosingFragment;
     }
diff --git a/pkg/analysis_server/lib/src/lsp/handlers/handler_document_color_presentation.dart b/pkg/analysis_server/lib/src/lsp/handlers/handler_document_color_presentation.dart
index 8bca379cd6b..2eda9808820 100644
--- a/pkg/analysis_server/lib/src/lsp/handlers/handler_document_color_presentation.dart
+++ b/pkg/analysis_server/lib/src/lsp/handlers/handler_document_color_presentation.dart
@@ -71,7 +71,7 @@ class DocumentColorPresentationHandler
   Future<ColorPresentation> _createColorPresentation({
     required ResolvedUnitResult unit,
     required SourceRange editRange,
-    required InterfaceElement2 colorType,
+    required InterfaceElement colorType,
     required String typeName,
     required String invocationString,
     required bool includeConstKeyword,
@@ -250,8 +250,8 @@ class DocumentColorPresentationHandler
           parent is PrefixedIdentifier ? parent.element : node.element;
 
       return switch (element) {
-        PropertyAccessorElement2(:var variable3) => variable3?.isConst ?? false,
-        VariableElement2() => element.isConst,
+        PropertyAccessorElement(:var variable3) => variable3?.isConst ?? false,
+        VariableElement() => element.isConst,
         _ => false,
       };
     } else {
diff --git a/pkg/analysis_server/lib/src/lsp/handlers/handler_implementation.dart b/pkg/analysis_server/lib/src/lsp/handlers/handler_implementation.dart
index 66722d5b2ac..8c026614868 100644
--- a/pkg/analysis_server/lib/src/lsp/handlers/handler_implementation.dart
+++ b/pkg/analysis_server/lib/src/lsp/handlers/handler_implementation.dart
@@ -76,7 +76,7 @@ class ImplementationHandler
     }
     var needsMember = helper.findMemberElement(interfaceElement) != null;
 
-    var allSubtypes = <InterfaceElement2>{};
+    var allSubtypes = <InterfaceElement>{};
     await performance.runAsync(
       'appendAllSubtypes',
       (performance) => server.searchEngine.appendAllSubtypes(
diff --git a/pkg/analysis_server/lib/src/lsp/handlers/handler_inline_value.dart b/pkg/analysis_server/lib/src/lsp/handlers/handler_inline_value.dart
index 8da3d2b93e4..de451ff8c98 100644
--- a/pkg/analysis_server/lib/src/lsp/handlers/handler_inline_value.dart
+++ b/pkg/analysis_server/lib/src/lsp/handlers/handler_inline_value.dart
@@ -13,7 +13,7 @@ import 'package:analysis_server/src/lsp/registration/feature_registration.dart';
 import 'package:analysis_server/src/services/correction/dart/convert_null_check_to_null_aware_element_or_entry.dart';
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/ast/visitor.dart';
-import 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/dart/element/element.dart' as analyzer;
 import 'package:analyzer/dart/element/type.dart';
 import 'package:analyzer/source/line_info.dart';
 import 'package:analyzer/src/dart/element/extensions.dart';
@@ -124,7 +124,7 @@ class InlineValueRegistrations extends FeatureRegistration
 /// is recorded multiple times.
 class _InlineValueCollector {
   /// A map of elements and their inline value.
-  final Map<Element2, InlineValue> values = {};
+  final Map<analyzer.Element, InlineValue> values = {};
 
   /// The range for which simple inline values should be returned.
   ///
@@ -153,7 +153,7 @@ class _InlineValueCollector {
   ///
   /// Expression values are sent to the client without expressions because the
   /// client can use the range from the source to get the expression.
-  void recordExpression(Element2? element, int offset, int length) {
+  void recordExpression(analyzer.Element? element, int offset, int length) {
     assert(offset >= 0);
     assert(length > 0);
     if (element == null) return;
@@ -180,7 +180,7 @@ class _InlineValueCollector {
   /// Variable inline values are sent to the client without names because the
   /// client can infer the name from the range and look it up from the debuggers
   /// Scopes/Variables.
-  void recordVariableLookup(Element2? element, int offset, int length) {
+  void recordVariableLookup(analyzer.Element? element, int offset, int length) {
     assert(offset >= 0);
     assert(length > 0);
     if (element == null || element.isWildcardVariable) return;
@@ -214,10 +214,10 @@ class _InlineValueCollector {
 
   /// Returns whether [element] is something that should never be eagerly
   /// evaluated because of potential side-effects (such as `iterable.length`).
-  bool _isExcludedElement(Element2 element) {
+  bool _isExcludedElement(analyzer.Element element) {
     return switch (element) {
-      VariableElement2() => _isExcludedType(element.type),
-      GetterElement() => _isExcludedType(element.returnType),
+      analyzer.VariableElement() => _isExcludedType(element.type),
+      analyzer.GetterElement() => _isExcludedType(element.returnType),
       _ => false,
     };
   }
@@ -236,7 +236,7 @@ class _InlineValueCollector {
 
   /// Records an inline value [value] for [element] if it is within range and is
   /// the latest one in the source for that element.
-  void _record(InlineValue value, Element2 element) {
+  void _record(InlineValue value, analyzer.Element element) {
     // Don't create values for any elements that are excluded types.
     if (_isExcludedElement(element)) {
       return;
@@ -307,8 +307,8 @@ class _InlineValueVisitor extends GeneralizingAstVisitor<void> {
 
       // Never produce values for obvious enum getters (this includes `values`).
       var isEnumGetter =
-          node.element is GetterElement &&
-          node.element?.enclosingElement2 is EnumElement2;
+          node.element is analyzer.GetterElement &&
+          node.element?.enclosingElement2 is analyzer.EnumElement;
 
       if (!isTarget && !isEnumGetter) {
         collector.recordExpression(node.element, node.offset, node.length);
@@ -347,8 +347,8 @@ class _InlineValueVisitor extends GeneralizingAstVisitor<void> {
     var isInvocation = parent is InvocationExpression;
     if (!isTarget && !isInvocation) {
       switch (node.element) {
-        case LocalVariableElement2(name3: _?):
-        case FormalParameterElement():
+        case analyzer.LocalVariableElement(name3: _?):
+        case analyzer.FormalParameterElement():
           collector.recordVariableLookup(
             node.element,
             node.offset,
diff --git a/pkg/analysis_server/lib/src/lsp/handlers/handler_references.dart b/pkg/analysis_server/lib/src/lsp/handlers/handler_references.dart
index fcae3d4bd65..e9ad49b31fc 100644
--- a/pkg/analysis_server/lib/src/lsp/handlers/handler_references.dart
+++ b/pkg/analysis_server/lib/src/lsp/handlers/handler_references.dart
@@ -51,7 +51,7 @@ class ReferencesHandler
     );
   }
 
-  List<Location> _getDeclarations(Element2 element) {
+  List<Location> _getDeclarations(Element element) {
     return element.nonSynthetic2.fragments
         .map((fragment) => fragmentToLocation(uriConverter, fragment))
         .nonNulls
@@ -68,8 +68,8 @@ class ReferencesHandler
     node = _getReferenceTargetNode(node);
 
     var element = switch (node?.getElement()) {
-      FieldFormalParameterElement2(:var field2?) => field2,
-      PropertyAccessorElement2(:var variable3?) => variable3,
+      FieldFormalParameterElement(:var field2?) => field2,
+      PropertyAccessorElement(:var variable3?) => variable3,
       var element => element,
     };
 
diff --git a/pkg/analysis_server/lib/src/lsp/handlers/handler_rename.dart b/pkg/analysis_server/lib/src/lsp/handlers/handler_rename.dart
index 1a0c2da9035..6f5aeb602d3 100644
--- a/pkg/analysis_server/lib/src/lsp/handlers/handler_rename.dart
+++ b/pkg/analysis_server/lib/src/lsp/handlers/handler_rename.dart
@@ -321,7 +321,7 @@ class RenameHandler extends LspMessageHandler<RenameParams, WorkspaceEdit?> {
 
   bool _isClassRename(RenameRefactoring refactoring) =>
       refactoring is RenameUnitMemberRefactoringImpl &&
-      refactoring.element is InterfaceElement2;
+      refactoring.element is InterfaceElement;
 
   /// Asks the user whether they would like to rename the file along with the
   /// class.
diff --git a/pkg/analysis_server/lib/src/lsp/handlers/handler_type_definition.dart b/pkg/analysis_server/lib/src/lsp/handlers/handler_type_definition.dart
index 80542b14f71..4a7dc3b7989 100644
--- a/pkg/analysis_server/lib/src/lsp/handlers/handler_type_definition.dart
+++ b/pkg/analysis_server/lib/src/lsp/handlers/handler_type_definition.dart
@@ -9,7 +9,7 @@ import 'package:analysis_server/src/lsp/mapping.dart';
 import 'package:analysis_server/src/lsp/registration/feature_registration.dart';
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/ast/syntactic_entity.dart';
-import 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/dart/element/element.dart' as analyzer;
 import 'package:analyzer/dart/element/type.dart';
 import 'package:analyzer/source/line_info.dart';
 import 'package:analyzer/src/dart/ast/extensions.dart';
@@ -85,7 +85,7 @@ class TypeDefinitionHandler
         if (node is NamedType) {
           originEntity = node.name2;
           var element = node.element2;
-          if (element case InterfaceElement2 element) {
+          if (element case analyzer.InterfaceElement element) {
             type = element.thisType;
           }
         } else if (node is VariableDeclaration) {
@@ -105,13 +105,13 @@ class TypeDefinitionHandler
           return success(_emptyResult);
         }
 
-        Element2? element;
+        analyzer.Element? element;
         if (type is InterfaceType) {
           element = type.element3;
         } else if (type is TypeParameterType) {
           element = type.element3;
         }
-        if (element is! Element2) {
+        if (element is! analyzer.Element) {
           return success(_emptyResult);
         }
 
@@ -155,9 +155,9 @@ class TypeDefinitionHandler
 
   /// Creates an LSP [Location] for navigating to [targetFragment].
   Location _toLocation(
-    Fragment targetFragment,
+    analyzer.Fragment targetFragment,
     Range targetNameRange,
-    LibraryFragment targetUnit,
+    analyzer.LibraryFragment targetUnit,
   ) {
     return Location(
       uri: uriConverter.toClientUri(targetUnit.source.fullName),
@@ -172,9 +172,9 @@ class TypeDefinitionHandler
   LocationLink _toLocationLink(
     SyntacticEntity originEntity,
     LineInfo originLineInfo,
-    Fragment targetFragment,
+    analyzer.Fragment targetFragment,
     Range targetNameRange,
-    LibraryFragment targetUnit,
+    analyzer.LibraryFragment targetUnit,
   ) {
     var (codeOffset, codeLength) = switch (targetFragment) {
       ElementImpl e => (e.codeOffset, e.codeLength),
@@ -203,9 +203,9 @@ class TypeDefinitionHandler
   static DartType? _getType(Expression node) {
     if (node is SimpleIdentifier) {
       var element = node.element;
-      if (element case InterfaceElement2 element) {
+      if (element case analyzer.InterfaceElement element) {
         return element.thisType;
-      } else if (element case VariableElement2 element) {
+      } else if (element case analyzer.VariableElement element) {
         if (node.inDeclarationContext()) {
           return element.type;
         }
@@ -216,8 +216,8 @@ class TypeDefinitionHandler
       } else if (node.inSetterContext()) {
         var writeElement = node.writeOrReadElement2;
         if (writeElement
-            case GetterElement(:var variable3) ||
-                SetterElement(:var variable3)) {
+            case analyzer.GetterElement(:var variable3) ||
+                analyzer.SetterElement(:var variable3)) {
           return variable3?.type;
         }
       }
diff --git a/pkg/analysis_server/lib/src/protocol_server.dart b/pkg/analysis_server/lib/src/protocol_server.dart
index 6465a5728b6..fa996082a2d 100644
--- a/pkg/analysis_server/lib/src/protocol_server.dart
+++ b/pkg/analysis_server/lib/src/protocol_server.dart
@@ -58,8 +58,8 @@ void doSourceChange_addSourceEdit(
   change.addEdit(file, isNewFile ? -1 : 0, edit);
 }
 
-String? getAliasedTypeString(engine.Element2 element) {
-  if (element is engine.TypeAliasElement2) {
+String? getAliasedTypeString(engine.Element element) {
+  if (element is engine.TypeAliasElement) {
     var aliasedType = element.aliasedType;
     return aliasedType.getDisplayString();
   }
@@ -68,8 +68,8 @@ String? getAliasedTypeString(engine.Element2 element) {
 
 /// Returns a color hex code (in the form '#FFFFFF')  if [element] represents
 /// a color.
-String? getColorHexString(engine.Element2? element) {
-  if (element is engine.VariableElement2) {
+String? getColorHexString(engine.Element? element) {
+  if (element is engine.VariableElement) {
     var dartValue = element.computeConstantValue();
     if (dartValue != null) {
       var color = ColorComputer.getColorForObject(dartValue);
@@ -85,17 +85,17 @@ String? getColorHexString(engine.Element2? element) {
   return null;
 }
 
-String? getReturnTypeString(engine.Element2 element) {
-  if (element is engine.ExecutableElement2) {
+String? getReturnTypeString(engine.Element element) {
+  if (element is engine.ExecutableElement) {
     if (element.kind == engine.ElementKind.SETTER) {
       return null;
     } else {
       return element.returnType.getDisplayString();
     }
-  } else if (element is engine.VariableElement2) {
+  } else if (element is engine.VariableElement) {
     var type = element.type;
     return type.getDisplayString();
-  } else if (element is engine.TypeAliasElement2) {
+  } else if (element is engine.TypeAliasElement) {
     var aliasedType = element.aliasedType;
     if (aliasedType is FunctionType) {
       var returnType = aliasedType.returnType;
@@ -236,8 +236,8 @@ DiagnosticMessage newDiagnosticMessage(
   );
 }
 
-/// Create a Location based on an [engine.Element2].
-Location? newLocation_fromElement(engine.Element2? element) {
+/// Create a Location based on an [engine.Element].
+Location? newLocation_fromElement(engine.Element? element) {
   if (element == null) {
     return null;
   }
@@ -297,7 +297,7 @@ Location newLocation_fromUnit(
 }
 
 /// Construct based on an element from the analyzer engine.
-OverriddenMember newOverriddenMember_fromEngine(engine.Element2 member) {
+OverriddenMember newOverriddenMember_fromEngine(engine.Element member) {
   var element = convertElement(member);
   var className = member.enclosingElement2!.displayName;
   return OverriddenMember(element, className);
@@ -344,7 +344,7 @@ SourceEdit newSourceEdit_range(
   return SourceEdit(range.offset, range.length, replacement, id: id);
 }
 
-List<Element> _computePath(engine.Element2 element) {
+List<Element> _computePath(engine.Element element) {
   var path = <Element>[];
   for (var fragment in element.firstFragment.withAncestors) {
     if (fragment is engine.LibraryFragment) {
@@ -355,8 +355,8 @@ List<Element> _computePath(engine.Element2 element) {
   return path;
 }
 
-engine.LibraryFragment _getUnitElement(engine.Element2 element) {
-  if (element is engine.LibraryElement2) {
+engine.LibraryFragment _getUnitElement(engine.Element element) {
+  if (element is engine.LibraryElement) {
     return element.firstFragment;
   }
   var fragment = element.firstFragment.libraryFragment;
diff --git a/pkg/analysis_server/lib/src/search/element_references.dart b/pkg/analysis_server/lib/src/search/element_references.dart
index 1be0ce14bd6..0d345da0a17 100644
--- a/pkg/analysis_server/lib/src/search/element_references.dart
+++ b/pkg/analysis_server/lib/src/search/element_references.dart
@@ -17,7 +17,7 @@ class ElementReferencesComputer {
 
   /// Computes [SearchMatch]es for [element] references.
   Future<List<SearchMatch>> compute(
-    Element2 element,
+    Element element,
     bool withPotential, {
     OperationPerformanceImpl? performance,
   }) async {
@@ -47,9 +47,9 @@ class ElementReferencesComputer {
   }
 
   /// Returns a [Future] completing with a [List] of references to [element] or
-  /// to the corresponding hierarchy [Element2]s.
+  /// to the corresponding hierarchy [Element]s.
   Future<List<SearchMatch>> _findElementsReferences(
-    Element2 element,
+    Element element,
     OperationPerformanceImpl performance,
   ) async {
     var allResults = <SearchMatch>[];
@@ -68,18 +68,18 @@ class ElementReferencesComputer {
   }
 
   /// Returns a [Future] completing with a [List] of references to [element].
-  Future<List<SearchMatch>> _findSingleElementReferences(Element2 element) {
+  Future<List<SearchMatch>> _findSingleElementReferences(Element element) {
     return searchEngine.searchReferences(element);
   }
 
-  /// Returns a [Future] completing with [Element2]s to search references to.
+  /// Returns a [Future] completing with [Element]s to search references to.
   ///
   /// If an instance member or a named [FormalParameterElement] is given, each
-  /// corresponding [Element2] in the hierarchy is returned.
+  /// corresponding [Element] in the hierarchy is returned.
   ///
   /// Otherwise, only references to [element] should be searched.
-  Future<Iterable<Element2>> _getRefElements(
-    Element2 element,
+  Future<Iterable<Element>> _getRefElements(
+    Element element,
     OperationPerformanceImpl performance,
   ) async {
     if (element is FormalParameterElement && element.isNamed) {
@@ -88,9 +88,9 @@ class ElementReferencesComputer {
         (_) => getHierarchyNamedParameters(searchEngine, element),
       );
     }
-    if (element is MethodElement2 ||
-        element is FieldElement2 ||
-        element is ConstructorElement2) {
+    if (element is MethodElement ||
+        element is FieldElement ||
+        element is ConstructorElement) {
       var (members, parameters) = await performance.runAsync(
         'getHierarchyMembers',
         (performance) => getHierarchyMembersAndParameters(
@@ -110,10 +110,10 @@ class ElementReferencesComputer {
     return newSearchResult_fromMatch(match);
   }
 
-  static bool _isMemberElement(Element2 element) {
-    if (element is ConstructorElement2) {
+  static bool _isMemberElement(Element element) {
+    if (element is ConstructorElement) {
       return false;
     }
-    return element.enclosingElement2 is InterfaceElement2;
+    return element.enclosingElement2 is InterfaceElement;
   }
 }
diff --git a/pkg/analysis_server/lib/src/search/type_hierarchy.dart b/pkg/analysis_server/lib/src/search/type_hierarchy.dart
index 92574f98906..d2de0f87179 100644
--- a/pkg/analysis_server/lib/src/search/type_hierarchy.dart
+++ b/pkg/analysis_server/lib/src/search/type_hierarchy.dart
@@ -11,17 +11,17 @@ import 'package:analysis_server/src/services/search/search_engine.dart';
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/type.dart';
 
-/// A computer for a type hierarchy of an [Element2].
+/// A computer for a type hierarchy of an [Element].
 class TypeHierarchyComputer {
   final SearchEngine _searchEngine;
   final TypeHierarchyComputerHelper helper;
 
   final List<TypeHierarchyItem> _items = <TypeHierarchyItem>[];
-  final List<InterfaceElement2> _itemClassElements = [];
-  final Map<Element2, TypeHierarchyItem> _elementItemMap =
-      HashMap<Element2, TypeHierarchyItem>();
+  final List<InterfaceElement> _itemClassElements = [];
+  final Map<Element, TypeHierarchyItem> _elementItemMap =
+      HashMap<Element, TypeHierarchyItem>();
 
-  TypeHierarchyComputer(this._searchEngine, Element2 pivotElement)
+  TypeHierarchyComputer(this._searchEngine, Element pivotElement)
     : helper = TypeHierarchyComputerHelper.fromElement(pivotElement);
 
   /// Returns the computed type hierarchy, maybe `null`.
@@ -49,7 +49,7 @@ class TypeHierarchyComputer {
   Future<void> _createSubclasses(
     TypeHierarchyItem item,
     int itemId,
-    InterfaceElement2 classElement,
+    InterfaceElement classElement,
     SearchEngineCache searchEngineCache,
   ) async {
     var subElements = await getDirectSubClasses(
@@ -100,7 +100,7 @@ class TypeHierarchyComputer {
   }
 
   int _createSuperItem(
-    InterfaceElement2 classElement,
+    InterfaceElement classElement,
     List<DartType>? typeArguments,
   ) {
     // check for recursion
@@ -160,12 +160,12 @@ class TypeHierarchyComputer {
 }
 
 class TypeHierarchyComputerHelper {
-  final Element2 pivotElement;
-  final LibraryElement2 pivotLibrary;
+  final Element pivotElement;
+  final LibraryElement pivotLibrary;
   final ElementKind pivotKind;
   final String? pivotName;
   final bool pivotFieldFinal;
-  final InterfaceElement2? pivotClass;
+  final InterfaceElement? pivotClass;
 
   TypeHierarchyComputerHelper(
     this.pivotElement,
@@ -176,19 +176,19 @@ class TypeHierarchyComputerHelper {
     this.pivotClass,
   );
 
-  factory TypeHierarchyComputerHelper.fromElement(Element2 pivotElement) {
+  factory TypeHierarchyComputerHelper.fromElement(Element pivotElement) {
     // try to find enclosing ClassElement
-    Element2? element = pivotElement;
+    Element? element = pivotElement;
     bool pivotFieldFinal = false;
-    if (pivotElement is FieldElement2) {
+    if (pivotElement is FieldElement) {
       pivotFieldFinal = pivotElement.isFinal;
       element = pivotElement.enclosingElement2;
     }
-    if (pivotElement is ExecutableElement2) {
+    if (pivotElement is ExecutableElement) {
       element = pivotElement.enclosingElement2;
     }
-    InterfaceElement2? pivotClass;
-    if (element is InterfaceElement2) {
+    InterfaceElement? pivotClass;
+    if (element is InterfaceElement) {
       pivotClass = element;
     }
 
@@ -202,10 +202,10 @@ class TypeHierarchyComputerHelper {
     );
   }
 
-  ExecutableElement2? findMemberElement(InterfaceElement2 clazz) {
+  ExecutableElement? findMemberElement(InterfaceElement clazz) {
     // Members of extension types don't override anything.
     // They redeclare, and resolved statically.
-    if (pivotClass is ExtensionTypeElement2 || clazz is ExtensionTypeElement2) {
+    if (pivotClass is ExtensionTypeElement || clazz is ExtensionTypeElement) {
       return null;
     }
 
@@ -213,7 +213,7 @@ class TypeHierarchyComputerHelper {
     if (pivotName == null) {
       return null;
     }
-    ExecutableElement2? result;
+    ExecutableElement? result;
     // try to find in the class itself
     if (pivotKind == ElementKind.METHOD) {
       result = clazz.getMethod2(pivotName);
diff --git a/pkg/analysis_server/lib/src/services/completion/dart/candidate_suggestion.dart b/pkg/analysis_server/lib/src/services/completion/dart/candidate_suggestion.dart
index a83e66171eb..df8056bda0c 100644
--- a/pkg/analysis_server/lib/src/services/completion/dart/candidate_suggestion.dart
+++ b/pkg/analysis_server/lib/src/services/completion/dart/candidate_suggestion.dart
@@ -50,7 +50,7 @@ sealed class CandidateSuggestion {
 final class ClassSuggestion extends ImportableSuggestion
     implements ElementBasedSuggestion {
   @override
-  final ClassElement2 element;
+  final ClassElement element;
 
   /// Initialize a newly created candidate suggestion to suggest the [element].
   ClassSuggestion({
@@ -146,7 +146,7 @@ final class ClosureSuggestion extends CandidateSuggestion with SuggestionData {
 final class ConstructorSuggestion extends ExecutableSuggestion
     implements ElementBasedSuggestion {
   @override
-  final ConstructorElement2 element;
+  final ConstructorElement element;
 
   /// Whether the class name is already, implicitly or explicitly, at the call
   /// site. That is, whether we are completing after a period.
@@ -213,7 +213,7 @@ final class ConstructorSuggestion extends ExecutableSuggestion
 
 abstract interface class ElementBasedSuggestion {
   /// The element on which the suggestion is based.
-  Element2 get element;
+  Element get element;
 }
 
 /// The information about a candidate suggestion based on a static field in a
@@ -222,7 +222,7 @@ abstract interface class ElementBasedSuggestion {
 final class EnumConstantSuggestion extends ImportableSuggestion
     implements ElementBasedSuggestion {
   @override
-  final FieldElement2 element;
+  final FieldElement element;
 
   /// Whether the name of the enum should be included in the completion.
   final bool includeEnumName;
@@ -250,7 +250,7 @@ final class EnumConstantSuggestion extends ImportableSuggestion
 final class EnumSuggestion extends ImportableSuggestion
     implements ElementBasedSuggestion {
   @override
-  final EnumElement2 element;
+  final EnumElement element;
 
   /// Initialize a newly created candidate suggestion to suggest the [element].
   EnumSuggestion({
@@ -287,7 +287,7 @@ sealed class ExecutableSuggestion extends ImportableSuggestion {
 final class ExtensionSuggestion extends ExecutableSuggestion
     implements ElementBasedSuggestion {
   @override
-  final ExtensionElement2 element;
+  final ExtensionElement element;
 
   /// Initialize a newly created candidate suggestion to suggest the [element].
   ExtensionSuggestion({
@@ -305,7 +305,7 @@ final class ExtensionSuggestion extends ExecutableSuggestion
 final class ExtensionTypeSuggestion extends ImportableSuggestion
     implements ElementBasedSuggestion {
   @override
-  final ExtensionTypeElement2 element;
+  final ExtensionTypeElement element;
 
   /// Initialize a newly created candidate suggestion to suggest the [element].
   ExtensionTypeSuggestion({
@@ -321,12 +321,12 @@ final class ExtensionTypeSuggestion extends ImportableSuggestion
 /// The information about a candidate suggestion based on a field.
 final class FieldSuggestion extends CandidateSuggestion with MemberSuggestion {
   @override
-  final FieldElement2 element;
+  final FieldElement element;
 
   /// The element defined by the declaration in which the suggestion is to be
   /// applied, or `null` if the completion is in a static context.
   @override
-  final InterfaceElement2? referencingInterface;
+  final InterfaceElement? referencingInterface;
 
   /// Indicates the context, whether the completion is in the body of the
   /// declaration.
@@ -395,7 +395,7 @@ final class GetterSuggestion extends ImportableSuggestion
   /// The element defined by the declaration in which the suggestion is to be
   /// applied, or `null` if the completion is in a static context.
   @override
-  final InterfaceElement2? referencingInterface;
+  final InterfaceElement? referencingInterface;
 
   /// Whether the accessor is being invoked with a target.
   final bool withEnclosingName;
@@ -424,9 +424,9 @@ final class GetterSuggestion extends ImportableSuggestion
   /// we either fail with assertion, or return `null`.
   String? get _enclosingClassOrExtensionName {
     var enclosing = element.enclosingElement2;
-    if (enclosing is InterfaceElement2) {
+    if (enclosing is InterfaceElement) {
       return enclosing.displayName;
-    } else if (enclosing is ExtensionElement2) {
+    } else if (enclosing is ExtensionElement) {
       return enclosing.displayName;
     } else {
       assert(false, 'Expected ClassElement or ExtensionElement');
@@ -523,9 +523,9 @@ final class ImportData {
 /// A suggestion based on an import prefix.
 final class ImportPrefixSuggestion extends CandidateSuggestion
     implements ElementBasedSuggestion {
-  final LibraryElement2 libraryElement;
+  final LibraryElement libraryElement;
 
-  final PrefixElement2 prefixElement;
+  final PrefixElement prefixElement;
 
   ImportPrefixSuggestion({
     required this.libraryElement,
@@ -537,7 +537,7 @@ final class ImportPrefixSuggestion extends CandidateSuggestion
   String get completion => prefixElement.displayName;
 
   @override
-  Element2 get element => prefixElement;
+  Element get element => prefixElement;
 }
 
 /// The information about a candidate suggestion based on a keyword.
@@ -656,7 +656,7 @@ final class LocalFunctionSuggestion extends ExecutableSuggestion
 final class LocalVariableSuggestion extends CandidateSuggestion
     implements ElementBasedSuggestion {
   @override
-  final LocalVariableElement2 element;
+  final LocalVariableElement element;
 
   /// The number of local variables between the completion location and the
   /// declaration of this variable.
@@ -678,7 +678,7 @@ final class LocalVariableSuggestion extends CandidateSuggestion
 mixin MemberSuggestion implements ElementBasedSuggestion {
   /// The element defined by the declaration in which the suggestion is to be
   /// applied, or `null` if the completion is in a static context.
-  InterfaceElement2? get referencingInterface;
+  InterfaceElement? get referencingInterface;
 
   /// Returns the value of the inheritance distance feature.
   ///
@@ -686,10 +686,10 @@ mixin MemberSuggestion implements ElementBasedSuggestion {
   double inheritanceDistance(FeatureComputer featureComputer) {
     var inheritanceDistance = 0.0;
     var element = this.element;
-    if (!(element is FieldElement2 && element.isEnumConstant)) {
+    if (!(element is FieldElement && element.isEnumConstant)) {
       var declaringClass = element.enclosingElement2;
       var referencingInterface = this.referencingInterface;
-      if (referencingInterface != null && declaringClass is InterfaceElement2) {
+      if (referencingInterface != null && declaringClass is InterfaceElement) {
         inheritanceDistance = featureComputer.inheritanceDistanceFeature(
           referencingInterface,
           declaringClass,
@@ -704,12 +704,12 @@ mixin MemberSuggestion implements ElementBasedSuggestion {
 final class MethodSuggestion extends ExecutableSuggestion
     with MemberSuggestion {
   @override
-  final MethodElement2 element;
+  final MethodElement element;
 
   /// The element defined by the declaration in which the suggestion is to be
   /// applied, or `null` if the completion is in a static context.
   @override
-  final InterfaceElement2? referencingInterface;
+  final InterfaceElement? referencingInterface;
 
   /// Initialize a newly created candidate suggestion to suggest the [element].
   MethodSuggestion({
@@ -728,7 +728,7 @@ final class MethodSuggestion extends ExecutableSuggestion
 final class MixinSuggestion extends ImportableSuggestion
     implements ElementBasedSuggestion {
   @override
-  final MixinElement2 element;
+  final MixinElement element;
 
   /// Initialize a newly created candidate suggestion to suggest the [element].
   MixinSuggestion({
@@ -852,7 +852,7 @@ class OverrideData {
 final class OverrideSuggestion extends CandidateSuggestion
     implements ElementBasedSuggestion {
   @override
-  final ExecutableElement2 element;
+  final ExecutableElement element;
 
   /// Whether `super` should be invoked in the body of the override.
   final bool shouldInvokeSuper;
@@ -957,12 +957,12 @@ final class RecordLiteralNamedFieldSuggestion extends CandidateSuggestion
 final class SetStateMethodSuggestion extends ExecutableSuggestion
     with MemberSuggestion, SuggestionData {
   @override
-  final MethodElement2 element;
+  final MethodElement element;
 
   /// The element defined by the declaration in which the suggestion is to be
   /// applied, or `null` if the completion is in a static context.
   @override
-  final InterfaceElement2? referencingInterface;
+  final InterfaceElement? referencingInterface;
 
   /// The identation to be used for a multi-line completion.
   final String indent;
@@ -1009,7 +1009,7 @@ final class SetterSuggestion extends ImportableSuggestion
   /// The element defined by the declaration in which the suggestion is to be
   /// applied, or `null` if the completion is in a static context.
   @override
-  final InterfaceElement2? referencingInterface;
+  final InterfaceElement? referencingInterface;
 
   /// Whether the accessor is being invoked with a target.
   final bool withEnclosingName;
@@ -1038,9 +1038,9 @@ final class SetterSuggestion extends ImportableSuggestion
   /// we either fail with assertion, or return `null`.
   String? get _enclosingClassOrExtensionName {
     var enclosing = element.enclosingElement2;
-    if (enclosing is InterfaceElement2) {
+    if (enclosing is InterfaceElement) {
       return enclosing.displayName;
-    } else if (enclosing is ExtensionElement2) {
+    } else if (enclosing is ExtensionElement) {
       return enclosing.displayName;
     } else {
       assert(false, 'Expected ClassElement or ExtensionElement');
@@ -1063,7 +1063,7 @@ final class SetterSuggestion extends ImportableSuggestion
 final class StaticFieldSuggestion extends ImportableSuggestion
     implements ElementBasedSuggestion {
   @override
-  final FieldElement2 element;
+  final FieldElement element;
 
   /// Initialize a newly created candidate suggestion to suggest the [element].
   StaticFieldSuggestion({
@@ -1174,7 +1174,7 @@ final class TopLevelSetterSuggestion extends ImportableSuggestion
 final class TopLevelVariableSuggestion extends ImportableSuggestion
     implements ElementBasedSuggestion {
   @override
-  final TopLevelVariableElement2 element;
+  final TopLevelVariableElement element;
 
   /// Initialize a newly created candidate suggestion to suggest the [element].
   TopLevelVariableSuggestion({
@@ -1191,7 +1191,7 @@ final class TopLevelVariableSuggestion extends ImportableSuggestion
 final class TypeAliasSuggestion extends ImportableSuggestion
     implements ElementBasedSuggestion {
   @override
-  final TypeAliasElement2 element;
+  final TypeAliasElement element;
 
   /// Initialize a newly created candidate suggestion to suggest the [element].
   TypeAliasSuggestion({
@@ -1208,7 +1208,7 @@ final class TypeAliasSuggestion extends ImportableSuggestion
 final class TypeParameterSuggestion extends CandidateSuggestion
     implements ElementBasedSuggestion {
   @override
-  final TypeParameterElement2 element;
+  final TypeParameterElement element;
 
   /// Initialize a newly created candidate suggestion to suggest the [element].
   TypeParameterSuggestion({required this.element, required super.matcherScore});
diff --git a/pkg/analysis_server/lib/src/services/completion/dart/completion_manager.dart b/pkg/analysis_server/lib/src/services/completion/dart/completion_manager.dart
index f3b1a578394..587f2e27899 100644
--- a/pkg/analysis_server/lib/src/services/completion/dart/completion_manager.dart
+++ b/pkg/analysis_server/lib/src/services/completion/dart/completion_manager.dart
@@ -250,7 +250,7 @@ class DartCompletionRequest {
   final FeatureComputer featureComputer;
 
   /// The library element of the file in which completion is requested.
-  final LibraryElement2 libraryElement;
+  final LibraryElement libraryElement;
 
   /// The library fragment of the file in which completion is requested.
   final LibraryFragment libraryFragment;
diff --git a/pkg/analysis_server/lib/src/services/completion/dart/completion_state.dart b/pkg/analysis_server/lib/src/services/completion/dart/completion_state.dart
index e87e9f94386..903c3546a96 100644
--- a/pkg/analysis_server/lib/src/services/completion/dart/completion_state.dart
+++ b/pkg/analysis_server/lib/src/services/completion/dart/completion_state.dart
@@ -58,7 +58,7 @@ class CompletionState {
   }
 
   /// The element of the library containing the completion location.
-  LibraryElement2 get libraryElement => request.libraryElement;
+  LibraryElement get libraryElement => request.libraryElement;
 
   /// The type of quotes preferred for [String]s as specified in [CodeStyleOptions].
   String get preferredQuoteForStrings =>
diff --git a/pkg/analysis_server/lib/src/services/completion/dart/declaration_helper.dart b/pkg/analysis_server/lib/src/services/completion/dart/declaration_helper.dart
index 8e36af61d5e..67ab2281d49 100644
--- a/pkg/analysis_server/lib/src/services/completion/dart/declaration_helper.dart
+++ b/pkg/analysis_server/lib/src/services/completion/dart/declaration_helper.dart
@@ -161,7 +161,7 @@ class DeclarationHelper {
   }
 
   /// Add suggestions for all constructors of [element].
-  void addConstructorNamesForElement({required InterfaceElement2 element}) {
+  void addConstructorNamesForElement({required InterfaceElement element}) {
     var constructors = element.constructors2;
     for (var constructor in constructors) {
       _suggestConstructor(
@@ -197,7 +197,7 @@ class DeclarationHelper {
   }
 
   /// Add suggestions for declarations through [prefixElement].
-  void addDeclarationsThroughImportPrefix(PrefixElement2 prefixElement) {
+  void addDeclarationsThroughImportPrefix(PrefixElement prefixElement) {
     for (var importElement in prefixElement.imports) {
       var importedLibrary = importElement.importedLibrary2;
       if (importedLibrary == null) {
@@ -232,7 +232,7 @@ class DeclarationHelper {
   /// be skipped because the cursor is inside that field's name.
   void addFieldsForInitializers(
     ConstructorDeclaration constructor,
-    FieldElement2? fieldToInclude,
+    FieldElement? fieldToInclude,
   ) {
     var constructorElement = constructor.declaredFragment?.element;
     var containingElement = constructorElement?.enclosingElement2;
@@ -240,12 +240,12 @@ class DeclarationHelper {
       return;
     }
 
-    var fieldsToSkip = <FieldElement2>{};
+    var fieldsToSkip = <FieldElement>{};
     // Skip fields that are already initialized in the initializer list.
     for (var initializer in constructor.initializers) {
       if (initializer is ConstructorFieldInitializer) {
         var fieldElement = initializer.fieldName.element;
-        if (fieldElement is FieldElement2) {
+        if (fieldElement is FieldElement) {
           fieldsToSkip.add(fieldElement);
         }
       }
@@ -255,7 +255,7 @@ class DeclarationHelper {
       parameter = parameter.notDefault;
       if (parameter is FieldFormalParameter) {
         var parameterElement = parameter.declaredFragment?.element;
-        if (parameterElement is FieldFormalParameterElement2) {
+        if (parameterElement is FieldFormalParameterElement) {
           var field = parameterElement.field2;
           if (field != null) {
             fieldsToSkip.add(field);
@@ -279,7 +279,7 @@ class DeclarationHelper {
   /// Add suggestions for all of the top-level declarations that are exported
   /// from the [library] except for those whose name is in the set of
   /// [excludedNames].
-  void addFromLibrary(LibraryElement2 library, Set<String> excludedNames) {
+  void addFromLibrary(LibraryElement library, Set<String> excludedNames) {
     for (var entry in library.exportNamespace.definedNames2.entries) {
       if (!excludedNames.contains(entry.key)) {
         _addImportedElement(entry.value);
@@ -430,9 +430,9 @@ class DeclarationHelper {
     }
   }
 
-  /// Add members from the given [ExtensionElement2].
+  /// Add members from the given [ExtensionElement].
   void addMembersFromExtensionElement(
-    ExtensionElement2 extension, {
+    ExtensionElement extension, {
     ImportData? importData,
     required Set<String> excludedGetters,
     required bool includeMethods,
@@ -482,7 +482,7 @@ class DeclarationHelper {
 
   /// Adds suggestions for any constructors that are visible within the not yet
   /// imported [library].
-  void addNotImportedConstructors(LibraryElement2 library) {
+  void addNotImportedConstructors(LibraryElement library) {
     var importData = ImportData(
       libraryUri: library.uri,
       prefix: null,
@@ -494,7 +494,7 @@ class DeclarationHelper {
   /// Add members from all the applicable extensions that are visible in the
   /// not yet imported [library] that are applicable for the given [type].
   void addNotImportedExtensionMethods({
-    required LibraryElement2 library,
+    required LibraryElement library,
     required DartType type,
     required Set<String> excludedGetters,
     required bool includeMethods,
@@ -502,7 +502,7 @@ class DeclarationHelper {
   }) {
     var libraryElement = library;
     var applicableExtensions = library.exportNamespace.definedNames2.values
-        .whereType<ExtensionElement2>()
+        .whereType<ExtensionElement>()
         .applicableTo(
           targetLibrary: libraryElement,
           // Ignore nullability, consistent with non-extension members.
@@ -534,7 +534,7 @@ class DeclarationHelper {
 
   /// Adds suggestions for any top-level declarations that are visible within
   /// the not yet imported [library].
-  void addNotImportedTopLevelDeclarations(LibraryElement2 library) {
+  void addNotImportedTopLevelDeclarations(LibraryElement library) {
     var importData = ImportData(
       libraryUri: library.uri,
       prefix: null,
@@ -603,8 +603,8 @@ class DeclarationHelper {
   /// Add suggestions for all of the constructor in the [library] that could be
   /// a redirection target for the [redirectingConstructor].
   void addPossibleRedirectionsInLibrary(
-    ConstructorElement2 redirectingConstructor,
-    LibraryElement2 library,
+    ConstructorElement redirectingConstructor,
+    LibraryElement library,
   ) {
     var classElement = redirectingConstructor.enclosingElement2;
     var classType = classElement.thisType;
@@ -627,15 +627,15 @@ class DeclarationHelper {
   }
 
   /// Add any static members defined by the given [element].
-  void addStaticMembersOfElement(Element2 element) {
-    if (element is TypeAliasElement2) {
+  void addStaticMembersOfElement(Element element) {
+    if (element is TypeAliasElement) {
       var aliasedType = element.aliasedType;
       if (aliasedType is InterfaceType) {
         element = aliasedType.element3;
       }
     }
     switch (element) {
-      case EnumElement2():
+      case EnumElement():
         _addStaticMembers(
           getters: element.getters2,
           setters: element.setters2,
@@ -644,7 +644,7 @@ class DeclarationHelper {
           fields: element.fields2,
           methods: element.methods2,
         );
-      case ExtensionElement2():
+      case ExtensionElement():
         _addStaticMembers(
           getters: element.getters2,
           setters: element.setters2,
@@ -653,7 +653,7 @@ class DeclarationHelper {
           fields: element.fields2,
           methods: element.methods2,
         );
-      case InterfaceElement2():
+      case InterfaceElement():
         _addStaticMembers(
           getters: element.getters2,
           setters: element.setters2,
@@ -667,7 +667,7 @@ class DeclarationHelper {
 
   /// Adds suggestions for any constructors that are declared within the
   /// [library].
-  void _addConstructors(LibraryElement2 library, ImportData importData) {
+  void _addConstructors(LibraryElement library, ImportData importData) {
     for (var element in library.classes) {
       _suggestConstructors(
         element.constructors2,
@@ -689,19 +689,19 @@ class DeclarationHelper {
   /// Adds suggestions for any constructors that are visible through type
   /// aliases declared within the `importData.libraryUri`.
   void _addConstructorsForAliasedElement(
-    TypeAliasElement2 alias,
+    TypeAliasElement alias,
     ImportData? importData,
   ) {
     var aliasedElement = alias.aliasedElement2;
-    if (aliasedElement is ClassElement2) {
+    if (aliasedElement is ClassElement) {
       _suggestConstructors(
         aliasedElement.constructors2,
         importData,
         allowNonFactory: !aliasedElement.isAbstract,
       );
-    } else if (aliasedElement is ExtensionTypeElement2) {
+    } else if (aliasedElement is ExtensionTypeElement) {
       _suggestConstructors(aliasedElement.constructors2, importData);
-    } else if (aliasedElement is MixinElement2) {
+    } else if (aliasedElement is MixinElement) {
       _suggestConstructors(aliasedElement.constructors2, importData);
     }
   }
@@ -709,7 +709,7 @@ class DeclarationHelper {
   /// Adds suggestions for any constructors that are visible within the
   /// [library].
   void _addConstructorsImportedFrom({
-    required LibraryElement2 library,
+    required LibraryElement library,
     required Namespace namespace,
     required String? prefix,
   }) {
@@ -720,15 +720,15 @@ class DeclarationHelper {
     );
     for (var element in namespace.definedNames2.values) {
       switch (element) {
-        case ClassElement2():
+        case ClassElement():
           _suggestConstructors(
             element.constructors2,
             importData,
             allowNonFactory: !element.isAbstract,
           );
-        case ExtensionTypeElement2():
+        case ExtensionTypeElement():
           _suggestConstructors(element.constructors2, importData);
-        case TypeAliasElement2():
+        case TypeAliasElement():
           _addConstructorsForAliasedElement(element, importData);
       }
     }
@@ -737,7 +737,7 @@ class DeclarationHelper {
   /// Adds suggestions for any top-level declarations that are visible within
   /// the [library].
   void _addDeclarationsImportedFrom({
-    required LibraryElement2 library,
+    required LibraryElement library,
     required Namespace namespace,
     required String? prefix,
   }) {
@@ -799,7 +799,7 @@ class DeclarationHelper {
         } else {
           // All fields induce a getter.
           var variable = getter.variable3;
-          if (variable is FieldElement2) {
+          if (variable is FieldElement) {
             _suggestField(field: variable);
           }
         }
@@ -828,27 +828,27 @@ class DeclarationHelper {
   ///
   /// The [importData] indicates how the library is, or should be, imported.
   void _addExternalTopLevelDeclarations({
-    required LibraryElement2 library,
+    required LibraryElement library,
     required Namespace namespace,
     required ImportData importData,
   }) {
     for (var element in namespace.definedNames2.values) {
       switch (element) {
-        case ClassElement2():
+        case ClassElement():
           _suggestClass(element, importData);
-        case EnumElement2():
+        case EnumElement():
           _suggestEnum(element, importData);
-        case ExtensionElement2():
+        case ExtensionElement():
           if (!mustBeType) {
             _suggestExtension(element, importData);
           }
-        case ExtensionTypeElement2():
+        case ExtensionTypeElement():
           _suggestExtensionType(element, importData);
         case TopLevelFunctionElement():
           if (!mustBeType) {
             _suggestTopLevelFunction(element, importData);
           }
-        case MixinElement2():
+        case MixinElement():
           _suggestMixin(element, importData);
         case GetterElement():
           if (!mustBeType) {
@@ -864,11 +864,11 @@ class DeclarationHelper {
             }
             _suggestTopLevelProperty(element, importData);
           }
-        case TopLevelVariableElement2():
+        case TopLevelVariableElement():
           if (!mustBeType) {
             _suggestTopLevelVariable(element, importData);
           }
-        case TypeAliasElement2():
+        case TypeAliasElement():
           _suggestTypeAlias(element, importData);
       }
     }
@@ -893,7 +893,7 @@ class DeclarationHelper {
 
   /// Adds suggestions for any constructors that are imported into the
   /// [library].
-  void _addImportedConstructors(LibraryElement2 library) {
+  void _addImportedConstructors(LibraryElement library) {
     // TODO(brianwilkerson): This will create suggestions for elements that
     //  conflict with different elements imported from a different library. Not
     //  sure whether that's the desired behavior.
@@ -911,7 +911,7 @@ class DeclarationHelper {
 
   /// Adds suggestions for any top-level declarations that are imported into the
   /// [library].
-  void _addImportedDeclarations(LibraryElement2 library) {
+  void _addImportedDeclarations(LibraryElement library) {
     // TODO(brianwilkerson): This will create suggestions for elements that
     //  conflict with different elements imported from a different library. Not
     //  sure whether that's the desired behavior.
@@ -937,26 +937,26 @@ class DeclarationHelper {
   }
 
   /// Adds a suggestion for the top-level [element].
-  void _addImportedElement(Element2 element) {
+  void _addImportedElement(Element element) {
     var matcherScore = state.matcher.score(element.displayName);
     if (matcherScore != -1) {
       var suggestion = switch (element) {
-        ClassElement2() => ClassSuggestion(
+        ClassElement() => ClassSuggestion(
           importData: null,
           element: element,
           matcherScore: matcherScore,
         ),
-        EnumElement2() => EnumSuggestion(
+        EnumElement() => EnumSuggestion(
           importData: null,
           element: element,
           matcherScore: matcherScore,
         ),
-        ExtensionElement2() => ExtensionSuggestion(
+        ExtensionElement() => ExtensionSuggestion(
           importData: null,
           element: element,
           matcherScore: matcherScore,
         ),
-        ExtensionTypeElement2() => ExtensionTypeSuggestion(
+        ExtensionTypeElement() => ExtensionTypeSuggestion(
           importData: null,
           element: element,
           matcherScore: matcherScore,
@@ -967,21 +967,21 @@ class DeclarationHelper {
           kind: _executableSuggestionKind,
           matcherScore: matcherScore,
         ),
-        MixinElement2() => MixinSuggestion(
+        MixinElement() => MixinSuggestion(
           importData: null,
           element: element,
           matcherScore: matcherScore,
         ),
-        PropertyAccessorElement2() => _createSuggestionFromTopLevelProperty(
+        PropertyAccessorElement() => _createSuggestionFromTopLevelProperty(
           element,
           matcherScore,
         ),
-        TopLevelVariableElement2() => TopLevelVariableSuggestion(
+        TopLevelVariableElement() => TopLevelVariableSuggestion(
           importData: null,
           element: element,
           matcherScore: matcherScore,
         ),
-        TypeAliasElement2() => TypeAliasSuggestion(
+        TypeAliasElement() => TypeAliasSuggestion(
           importData: null,
           element: element,
           matcherScore: matcherScore,
@@ -1008,7 +1008,7 @@ class DeclarationHelper {
       _ => null,
     };
     var element = fragment?.element;
-    if (!mustBeStatic && element is ExtensionElement2) {
+    if (!mustBeStatic && element is ExtensionElement) {
       var thisType = element.thisType;
       if (thisType is InterfaceType) {
         _addInstanceMembers(
@@ -1020,19 +1020,19 @@ class DeclarationHelper {
       }
       return;
     }
-    if (element is! InterfaceElement2) {
+    if (element is! InterfaceElement) {
       return;
     }
     var referencingInterface = _referencingInterfaceFor(element);
     var members = request.inheritanceManager.getInheritedMap(element);
     for (var member in members.values) {
       switch (member) {
-        case MethodElement2():
+        case MethodElement():
           _suggestMethod(
             method: member,
             referencingInterface: referencingInterface,
           );
-        case PropertyAccessorElement2():
+        case PropertyAccessorElement():
           _suggestProperty(
             accessor: member,
             referencingInterface: referencingInterface,
@@ -1064,12 +1064,12 @@ class DeclarationHelper {
             ? request.inheritanceManager.getInheritedConcreteMap(type.element3)
             : request.inheritanceManager.getInterface2(type.element3).map2;
 
-    var membersByName = <String, List<ExecutableElement2>>{};
+    var membersByName = <String, List<ExecutableElement>>{};
     for (var rawMember in map.values) {
       if (_canAccessInstanceMember(rawMember)) {
         var name = rawMember.displayName;
         membersByName
-            .putIfAbsent(name, () => <ExecutableElement2>[])
+            .putIfAbsent(name, () => <ExecutableElement>[])
             .add(rawMember);
       }
     }
@@ -1077,7 +1077,7 @@ class DeclarationHelper {
     for (var entry in membersByName.entries) {
       var members = entry.value;
       var rawMember = members.bestMember;
-      if (rawMember is MethodElement2) {
+      if (rawMember is MethodElement) {
         if (includeMethods) {
           if (rawMember.isOperator) {
             continue;
@@ -1085,7 +1085,7 @@ class DeclarationHelper {
           // Exclude static methods when completion on an instance.
           var member = ExecutableMember.from(rawMember, substitution);
           _suggestMethod(
-            method: member as MethodElement2,
+            method: member as MethodElement,
             referencingInterface: referencingInterface,
           );
         }
@@ -1093,7 +1093,7 @@ class DeclarationHelper {
         if (!excludedGetters.contains(entry.key)) {
           var member = ExecutableMember.from(rawMember, substitution);
           _suggestProperty(
-            accessor: member as PropertyAccessorElement2,
+            accessor: member as PropertyAccessorElement,
             referencingInterface: referencingInterface,
           );
         }
@@ -1101,7 +1101,7 @@ class DeclarationHelper {
         if (includeSetters) {
           var member = ExecutableMember.from(rawMember, substitution);
           _suggestProperty(
-            accessor: member as PropertyAccessorElement2,
+            accessor: member as PropertyAccessorElement,
             referencingInterface: referencingInterface,
           );
         }
@@ -1269,7 +1269,7 @@ class DeclarationHelper {
   }
 
   /// Completion is inside the declaration of the [element].
-  void _addMembersOfEnclosingInstance(InstanceElement2 element) {
+  void _addMembersOfEnclosingInstance(InstanceElement element) {
     var referencingInterface = _referencingInterfaceFor(element);
 
     for (var accessor in element.getters2) {
@@ -1370,7 +1370,7 @@ class DeclarationHelper {
         }
       case GenericTypeAlias():
         var element = declaration.declaredFragment?.element;
-        if (element is TypeAliasElement2) {
+        if (element is TypeAliasElement) {
           _suggestTypeParameters(element.typeParameters2);
         }
       case MixinDeclaration():
@@ -1389,10 +1389,10 @@ class DeclarationHelper {
   void _addStaticMembers({
     required List<GetterElement> getters,
     required List<SetterElement> setters,
-    required List<ConstructorElement2> constructors,
-    required Element2 containingElement,
-    required List<FieldElement2> fields,
-    required List<MethodElement2> methods,
+    required List<ConstructorElement> constructors,
+    required Element containingElement,
+    required List<FieldElement> fields,
+    required List<MethodElement> methods,
   }) {
     for (var getter in getters) {
       if (getter.isStatic &&
@@ -1411,7 +1411,7 @@ class DeclarationHelper {
     for (var field in fields) {
       if (field.isStatic &&
           (!field.isSynthetic ||
-              (containingElement is EnumElement2 && field.name3 == 'values')) &&
+              (containingElement is EnumElement && field.name3 == 'values')) &&
           field.isVisibleIn(request.libraryElement)) {
         if (field.isEnumConstant) {
           var enumElement = field.enclosingElement2;
@@ -1434,7 +1434,7 @@ class DeclarationHelper {
     }
     if (!mustBeAssignable) {
       var allowNonFactory =
-          containingElement is ClassElement2 && !containingElement.isAbstract;
+          containingElement is ClassElement && !containingElement.isAbstract;
       for (var constructor in constructors) {
         if (constructor.isVisibleIn(request.libraryElement) &&
             (allowNonFactory || constructor.isFactory)) {
@@ -1458,7 +1458,7 @@ class DeclarationHelper {
   /// the [library].
   ///
   /// The [library] is the library in which completion is being requested.
-  void _addTopLevelDeclarations(LibraryElement2 library) {
+  void _addTopLevelDeclarations(LibraryElement library) {
     for (var element in library.classes) {
       _suggestClass(element, null);
     }
@@ -1505,7 +1505,7 @@ class DeclarationHelper {
     }
   }
 
-  bool _canAccessInstanceMember(ExecutableElement2 element) {
+  bool _canAccessInstanceMember(ExecutableElement element) {
     if (element.isStatic) {
       return false;
     }
@@ -1527,7 +1527,7 @@ class DeclarationHelper {
 
     if (element.isProtected) {
       var elementInterface = element.enclosingElement2;
-      if (elementInterface is! InterfaceElement2) {
+      if (elementInterface is! InterfaceElement) {
         return false;
       }
 
@@ -1566,14 +1566,14 @@ class DeclarationHelper {
   }
 
   ImportableSuggestion? _createSuggestionFromTopLevelProperty(
-    PropertyAccessorElement2 element,
+    PropertyAccessorElement element,
     double matcherScore, {
     ImportData? importData,
   }) {
     if (element.isSynthetic) {
       if (element is GetterElement) {
         var variable = element.variable3;
-        if (variable is TopLevelVariableElement2) {
+        if (variable is TopLevelVariableElement) {
           return TopLevelVariableSuggestion(
             importData: importData,
             element: variable,
@@ -1609,12 +1609,12 @@ class DeclarationHelper {
 
   /// Returns the interface element for the type of `this` within the
   /// declaration of the given class-like [element].
-  InterfaceElement2? _referencingInterfaceFor(Element2 element) {
-    if (element is InterfaceElement2) {
+  InterfaceElement? _referencingInterfaceFor(Element element) {
+    if (element is InterfaceElement) {
       return element;
-    } else if (element is InstanceElement2) {
+    } else if (element is InstanceElement) {
       var thisElement = element.thisType.element3;
-      if (thisElement is InterfaceElement2) {
+      if (thisElement is InterfaceElement) {
         return thisElement;
       }
     }
@@ -1622,7 +1622,7 @@ class DeclarationHelper {
   }
 
   /// Adds a suggestion for the class represented by the [element].
-  void _suggestClass(ClassElement2 element, ImportData? importData) {
+  void _suggestClass(ClassElement element, ImportData? importData) {
     if (visibilityTracker.isVisible(element: element, importData: importData)) {
       if ((mustBeExtendable &&
               !element.isExtendableIn2(request.libraryElement)) ||
@@ -1655,7 +1655,7 @@ class DeclarationHelper {
 
   /// Adds a suggestion for the constructor represented by the [element].
   void _suggestConstructor(
-    ConstructorElement2 element, {
+    ConstructorElement element, {
     required ImportData? importData,
     required bool hasClassName,
     required bool isConstructorRedirect,
@@ -1711,7 +1711,7 @@ class DeclarationHelper {
 
   /// Adds a suggestion for each of the [constructors].
   void _suggestConstructors(
-    List<ConstructorElement2> constructors,
+    List<ConstructorElement> constructors,
     ImportData? importData, {
     bool allowNonFactory = true,
   }) {
@@ -1732,7 +1732,7 @@ class DeclarationHelper {
   }
 
   /// Adds a suggestion for the enum represented by the [element].
-  void _suggestEnum(EnumElement2 element, ImportData? importData) {
+  void _suggestEnum(EnumElement element, ImportData? importData) {
     if (visibilityTracker.isVisible(element: element, importData: importData)) {
       if (mustBeExtendable || mustBeImplementable || mustBeMixable) {
         return;
@@ -1759,7 +1759,7 @@ class DeclarationHelper {
   }
 
   /// Adds a suggestion for the extension represented by the [element].
-  void _suggestExtension(ExtensionElement2 element, ImportData? importData) {
+  void _suggestExtension(ExtensionElement element, ImportData? importData) {
     if (visibilityTracker.isVisible(element: element, importData: importData)) {
       if (mustBeExtendable || mustBeImplementable || mustBeMixable) {
         return;
@@ -1785,7 +1785,7 @@ class DeclarationHelper {
 
   /// Adds a suggestion for the extension type represented by the [element].
   void _suggestExtensionType(
-    ExtensionTypeElement2 element,
+    ExtensionTypeElement element,
     ImportData? importData,
   ) {
     if (visibilityTracker.isVisible(element: element, importData: importData)) {
@@ -1815,8 +1815,8 @@ class DeclarationHelper {
   /// [referencingInterface] is provided, it should be the class in which
   /// completion was requested.
   void _suggestField({
-    required FieldElement2 field,
-    InterfaceElement2? referencingInterface,
+    required FieldElement field,
+    InterfaceElement? referencingInterface,
     bool isInDeclaration = false,
   }) {
     if (visibilityTracker.isVisible(element: field, importData: null)) {
@@ -1846,7 +1846,7 @@ class DeclarationHelper {
   }
 
   /// Adds a suggestion for the local function represented by the [element].
-  void _suggestLocalFunction(ExecutableElement2 element) {
+  void _suggestLocalFunction(ExecutableElement element) {
     if (element is LocalFunctionElement &&
         visibilityTracker.isVisible(element: element, importData: null)) {
       if (mustBeAssignable ||
@@ -1879,10 +1879,10 @@ class DeclarationHelper {
   /// [referencingInterface] is provided, it should be the class in which
   /// completion was requested.
   void _suggestMethod({
-    required MethodElement2 method,
+    required MethodElement method,
     bool ignoreVisibility = false,
     ImportData? importData,
-    InterfaceElement2? referencingInterface,
+    InterfaceElement? referencingInterface,
   }) {
     if (ignoreVisibility ||
         visibilityTracker.isVisible(element: method, importData: importData)) {
@@ -1895,7 +1895,7 @@ class DeclarationHelper {
       if (matcherScore != -1) {
         var enclosingElement = method.enclosingElement2;
         if (method.name3 == 'setState' &&
-            enclosingElement is ClassElement2 &&
+            enclosingElement is ClassElement &&
             enclosingElement.isExactState) {
           var suggestion = SetStateMethodSuggestion(
             element: method,
@@ -1920,7 +1920,7 @@ class DeclarationHelper {
   }
 
   /// Adds a suggestion for the mixin represented by the [element].
-  void _suggestMixin(MixinElement2 element, ImportData? importData) {
+  void _suggestMixin(MixinElement element, ImportData? importData) {
     if (visibilityTracker.isVisible(element: element, importData: importData)) {
       if (mustBeExtendable ||
           (mustBeImplementable &&
@@ -1971,10 +1971,10 @@ class DeclarationHelper {
   /// [referencingInterface] is provided, it should be the class in which
   /// completion was requested.
   void _suggestProperty({
-    required PropertyAccessorElement2 accessor,
+    required PropertyAccessorElement accessor,
     bool ignoreVisibility = false,
     ImportData? importData,
-    InterfaceElement2? referencingInterface,
+    InterfaceElement? referencingInterface,
     bool isInDeclaration = false,
   }) {
     if (ignoreVisibility ||
@@ -1997,7 +1997,7 @@ class DeclarationHelper {
           // synthetic setter.
           if (accessor is GetterElement) {
             var variable = accessor.variable3;
-            if (variable is FieldElement2) {
+            if (variable is FieldElement) {
               var suggestion = FieldSuggestion(
                 element: variable,
                 matcherScore: matcherScore,
@@ -2049,7 +2049,7 @@ class DeclarationHelper {
 
   /// Adds a suggestion for the enum constant represented by the [element].
   /// The [importData] should be provided if the enum is imported.
-  void _suggestStaticField(FieldElement2 element, ImportData? importData) {
+  void _suggestStaticField(FieldElement element, ImportData? importData) {
     if (!element.isStatic ||
         (mustBeAssignable && !(element.isFinal || element.isConst)) ||
         (mustBeConstant && !element.isConst)) {
@@ -2082,7 +2082,7 @@ class DeclarationHelper {
             if (getter != null) {
               if (getter.isSynthetic) {
                 var variable = getter.variable3;
-                if (variable is FieldElement2) {
+                if (variable is FieldElement) {
                   var suggestion = FieldSuggestion(
                     element: variable,
                     matcherScore: matcherScore,
@@ -2116,10 +2116,7 @@ class DeclarationHelper {
   }
 
   /// Adds a suggestion for each of the static fields in the list of [fields].
-  void _suggestStaticFields(
-    List<FieldElement2> fields,
-    ImportData? importData,
-  ) {
+  void _suggestStaticFields(List<FieldElement> fields, ImportData? importData) {
     for (var field in fields) {
       if (field.isVisibleIn(request.libraryElement)) {
         _suggestStaticField(field, importData);
@@ -2164,7 +2161,7 @@ class DeclarationHelper {
 
   /// Adds a suggestion for the getter or setter represented by the [element].
   void _suggestTopLevelProperty(
-    PropertyAccessorElement2 element,
+    PropertyAccessorElement element,
     ImportData? importData,
   ) {
     if (visibilityTracker.isVisible(element: element, importData: importData)) {
@@ -2192,7 +2189,7 @@ class DeclarationHelper {
 
   /// Adds a suggestion for the getter or setter represented by the [element].
   void _suggestTopLevelVariable(
-    TopLevelVariableElement2 element,
+    TopLevelVariableElement element,
     ImportData? importData,
   ) {
     if (visibilityTracker.isVisible(element: element, importData: importData)) {
@@ -2214,7 +2211,7 @@ class DeclarationHelper {
   }
 
   /// Adds a suggestion for the type alias represented by the [element].
-  void _suggestTypeAlias(TypeAliasElement2 element, ImportData? importData) {
+  void _suggestTypeAlias(TypeAliasElement element, ImportData? importData) {
     if (visibilityTracker.isVisible(element: element, importData: importData)) {
       var matcherScore = state.matcher.score(element.displayName);
       if (matcherScore != -1) {
@@ -2232,7 +2229,7 @@ class DeclarationHelper {
   }
 
   /// Adds a suggestion for the type parameter represented by the [element].
-  void _suggestTypeParameter(TypeParameterElement2 element) {
+  void _suggestTypeParameter(TypeParameterElement element) {
     if (visibilityTracker.isVisible(element: element, importData: null)) {
       var matcherScore = state.matcher.score(element.displayName);
       if (matcherScore != -1) {
@@ -2246,7 +2243,7 @@ class DeclarationHelper {
   }
 
   /// Adds a suggestion for each of the [typeParameters].
-  void _suggestTypeParameters(List<TypeParameterElement2> typeParameters) {
+  void _suggestTypeParameters(List<TypeParameterElement> typeParameters) {
     for (var parameter in typeParameters) {
       if (!_isWildcard(parameter.name3)) {
         _suggestTypeParameter(parameter);
@@ -2255,7 +2252,7 @@ class DeclarationHelper {
   }
 
   /// Adds a suggestion for the local variable represented by the [element].
-  void _suggestVariable(LocalVariableElement2 element) {
+  void _suggestVariable(LocalVariableElement element) {
     if (element.isWildcardVariable) return;
     if (visibilityTracker.isVisible(element: element, importData: null)) {
       if (mustBeConstant && !element.isConst) {
@@ -2324,7 +2321,7 @@ class DeclarationHelper {
       var variables = node.variables;
       for (var variable in variables.variables) {
         var declaredElement = variable.declaredElement2;
-        if (declaredElement is LocalVariableElement2) {
+        if (declaredElement is LocalVariableElement) {
           _suggestVariable(declaredElement);
         }
       }
@@ -2524,12 +2521,12 @@ class DeclarationHelper {
   }
 }
 
-extension on Element2 {
+extension on Element {
   /// Whether this element is visible within the [referencingLibrary].
   ///
   /// An element is visible if it's declared in the [referencingLibrary] or if
   /// the name is not private.
-  bool isVisibleIn(LibraryElement2 referencingLibrary) {
+  bool isVisibleIn(LibraryElement referencingLibrary) {
     if (library2 == referencingLibrary) {
       return true;
     }
@@ -2538,13 +2535,13 @@ extension on Element2 {
   }
 }
 
-extension on List<ExecutableElement2> {
+extension on List<ExecutableElement> {
   /// Returns the element in this list that is the best element to suggest.
   ///
   /// Getters are preferred over setters, otherwise the first element in the
   /// list is returned under the assumption that it's lower in the hierarchy.
-  ExecutableElement2 get bestMember {
-    ExecutableElement2 bestMember = this[0];
+  ExecutableElement get bestMember {
+    ExecutableElement bestMember = this[0];
     if (bestMember is SetterElement) {
       for (var i = 1; i < length; i++) {
         var member = this[i];
@@ -2557,7 +2554,7 @@ extension on List<ExecutableElement2> {
   }
 }
 
-extension on PropertyAccessorElement2 {
+extension on PropertyAccessorElement {
   /// Whether this accessor is an accessor for a constant variable.
   bool get isConst {
     if (isSynthetic) {
diff --git a/pkg/analysis_server/lib/src/services/completion/dart/feature_computer.dart b/pkg/analysis_server/lib/src/services/completion/dart/feature_computer.dart
index dee2c1cf4b9..aac3e6ee0fa 100644
--- a/pkg/analysis_server/lib/src/services/completion/dart/feature_computer.dart
+++ b/pkg/analysis_server/lib/src/services/completion/dart/feature_computer.dart
@@ -188,18 +188,18 @@ class FeatureComputer {
   /// setters are always mapped into a different kind: FIELD for getters and
   /// setters declared in a class or extension, and TOP_LEVEL_VARIABLE for
   /// top-level getters and setters.
-  protocol.ElementKind computeElementKind(Element2 element) {
-    if (element is LibraryElement2) {
+  protocol.ElementKind computeElementKind(Element element) {
+    if (element is LibraryElement) {
       return protocol.ElementKind.PREFIX;
-    } else if (element is EnumElement2) {
+    } else if (element is EnumElement) {
       return protocol.ElementKind.ENUM;
-    } else if (element is MixinElement2) {
+    } else if (element is MixinElement) {
       return protocol.ElementKind.MIXIN;
-    } else if (element is ClassElement2) {
+    } else if (element is ClassElement) {
       return protocol.ElementKind.CLASS;
-    } else if (element is FieldElement2 && element.isEnumConstant) {
+    } else if (element is FieldElement && element.isEnumConstant) {
       return protocol.ElementKind.ENUM_CONSTANT;
-    } else if (element is PropertyAccessorElement2) {
+    } else if (element is PropertyAccessorElement) {
       var variable = element.variable3;
       if (variable == null) {
         return protocol.ElementKind.UNKNOWN;
@@ -244,18 +244,18 @@ class FeatureComputer {
   /// setters are always mapped into a different kind: FIELD for getters and
   /// setters declared in a class or extension, and TOP_LEVEL_VARIABLE for
   /// top-level getters and setters.
-  protocol.ElementKind computeElementKind2(Element2 element) {
-    if (element is LibraryElement2) {
+  protocol.ElementKind computeElementKind2(Element element) {
+    if (element is LibraryElement) {
       return protocol.ElementKind.PREFIX;
-    } else if (element is EnumElement2) {
+    } else if (element is EnumElement) {
       return protocol.ElementKind.ENUM;
-    } else if (element is MixinElement2) {
+    } else if (element is MixinElement) {
       return protocol.ElementKind.MIXIN;
-    } else if (element is ClassElement2) {
+    } else if (element is ClassElement) {
       return protocol.ElementKind.CLASS;
-    } else if (element is FieldElement2 && element.isEnumConstant) {
+    } else if (element is FieldElement && element.isEnumConstant) {
       return protocol.ElementKind.ENUM_CONSTANT;
-    } else if (element is PropertyAccessorElement2) {
+    } else if (element is PropertyAccessorElement) {
       var variable = element.variable3;
       if (variable == null) {
         return protocol.ElementKind.UNKNOWN;
@@ -331,7 +331,7 @@ class FeatureComputer {
   /// completing at the given [completionLocation]. If a [distance] is given it
   /// will be used to provide finer-grained relevance scores.
   double elementKindFeature(
-    Element2 element,
+    Element element,
     String? completionLocation, {
     double? distance,
   }) {
@@ -353,7 +353,7 @@ class FeatureComputer {
   }
 
   // Return the value of the _has deprecated_ feature for the given [element].
-  double hasDeprecatedFeature(Element2 element) {
+  double hasDeprecatedFeature(Element element) {
     return element.hasOrInheritsDeprecated ? -1.0 : 0.0;
   }
 
@@ -364,8 +364,8 @@ class FeatureComputer {
   /// supertype if the two types are not the same. Return `-1` if the [subclass]
   /// is not a subclass of the [superclass].
   int inheritanceDistance(
-    InterfaceElement2 subclass,
-    InterfaceElement2 superclass,
+    InterfaceElement subclass,
+    InterfaceElement superclass,
   ) {
     // This method is only visible for the metrics computation and might be made
     // private at some future date.
@@ -376,24 +376,22 @@ class FeatureComputer {
   /// defined in the [superclass] that is being accessed through an expression
   /// whose static type is the [subclass].
   double inheritanceDistanceFeature(
-    InterfaceElement2 subclass,
-    InterfaceElement2 superclass,
+    InterfaceElement subclass,
+    InterfaceElement superclass,
   ) {
     var distance = _inheritanceDistance(subclass, superclass, {});
     return distanceToPercent(distance);
   }
 
   /// Return the value of the _is constant_ feature for the given [element].
-  double isConstantFeature(Element2 element) {
-    if (element is ConstructorElement2 && element.isConst) {
+  double isConstantFeature(Element element) {
+    if (element is ConstructorElement && element.isConst) {
       return 1.0;
-    } else if (element is FieldElement2 &&
-        element.isStatic &&
-        element.isConst) {
+    } else if (element is FieldElement && element.isStatic && element.isConst) {
       return 1.0;
-    } else if (element is TopLevelVariableElement2 && element.isConst) {
+    } else if (element is TopLevelVariableElement && element.isConst) {
       return 1.0;
-    } else if (element is PropertyAccessorElement2 && element.isSynthetic) {
+    } else if (element is PropertyAccessorElement && element.isSynthetic) {
       var variable = element.variable3;
       if (variable != null && variable.isStatic && variable.isConst) {
         return 1.0;
@@ -412,7 +410,7 @@ class FeatureComputer {
       // override of `noSuchMethod`.
       return 0.0;
     }
-    return proposedMemberName == MethodElement2.NO_SUCH_METHOD_METHOD_NAME
+    return proposedMemberName == MethodElement.NO_SUCH_METHOD_METHOD_NAME
         ? -1.0
         : 0.0;
   }
@@ -469,9 +467,9 @@ class FeatureComputer {
   ///
   /// This is the implementation of [inheritanceDistance].
   int _inheritanceDistance(
-    InterfaceElement2? subclass,
-    InterfaceElement2 superclass,
-    Set<InterfaceElement2> visited,
+    InterfaceElement? subclass,
+    InterfaceElement superclass,
+    Set<InterfaceElement> visited,
   ) {
     if (subclass == null) {
       return -1;
@@ -495,7 +493,7 @@ class FeatureComputer {
       }
     }
 
-    if (subclass is MixinElement2) {
+    if (subclass is MixinElement) {
       visitTypes(subclass.superclassConstraints);
     }
     visitTypes(subclass.mixins);
@@ -664,7 +662,7 @@ class _ContextTypeVisitor extends SimpleAstVisitor<DartType> {
   DartType? visitConstructorFieldInitializer(ConstructorFieldInitializer node) {
     if (node.equals.end <= offset) {
       var element = node.fieldName.element;
-      if (element is FieldElement2) {
+      if (element is FieldElement) {
         return element.type;
       }
     }
@@ -1226,7 +1224,7 @@ parent3: ${node.parent?.parent?.parent}
     // TODO(brianwilkerson): Replace with `patternTypeSchema` (on AST) where
     //  possible.
     pattern = pattern.unParenthesized;
-    Element2? element;
+    Element? element;
     if (pattern is AssignedVariablePattern) {
       element = pattern.element2;
     } else if (pattern is DeclaredVariablePattern) {
@@ -1236,7 +1234,7 @@ parent3: ${node.parent?.parent?.parent}
     } else if (pattern is ListPattern) {
       return pattern.requiredType;
     }
-    if (element is VariableElement2) {
+    if (element is VariableElement) {
       return element.type;
     }
     return null;
@@ -1264,7 +1262,7 @@ parent3: ${node.parent?.parent?.parent}
     var member = manager.getMember3(type, Name(uri, name));
     if (member is GetterElement) {
       return member.returnType;
-    } else if (member is MethodElement2) {
+    } else if (member is MethodElement) {
       return member.returnType;
     }
     return null;
diff --git a/pkg/analysis_server/lib/src/services/completion/dart/in_scope_completion_pass.dart b/pkg/analysis_server/lib/src/services/completion/dart/in_scope_completion_pass.dart
index 7d7973eac66..46a5888d8dd 100644
--- a/pkg/analysis_server/lib/src/services/completion/dart/in_scope_completion_pass.dart
+++ b/pkg/analysis_server/lib/src/services/completion/dart/in_scope_completion_pass.dart
@@ -789,7 +789,7 @@ class InScopeCompletionPass extends SimpleAstVisitor<void> {
   void visitConstructorName(ConstructorName node) {
     if (node.parent is ConstructorReference) {
       var element = node.type.element2;
-      if (element is InterfaceElement2) {
+      if (element is InterfaceElement) {
         declarationHelper(
           preferNonInvocation: true,
         ).addStaticMembersOfElement(element);
@@ -1278,8 +1278,8 @@ class InScopeCompletionPass extends SimpleAstVisitor<void> {
     }
     if (constructor is ConstructorDeclaration) {
       var declaredElement = node.declaredFragment?.element;
-      FieldElement2? field;
-      if (declaredElement is FieldFormalParameterElement2) {
+      FieldElement? field;
+      if (declaredElement is FieldFormalParameterElement) {
         field = declaredElement.field2;
       }
       declarationHelper().addFieldsForInitializers(constructor, field);
@@ -1679,13 +1679,13 @@ class InScopeCompletionPass extends SimpleAstVisitor<void> {
       var element = node.element2;
       DartType type;
       collector.completionLocation = 'PropertyAccess_propertyName';
-      if (element is FunctionTypedElement2) {
+      if (element is FunctionTypedElement) {
         if (element is GetterElement) {
           type = element.type.returnType;
         } else {
           type = element.type;
         }
-      } else if (element is PrefixElement2) {
+      } else if (element is PrefixElement) {
         var isInstanceCreation =
             node.parent?.parent?.parent is InstanceCreationExpression;
         declarationHelper(
@@ -1694,10 +1694,10 @@ class InScopeCompletionPass extends SimpleAstVisitor<void> {
           mustBeNonVoid: isInstanceCreation,
         ).addDeclarationsThroughImportPrefix(element);
         return;
-      } else if (element is VariableElement2) {
+      } else if (element is VariableElement) {
         type = element.type;
       } else {
-        if (element is InterfaceElement2 || element is ExtensionElement2) {
+        if (element is InterfaceElement || element is ExtensionElement) {
           declarationHelper().addStaticMembersOfElement(element!);
         }
         return;
@@ -1944,10 +1944,10 @@ class InScopeCompletionPass extends SimpleAstVisitor<void> {
           target is Identifier &&
           (!node.isCascaded || offset == operator.offset + 1)) {
         var element = target.element;
-        if (element is InterfaceElement2 || element is ExtensionTypeElement2) {
+        if (element is InterfaceElement || element is ExtensionTypeElement) {
           declarationHelper().addStaticMembersOfElement(element!);
         }
-        if (element is PrefixElement2) {
+        if (element is PrefixElement) {
           declarationHelper().addDeclarationsThroughImportPrefix(element);
         }
       }
@@ -2076,7 +2076,7 @@ class InScopeCompletionPass extends SimpleAstVisitor<void> {
     var prefixElement = importPrefix?.element2;
 
     // `prefix.x^ print(0);` is recovered as `prefix.x print; (0);`.
-    if (prefixElement is PrefixElement2) {
+    if (prefixElement is PrefixElement) {
       if (node.parent case VariableDeclarationList variableList) {
         if (variableList.parent case VariableDeclarationStatement statement) {
           if (statement.semicolon.isSynthetic) {
@@ -2265,7 +2265,7 @@ class InScopeCompletionPass extends SimpleAstVisitor<void> {
           var parent = node.parent;
           var mustBeAssignable =
               parent is AssignmentExpression && node == parent.leftHandSide;
-          if (element is PrefixElement2) {
+          if (element is PrefixElement) {
             declarationHelper(
               mustBeAssignable: mustBeAssignable,
             ).addDeclarationsThroughImportPrefix(element);
@@ -2274,13 +2274,13 @@ class InScopeCompletionPass extends SimpleAstVisitor<void> {
               mustBeAssignable: mustBeAssignable,
               preferNonInvocation:
                   node.parent is CommentReference ||
-                  (element is InterfaceElement2 &&
+                  (element is InterfaceElement &&
                       state.request.shouldSuggestTearOff(element)),
             );
             if (node.parent is CommentReference) {
-              if (element is InterfaceElement2) {
+              if (element is InterfaceElement) {
                 helper.addInstanceMembersOfType(element.thisType);
-              } else if (element is ExtensionElement2) {
+              } else if (element is ExtensionElement) {
                 helper.addMembersFromExtensionElement(
                   element,
                   excludedGetters: {},
@@ -2333,10 +2333,10 @@ class InScopeCompletionPass extends SimpleAstVisitor<void> {
           target is Identifier &&
           (!node.isCascaded || offset == operator.offset + 1)) {
         var element = target.element;
-        if (element is InterfaceElement2 || element is ExtensionTypeElement2) {
+        if (element is InterfaceElement || element is ExtensionTypeElement) {
           declarationHelper().addStaticMembersOfElement(element!);
         }
-        if (element is PrefixElement2) {
+        if (element is PrefixElement) {
           declarationHelper().addDeclarationsThroughImportPrefix(element);
         }
       }
@@ -2579,7 +2579,7 @@ class InScopeCompletionPass extends SimpleAstVisitor<void> {
       if (type is NamedType) {
         if (type.importPrefix case var importPrefix?) {
           var prefixElement = importPrefix.element2;
-          if (prefixElement is PrefixElement2) {
+          if (prefixElement is PrefixElement) {
             if (type.name2.coversOffset(offset)) {
               declarationHelper(
                 mustBeType: true,
@@ -3418,8 +3418,8 @@ class InScopeCompletionPass extends SimpleAstVisitor<void> {
     ConstructorFieldInitializer? initializer,
   ) {
     var element = initializer?.fieldName.element;
-    FieldElement2? field;
-    if (element is FieldElement2) {
+    FieldElement? field;
+    if (element is FieldElement) {
       field = element;
     }
     keywordHelper.addConstructorInitializerKeywords(constructor, initializer);
@@ -3740,7 +3740,7 @@ class InScopeCompletionPass extends SimpleAstVisitor<void> {
     if (node is NamedType) {
       if (node.importPrefix case var importPrefix?) {
         var prefixElement = importPrefix.element2;
-        if (prefixElement is PrefixElement2) {
+        if (prefixElement is PrefixElement) {
           declarationHelper(
             mustBeExtensible: mustBeExtensible,
             mustBeImplementable: mustBeImplementable,
@@ -3923,7 +3923,7 @@ class InScopeCompletionPass extends SimpleAstVisitor<void> {
   /// If the budget has been exceeded, then the results are marked as incomplete
   /// and no suggestions are added.
   void _suggestOverridesFor({
-    required InterfaceElement2? element,
+    required InterfaceElement? element,
     bool skipAt = false,
   }) {
     if (state.budget.isEmpty) {
@@ -4015,7 +4015,7 @@ class InScopeCompletionPass extends SimpleAstVisitor<void> {
     var lexeme = identifier.lexeme;
     if (lexeme.isNotEmpty && 'override'.startsWith(lexeme)) {
       var declaredElement = node.declaredFragment?.element;
-      if (declaredElement is InterfaceElement2) {
+      if (declaredElement is InterfaceElement) {
         _suggestOverridesFor(element: declaredElement, skipAt: true);
       }
     }
@@ -4212,7 +4212,7 @@ extension on ClassMember {
 extension on ArgumentList {
   /// The element being invoked by the expression containing this argument list,
   /// or `null` if the element is not known.
-  Element2? get invokedElement {
+  Element? get invokedElement {
     switch (parent) {
       case Annotation invocation:
         return invocation.element2;
@@ -4334,7 +4334,7 @@ extension on CompilationUnit {
   }
 }
 
-extension on Element2? {
+extension on Element? {
   /// Returns the parameters associated with this element, or `null` if this
   /// element doesn't have any parameters associated with it.
   ///
@@ -4346,9 +4346,9 @@ extension on Element2? {
     var self = this;
     if (self is GetterElement) {
       return self.returnType.ifTypeOrNull<FunctionType>()?.formalParameters;
-    } else if (self is ExecutableElement2) {
+    } else if (self is ExecutableElement) {
       return self.formalParameters;
-    } else if (self is VariableElement2) {
+    } else if (self is VariableElement) {
       var type = self.type;
       if (type is FunctionType) {
         return type.formalParameters;
diff --git a/pkg/analysis_server/lib/src/services/completion/dart/not_imported_completion_pass.dart b/pkg/analysis_server/lib/src/services/completion/dart/not_imported_completion_pass.dart
index 70ff71354c1..fc092796a24 100644
--- a/pkg/analysis_server/lib/src/services/completion/dart/not_imported_completion_pass.dart
+++ b/pkg/analysis_server/lib/src/services/completion/dart/not_imported_completion_pass.dart
@@ -26,7 +26,7 @@ class ConstructorsOperation extends NotImportedOperation {
     : _declarationHelper = declarationHelper;
 
   /// Compute any candidate suggestions for elements in the [library].
-  void computeSuggestionsIn(LibraryElement2 library) {
+  void computeSuggestionsIn(LibraryElement library) {
     _declarationHelper.addNotImportedConstructors(library);
   }
 }
@@ -62,7 +62,7 @@ class InstanceExtensionMembersOperation extends NotImportedOperation {
        _includeSetters = includeSetters;
 
   /// Compute any candidate suggestions for elements in the [library].
-  void computeSuggestionsIn(LibraryElement2 library) {
+  void computeSuggestionsIn(LibraryElement library) {
     _declarationHelper.addNotImportedExtensionMethods(
       library: library,
       type: _type,
@@ -198,9 +198,9 @@ class StaticMembersOperation extends NotImportedOperation {
 
   /// Compute any candidate suggestions for elements in the [library].
   void computeSuggestionsIn(
-    LibraryElement2 library,
-    List<Element2> exportElements,
-    Set<Element2> importedElements,
+    LibraryElement library,
+    List<Element> exportElements,
+    Set<Element> importedElements,
   ) {
     // TODO(brianwilkerson): Determine whether we need the element parameters.
     _declarationHelper.addNotImportedTopLevelDeclarations(library);
@@ -211,12 +211,12 @@ class StaticMembersOperation extends NotImportedOperation {
 class _ImportSummary {
   /// The elements that are imported from libraries that are only partially
   /// imported.
-  Set<Element2> importedElements = Set<Element2>.identity();
+  Set<Element> importedElements = Set<Element>.identity();
 
   /// The libraries that are imported in their entirety.
-  Set<LibraryElement2> importedLibraries = Set<LibraryElement2>.identity();
+  Set<LibraryElement> importedLibraries = Set<LibraryElement>.identity();
 
-  _ImportSummary(LibraryElement2 library) {
+  _ImportSummary(LibraryElement library) {
     for (var fragment in library.fragments) {
       for (var import in fragment.libraryImports2) {
         var importedLibrary = import.importedLibrary2;
diff --git a/pkg/analysis_server/lib/src/services/completion/dart/override_helper.dart b/pkg/analysis_server/lib/src/services/completion/dart/override_helper.dart
index 9389e3236f1..e34ab189657 100644
--- a/pkg/analysis_server/lib/src/services/completion/dart/override_helper.dart
+++ b/pkg/analysis_server/lib/src/services/completion/dart/override_helper.dart
@@ -29,7 +29,7 @@ class OverrideHelper {
     : inheritanceManager = state.request.inheritanceManager;
 
   void computeOverridesFor({
-    required InterfaceElement2 interfaceElement,
+    required InterfaceElement interfaceElement,
     required SourceRange replacementRange,
     required bool skipAt,
   }) {
@@ -73,7 +73,7 @@ class OverrideHelper {
   }
 
   /// Checks if the [element] has the `@nonVirtual` annotation.
-  bool _hasNonVirtualAnnotation(ExecutableElement2 element) {
+  bool _hasNonVirtualAnnotation(ExecutableElement element) {
     if (element is GetterElement && element.isSynthetic) {
       var variable = element.variable3;
       if (variable != null && variable.metadata2.hasNonVirtual) {
diff --git a/pkg/analysis_server/lib/src/services/completion/dart/relevance_computer.dart b/pkg/analysis_server/lib/src/services/completion/dart/relevance_computer.dart
index c29891f3c6c..b6b9b68c5ce 100644
--- a/pkg/analysis_server/lib/src/services/completion/dart/relevance_computer.dart
+++ b/pkg/analysis_server/lib/src/services/completion/dart/relevance_computer.dart
@@ -65,9 +65,9 @@ class RelevanceComputer {
     return _cachedContainingMemberName;
   }
 
-  /// Compute the relevance for [FieldElement2] suggestion.
+  /// Compute the relevance for [FieldElement] suggestion.
   int computeFieldElementRelevance(
-    FieldElement2 element,
+    FieldElement element,
     double inheritanceDistance,
   ) {
     var contextType = featureComputer.contextTypeFeature(
@@ -340,7 +340,7 @@ class RelevanceComputer {
 
   /// Return the relevance score for a top-level [element].
   int computeTopLevelRelevance(
-    Element2 element, {
+    Element element, {
     required DartType elementType,
     required bool isNotImportedLibrary,
   }) {
@@ -367,7 +367,7 @@ class RelevanceComputer {
 
   /// Return the relevance score for a top-level [element].
   int computeTopLevelRelevance2(
-    Element2 element, {
+    Element element, {
     required DartType elementType,
     required bool isNotImportedLibrary,
   }) {
@@ -395,7 +395,7 @@ class RelevanceComputer {
   /// Compute the relevance for an [accessor].
   int _computeAccessorRelevance(
     DartType? type,
-    Element2 accessor,
+    Element accessor,
     bool isNotImportedLibrary, {
     double startsWithDollar = 0.0,
     double superMatches = 0.0,
@@ -420,9 +420,9 @@ class RelevanceComputer {
     );
   }
 
-  /// Compute the relevance for [ConstructorElement2].
+  /// Compute the relevance for [ConstructorElement].
   int _computeConstructorRelevance(
-    ConstructorElement2 element,
+    ConstructorElement element,
     NeverType neverType,
     bool isNotImportedLibrary,
   ) {
@@ -437,7 +437,7 @@ class RelevanceComputer {
 
   /// Compute the value of the _element kind_ feature for the given [element] in
   /// the completion context.
-  double _computeElementKind(Element2 element, {double? distance}) {
+  double _computeElementKind(Element element, {double? distance}) {
     var location = completionLocation;
     var elementKind = featureComputer.elementKindFeature(
       element,
@@ -459,7 +459,7 @@ class RelevanceComputer {
 
   /// Compute the value of the _element kind_ feature for the given [element] in
   /// the completion context.
-  double _computeElementKind2(Element2 element, {double? distance}) {
+  double _computeElementKind2(Element element, {double? distance}) {
     var location = completionLocation;
     var elementKind = featureComputer.elementKindFeature(
       element,
@@ -564,9 +564,9 @@ class RelevanceComputer {
     );
   }
 
-  /// Compute the relevance for [MethodElement2].
+  /// Compute the relevance for [MethodElement].
   int _computeMethodRelevance(
-    MethodElement2 method,
+    MethodElement method,
     double inheritanceDistance,
     bool isNotImportedLibrary,
   ) {
@@ -605,16 +605,16 @@ class RelevanceComputer {
     );
   }
 
-  /// Compute the relevance for [PropertyAccessorElement2].
+  /// Compute the relevance for [PropertyAccessorElement].
   int _computePropertyAccessorRelevance(
-    PropertyAccessorElement2 accessor,
+    PropertyAccessorElement accessor,
     double inheritanceDistance,
     bool isNotImportedLibrary,
   ) {
     if (accessor.isSynthetic) {
       if (accessor is GetterElement) {
         var variable = accessor.variable3;
-        if (variable is FieldElement2) {
+        if (variable is FieldElement) {
           return computeFieldElementRelevance(variable, inheritanceDistance);
         }
       }
@@ -639,9 +639,9 @@ class RelevanceComputer {
     return 0;
   }
 
-  /// Compute the relevance for a static [FieldElement2].
+  /// Compute the relevance for a static [FieldElement].
   int _computeStaticFieldRelevance(
-    FieldElement2 element,
+    FieldElement element,
     double inheritanceDistance,
     bool isNotImportedLibrary,
   ) {
@@ -649,7 +649,7 @@ class RelevanceComputer {
       var getter = element.getter2;
       if (getter != null) {
         var variable = getter.variable3;
-        if (variable is FieldElement2) {
+        if (variable is FieldElement) {
           return computeFieldElementRelevance(variable, inheritanceDistance);
         }
       }
@@ -663,15 +663,15 @@ class RelevanceComputer {
     return 0;
   }
 
-  /// Compute the relevance for top level [PropertyAccessorElement2].
+  /// Compute the relevance for top level [PropertyAccessorElement].
   int _computeTopLevelPropertyAccessorRelevance(
-    PropertyAccessorElement2 accessor,
+    PropertyAccessorElement accessor,
     bool isNotImportedLibrary,
   ) {
     if (accessor.isSynthetic) {
       if (accessor is GetterElement) {
         var variable = accessor.variable3;
-        if (variable is TopLevelVariableElement2) {
+        if (variable is TopLevelVariableElement) {
           return computeTopLevelRelevance(
             variable,
             elementType: variable.type,
@@ -694,8 +694,8 @@ class RelevanceComputer {
     return 0;
   }
 
-  /// Compute the relevance for [TypeParameterElement2].
-  int _computeTypeParameterRelevance(TypeParameterElement2 parameter) {
+  /// Compute the relevance for [TypeParameterElement].
+  int _computeTypeParameterRelevance(TypeParameterElement parameter) {
     var elementKind = _computeElementKind(parameter);
     var isConstant =
         preferConstants ? featureComputer.isConstantFeature(parameter) : 0.0;
@@ -704,7 +704,7 @@ class RelevanceComputer {
 
   /// Return the type associated with the [accessor], maybe `null` if an
   /// invalid setter with no parameters at all.
-  DartType? _getPropertyAccessorType(PropertyAccessorElement2 accessor) {
+  DartType? _getPropertyAccessorType(PropertyAccessorElement accessor) {
     if (accessor is GetterElement) {
       return accessor.returnType;
     } else {
@@ -718,7 +718,7 @@ class RelevanceComputer {
   }
 
   /// Return the [DartType] for an instantiated [TypeAlias].
-  DartType _instantiateTypeAlias(TypeAliasElement2 element) {
+  DartType _instantiateTypeAlias(TypeAliasElement element) {
     var typeParameters = element.typeParameters2;
     var typeArguments = const <DartType>[];
     if (typeParameters.isNotEmpty) {
diff --git a/pkg/analysis_server/lib/src/services/completion/dart/suggestion_builder.dart b/pkg/analysis_server/lib/src/services/completion/dart/suggestion_builder.dart
index 38f9cd3efe9..adfb226ee0d 100644
--- a/pkg/analysis_server/lib/src/services/completion/dart/suggestion_builder.dart
+++ b/pkg/analysis_server/lib/src/services/completion/dart/suggestion_builder.dart
@@ -163,7 +163,7 @@ class SuggestionBuilder {
   /// can only be referenced using a prefix, and the class name is to be
   /// included in the completion, then the [prefix] should be provided.
   void suggestConstructor(
-    ConstructorElement2 constructor, {
+    ConstructorElement constructor, {
     CompletionSuggestionKind kind = CompletionSuggestionKind.INVOCATION,
     bool suggestUnnamedAsNew = false,
     bool hasClassName = false,
@@ -222,7 +222,7 @@ class SuggestionBuilder {
   /// Add a suggestion for an enum [constant]. If the enum can only be
   /// referenced using a prefix, then the [prefix] should be provided.
   void suggestEnumConstant(
-    FieldElement2 constant,
+    FieldElement constant,
     String completion, {
     String? prefix,
     int? relevance,
@@ -248,7 +248,7 @@ class SuggestionBuilder {
   /// used as the kind for the suggestion. If the extension can only be
   /// referenced using a prefix, then the [prefix] should be provided.
   void suggestExtension(
-    ExtensionElement2 extension, {
+    ExtensionElement extension, {
     CompletionSuggestionKind kind = CompletionSuggestionKind.INVOCATION,
     String? prefix,
     int? relevance,
@@ -278,7 +278,7 @@ class SuggestionBuilder {
   /// The [inheritanceDistance] is the value of the inheritance distance feature
   /// computed for the field (or `-1.0` if the field is a static field).
   void suggestField(
-    FieldElement2 field, {
+    FieldElement field, {
     required double inheritanceDistance,
     int? relevance,
   }) {
@@ -362,7 +362,7 @@ class SuggestionBuilder {
   void suggestFunctionCall() {
     var element = protocol.Element(
       protocol.ElementKind.METHOD,
-      MethodElement2.CALL_METHOD_NAME,
+      MethodElement.CALL_METHOD_NAME,
       protocol.Element.makeFlags(),
       parameters: '()',
       returnType: 'void',
@@ -371,8 +371,8 @@ class SuggestionBuilder {
       CompletionSuggestion(
         CompletionSuggestionKind.INVOCATION,
         Relevance.callFunction,
-        MethodElement2.CALL_METHOD_NAME,
-        MethodElement2.CALL_METHOD_NAME.length,
+        MethodElement.CALL_METHOD_NAME,
+        MethodElement.CALL_METHOD_NAME.length,
         0,
         false,
         false,
@@ -453,7 +453,7 @@ class SuggestionBuilder {
   /// Add a suggestion for an [element]. If the class can only be
   /// referenced using a prefix, then the [prefix] should be provided.
   void suggestInterface(
-    InterfaceElement2 element, {
+    InterfaceElement element, {
     String? prefix,
     int? relevance,
   }) {
@@ -538,7 +538,7 @@ class SuggestionBuilder {
   /// Add a suggestion for the `loadLibrary` [function] associated with a
   /// prefix.
   void suggestLoadLibraryFunction(
-    ExecutableElement2 function, {
+    ExecutableElement function, {
     CompletionSuggestionKind kind = CompletionSuggestionKind.INVOCATION,
   }) {
     // TODO(brianwilkerson): This might want to use the context type rather than
@@ -584,7 +584,7 @@ class SuggestionBuilder {
   }
 
   void suggestLocalVariable({
-    required LocalVariableElement2 element,
+    required LocalVariableElement element,
     required int distance,
     int? relevance,
   }) {
@@ -624,7 +624,7 @@ class SuggestionBuilder {
   /// as the kind for the suggestion. The [inheritanceDistance] is the value of
   /// the inheritance distance feature computed for the method.
   void suggestMethod(
-    MethodElement2 method, {
+    MethodElement method, {
     required CompletionSuggestionKind kind,
     required double inheritanceDistance,
     int? relevance,
@@ -726,7 +726,7 @@ class SuggestionBuilder {
       element: convertElement(parameter),
     );
 
-    if (parameter is FieldFormalParameterElement2) {
+    if (parameter is FieldFormalParameterElement) {
       _setDocumentation(suggestion, parameter);
     }
 
@@ -776,7 +776,7 @@ class SuggestionBuilder {
   /// [element]. If [invokeSuper] is `true`, then the override will contain an
   /// invocation of an overridden member.
   Future<void> suggestOverride({
-    required ExecutableElement2 element,
+    required ExecutableElement element,
     required bool invokeSuper,
     required SourceRange replacementRange,
     required bool skipAt,
@@ -855,7 +855,7 @@ class SuggestionBuilder {
   }
 
   /// Add a suggestion for a [prefix] associated with a [library].
-  void suggestPrefix(LibraryElement2 library, String prefix, {int? relevance}) {
+  void suggestPrefix(LibraryElement library, String prefix, {int? relevance}) {
     var elementKind = _computeElementKind(library);
     // TODO(brianwilkerson): If we are in a constant context it would be nice
     //  to promote prefixes for libraries that define constants, but that
@@ -903,7 +903,7 @@ class SuggestionBuilder {
 
   /// Add a suggestion for the Flutter's `setState` method.
   void suggestSetStateMethod(
-    MethodElement2 method, {
+    MethodElement method, {
     required CompletionSuggestionKind kind,
     required String completion,
     required String displayText,
@@ -996,7 +996,7 @@ class SuggestionBuilder {
   /// If the enclosing element can only be referenced using a prefix, then
   /// the [prefix] should be provided.
   void suggestStaticField(
-    FieldElement2 element, {
+    FieldElement element, {
     String? prefix,
     int? relevance,
     String? completion,
@@ -1076,7 +1076,7 @@ class SuggestionBuilder {
     int? relevance,
   }) {
     assert(
-      getter.enclosingElement2 is LibraryElement2,
+      getter.enclosingElement2 is LibraryElement,
       'Enclosing element of ${getter.runtimeType} is '
       '${getter.enclosingElement2.runtimeType}.',
     );
@@ -1128,7 +1128,7 @@ class SuggestionBuilder {
     int? relevance,
   }) {
     assert(
-      setter.enclosingElement2 is LibraryElement2,
+      setter.enclosingElement2 is LibraryElement,
       'Enclosing element of ${setter.runtimeType} is '
       '${setter.enclosingElement2.runtimeType}.',
     );
@@ -1175,14 +1175,14 @@ class SuggestionBuilder {
   /// Add a suggestion for a top-level [variable]. If the variable can only be
   /// referenced using a prefix, then the [prefix] should be provided.
   void suggestTopLevelVariable(
-    TopLevelVariableElement2 variable, {
+    TopLevelVariableElement variable, {
     String? prefix,
     int? relevance,
   }) {
     var completion = _getCompletionString(variable);
     if (completion == null) return;
     if (_couldMatch(completion, prefix)) {
-      assert(variable.enclosingElement2 is LibraryElement2);
+      assert(variable.enclosingElement2 is LibraryElement);
       relevance ??= relevanceComputer.computeTopLevelRelevance2(
         variable,
         elementType: variable.type,
@@ -1203,7 +1203,7 @@ class SuggestionBuilder {
   /// Add a suggestion for a [typeAlias]. If the alias can only be referenced
   /// using a prefix, then the [prefix] should be provided.
   void suggestTypeAlias(
-    TypeAliasElement2 typeAlias, {
+    TypeAliasElement typeAlias, {
     String? prefix,
     int? relevance,
   }) {
@@ -1228,7 +1228,7 @@ class SuggestionBuilder {
   }
 
   /// Add a suggestion for a type [parameter].
-  void suggestTypeParameter(TypeParameterElement2 parameter, {int? relevance}) {
+  void suggestTypeParameter(TypeParameterElement parameter, {int? relevance}) {
     var elementKind = _computeElementKind(parameter);
     var isConstant =
         _preferConstants
@@ -1278,11 +1278,11 @@ class SuggestionBuilder {
           // suggestions are added has been changed by the move to
           // `InScopeCompletionPass`.
           var suggestedElement = suggestion.orgElement;
-          if (suggestedElement is ConstructorElement2) {
+          if (suggestedElement is ConstructorElement) {
             var parentName = suggestedElement.enclosingElement2.displayName;
             var existingSuggestion = _suggestionMap[parentName];
             if (existingSuggestion is _CompletionSuggestionBuilderImpl &&
-                existingSuggestion.orgElement is! ClassElement2) {
+                existingSuggestion.orgElement is! ClassElement) {
               // We return when the current suggestion is not a class because that
               // means that the current suggestion shadows the one being added.
               return;
@@ -1322,7 +1322,7 @@ class SuggestionBuilder {
 
   /// Compute the value of the _element kind_ feature for the given [element] in
   /// the completion context.
-  double _computeElementKind(Element2 element, {double? distance}) {
+  double _computeElementKind(Element element, {double? distance}) {
     var location = request.opType.completionLocation;
     var elementKind = request.featureComputer.elementKindFeature(
       element,
@@ -1367,7 +1367,7 @@ class SuggestionBuilder {
   /// element. If a [prefix] is provided, then the element name (or completion)
   /// will be prefixed. The [relevance] is the relevance of the suggestion.
   CompletionSuggestionBuilder? _createCompletionSuggestionBuilder(
-    Element2 element, {
+    Element element, {
     String? completion,
     required CompletionSuggestionKind kind,
     required int relevance,
@@ -1395,7 +1395,7 @@ class SuggestionBuilder {
     );
   }
 
-  _ElementCompletionData _createElementCompletionData(Element2 element) {
+  _ElementCompletionData _createElementCompletionData(Element element) {
     var documentation = _getDocumentation(element);
 
     var suggestedElement = protocol.convertElement(element);
@@ -1404,7 +1404,7 @@ class SuggestionBuilder {
     if (element is! FormalParameterElement) {
       var enclosingElement = element.enclosingElement2;
 
-      if (enclosingElement is InterfaceElement2) {
+      if (enclosingElement is InterfaceElement) {
         declaringType = enclosingElement.displayName;
       }
     }
@@ -1417,7 +1417,7 @@ class SuggestionBuilder {
     int? requiredParameterCount;
     bool? hasNamedParameters;
     CompletionDefaultArgumentList? defaultArgumentList;
-    if (element is ExecutableElement2 && element is! PropertyAccessorElement2) {
+    if (element is ExecutableElement && element is! PropertyAccessorElement) {
       parameterNames =
           element.formalParameters.map((parameter) {
             return parameter.displayName;
@@ -1463,11 +1463,11 @@ class SuggestionBuilder {
   ///
   /// The enclosing element must be either a class, or extension; otherwise
   /// we either fail with assertion, or return `null`.
-  String? _enclosingClassOrExtensionName(Element2 element) {
+  String? _enclosingClassOrExtensionName(Element element) {
     var enclosing = element.enclosingElement2;
-    if (enclosing is InterfaceElement2) {
+    if (enclosing is InterfaceElement) {
       return enclosing.displayName;
-    } else if (enclosing is ExtensionElement2) {
+    } else if (enclosing is ExtensionElement) {
       return enclosing.displayName;
     } else {
       assert(false, 'Expected ClassElement or ExtensionElement');
@@ -1475,8 +1475,8 @@ class SuggestionBuilder {
     }
   }
 
-  String? _getCompletionString(Element2 element) {
-    if (element is MethodElement2 && element.isOperator) {
+  String? _getCompletionString(Element element) {
+    if (element is MethodElement && element.isOperator) {
       return null;
     }
 
@@ -1484,7 +1484,7 @@ class SuggestionBuilder {
   }
 
   /// If the [element] has a documentation comment, return it.
-  _ElementDocumentation? _getDocumentation(Element2 element) {
+  _ElementDocumentation? _getDocumentation(Element element) {
     var doc = request.documentationComputer.compute(
       element,
       includeSummary: true,
@@ -1509,7 +1509,7 @@ class SuggestionBuilder {
     }
   }
 
-  InterfaceType _instantiateInstanceElement(InterfaceElement2 element) {
+  InterfaceType _instantiateInstanceElement(InterfaceElement element) {
     var typeParameters = element.typeParameters2;
     var typeArguments = const <DartType>[];
     if (typeParameters.isNotEmpty) {
@@ -1522,7 +1522,7 @@ class SuggestionBuilder {
     );
   }
 
-  InterfaceType _instantiateInstanceElement2(InterfaceElement2 element) {
+  InterfaceType _instantiateInstanceElement2(InterfaceElement element) {
     var typeParameters = element.typeParameters2;
     var typeArguments = const <DartType>[];
     if (typeParameters.isNotEmpty) {
@@ -1535,7 +1535,7 @@ class SuggestionBuilder {
     );
   }
 
-  DartType _instantiateTypeAlias(TypeAliasElement2 element) {
+  DartType _instantiateTypeAlias(TypeAliasElement element) {
     var typeParameters = element.typeParameters2;
     var typeArguments = const <DartType>[];
     if (typeParameters.isNotEmpty) {
@@ -1550,7 +1550,7 @@ class SuggestionBuilder {
 
   /// If the [element] has a documentation comment, fill the [suggestion]'s
   /// documentation fields.
-  void _setDocumentation(CompletionSuggestion suggestion, Element2 element) {
+  void _setDocumentation(CompletionSuggestion suggestion, Element element) {
     var doc = request.documentationComputer.compute(
       element,
       includeSummary: true,
@@ -1561,8 +1561,8 @@ class SuggestionBuilder {
     }
   }
 
-  static String _textToMatchOverride(ExecutableElement2 element) {
-    if (element is MethodElement2 && element.isOperator) {
+  static String _textToMatchOverride(ExecutableElement element) {
+    if (element is MethodElement && element.isOperator) {
       return 'override_operator';
     }
     // Add "override" to match filter when `@override`.
@@ -1642,7 +1642,7 @@ class ValueCompletionSuggestionBuilder implements CompletionSuggestionBuilder {
 /// The implementation of [CompletionSuggestionBuilder] that is based on
 /// [_ElementCompletionData] and location specific information.
 class _CompletionSuggestionBuilderImpl implements CompletionSuggestionBuilder {
-  final Element2 orgElement;
+  final Element orgElement;
   final SuggestionBuilder suggestionBuilder;
 
   @override
@@ -1714,7 +1714,7 @@ class _CompletionSuggestionBuilderImpl implements CompletionSuggestionBuilder {
   }
 }
 
-/// Information about an [Element2] that does not depend on the location where
+/// Information about an [Element] that does not depend on the location where
 /// this element is suggested. For some often used elements, such as classes,
 /// it might be cached, so created only once.
 class _ElementCompletionData {
diff --git a/pkg/analysis_server/lib/src/services/completion/dart/utilities.dart b/pkg/analysis_server/lib/src/services/completion/dart/utilities.dart
index 16af3458eb7..53d5bb6c403 100644
--- a/pkg/analysis_server/lib/src/services/completion/dart/utilities.dart
+++ b/pkg/analysis_server/lib/src/services/completion/dart/utilities.dart
@@ -88,7 +88,7 @@ String buildClosureParameters(
 /// Compute default argument list text and ranges based on the given
 /// [requiredParams] and [namedParams].
 CompletionDefaultArgumentList computeCompletionDefaultArgumentList(
-  Element2 element,
+  Element element,
   Iterable<FormalParameterElement> requiredParams,
   Iterable<FormalParameterElement> namedParams,
 ) {
@@ -213,9 +213,9 @@ String getTypeString(DartType type) {
   }
 }
 
-/// Instantiates the given [InterfaceElement2]
+/// Instantiates the given [InterfaceElement]
 InterfaceType instantiateInstanceElement(
-  InterfaceElement2 element,
+  InterfaceElement element,
   NeverType neverType,
 ) {
   var typeParameters = element.typeParameters2;
@@ -233,7 +233,7 @@ InterfaceType instantiateInstanceElement(
 /// `Widget`.
 bool isFlutterWidgetParameter(FormalParameterElement parameter) {
   var element = parameter.enclosingElement2;
-  if (element is ConstructorElement2 && element.enclosingElement2.isWidget) {
+  if (element is ConstructorElement && element.enclosingElement2.isWidget) {
     return true;
   }
   return false;
@@ -247,19 +247,19 @@ String? nameForType(SimpleIdentifier identifier, TypeAnnotation? declaredType) {
   var element = identifier.element;
   if (element == null) {
     return DYNAMIC;
-  } else if (element is FunctionTypedElement2) {
-    if (element is PropertyAccessorElement2 && element is SetterElement) {
+  } else if (element is FunctionTypedElement) {
+    if (element is PropertyAccessorElement && element is SetterElement) {
       return null;
     }
     type = element.returnType;
-  } else if (element is TypeAliasElement2) {
+  } else if (element is TypeAliasElement) {
     var aliasedType = element.aliasedType;
     if (aliasedType is FunctionType) {
       type = aliasedType.returnType;
     } else {
       return null;
     }
-  } else if (element is VariableElement2) {
+  } else if (element is VariableElement) {
     type = element.type;
   } else {
     return null;
diff --git a/pkg/analysis_server/lib/src/services/completion/dart/visibility_tracker.dart b/pkg/analysis_server/lib/src/services/completion/dart/visibility_tracker.dart
index ade38aa514f..eca3029fa68 100644
--- a/pkg/analysis_server/lib/src/services/completion/dart/visibility_tracker.dart
+++ b/pkg/analysis_server/lib/src/services/completion/dart/visibility_tracker.dart
@@ -21,10 +21,7 @@ class VisibilityTracker {
   /// by being `null` or by returning `false` from `isNotImported`) and the name
   /// is visible, it will be added to the list of [_declaredNames] so that it
   /// will shadow any elements of the same name further up the scope chain.
-  bool isVisible({
-    required Element2? element,
-    required ImportData? importData,
-  }) {
+  bool isVisible({required Element? element, required ImportData? importData}) {
     var name = element?.displayName;
     if (name == null) {
       return false;
diff --git a/pkg/analysis_server/lib/src/services/completion/postfix/postfix_completion.dart b/pkg/analysis_server/lib/src/services/completion/postfix/postfix_completion.dart
index c2759a5747b..9e9f9db4a27 100644
--- a/pkg/analysis_server/lib/src/services/completion/postfix/postfix_completion.dart
+++ b/pkg/analysis_server/lib/src/services/completion/postfix/postfix_completion.dart
@@ -623,7 +623,7 @@ final class PostfixCompletionProcessor {
   }
 
   Expression? _findOuterExpression(AstNode? start, InterfaceType builtInType) {
-    if (start is SimpleIdentifier && start.element is PrefixElement2) {
+    if (start is SimpleIdentifier && start.element is PrefixElement) {
       return null;
     }
 
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/add_diagnostic_property_reference.dart b/pkg/analysis_server/lib/src/services/correction/dart/add_diagnostic_property_reference.dart
index af97fc8c768..a4bf2de9d7a 100644
--- a/pkg/analysis_server/lib/src/services/correction/dart/add_diagnostic_property_reference.dart
+++ b/pkg/analysis_server/lib/src/services/correction/dart/add_diagnostic_property_reference.dart
@@ -417,7 +417,7 @@ class AddDiagnosticPropertyReference extends ResolvedCorrectionProducer {
         }
       case VariableDeclaration():
         var element = node.declaredFragment?.element;
-        if (element is FieldElement2) {
+        if (element is FieldElement) {
           return element.type;
         }
     }
@@ -425,7 +425,7 @@ class AddDiagnosticPropertyReference extends ResolvedCorrectionProducer {
   }
 
   bool _isEnum(DartType type) {
-    return type is InterfaceType && type.element3 is EnumElement2;
+    return type is InterfaceType && type.element3 is EnumElement;
   }
 
   bool _isIterable(DartType type) {
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/add_enum_constant.dart b/pkg/analysis_server/lib/src/services/correction/dart/add_enum_constant.dart
index b053128d46b..64a6014c281 100644
--- a/pkg/analysis_server/lib/src/services/correction/dart/add_enum_constant.dart
+++ b/pkg/analysis_server/lib/src/services/correction/dart/add_enum_constant.dart
@@ -37,7 +37,7 @@ class AddEnumConstant extends ResolvedCorrectionProducer {
     var target = parent.prefix;
 
     var targetElement = target.element;
-    if (targetElement is! EnumElement2) return;
+    if (targetElement is! EnumElement) return;
     if (targetElement.library2.isInSdk) return;
 
     var targetFragment = targetElement.firstFragment;
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/add_field_formal_parameters.dart b/pkg/analysis_server/lib/src/services/correction/dart/add_field_formal_parameters.dart
index 83136565d0d..06bcffe313f 100644
--- a/pkg/analysis_server/lib/src/services/correction/dart/add_field_formal_parameters.dart
+++ b/pkg/analysis_server/lib/src/services/correction/dart/add_field_formal_parameters.dart
@@ -42,7 +42,7 @@ class AddFieldFormalParameters extends ResolvedCorrectionProducer {
 
     // Compute uninitialized final fields.
     var fields = ErrorVerifier.computeNotInitializedFields(constructor);
-    fields.retainWhere((FieldElement2 field) => field.isFinal);
+    fields.retainWhere((FieldElement field) => field.isFinal);
     fields.sort(
       (a, b) => a.firstFragment.nameOffset2! - b.firstFragment.nameOffset2!,
     );
@@ -51,7 +51,7 @@ class AddFieldFormalParameters extends ResolvedCorrectionProducer {
     if (superType.isExactlyStatelessWidgetType ||
         superType.isExactlyStatefulWidgetType) {
       if (parameters.isNotEmpty && parameters.last.isNamed) {
-        String parameterForField(FieldElement2 field) {
+        String parameterForField(FieldElement field) {
           var prefix = '';
           if (typeSystem.isPotentiallyNonNullable(field.type)) {
             prefix = 'required ';
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/add_key_to_constructors.dart b/pkg/analysis_server/lib/src/services/correction/dart/add_key_to_constructors.dart
index 10d04f4b214..0df8a815ed6 100644
--- a/pkg/analysis_server/lib/src/services/correction/dart/add_key_to_constructors.dart
+++ b/pkg/analysis_server/lib/src/services/correction/dart/add_key_to_constructors.dart
@@ -45,7 +45,7 @@ class AddKeyToConstructors extends ResolvedCorrectionProducer {
   /// Return `true` if the [classDeclaration] can be instantiated as a `const`.
   bool _canBeConst(
     ClassDeclaration classDeclaration,
-    List<ConstructorElement2> constructors,
+    List<ConstructorElement> constructors,
   ) {
     for (var constructor in constructors) {
       if (constructor.isDefaultConstructor && !constructor.isConst) {
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/add_late.dart b/pkg/analysis_server/lib/src/services/correction/dart/add_late.dart
index 2c57efafb7b..49b2b907bd6 100644
--- a/pkg/analysis_server/lib/src/services/correction/dart/add_late.dart
+++ b/pkg/analysis_server/lib/src/services/correction/dart/add_late.dart
@@ -61,7 +61,7 @@ class AddLate extends ResolvedCorrectionProducer {
       var getter = node.writeOrReadElement2;
       if (getter is GetterElement &&
           getter.isSynthetic &&
-          getter.enclosingElement2 is InterfaceElement2) {
+          getter.enclosingElement2 is InterfaceElement) {
         var variableElement = getter.variable3;
         if (variableElement != null &&
             !variableElement.isSynthetic &&
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/add_missing_enum_case_clauses.dart b/pkg/analysis_server/lib/src/services/correction/dart/add_missing_enum_case_clauses.dart
index 7bbc43e9b24..af4c4e14363 100644
--- a/pkg/analysis_server/lib/src/services/correction/dart/add_missing_enum_case_clauses.dart
+++ b/pkg/analysis_server/lib/src/services/correction/dart/add_missing_enum_case_clauses.dart
@@ -45,7 +45,7 @@ class AddMissingEnumCaseClauses extends ResolvedCorrectionProducer {
     var expressionType = statement.expression.staticType;
     if (expressionType is InterfaceType) {
       var enumElement = expressionType.element3;
-      if (enumElement is EnumElement2) {
+      if (enumElement is EnumElement) {
         enumName = enumElement.name3;
         for (var field in enumElement.fields2) {
           if (field.isEnumConstant) {
@@ -122,7 +122,7 @@ class AddMissingEnumCaseClauses extends ResolvedCorrectionProducer {
 
   /// Return the shortest prefix for the [element], or an empty String if not
   /// found.
-  String _importPrefix(Element2 element) {
+  String _importPrefix(Element element) {
     var shortestPrefix = '';
     for (var directive in unit.directives) {
       if (directive is ImportDirective) {
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/add_missing_enum_like_case_clauses.dart b/pkg/analysis_server/lib/src/services/correction/dart/add_missing_enum_like_case_clauses.dart
index e6fdaf1a22a..569053a2f94 100644
--- a/pkg/analysis_server/lib/src/services/correction/dart/add_missing_enum_like_case_clauses.dart
+++ b/pkg/analysis_server/lib/src/services/correction/dart/add_missing_enum_like_case_clauses.dart
@@ -101,7 +101,7 @@ class AddMissingEnumLikeCaseClauses extends ResolvedCorrectionProducer {
   }
 
   /// Return the names of the constants defined in [classElement].
-  List<String> _constantNames(InterfaceElement2 classElement) {
+  List<String> _constantNames(InterfaceElement classElement) {
     var type = classElement.thisType;
     var constantNames = <String>[];
     for (var field in classElement.fields2) {
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/add_missing_required_argument.dart b/pkg/analysis_server/lib/src/services/correction/dart/add_missing_required_argument.dart
index a9c39b06f95..b9a8aa3ab90 100644
--- a/pkg/analysis_server/lib/src/services/correction/dart/add_missing_required_argument.dart
+++ b/pkg/analysis_server/lib/src/services/correction/dart/add_missing_required_argument.dart
@@ -47,7 +47,7 @@ class AddMissingRequiredArgument extends ResolvedCorrectionProducer {
   @override
   Future<void> compute(ChangeBuilder builder) async {
     InstanceCreationExpression? creation;
-    Element2? targetElement;
+    Element? targetElement;
     ArgumentList? argumentList;
 
     if (node is SimpleIdentifier ||
@@ -91,7 +91,7 @@ class AddMissingRequiredArgument extends ResolvedCorrectionProducer {
     _missingParameters = errors.length;
 
     for (var (index, diagnostic) in errors.indexed) {
-      if (targetElement is ExecutableElement2 && argumentList != null) {
+      if (targetElement is ExecutableElement && argumentList != null) {
         // Format: "Missing required argument 'foo'."
         var messageParts = diagnostic.problemMessage
             .messageText(includeUrl: false)
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/add_super_constructor_invocation.dart b/pkg/analysis_server/lib/src/services/correction/dart/add_super_constructor_invocation.dart
index 41d6b7f0710..ec072f56b88 100644
--- a/pkg/analysis_server/lib/src/services/correction/dart/add_super_constructor_invocation.dart
+++ b/pkg/analysis_server/lib/src/services/correction/dart/add_super_constructor_invocation.dart
@@ -60,7 +60,7 @@ class AddSuperConstructorInvocation extends MultiCorrectionProducer {
 /// the [AddSuperConstructorInvocation] producer.
 class _AddInvocation extends ResolvedCorrectionProducer {
   /// The constructor to be invoked.
-  final ConstructorElement2 _constructor;
+  final ConstructorElement _constructor;
 
   /// The offset at which the initializer is to be inserted.
   final int _insertOffset;
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/add_type_annotation.dart b/pkg/analysis_server/lib/src/services/correction/dart/add_type_annotation.dart
index b7fd1723d8a..3f82622dbcc 100644
--- a/pkg/analysis_server/lib/src/services/correction/dart/add_type_annotation.dart
+++ b/pkg/analysis_server/lib/src/services/correction/dart/add_type_annotation.dart
@@ -243,7 +243,7 @@ class _AssignedTypeCollector extends RecursiveAstVisitor<void> {
   /// The type system used to compute the best type.
   final TypeSystem typeSystem;
 
-  final LocalVariableElement2 variable;
+  final LocalVariableElement variable;
 
   /// The types that are assigned to the variable.
   final Set<DartType> assignedTypes = {};
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/ambiguous_import_fix.dart b/pkg/analysis_server/lib/src/services/correction/dart/ambiguous_import_fix.dart
index 3b5be07000c..02bdfefa201 100644
--- a/pkg/analysis_server/lib/src/services/correction/dart/ambiguous_import_fix.dart
+++ b/pkg/analysis_server/lib/src/services/correction/dart/ambiguous_import_fix.dart
@@ -21,7 +21,7 @@ class AmbiguousImportFix extends MultiCorrectionProducer {
   @override
   Future<List<ResolvedCorrectionProducer>> get producers async {
     var node = this.node;
-    Element2? element;
+    Element? element;
     String? prefix;
     if (node is NamedType) {
       element = node.element2;
@@ -34,7 +34,7 @@ class AmbiguousImportFix extends MultiCorrectionProducer {
         prefix = currentPrefix.name;
       }
     }
-    if (element is! MultiplyDefinedElement2) {
+    if (element is! MultiplyDefinedElement) {
       return const [];
     }
     var conflictingElements = element.conflictingElements2;
@@ -99,7 +99,7 @@ class AmbiguousImportFix extends MultiCorrectionProducer {
   _getImportDirectives(
     ResolvedLibraryResult libraryResult,
     ResolvedUnitResult? unitResult,
-    List<Element2> conflictingElements,
+    List<Element> conflictingElements,
     String name,
     String? prefix,
   ) {
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/change_to.dart b/pkg/analysis_server/lib/src/services/correction/dart/change_to.dart
index 66fbc0ae701..4ed697f0a30 100644
--- a/pkg/analysis_server/lib/src/services/correction/dart/change_to.dart
+++ b/pkg/analysis_server/lib/src/services/correction/dart/change_to.dart
@@ -16,7 +16,7 @@ import 'package:analyzer_plugin/utilities/fixes/fixes.dart';
 import 'package:analyzer_plugin/utilities/range_factory.dart';
 
 /// A predicate is a one-argument function that returns a boolean value.
-typedef _ElementPredicate = bool Function(Element2 argument);
+typedef _ElementPredicate = bool Function(Element argument);
 
 class ChangeTo extends ResolvedCorrectionProducer {
   /// The kind of elements that should be proposed.
@@ -84,7 +84,7 @@ class ChangeTo extends ResolvedCorrectionProducer {
   }
 
   Iterable<FormalParameterElement> _formalParameterSuggestions(
-    FunctionTypedElement2 element,
+    FunctionTypedElement element,
     Iterable<FormalParameter> formalParameters,
   ) {
     return element.formalParameters.where(
@@ -117,7 +117,7 @@ class ChangeTo extends ResolvedCorrectionProducer {
       nameToken = node.name2;
     } else if (node is PrefixedIdentifier &&
         node.parent is NamedType &&
-        node.prefix.element is PrefixElement2) {
+        node.prefix.element is PrefixElement) {
       prefixName = node.prefix.name;
       nameToken = node.identifier.token;
     } else if (node is SimpleIdentifier) {
@@ -128,7 +128,7 @@ class ChangeTo extends ResolvedCorrectionProducer {
       // Prepare for selecting the closest element.
       var finder = _ClosestElementFinder(
         nameToken.lexeme,
-        (element) => element is InterfaceElement2,
+        (element) => element is InterfaceElement,
       );
       // Check elements of this library.
       if (prefixName == null) {
@@ -164,7 +164,7 @@ class ChangeTo extends ResolvedCorrectionProducer {
       }
     } else if (target is ExtensionOverride) {
       _updateFinderWithExtensionMembers(finder, target.element2);
-    } else if (targetIdentifierElement is ExtensionElement2) {
+    } else if (targetIdentifierElement is ExtensionElement) {
       _updateFinderWithExtensionMembers(finder, targetIdentifierElement);
     } else {
       var interfaceElement = getTargetInterfaceElement(target);
@@ -203,7 +203,7 @@ class ChangeTo extends ResolvedCorrectionProducer {
 
     var type = node.type?.type;
     await _proposeClassOrMixinMember(builder, node.name, null, (element) {
-      return element is FieldElement2 &&
+      return element is FieldElement &&
           !exclusions.contains(element.name3) &&
           !element.isSynthetic &&
           !element.isExternal &&
@@ -225,7 +225,7 @@ class ChangeTo extends ResolvedCorrectionProducer {
         var invocation = node.parent;
         if (invocation is MethodInvocation && invocation.methodName == node) {
           var target = invocation.target;
-          if (target is SimpleIdentifier && target.element is PrefixElement2) {
+          if (target is SimpleIdentifier && target.element is PrefixElement) {
             prefixName = target.name;
           }
         }
@@ -273,7 +273,7 @@ class ChangeTo extends ResolvedCorrectionProducer {
           return wantGetter;
         } else if (element is SetterElement) {
           return wantSetter;
-        } else if (element is FieldElement2) {
+        } else if (element is FieldElement) {
           return wantGetter && element.getter2 != null ||
               wantSetter && element.setter2 != null;
         }
@@ -290,7 +290,7 @@ class ChangeTo extends ResolvedCorrectionProducer {
         builder,
         node.token,
         parent.realTarget,
-        (element) => element is MethodElement2 && !element.isOperator,
+        (element) => element is MethodElement && !element.isOperator,
       );
     }
   }
@@ -354,7 +354,7 @@ class ChangeTo extends ResolvedCorrectionProducer {
 
   void _updateFinderWithClassMembers(
     _ClosestElementFinder finder,
-    InterfaceElement2 clazz,
+    InterfaceElement clazz,
   ) {
     var members = getMembers(clazz);
     finder._updateList(members);
@@ -362,7 +362,7 @@ class ChangeTo extends ResolvedCorrectionProducer {
 
   void _updateFinderWithExtensionMembers(
     _ClosestElementFinder finder,
-    ExtensionElement2? element,
+    ExtensionElement? element,
   ) {
     if (element != null) {
       finder._updateList(getExtensionMembers(element));
@@ -370,7 +370,7 @@ class ChangeTo extends ResolvedCorrectionProducer {
   }
 }
 
-/// Helper for finding [Element2] with name closest to the given.
+/// Helper for finding [Element] with name closest to the given.
 class _ClosestElementFinder {
   /// The maximum Levenshtein distance between the existing name and a possible
   /// replacement before the replacement is deemed to not be worth offering.
@@ -385,11 +385,11 @@ class _ClosestElementFinder {
 
   int _distance = _maxDistance;
 
-  Element2? _element;
+  Element? _element;
 
   _ClosestElementFinder(this._targetName, this._predicate);
 
-  void _update(Element2 element) {
+  void _update(Element element) {
     if (_predicate(element)) {
       var name = element.name3;
       if (name != null) {
@@ -402,7 +402,7 @@ class _ClosestElementFinder {
     }
   }
 
-  void _updateList(Iterable<Element2> elements) {
+  void _updateList(Iterable<Element> elements) {
     for (var element in elements) {
       _update(element);
     }
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/change_to_static_access.dart b/pkg/analysis_server/lib/src/services/correction/dart/change_to_static_access.dart
index 6680d8b226e..c187e7a2f63 100644
--- a/pkg/analysis_server/lib/src/services/correction/dart/change_to_static_access.dart
+++ b/pkg/analysis_server/lib/src/services/correction/dart/change_to_static_access.dart
@@ -50,13 +50,13 @@ class ChangeToStaticAccess extends ResolvedCorrectionProducer {
     }
 
     var invokedElement = identifier.element;
-    if (invokedElement is! ExecutableElement2) {
+    if (invokedElement is! ExecutableElement) {
       return;
     }
 
     var declaringElement = invokedElement.enclosingElement2;
 
-    if (declaringElement is InterfaceElement2) {
+    if (declaringElement is InterfaceElement) {
       var declaringElementName = declaringElement.name3;
       if (declaringElementName != null) {
         _className = declaringElementName;
@@ -66,7 +66,7 @@ class ChangeToStaticAccess extends ResolvedCorrectionProducer {
           });
         });
       }
-    } else if (declaringElement is ExtensionElement2) {
+    } else if (declaringElement is ExtensionElement) {
       var extensionName = declaringElement.name3;
       if (extensionName != null) {
         _className = extensionName;
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/convert_class_to_enum.dart b/pkg/analysis_server/lib/src/services/correction/dart/convert_class_to_enum.dart
index a781d6656e0..0acf5be3a0e 100644
--- a/pkg/analysis_server/lib/src/services/correction/dart/convert_class_to_enum.dart
+++ b/pkg/analysis_server/lib/src/services/correction/dart/convert_class_to_enum.dart
@@ -71,7 +71,7 @@ class ConvertClassToEnum extends ResolvedCorrectionProducer {
 /// A superclass for the [_EnumVisitor] and [_NonEnumVisitor].
 class _BaseVisitor extends RecursiveAstVisitor<void> {
   /// The element representing the enum declaration that's being visited.
-  final ClassElement2 classElement;
+  final ClassElement classElement;
 
   _BaseVisitor(this.classElement);
 
@@ -97,7 +97,7 @@ class _CannotConvertException implements Exception {
 /// replaced by an enum constant.
 class _ConstantField extends _Field {
   /// The element representing the constructor used to initialize the field.
-  ConstructorElement2 constructorElement;
+  ConstructorElement constructorElement;
 
   /// The invocation of the constructor.
   final InstanceCreationExpression instanceCreation;
@@ -122,7 +122,7 @@ class _Constructor {
   final ConstructorDeclaration declaration;
 
   /// The element representing the constructor.
-  final ConstructorElement2 element;
+  final ConstructorElement element;
 
   _Constructor(this.declaration, this.element);
 }
@@ -130,7 +130,7 @@ class _Constructor {
 /// Information about the constructors in the class being converted.
 class _Constructors {
   /// A map from elements to constructors.
-  final Map<ConstructorElement2, _Constructor> byElement = {};
+  final Map<ConstructorElement, _Constructor> byElement = {};
 
   _Constructors();
 
@@ -143,7 +143,7 @@ class _Constructors {
   }
 
   /// Return the constructor with the given [element].
-  _Constructor? forElement(ConstructorElement2 element) {
+  _Constructor? forElement(ConstructorElement element) {
     return byElement[element];
   }
 }
@@ -449,7 +449,7 @@ class _EnumDescription {
     _Constructors constructors,
     _Fields fields,
   ) {
-    var usedElements = <ConstructorElement2>{};
+    var usedElements = <ConstructorElement>{};
     for (var field in fields.fieldsToConvert) {
       usedElements.add(field.constructorElement);
     }
@@ -533,7 +533,7 @@ class _EnumDescription {
     var indexFieldElement = indexField.element;
     for (var i = 0; i < parameters.length; i++) {
       var element = parameters[i].declaredFragment!.element;
-      if (element is FieldFormalParameterElement2) {
+      if (element is FieldFormalParameterElement) {
         if (element.field2 == indexFieldElement) {
           if (element.isPositional) {
             return _Parameter(i, element);
@@ -552,13 +552,13 @@ class _EnumDescription {
   /// The [classElement] must be the element declared by the [classDeclaration].
   static _Constructors? _validateConstructors(
     ClassDeclaration classDeclaration,
-    ClassElement2 classElement,
+    ClassElement classElement,
   ) {
     var constructors = _Constructors();
     for (var member in classDeclaration.members) {
       if (member is ConstructorDeclaration) {
         var constructor = member.declaredFragment?.element;
-        if (constructor is ConstructorElement2) {
+        if (constructor is ConstructorElement) {
           if (!classElement.isPrivate && !constructor.isPrivate) {
             // Public constructor in public enum.
             return null;
@@ -582,7 +582,7 @@ class _EnumDescription {
   /// The [classElement] must be the element declared by the [classDeclaration].
   static _Fields? _validateFields(
     ClassDeclaration classDeclaration,
-    ClassElement2 classElement, {
+    ClassElement classElement, {
     required bool strictCasts,
   }) {
     var potentialFieldsToConvert = <DartObject, List<_ConstantField>>{};
@@ -595,7 +595,7 @@ class _EnumDescription {
         if (member.isStatic) {
           for (var field in fields) {
             var fieldElement = field.declaredFragment?.element;
-            if (fieldElement is FieldElement2) {
+            if (fieldElement is FieldElement) {
               var fieldType = fieldElement.type;
               // The field can be converted to be an enum constant if it
               // - is a const field,
@@ -643,7 +643,7 @@ class _EnumDescription {
               return null;
             }
             var fieldElement = field.declaredFragment?.element;
-            if (fieldElement is FieldElement2) {
+            if (fieldElement is FieldElement) {
               var fieldType = fieldElement.type;
               if (fieldElement.name3 == 'index' && fieldType.isDartCoreInt) {
                 indexField = _Field(fieldElement, field, fieldList, member);
@@ -728,7 +728,7 @@ class _EnumVisitor extends _BaseVisitor {
 /// A representation of a field of interest in the class being converted.
 class _Field {
   /// The element representing the field.
-  final FieldElement2 element;
+  final FieldElement element;
 
   /// The declaration of the field.
   final VariableDeclaration declaration;
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/convert_class_to_mixin.dart b/pkg/analysis_server/lib/src/services/correction/dart/convert_class_to_mixin.dart
index 892c197ecad..7d6ceb3b859 100644
--- a/pkg/analysis_server/lib/src/services/correction/dart/convert_class_to_mixin.dart
+++ b/pkg/analysis_server/lib/src/services/correction/dart/convert_class_to_mixin.dart
@@ -91,7 +91,7 @@ class ConvertClassToMixin extends ResolvedCorrectionProducer {
 /// A visitor used to find all of the classes that define members referenced via
 /// `super`.
 class _SuperclassReferenceFinder extends RecursiveAstVisitor<void> {
-  final List<ClassElement2> referencedClasses = [];
+  final List<ClassElement> referencedClasses = [];
 
   _SuperclassReferenceFinder();
 
@@ -112,10 +112,10 @@ class _SuperclassReferenceFinder extends RecursiveAstVisitor<void> {
     return super.visitSuperExpression(node);
   }
 
-  void _addElement(Element2? element) {
-    if (element is ExecutableElement2) {
+  void _addElement(Element? element) {
+    if (element is ExecutableElement) {
       var enclosingElement = element.enclosingElement2;
-      if (enclosingElement is ClassElement2) {
+      if (enclosingElement is ClassElement) {
         referencedClasses.add(enclosingElement);
       }
     }
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/convert_into_block_body.dart b/pkg/analysis_server/lib/src/services/correction/dart/convert_into_block_body.dart
index 1b85b1c4dfe..f0fd3d9ef32 100644
--- a/pkg/analysis_server/lib/src/services/correction/dart/convert_into_block_body.dart
+++ b/pkg/analysis_server/lib/src/services/correction/dart/convert_into_block_body.dart
@@ -179,7 +179,7 @@ class ConvertIntoBlockBody extends ResolvedCorrectionProducer {
     return [returnCode];
   }
 
-  ExecutableElement2? _getFunctionElement(AstNode? node) {
+  ExecutableElement? _getFunctionElement(AstNode? node) {
     if (node is MethodDeclaration) {
       return node.declaredFragment?.element;
     } else if (node is ConstructorDeclaration) {
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/convert_into_final_field.dart b/pkg/analysis_server/lib/src/services/correction/dart/convert_into_final_field.dart
index 94983265f23..458ee143f2a 100644
--- a/pkg/analysis_server/lib/src/services/correction/dart/convert_into_final_field.dart
+++ b/pkg/analysis_server/lib/src/services/correction/dart/convert_into_final_field.dart
@@ -57,7 +57,7 @@ class ConvertIntoFinalField extends ResolvedCorrectionProducer {
     // static.
     if (!getterElement.isStatic) {
       switch (getterElement.enclosingElement2) {
-        case ExtensionElement2() || ExtensionTypeElement2():
+        case ExtensionElement() || ExtensionTypeElement():
           return;
       }
     }
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/convert_into_for_index.dart b/pkg/analysis_server/lib/src/services/correction/dart/convert_into_for_index.dart
index c097f6973a3..319b5e393f7 100644
--- a/pkg/analysis_server/lib/src/services/correction/dart/convert_into_for_index.dart
+++ b/pkg/analysis_server/lib/src/services/correction/dart/convert_into_for_index.dart
@@ -51,7 +51,7 @@ class ConvertIntoForIndex extends ResolvedCorrectionProducer {
     // iterable should be VariableElement
     String listName;
     var iterable = forEachParts.iterable;
-    if (iterable is SimpleIdentifier && iterable.element is VariableElement2) {
+    if (iterable is SimpleIdentifier && iterable.element is VariableElement) {
       listName = iterable.name;
     } else {
       return;
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/convert_null_check_to_null_aware_element_or_entry.dart b/pkg/analysis_server/lib/src/services/correction/dart/convert_null_check_to_null_aware_element_or_entry.dart
index 251c174a9fb..ce4cd69ef49 100644
--- a/pkg/analysis_server/lib/src/services/correction/dart/convert_null_check_to_null_aware_element_or_entry.dart
+++ b/pkg/analysis_server/lib/src/services/correction/dart/convert_null_check_to_null_aware_element_or_entry.dart
@@ -143,7 +143,7 @@ class ConvertNullCheckToNullAwareElementOrEntry
 }
 
 extension AstNodeNullableExtension on AstNode? {
-  Element2? get canonicalElement {
+  Element? get canonicalElement {
     var self = this;
     if (self is Expression) {
       var node = self.unParenthesized;
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/convert_to_if_case_statement.dart b/pkg/analysis_server/lib/src/services/correction/dart/convert_to_if_case_statement.dart
index b3191a33ef5..3433e8d1b3f 100644
--- a/pkg/analysis_server/lib/src/services/correction/dart/convert_to_if_case_statement.dart
+++ b/pkg/analysis_server/lib/src/services/correction/dart/convert_to_if_case_statement.dart
@@ -180,7 +180,7 @@ class ConvertToIfCaseStatement extends ResolvedCorrectionProducer {
 class _DeclaredVariable {
   final VariableDeclarationStatement statement;
   final VariableDeclaration declaration;
-  final LocalVariableElement2 element;
+  final LocalVariableElement element;
   final Expression initializer;
 
   _DeclaredVariable({
@@ -196,7 +196,7 @@ class _DeclaredVariable {
 }
 
 class _ReferenceVisitor extends RecursiveAstVisitor<void> {
-  final LocalVariableElement2 element;
+  final LocalVariableElement element;
   bool hasReference = false;
 
   _ReferenceVisitor(this.element);
@@ -240,7 +240,7 @@ extension on Statement {
     }
 
     var declaredElement = declaration.declaredElement2;
-    if (declaredElement is! LocalVariableElement2) {
+    if (declaredElement is! LocalVariableElement) {
       return null;
     }
 
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/convert_to_initializing_formal.dart b/pkg/analysis_server/lib/src/services/correction/dart/convert_to_initializing_formal.dart
index 859379a3ca4..3d5c617bcab 100644
--- a/pkg/analysis_server/lib/src/services/correction/dart/convert_to_initializing_formal.dart
+++ b/pkg/analysis_server/lib/src/services/correction/dart/convert_to_initializing_formal.dart
@@ -82,7 +82,7 @@ class ConvertToInitializingFormal extends ResolvedCorrectionProducer {
       }
 
       var fieldElement = node.fieldName.element;
-      if (fieldElement is! VariableElement2) {
+      if (fieldElement is! VariableElement) {
         return;
       }
 
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/convert_to_map_literal.dart b/pkg/analysis_server/lib/src/services/correction/dart/convert_to_map_literal.dart
index 039b5958d41..7f6fd247c36 100644
--- a/pkg/analysis_server/lib/src/services/correction/dart/convert_to_map_literal.dart
+++ b/pkg/analysis_server/lib/src/services/correction/dart/convert_to_map_literal.dart
@@ -83,7 +83,7 @@ class ConvertToMapLiteral extends ResolvedCorrectionProducer {
 
   /// Return `true` if the [element] represents either the class `Map` or
   /// `LinkedHashMap`.
-  bool _isMapClass(InterfaceElement2 element) =>
+  bool _isMapClass(InterfaceElement element) =>
       element == typeProvider.mapElement2 ||
       (element.name3 == 'LinkedHashMap' &&
           element.library2.name3 == 'dart.collection');
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/convert_to_switch_expression.dart b/pkg/analysis_server/lib/src/services/correction/dart/convert_to_switch_expression.dart
index 195f6789068..b0de957b7f7 100644
--- a/pkg/analysis_server/lib/src/services/correction/dart/convert_to_switch_expression.dart
+++ b/pkg/analysis_server/lib/src/services/correction/dart/convert_to_switch_expression.dart
@@ -19,7 +19,7 @@ import 'package:analyzer_plugin/utilities/range_factory.dart';
 
 class ConvertToSwitchExpression extends ResolvedCorrectionProducer {
   /// Local variable reference used in assignment switch expression generation.
-  LocalVariableElement2? writeElement;
+  LocalVariableElement? writeElement;
 
   /// Assignment operator used in assignment switch expression generation.
   TokenType? assignmentOperator;
@@ -488,7 +488,7 @@ class ConvertToSwitchExpression extends ResolvedCorrectionProducer {
           if (leftHandSide is! SimpleIdentifierImpl) return null;
           if (writeElement == null) {
             var element = leftHandSide.element;
-            if (element is! LocalVariableElement2) return null;
+            if (element is! LocalVariableElement) return null;
             writeElement = element;
             assignmentOperator = expression.operator.type;
           } else if (writeElement != leftHandSide.element ||
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/convert_to_wildcard_variable.dart b/pkg/analysis_server/lib/src/services/correction/dart/convert_to_wildcard_variable.dart
index 4e46ae39499..6a023f1be02 100644
--- a/pkg/analysis_server/lib/src/services/correction/dart/convert_to_wildcard_variable.dart
+++ b/pkg/analysis_server/lib/src/services/correction/dart/convert_to_wildcard_variable.dart
@@ -47,7 +47,7 @@ class ConvertToWildcardVariable extends ResolvedCorrectionProducer {
 
     var nameToken = node.name;
     var element = node.declaredElement2;
-    if (element is! LocalVariableElement2) {
+    if (element is! LocalVariableElement) {
       return;
     }
 
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/create_class.dart b/pkg/analysis_server/lib/src/services/correction/dart/create_class.dart
index 220a8f13421..33d043f6bc9 100644
--- a/pkg/analysis_server/lib/src/services/correction/dart/create_class.dart
+++ b/pkg/analysis_server/lib/src/services/correction/dart/create_class.dart
@@ -30,7 +30,7 @@ class CreateClass extends ResolvedCorrectionProducer {
   @override
   Future<void> compute(ChangeBuilder builder) async {
     var targetNode = node;
-    Element2? prefixElement;
+    Element? prefixElement;
     ArgumentList? arguments;
 
     String? className;
@@ -94,7 +94,7 @@ class CreateClass extends ResolvedCorrectionProducer {
       prefix = '$eol$eol';
     } else {
       for (var import in libraryElement2.firstFragment.libraryImports2) {
-        if (prefixElement is PrefixElement2 &&
+        if (prefixElement is PrefixElement &&
             import.prefix2?.element == prefixElement) {
           var library = import.importedLibrary2;
           if (library != null) {
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/create_constructor.dart b/pkg/analysis_server/lib/src/services/correction/dart/create_constructor.dart
index 954aad527e0..07d83c0c853 100644
--- a/pkg/analysis_server/lib/src/services/correction/dart/create_constructor.dart
+++ b/pkg/analysis_server/lib/src/services/correction/dart/create_constructor.dart
@@ -176,7 +176,7 @@ class CreateConstructor extends ResolvedCorrectionProducer {
     }
 
     var targetElement = constructorElement.enclosingElement2;
-    var targetFragment = (targetElement as ClassElement2).firstFragment;
+    var targetFragment = (targetElement as ClassElement).firstFragment;
 
     var targetElementName = targetElement.name3;
     if (targetElementName == null) {
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/create_constructor_super.dart b/pkg/analysis_server/lib/src/services/correction/dart/create_constructor_super.dart
index cf8ccb45b74..102e10c0c6d 100644
--- a/pkg/analysis_server/lib/src/services/correction/dart/create_constructor_super.dart
+++ b/pkg/analysis_server/lib/src/services/correction/dart/create_constructor_super.dart
@@ -45,7 +45,7 @@ class CreateConstructorSuper extends MultiCorrectionProducer {
 /// the [CreateConstructorSuper] producer.
 class _CreateConstructor extends ResolvedCorrectionProducer {
   /// The constructor to be invoked.
-  final ConstructorElement2 _constructor;
+  final ConstructorElement _constructor;
 
   /// The class in which the constructor will be added.
   final ClassDeclaration _targetClass;
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/create_extension_member.dart b/pkg/analysis_server/lib/src/services/correction/dart/create_extension_member.dart
index 14f8e7adc2a..850b3a0a255 100644
--- a/pkg/analysis_server/lib/src/services/correction/dart/create_extension_member.dart
+++ b/pkg/analysis_server/lib/src/services/correction/dart/create_extension_member.dart
@@ -418,7 +418,7 @@ abstract class _CreateExtensionMember extends ResolvedCorrectionProducer {
     return CorrectionApplicability.singleLocation;
   }
 
-  ExecutableElement2? get methodBeingCopied =>
+  ExecutableElement? get methodBeingCopied =>
       _enclosingFunction?.declaredFragment?.element;
 
   FunctionDeclaration? get _enclosingFunction => node.thisOrAncestorOfType();
@@ -517,7 +517,7 @@ extension on List<DartType?> {
   /// it uses and get any type parameters they use by using this same getter.
   ///
   /// These types are added internally to a set so that we don't add duplicates.
-  List<TypeParameterElement2> get typeParameters =>
+  List<TypeParameterElement> get typeParameters =>
       {
         for (var type in whereType<TypeParameterType>()) ...[
           type.element3,
@@ -528,10 +528,10 @@ extension on List<DartType?> {
       }.toList();
 }
 
-extension on Element2? {
+extension on Element? {
   bool get declaresIndex {
     var element = this;
-    if (element is! InterfaceElement2) {
+    if (element is! InterfaceElement) {
       return false;
     }
     var inheritanceManager3 = InheritanceManager3();
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/create_field.dart b/pkg/analysis_server/lib/src/services/correction/dart/create_field.dart
index 13279718a3d..50dcc9fd8bf 100644
--- a/pkg/analysis_server/lib/src/services/correction/dart/create_field.dart
+++ b/pkg/analysis_server/lib/src/services/correction/dart/create_field.dart
@@ -33,7 +33,7 @@ class CreateField extends CreateFieldOrGetter {
   @override
   Future<void> addForObjectPattern({
     required ChangeBuilder builder,
-    required InterfaceElement2? targetElement,
+    required InterfaceElement? targetElement,
     required String fieldName,
     required DartType? fieldType,
   }) async {
@@ -64,7 +64,7 @@ class CreateField extends CreateFieldOrGetter {
   Future<void> _addDeclaration({
     required ChangeBuilder builder,
     required bool staticModifier,
-    required InterfaceElement2? targetElement,
+    required InterfaceElement? targetElement,
     required DartType? fieldType,
   }) async {
     if (targetElement == null) {
@@ -153,7 +153,7 @@ class CreateField extends CreateFieldOrGetter {
     };
     // Prepare target `ClassElement`.
     var staticModifier = false;
-    InterfaceElement2? targetClassElement;
+    InterfaceElement? targetClassElement;
     if (target != null) {
       targetClassElement = getTargetInterfaceElement(target);
       // Maybe static.
@@ -172,7 +172,7 @@ class CreateField extends CreateFieldOrGetter {
 
     var fieldTypeNode = climbPropertyAccess(nameNode);
     var fieldTypeParent = fieldTypeNode.parent;
-    if (targetClassElement is EnumElement2 &&
+    if (targetClassElement is EnumElement &&
         fieldTypeParent is AssignmentExpression &&
         fieldTypeNode == fieldTypeParent.leftHandSide) {
       // Any field on an enum must be final; creating a final field does not
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/create_getter.dart b/pkg/analysis_server/lib/src/services/correction/dart/create_getter.dart
index b8ebae7c514..b652e5f22ea 100644
--- a/pkg/analysis_server/lib/src/services/correction/dart/create_getter.dart
+++ b/pkg/analysis_server/lib/src/services/correction/dart/create_getter.dart
@@ -23,7 +23,7 @@ abstract class CreateFieldOrGetter extends ResolvedCorrectionProducer {
   /// Adds the declaration that makes a [fieldName] available.
   Future<void> addForObjectPattern({
     required ChangeBuilder builder,
-    required InterfaceElement2? targetElement,
+    required InterfaceElement? targetElement,
     required String fieldName,
     required DartType? fieldType,
   });
@@ -103,7 +103,7 @@ class CreateGetter extends CreateFieldOrGetter {
   @override
   Future<void> addForObjectPattern({
     required ChangeBuilder builder,
-    required InterfaceElement2? targetElement,
+    required InterfaceElement? targetElement,
     required String fieldName,
     required DartType? fieldType,
   }) async {
@@ -142,11 +142,11 @@ class CreateGetter extends CreateFieldOrGetter {
     }
     // prepare target element
     var staticModifier = false;
-    InstanceElement2? targetElement;
+    InstanceElement? targetElement;
     if (target is ExtensionOverride) {
       targetElement = target.element2;
-    } else if (target is Identifier && target.element is ExtensionElement2) {
-      targetElement = target.element as InstanceElement2?;
+    } else if (target is Identifier && target.element is ExtensionElement) {
+      targetElement = target.element as InstanceElement?;
       staticModifier = true;
     } else if (target != null) {
       // prepare target interface type
@@ -185,7 +185,7 @@ class CreateGetter extends CreateFieldOrGetter {
   Future<void> _addDeclaration({
     required ChangeBuilder builder,
     required bool staticModifier,
-    required InstanceElement2? targetElement,
+    required InstanceElement? targetElement,
     required DartType? fieldType,
   }) async {
     if (targetElement == null) {
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/create_method.dart b/pkg/analysis_server/lib/src/services/correction/dart/create_method.dart
index 7fdd40b658d..502822dd79a 100644
--- a/pkg/analysis_server/lib/src/services/correction/dart/create_method.dart
+++ b/pkg/analysis_server/lib/src/services/correction/dart/create_method.dart
@@ -66,7 +66,7 @@ class CreateMethod extends ResolvedCorrectionProducer {
 
     await builder.addDartFileEdit(file, (fileBuilder) {
       fileBuilder.insertIntoUnitMember(classDecl, (builder) {
-        ExecutableElement2? element;
+        ExecutableElement? element;
         if (missingEquals) {
           _memberName = '==';
           element = inheritanceManager.getInherited4(
@@ -109,8 +109,8 @@ class CreateMethod extends ResolvedCorrectionProducer {
           return;
         }
       }
-    } else if (target is Identifier && target.element is ExtensionElement2) {
-      targetFragment = (target.element as ExtensionElement2).firstFragment;
+    } else if (target is Identifier && target.element is ExtensionElement) {
+      targetFragment = (target.element as ExtensionElement).firstFragment;
       if (targetFragment is ExtensionFragment) {
         targetNode = await getExtensionDeclaration(targetFragment);
         if (targetNode == null) {
@@ -141,16 +141,16 @@ class CreateMethod extends ResolvedCorrectionProducer {
         return;
       }
       // Prepare target ClassDeclaration.
-      if (targetClassElement is MixinElement2) {
+      if (targetClassElement is MixinElement) {
         var fragment = targetClassElement.firstFragment;
         targetNode = await getMixinDeclaration(fragment);
-      } else if (targetClassElement is ClassElement2) {
+      } else if (targetClassElement is ClassElement) {
         var fragment = targetClassElement.firstFragment;
         targetNode = await getClassDeclaration(fragment);
-      } else if (targetClassElement is ExtensionTypeElement2) {
+      } else if (targetClassElement is ExtensionTypeElement) {
         var fragment = targetClassElement.firstFragment;
         targetNode = await getExtensionTypeDeclaration(fragment);
-      } else if (targetClassElement is EnumElement2) {
+      } else if (targetClassElement is EnumElement) {
         var fragment = targetClassElement.firstFragment;
         targetNode = await getEnumDeclaration(fragment);
       }
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/create_method_or_function.dart b/pkg/analysis_server/lib/src/services/correction/dart/create_method_or_function.dart
index a81de9183e7..1b4dc6e7075 100644
--- a/pkg/analysis_server/lib/src/services/correction/dart/create_method_or_function.dart
+++ b/pkg/analysis_server/lib/src/services/correction/dart/create_method_or_function.dart
@@ -40,7 +40,7 @@ class CreateMethodOrFunction extends ResolvedCorrectionProducer {
     var nameNode = node;
     if (nameNode is SimpleIdentifier) {
       // prepare argument expression (to get parameter)
-      InterfaceElement2? targetElement;
+      InterfaceElement? targetElement;
       Expression argument;
       var target = getQualifiedPropertyTarget(node);
       if (target != null) {
@@ -49,7 +49,7 @@ class CreateMethodOrFunction extends ResolvedCorrectionProducer {
           targetElement = targetType.element3;
           argument = target.parent as Expression;
         } else if (target case SimpleIdentifier(
-          :InterfaceElement2? element,
+          :InterfaceElement? element,
           :Expression parent,
         )) {
           isStatic = true;
@@ -207,7 +207,7 @@ class CreateMethodOrFunction extends ResolvedCorrectionProducer {
   /// [FunctionType] inside the target element.
   Future<void> _createMethod(
     ChangeBuilder builder,
-    InterfaceElement2 targetClassElement,
+    InterfaceElement targetClassElement,
     FunctionType functionType, {
     required bool isStatic,
   }) async {
@@ -217,19 +217,19 @@ class CreateMethodOrFunction extends ResolvedCorrectionProducer {
     // prepare insert offset
     CompilationUnitMember? targetNode;
     List<ClassMember>? classMembers;
-    if (targetClassElement is MixinElement2) {
+    if (targetClassElement is MixinElement) {
       var fragment = targetClassElement.firstFragment;
       var node = targetNode = await getMixinDeclaration(fragment);
       classMembers = node?.members;
-    } else if (targetClassElement is ClassElement2) {
+    } else if (targetClassElement is ClassElement) {
       var fragment = targetClassElement.firstFragment;
       var node = targetNode = await getClassDeclaration(fragment);
       classMembers = node?.members;
-    } else if (targetClassElement is ExtensionTypeElement2) {
+    } else if (targetClassElement is ExtensionTypeElement) {
       var fragment = targetClassElement.firstFragment;
       var node = targetNode = await getExtensionTypeDeclaration(fragment);
       classMembers = node?.members;
-    } else if (targetClassElement is EnumElement2) {
+    } else if (targetClassElement is EnumElement) {
       var fragment = targetClassElement.firstFragment;
       var node = targetNode = await getEnumDeclaration(fragment);
       classMembers = node?.members;
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/create_missing_overrides.dart b/pkg/analysis_server/lib/src/services/correction/dart/create_missing_overrides.dart
index 87926684a9c..9194a4efd61 100644
--- a/pkg/analysis_server/lib/src/services/correction/dart/create_missing_overrides.dart
+++ b/pkg/analysis_server/lib/src/services/correction/dart/create_missing_overrides.dart
@@ -46,7 +46,7 @@ class CreateMissingOverrides extends ResolvedCorrectionProducer {
       ...InheritanceOverrideVerifier.missingMustBeOverridden(targetDeclaration),
     ];
     // Sort by name, getters before setters.
-    signatures.sort((ExecutableElement2 a, ExecutableElement2 b) {
+    signatures.sort((ExecutableElement a, ExecutableElement b) {
       var names = compareStrings(a.displayName, b.displayName);
       if (names != 0) {
         return names;
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/create_mixin.dart b/pkg/analysis_server/lib/src/services/correction/dart/create_mixin.dart
index 5a74db3b7d6..da06e0e58d2 100644
--- a/pkg/analysis_server/lib/src/services/correction/dart/create_mixin.dart
+++ b/pkg/analysis_server/lib/src/services/correction/dart/create_mixin.dart
@@ -29,7 +29,7 @@ class CreateMixin extends ResolvedCorrectionProducer {
 
   @override
   Future<void> compute(ChangeBuilder builder) async {
-    Element2? prefixElement;
+    Element? prefixElement;
     var node = this.node;
     if (node is NamedType) {
       var importPrefix = node.importPrefix;
@@ -85,7 +85,7 @@ class CreateMixin extends ResolvedCorrectionProducer {
       prefix = '$eol$eol';
     } else {
       for (var import in libraryElement2.firstFragment.libraryImports2) {
-        if (prefixElement is PrefixElement2 &&
+        if (prefixElement is PrefixElement &&
             import.prefix2?.element == prefixElement) {
           var library = import.importedLibrary2;
           if (library != null) {
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/create_setter.dart b/pkg/analysis_server/lib/src/services/correction/dart/create_setter.dart
index cf768dd6e8f..2e0fe4b8c66 100644
--- a/pkg/analysis_server/lib/src/services/correction/dart/create_setter.dart
+++ b/pkg/analysis_server/lib/src/services/correction/dart/create_setter.dart
@@ -49,11 +49,11 @@ class CreateSetter extends ResolvedCorrectionProducer {
     }
     // prepare target element
     var staticModifier = false;
-    InstanceElement2? targetElement;
+    InstanceElement? targetElement;
     if (target is ExtensionOverride) {
       targetElement = target.element2;
-    } else if (target is Identifier && target.element is ExtensionElement2) {
-      targetElement = target.element as ExtensionElement2;
+    } else if (target is Identifier && target.element is ExtensionElement) {
+      targetElement = target.element as ExtensionElement;
       staticModifier = true;
     } else if (target != null) {
       // prepare target interface type
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/data_driven.dart b/pkg/analysis_server/lib/src/services/correction/dart/data_driven.dart
index afe264c147e..9a536c39c27 100644
--- a/pkg/analysis_server/lib/src/services/correction/dart/data_driven.dart
+++ b/pkg/analysis_server/lib/src/services/correction/dart/data_driven.dart
@@ -59,9 +59,7 @@ class DataDriven extends MultiCorrectionProducer {
 
   /// Return the transform sets that are available for fixing issues in the
   /// given [library].
-  List<TransformSet> _availableTransformSetsForLibrary(
-    LibraryElement2 library,
-  ) {
+  List<TransformSet> _availableTransformSetsForLibrary(LibraryElement library) {
     var setsForTests = transformSetsForTests;
     if (setsForTests != null) {
       return setsForTests;
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/destructure_local_variable_assignment.dart b/pkg/analysis_server/lib/src/services/correction/dart/destructure_local_variable_assignment.dart
index 9c36471515c..c382ef00db6 100644
--- a/pkg/analysis_server/lib/src/services/correction/dart/destructure_local_variable_assignment.dart
+++ b/pkg/analysis_server/lib/src/services/correction/dart/destructure_local_variable_assignment.dart
@@ -253,7 +253,7 @@ abstract class RecordField {
 }
 
 class _ReferenceFinder extends RecursiveAstVisitor<void> {
-  final LocalVariableElement2? element;
+  final LocalVariableElement? element;
   final objectReferences = <AstNode>[];
   final propertyReferences = <String, List<AstNode>>{};
 
@@ -288,7 +288,7 @@ class _ReferenceFinder extends RecursiveAstVisitor<void> {
   }
 }
 
-extension on LocalVariableElement2 {
+extension on LocalVariableElement {
   ({
     List<AstNode> objectReferences,
     Map<String, List<AstNode>> propertyReferences,
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/encapsulate_field.dart b/pkg/analysis_server/lib/src/services/correction/dart/encapsulate_field.dart
index d5fcc28a033..6bdbaf836bb 100644
--- a/pkg/analysis_server/lib/src/services/correction/dart/encapsulate_field.dart
+++ b/pkg/analysis_server/lib/src/services/correction/dart/encapsulate_field.dart
@@ -60,7 +60,7 @@ class EncapsulateField extends ResolvedCorrectionProducer {
 
     // Should be in a class or mixin.
     List<ClassMember> classMembers;
-    InterfaceElement2 parentElement;
+    InterfaceElement parentElement;
     var parent = fieldDeclaration.parent;
     switch (parent) {
       case ClassDeclaration():
@@ -170,7 +170,7 @@ class EncapsulateField extends ResolvedCorrectionProducer {
   void _updateReferencesInConstructor(
     DartFileEditBuilder builder,
     ConstructorDeclaration constructor,
-    FieldElement2 fieldElement,
+    FieldElement fieldElement,
     String name,
     String fieldTypeCode,
   ) {
@@ -178,7 +178,7 @@ class EncapsulateField extends ResolvedCorrectionProducer {
       var identifier = parameter.name;
       var parameterElement = parameter.declaredFragment?.element;
       if (identifier != null &&
-          parameterElement is FieldFormalParameterElement2 &&
+          parameterElement is FieldFormalParameterElement &&
           parameterElement.field2 == fieldElement) {
         if (parameter.isNamed && parameter is DefaultFormalParameter) {
           var normalParam = parameter.parameter;
@@ -215,7 +215,7 @@ class EncapsulateField extends ResolvedCorrectionProducer {
   void _updateReferencesInConstructors(
     DartFileEditBuilder builder,
     List<ClassMember> classMembers,
-    FieldElement2 fieldElement,
+    FieldElement fieldElement,
     String name,
     String fieldTypeCode,
   ) {
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/extract_local_variable.dart b/pkg/analysis_server/lib/src/services/correction/dart/extract_local_variable.dart
index 280050f313f..ab36dd94814 100644
--- a/pkg/analysis_server/lib/src/services/correction/dart/extract_local_variable.dart
+++ b/pkg/analysis_server/lib/src/services/correction/dart/extract_local_variable.dart
@@ -79,7 +79,7 @@ class ExtractLocalVariable extends ResolvedCorrectionProducer {
   Future<void> _rewriteProperty({
     required ChangeBuilder builder,
     required Expression target,
-    required Element2? targetProperty,
+    required Element? targetProperty,
   }) async {
     if (targetProperty is! GetterElement) {
       return;
@@ -140,12 +140,12 @@ class ExtractLocalVariable extends ResolvedCorrectionProducer {
 }
 
 class _ExpressionEncoder {
-  final Map<Element2, int> _elementIds = {};
+  final Map<Element, int> _elementIds = {};
 
   String encode(Expression node) {
     var tokens = node.tokens;
 
-    var tokenToElementMap = Map<Token, Element2>.identity();
+    var tokenToElementMap = Map<Token, Element>.identity();
     node.accept(
       _FunctionAstVisitor(
         simpleIdentifier: (node) {
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/flutter_convert_to_stateful_widget.dart b/pkg/analysis_server/lib/src/services/correction/dart/flutter_convert_to_stateful_widget.dart
index 27c49239f39..eb2652490a7 100644
--- a/pkg/analysis_server/lib/src/services/correction/dart/flutter_convert_to_stateful_widget.dart
+++ b/pkg/analysis_server/lib/src/services/correction/dart/flutter_convert_to_stateful_widget.dart
@@ -71,7 +71,7 @@ class FlutterConvertToStatefulWidget extends ResolvedCorrectionProducer {
 
     // Prepare nodes to move.
     var nodesToMove = <ClassMember>{};
-    var elementsToMove = <Element2>{};
+    var elementsToMove = <Element>{};
     for (var member in widgetClass.members) {
       if (member is FieldDeclaration && !member.isStatic) {
         for (var fieldNode in member.fields.variables) {
@@ -273,12 +273,12 @@ class FlutterConvertToStatefulWidget extends ResolvedCorrectionProducer {
 }
 
 class _FieldFinder extends RecursiveAstVisitor<void> {
-  Set<FieldElement2> fieldsAssignedInConstructors = {};
+  Set<FieldElement> fieldsAssignedInConstructors = {};
 
   @override
   void visitFieldFormalParameter(FieldFormalParameter node) {
     var element = node.declaredFragment?.element;
-    if (element is FieldFormalParameterElement2) {
+    if (element is FieldFormalParameterElement) {
       var field = element.field2;
       if (field != null) {
         fieldsAssignedInConstructors.add(field);
@@ -292,7 +292,7 @@ class _FieldFinder extends RecursiveAstVisitor<void> {
   void visitSimpleIdentifier(SimpleIdentifier node) {
     if (node.parent is ConstructorFieldInitializer) {
       var element = node.element;
-      if (element is FieldElement2) {
+      if (element is FieldElement) {
         fieldsAssignedInConstructors.add(element);
       }
     }
@@ -300,7 +300,7 @@ class _FieldFinder extends RecursiveAstVisitor<void> {
       var element = node.writeOrReadElement2;
       if (element is SetterElement) {
         var field = element.variable3;
-        if (field is FieldElement2) {
+        if (field is FieldElement) {
           fieldsAssignedInConstructors.add(field);
         }
       }
@@ -309,9 +309,9 @@ class _FieldFinder extends RecursiveAstVisitor<void> {
 }
 
 class _ReplacementEditBuilder extends RecursiveAstVisitor<void> {
-  final ClassElement2 widgetClassElement;
+  final ClassElement widgetClassElement;
 
-  final Set<Element2> elementsToMove;
+  final Set<Element> elementsToMove;
 
   final SourceRange linesRange;
 
@@ -329,7 +329,7 @@ class _ReplacementEditBuilder extends RecursiveAstVisitor<void> {
       return;
     }
     var element = node.element;
-    if (element is ExecutableElement2 &&
+    if (element is ExecutableElement &&
         element.enclosingElement2 == widgetClassElement &&
         !elementsToMove.contains(element)) {
       var offset = node.offset - linesRange.offset;
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/flutter_convert_to_stateless_widget.dart b/pkg/analysis_server/lib/src/services/correction/dart/flutter_convert_to_stateless_widget.dart
index 9d039ad9041..88a28e6e68d 100644
--- a/pkg/analysis_server/lib/src/services/correction/dart/flutter_convert_to_stateless_widget.dart
+++ b/pkg/analysis_server/lib/src/services/correction/dart/flutter_convert_to_stateless_widget.dart
@@ -86,7 +86,7 @@ class FlutterConvertToStatelessWidget extends ResolvedCorrectionProducer {
 
     // Prepare nodes to move.
     var nodesToMove = <ClassMember>[];
-    var elementsToMove = <Element2>{};
+    var elementsToMove = <Element>{};
     for (var member in stateClass.members) {
       if (member is FieldDeclaration) {
         if (member.isStatic) {
@@ -94,7 +94,7 @@ class FlutterConvertToStatelessWidget extends ResolvedCorrectionProducer {
         }
         for (var fieldNode in member.fields.variables) {
           var fieldElement =
-              fieldNode.declaredFragment!.element as FieldElement2;
+              fieldNode.declaredFragment!.element as FieldElement;
           if (!fieldsAssignedInConstructors.contains(fieldElement)) {
             nodesToMove.add(member);
             elementsToMove.add(fieldElement);
@@ -195,7 +195,7 @@ class FlutterConvertToStatelessWidget extends ResolvedCorrectionProducer {
     return null;
   }
 
-  ClassDeclaration? _findStateClass(ClassElement2 widgetClassElement) {
+  ClassDeclaration? _findStateClass(ClassElement widgetClassElement) {
     for (var declaration in unit.declarations) {
       if (declaration is ClassDeclaration) {
         var type = declaration.extendsClause?.superclass.type;
@@ -265,7 +265,7 @@ class FlutterConvertToStatelessWidget extends ResolvedCorrectionProducer {
     return false;
   }
 
-  static bool _isState(ClassElement2 widgetClassElement, DartType? type) {
+  static bool _isState(ClassElement widgetClassElement, DartType? type) {
     if (type is! InterfaceType) return false;
 
     var firstArgument = type.typeArguments.singleOrNull;
@@ -275,18 +275,18 @@ class FlutterConvertToStatelessWidget extends ResolvedCorrectionProducer {
     }
 
     var classElement = type.element3;
-    return classElement is ClassElement2 && classElement.isExactState;
+    return classElement is ClassElement && classElement.isExactState;
   }
 }
 
 class _FieldFinder extends RecursiveAstVisitor<void> {
-  Set<FieldElement2> fieldsAssignedInConstructors = {};
+  Set<FieldElement> fieldsAssignedInConstructors = {};
 
   @override
   void visitSimpleIdentifier(SimpleIdentifier node) {
     if (node.parent is FieldFormalParameter) {
       var element = node.element;
-      if (element is FieldFormalParameterElement2) {
+      if (element is FieldFormalParameterElement) {
         var field = element.field2;
         if (field != null) {
           fieldsAssignedInConstructors.add(field);
@@ -295,17 +295,17 @@ class _FieldFinder extends RecursiveAstVisitor<void> {
     }
     if (node.parent is ConstructorFieldInitializer) {
       var element = node.element;
-      if (element is FieldElement2) {
+      if (element is FieldElement) {
         fieldsAssignedInConstructors.add(element);
       }
     }
     if (node.inSetterContext()) {
       var element = node.writeOrReadElement2;
       var field = switch (element) {
-        PropertyAccessorElement2(:var variable3) => variable3,
+        PropertyAccessorElement(:var variable3) => variable3,
         _ => null,
       };
-      if (field is FieldElement2) {
+      if (field is FieldElement) {
         fieldsAssignedInConstructors.add(field);
       }
     }
@@ -313,9 +313,9 @@ class _FieldFinder extends RecursiveAstVisitor<void> {
 }
 
 class _ReplacementEditBuilder extends RecursiveAstVisitor<void> {
-  final ClassElement2 widgetClassElement;
+  final ClassElement widgetClassElement;
 
-  final Set<Element2> elementsToMove;
+  final Set<Element> elementsToMove;
 
   final SourceRange linesRange;
 
@@ -333,7 +333,7 @@ class _ReplacementEditBuilder extends RecursiveAstVisitor<void> {
       return;
     }
     var element = node.element;
-    if (element is ExecutableElement2 &&
+    if (element is ExecutableElement &&
         element.enclosingElement2 == widgetClassElement &&
         !elementsToMove.contains(element)) {
       var parent = node.parent;
@@ -390,7 +390,7 @@ class _StatelessVerifier extends RecursiveAstVisitor<void> {
   void visitMethodInvocation(MethodInvocation node) {
     var methodElement = node.methodName.element?.baseElement;
     var classElement = methodElement?.enclosingElement2;
-    if (classElement is ClassElement2 &&
+    if (classElement is ClassElement &&
         classElement.isExactState &&
         !FlutterConvertToStatelessWidget._isDefaultOverride(
           node.thisOrAncestorOfType<MethodDeclaration>(),
@@ -404,8 +404,8 @@ class _StatelessVerifier extends RecursiveAstVisitor<void> {
 
 class _StateUsageVisitor extends RecursiveAstVisitor<void> {
   bool used = false;
-  ClassElement2 widgetClassElement;
-  ClassElement2 stateClassElement;
+  ClassElement widgetClassElement;
+  ClassElement stateClassElement;
 
   _StateUsageVisitor(this.widgetClassElement, this.stateClassElement);
 
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/flutter_remove_widget.dart b/pkg/analysis_server/lib/src/services/correction/dart/flutter_remove_widget.dart
index 58dfe5fcceb..756581243ac 100644
--- a/pkg/analysis_server/lib/src/services/correction/dart/flutter_remove_widget.dart
+++ b/pkg/analysis_server/lib/src/services/correction/dart/flutter_remove_widget.dart
@@ -161,7 +161,7 @@ class FlutterRemoveWidget extends ResolvedCorrectionProducer {
 }
 
 class _UsageFinder extends RecursiveAstVisitor<void> {
-  final Element2 element;
+  final Element element;
   bool used = false;
 
   _UsageFinder(this.element);
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/flutter_wrap.dart b/pkg/analysis_server/lib/src/services/correction/dart/flutter_wrap.dart
index 6397fa283ea..5d9d1743d9a 100644
--- a/pkg/analysis_server/lib/src/services/correction/dart/flutter_wrap.dart
+++ b/pkg/analysis_server/lib/src/services/correction/dart/flutter_wrap.dart
@@ -337,7 +337,7 @@ abstract class _WrapSingleWidget extends ResolvedCorrectionProducer {
     // If the wrapper class is specified, find its element.
     var parentLibraryUri = _parentLibraryUri;
     var parentClassName = _parentClassName;
-    ClassElement2? parentClassElement;
+    ClassElement? parentClassElement;
     if (parentLibraryUri != null && parentClassName != null) {
       parentClassElement = await sessionHelper.getClass(
         parentLibraryUri,
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/import_add_show.dart b/pkg/analysis_server/lib/src/services/correction/dart/import_add_show.dart
index 6f06240b0ef..175ff0e430a 100644
--- a/pkg/analysis_server/lib/src/services/correction/dart/import_add_show.dart
+++ b/pkg/analysis_server/lib/src/services/correction/dart/import_add_show.dart
@@ -59,7 +59,7 @@ class ImportAddShow extends ResolvedCorrectionProducer {
 }
 
 class _ReferenceFinder extends RecursiveAstVisitor<void> {
-  final Map<String, Element2> namespace;
+  final Map<String, Element> namespace;
 
   Set<String> referencedNames = SplayTreeSet<String>();
 
@@ -132,15 +132,15 @@ class _ReferenceFinder extends RecursiveAstVisitor<void> {
     _addName(node.token, element);
   }
 
-  void _addImplicitExtensionName(Element2? enclosingElement) {
-    if (enclosingElement is ExtensionElement2) {
+  void _addImplicitExtensionName(Element? enclosingElement) {
+    if (enclosingElement is ExtensionElement) {
       if (namespace[enclosingElement.name3] == enclosingElement) {
         referencedNames.add(enclosingElement.displayName);
       }
     }
   }
 
-  void _addName(Token nameToken, Element2? element) {
+  void _addName(Token nameToken, Element? element) {
     if (element != null) {
       var name = nameToken.lexeme;
       if (namespace[name] == element || namespace['$name='] == element) {
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/import_library.dart b/pkg/analysis_server/lib/src/services/correction/dart/import_library.dart
index f5119ddcf04..8074b4cd691 100644
--- a/pkg/analysis_server/lib/src/services/correction/dart/import_library.dart
+++ b/pkg/analysis_server/lib/src/services/correction/dart/import_library.dart
@@ -105,7 +105,7 @@ class ImportLibrary extends MultiCorrectionProducer {
   Future<(_ImportLibraryCombinator?, _ImportLibraryCombinatorMultiple?)>
   _importEditCombinators(
     LibraryImport import,
-    LibraryElement2 libraryElement,
+    LibraryElement libraryElement,
     String uri,
     String name, {
     String? prefix,
@@ -234,7 +234,7 @@ class ImportLibrary extends MultiCorrectionProducer {
     var producers = <ResolvedCorrectionProducer>[];
     // Maybe there is an existing import, but it is with prefix and we don't use
     // this prefix.
-    var alreadyImportedWithPrefix = <LibraryElement2>{};
+    var alreadyImportedWithPrefix = <LibraryElement>{};
     for (var import in unitResult.libraryFragment.libraryImports2) {
       // Prepare the element.
       var libraryElement = import.importedLibrary2;
@@ -245,7 +245,7 @@ class ImportLibrary extends MultiCorrectionProducer {
       if (element == null) {
         continue;
       }
-      if (element is PropertyAccessorElement2) {
+      if (element is PropertyAccessorElement) {
         element = element.variable3;
         if (element == null) {
           continue;
@@ -390,7 +390,7 @@ class ImportLibrary extends MultiCorrectionProducer {
   }
 
   List<_PrefixedName> _namesForExtensionInLibrary(
-    LibraryElement2 libraryToImport,
+    LibraryElement libraryToImport,
     DartType targetType,
     Name memberName,
   ) {
@@ -946,7 +946,7 @@ class _ImportLibraryCombinatorMultiple extends ResolvedCorrectionProducer {
 /// extension, but which does so only if the extension applies to a given type.
 class _ImportLibraryContainingExtension extends ResolvedCorrectionProducer {
   /// The library defining the extension.
-  LibraryElement2 library;
+  LibraryElement library;
 
   /// The type of the target that the extension must apply to.
   DartType targetType;
@@ -994,8 +994,8 @@ class _ImportLibraryContainingExtension extends ResolvedCorrectionProducer {
 /// A correction processor that can add a prefix to an identifier defined in a
 /// library that is already imported but that is imported with a prefix.
 class _ImportLibraryPrefix extends ResolvedCorrectionProducer {
-  final LibraryElement2 _importedLibrary;
-  final PrefixElement2 _importPrefix;
+  final LibraryElement _importedLibrary;
+  final PrefixElement _importPrefix;
   final String? _nodePrefix;
   final _ImportLibraryCombinator? _editCombinator;
 
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/make_field_not_final.dart b/pkg/analysis_server/lib/src/services/correction/dart/make_field_not_final.dart
index 0c95b4c7f04..890ef2c0446 100644
--- a/pkg/analysis_server/lib/src/services/correction/dart/make_field_not_final.dart
+++ b/pkg/analysis_server/lib/src/services/correction/dart/make_field_not_final.dart
@@ -52,7 +52,7 @@ class MakeFieldNotFinal extends ResolvedCorrectionProducer {
     }
 
     // It must be a field declaration.
-    if (getter.enclosingElement2 is! ClassElement2) {
+    if (getter.enclosingElement2 is! ClassElement) {
       return;
     }
 
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/make_variable_not_final.dart b/pkg/analysis_server/lib/src/services/correction/dart/make_variable_not_final.dart
index 696d34b503e..25359e02662 100644
--- a/pkg/analysis_server/lib/src/services/correction/dart/make_variable_not_final.dart
+++ b/pkg/analysis_server/lib/src/services/correction/dart/make_variable_not_final.dart
@@ -36,7 +36,7 @@ class MakeVariableNotFinal extends ResolvedCorrectionProducer {
     }
 
     var variable = node.element;
-    if (variable is! LocalVariableElement2) {
+    if (variable is! LocalVariableElement) {
       return;
     }
 
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/make_variable_nullable.dart b/pkg/analysis_server/lib/src/services/correction/dart/make_variable_nullable.dart
index f072e7e1865..9ce87131b3c 100644
--- a/pkg/analysis_server/lib/src/services/correction/dart/make_variable_nullable.dart
+++ b/pkg/analysis_server/lib/src/services/correction/dart/make_variable_nullable.dart
@@ -58,7 +58,7 @@ class MakeVariableNullable extends ResolvedCorrectionProducer {
   /// given [variable] that is located in the given [block] or in a surrounding
   /// block. Return `null` if the declaration can't be found.
   VariableDeclarationList? _findDeclaration(
-    LocalVariableElement2 variable,
+    LocalVariableElement variable,
     Block? block,
   ) {
     var currentBlock = block;
@@ -89,7 +89,7 @@ class MakeVariableNullable extends ResolvedCorrectionProducer {
     }
 
     var element = leftHandSide.element;
-    if (element is! LocalVariableElement2) {
+    if (element is! LocalVariableElement) {
       return;
     }
 
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/merge_combinators.dart b/pkg/analysis_server/lib/src/services/correction/dart/merge_combinators.dart
index 80c1efe4410..98ccbf49d0d 100644
--- a/pkg/analysis_server/lib/src/services/correction/dart/merge_combinators.dart
+++ b/pkg/analysis_server/lib/src/services/correction/dart/merge_combinators.dart
@@ -91,8 +91,8 @@ class _MergeCombinators extends ResolvedCorrectionProducer {
 
   @override
   Future<void> compute(ChangeBuilder builder) async {
-    LibraryElement2? element;
-    Map<String, Element2> namespace;
+    LibraryElement? element;
+    Map<String, Element> namespace;
     Namespace? originalNamespace;
     switch (directive) {
       case ExportDirective(:LibraryExportElementImpl libraryExport):
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/remove_abstract.dart b/pkg/analysis_server/lib/src/services/correction/dart/remove_abstract.dart
index 4688affdc95..e951bf609a6 100644
--- a/pkg/analysis_server/lib/src/services/correction/dart/remove_abstract.dart
+++ b/pkg/analysis_server/lib/src/services/correction/dart/remove_abstract.dart
@@ -49,7 +49,7 @@ class RemoveAbstract extends CorrectionProducerWithDiagnostic {
 
   Future<void> _compute(
     ClassDeclaration? classDeclaration,
-    Element2? fieldElement,
+    Element? fieldElement,
     ChangeBuilder builder,
   ) async {
     if (classDeclaration == null) return;
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/remove_deprecated_new_in_comment_reference.dart b/pkg/analysis_server/lib/src/services/correction/dart/remove_deprecated_new_in_comment_reference.dart
index 393be100c27..296da80b93b 100644
--- a/pkg/analysis_server/lib/src/services/correction/dart/remove_deprecated_new_in_comment_reference.dart
+++ b/pkg/analysis_server/lib/src/services/correction/dart/remove_deprecated_new_in_comment_reference.dart
@@ -43,12 +43,12 @@ class RemoveDeprecatedNewInCommentReference extends ResolvedCorrectionProducer {
     var identifier = comment.expression;
     if (identifier is Identifier) {
       var element = identifier.element;
-      if (identifier is SimpleIdentifier && element is ConstructorElement2) {
+      if (identifier is SimpleIdentifier && element is ConstructorElement) {
         await builder.addDartFileEdit(file, (builder) {
           builder.addSimpleInsertion(identifier.end, '.new');
         });
       } else {
-        if (element is ClassElement2) {
+        if (element is ClassElement) {
           if (element.unnamedConstructor2 != null) {
             await builder.addDartFileEdit(file, (builder) {
               builder.addSimpleInsertion(identifier.end, '.new');
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/remove_leading_underscore.dart b/pkg/analysis_server/lib/src/services/correction/dart/remove_leading_underscore.dart
index 3399f9c87e8..d87fa3353cf 100644
--- a/pkg/analysis_server/lib/src/services/correction/dart/remove_leading_underscore.dart
+++ b/pkg/analysis_server/lib/src/services/correction/dart/remove_leading_underscore.dart
@@ -29,7 +29,7 @@ class RemoveLeadingUnderscore extends ResolvedCorrectionProducer {
   Future<void> compute(ChangeBuilder builder) async {
     var node = this.node;
     Token? nameToken;
-    Element2? element;
+    Element? element;
     if (node is SimpleIdentifier) {
       nameToken = node.token;
       element = node.element;
@@ -77,7 +77,7 @@ class RemoveLeadingUnderscore extends ResolvedCorrectionProducer {
           references = findLocalElementReferences(root, element);
         }
       }
-    } else if (element is LocalElement2) {
+    } else if (element is LocalElement) {
       var block = node.thisOrAncestorOfType<Block>();
       if (block != null) {
         references = findLocalElementReferences(block, element);
@@ -96,7 +96,7 @@ class RemoveLeadingUnderscore extends ResolvedCorrectionProducer {
           }
         }
       }
-    } else if (element is PrefixElement2) {
+    } else if (element is PrefixElement) {
       var root = node.thisOrAncestorOfType<CompilationUnit>();
       if (root != null) {
         references = findImportPrefixElementReferences(root, element);
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/remove_unused.dart b/pkg/analysis_server/lib/src/services/correction/dart/remove_unused.dart
index f70bbacabc6..03c38cae6f0 100644
--- a/pkg/analysis_server/lib/src/services/correction/dart/remove_unused.dart
+++ b/pkg/analysis_server/lib/src/services/correction/dart/remove_unused.dart
@@ -36,7 +36,7 @@ class RemoveUnusedElement extends _RemoveUnused {
       return;
     }
 
-    Element2? element;
+    Element? element;
     if (node is Declaration) {
       element = node.declaredFragment?.element;
     }
@@ -112,7 +112,7 @@ class RemoveUnusedField extends _RemoveUnused {
     }
 
     var element = declaration.declaredFragment!.element;
-    if (element is! FieldElement2) {
+    if (element is! FieldElement) {
       return;
     }
 
@@ -243,7 +243,7 @@ class RemoveUnusedField extends _RemoveUnused {
 }
 
 class _ElementReferenceCollector extends RecursiveAstVisitor<void> {
-  final Element2 element;
+  final Element element;
   final List<AstNode> references = [];
 
   _ElementReferenceCollector(this.element);
@@ -272,11 +272,11 @@ class _ElementReferenceCollector extends RecursiveAstVisitor<void> {
     var staticElement = node.writeOrReadElement2;
     if (staticElement == element) {
       references.add(node);
-    } else if (staticElement is PropertyAccessorElement2) {
+    } else if (staticElement is PropertyAccessorElement) {
       if (staticElement.variable3 == element) {
         references.add(node);
       }
-    } else if (staticElement is FieldFormalParameterElement2) {
+    } else if (staticElement is FieldFormalParameterElement) {
       if (staticElement.field2 == element) {
         references.add(node);
       }
@@ -287,7 +287,7 @@ class _ElementReferenceCollector extends RecursiveAstVisitor<void> {
 abstract class _RemoveUnused extends ResolvedCorrectionProducer {
   _RemoveUnused({required super.context});
 
-  List<AstNode> _findAllReferences(AstNode root, Element2 element) {
+  List<AstNode> _findAllReferences(AstNode root, Element element) {
     var collector = _ElementReferenceCollector(element);
     root.accept(collector);
     return collector.references;
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/remove_unused_local_variable.dart b/pkg/analysis_server/lib/src/services/correction/dart/remove_unused_local_variable.dart
index d89b0ca22a2..16ab0bd8434 100644
--- a/pkg/analysis_server/lib/src/services/correction/dart/remove_unused_local_variable.dart
+++ b/pkg/analysis_server/lib/src/services/correction/dart/remove_unused_local_variable.dart
@@ -228,7 +228,7 @@ class RemoveUnusedLocalVariable extends ResolvedCorrectionProducer {
 
   bool _deleteReferences() {
     var element = _localVariableElement();
-    if (element is! LocalVariableElement2) {
+    if (element is! LocalVariableElement) {
       return false;
     }
 
@@ -280,7 +280,7 @@ class RemoveUnusedLocalVariable extends ResolvedCorrectionProducer {
     }
   }
 
-  LocalVariableElement2? _localVariableElement() {
+  LocalVariableElement? _localVariableElement() {
     var node = this.node;
     if (node is DeclaredVariablePattern) {
       return node.declaredElement2;
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/rename_method_parameter.dart b/pkg/analysis_server/lib/src/services/correction/dart/rename_method_parameter.dart
index b3e5d63e3b6..fba0b73fbaa 100644
--- a/pkg/analysis_server/lib/src/services/correction/dart/rename_method_parameter.dart
+++ b/pkg/analysis_server/lib/src/services/correction/dart/rename_method_parameter.dart
@@ -48,7 +48,7 @@ class RenameMethodParameter extends ResolvedCorrectionProducer {
     }
 
     var classElement = declaredFragment?.element;
-    if (classElement is! InterfaceElement2) return;
+    if (classElement is! InterfaceElement) return;
 
     var parentMethod = inheritanceManager.getInherited4(
       classElement,
@@ -108,7 +108,7 @@ class _Collector extends RecursiveAstVisitor<void> {
     super.visitVariableDeclaration(node);
   }
 
-  void _addNameToken(Token? nameToken, Element2? element) {
+  void _addNameToken(Token? nameToken, Element? element) {
     if (error) return;
 
     if (nameToken != null) {
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/rename_to_camel_case.dart b/pkg/analysis_server/lib/src/services/correction/dart/rename_to_camel_case.dart
index 14bbbd60686..319a42031d4 100644
--- a/pkg/analysis_server/lib/src/services/correction/dart/rename_to_camel_case.dart
+++ b/pkg/analysis_server/lib/src/services/correction/dart/rename_to_camel_case.dart
@@ -35,7 +35,7 @@ class RenameToCamelCase extends ResolvedCorrectionProducer {
   @override
   Future<void> compute(ChangeBuilder builder) async {
     Token? nameToken;
-    Element2? element;
+    Element? element;
     var node = this.node;
     if (node is SimpleFormalParameter) {
       nameToken = node.name;
@@ -73,7 +73,7 @@ class RenameToCamelCase extends ResolvedCorrectionProducer {
 
     // Find references to the identifier.
     List<AstNode>? references;
-    if (element is LocalVariableElement2) {
+    if (element is LocalVariableElement) {
       var root = node.thisOrAncestorOfType<Block>();
       if (root != null) {
         references = findLocalElementReferences(root, element);
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/shadow_field.dart b/pkg/analysis_server/lib/src/services/correction/dart/shadow_field.dart
index 580dff2a8d9..e048debfe43 100644
--- a/pkg/analysis_server/lib/src/services/correction/dart/shadow_field.dart
+++ b/pkg/analysis_server/lib/src/services/correction/dart/shadow_field.dart
@@ -40,7 +40,7 @@ class ShadowField extends ResolvedCorrectionProducer {
       return;
     }
 
-    if (accessor.enclosingElement2 is! InterfaceElement2) {
+    if (accessor.enclosingElement2 is! InterfaceElement) {
       // TODO(brianwilkerson): Should we also require that the getter be synthetic?
       return;
     }
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/use_different_division_operator.dart b/pkg/analysis_server/lib/src/services/correction/dart/use_different_division_operator.dart
index 41d68aa5b97..ea79863d68b 100644
--- a/pkg/analysis_server/lib/src/services/correction/dart/use_different_division_operator.dart
+++ b/pkg/analysis_server/lib/src/services/correction/dart/use_different_division_operator.dart
@@ -132,7 +132,7 @@ class _UseDifferentDivisionOperator extends ResolvedCorrectionProducer {
 extension on DartType {
   Set<_DivisionOperator> get divisionOperators {
     switch (element3) {
-      case InterfaceElement2 element:
+      case InterfaceElement element:
         return {
           for (var method in element.methods2)
             // No need to test for eq operators, as they are not explicitly defined.
@@ -142,7 +142,7 @@ extension on DartType {
               _DivisionOperator.effectiveIntegerDivision,
           ...element.allSupertypes.expand((type) => type.divisionOperators),
         };
-      case TypeParameterElement2 element:
+      case TypeParameterElement element:
         return element.bound?.divisionOperators ?? const {};
     }
     return const {};
diff --git a/pkg/analysis_server/lib/src/services/correction/executable_parameters.dart b/pkg/analysis_server/lib/src/services/correction/executable_parameters.dart
index 1280343afdf..b8acc42e3a3 100644
--- a/pkg/analysis_server/lib/src/services/correction/executable_parameters.dart
+++ b/pkg/analysis_server/lib/src/services/correction/executable_parameters.dart
@@ -6,10 +6,10 @@ import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/src/dart/analysis/session_helper.dart';
 
-/// [ExecutableElement2], its parameters, and operations on them.
+/// [ExecutableElement], its parameters, and operations on them.
 class ExecutableParameters {
   final AnalysisSessionHelper sessionHelper;
-  final ExecutableElement2 executable;
+  final ExecutableElement executable;
   final ExecutableFragment firstFragment;
 
   final List<FormalParameterElement> required = [];
@@ -75,7 +75,7 @@ class ExecutableParameters {
     AnalysisSessionHelper sessionHelper,
     AstNode? invocation,
   ) {
-    Element2? element;
+    Element? element;
     // This doesn't handle FunctionExpressionInvocation.
     if (invocation is Annotation) {
       element = invocation.element2;
@@ -87,7 +87,7 @@ class ExecutableParameters {
       element = invocation.element;
     }
     var firstFragment = element?.firstFragment;
-    if (element is ExecutableElement2 &&
+    if (element is ExecutableElement &&
         !element.isSynthetic &&
         firstFragment is ExecutableFragment) {
       return ExecutableParameters._(sessionHelper, element, firstFragment);
diff --git a/pkg/analysis_server/lib/src/services/correction/fix/data_driven/element_descriptor.dart b/pkg/analysis_server/lib/src/services/correction/fix/data_driven/element_descriptor.dart
index 04d92c61f68..fdcd4f4b914 100644
--- a/pkg/analysis_server/lib/src/services/correction/fix/data_driven/element_descriptor.dart
+++ b/pkg/analysis_server/lib/src/services/correction/fix/data_driven/element_descriptor.dart
@@ -142,7 +142,7 @@ class ElementDescriptor {
           if (type == null && target is SimpleIdentifier) {
             var element = target.element;
             // TODO(brianwilkerson): Handle more than `InterfaceElement`.
-            if (element is InterfaceElement2) {
+            if (element is InterfaceElement) {
               type = element.thisType;
             }
           }
diff --git a/pkg/analysis_server/lib/src/services/correction/fix/data_driven/element_matcher.dart b/pkg/analysis_server/lib/src/services/correction/fix/data_driven/element_matcher.dart
index 79d508ac083..11f6d6e634e 100644
--- a/pkg/analysis_server/lib/src/services/correction/fix/data_driven/element_matcher.dart
+++ b/pkg/analysis_server/lib/src/services/correction/fix/data_driven/element_matcher.dart
@@ -7,12 +7,12 @@ import 'package:analysis_server/src/services/correction/fix/data_driven/element_
 import 'package:analyzer/dart/ast/token.dart';
 import 'package:analyzer/dart/element/element.dart'
     show
-        ExtensionElement2,
-        InterfaceElement2,
-        LibraryElement2,
+        ExtensionElement,
+        InterfaceElement,
+        LibraryElement,
         LibraryFragment,
-        PrefixElement2,
-        PropertyAccessorElement2;
+        PrefixElement,
+        PropertyAccessorElement;
 import 'package:analyzer/dart/element/type.dart';
 import 'package:analyzer/src/dart/ast/ast.dart';
 
@@ -93,7 +93,7 @@ class ElementMatcher {
           }
           var element =
               (parent as CompilationUnitMember).declaredFragment?.element;
-          if (element is! InterfaceElement2) {
+          if (element is! InterfaceElement) {
             return false;
           }
           var types = element.allSupertypes.map((e) => e.element3.name3);
@@ -412,7 +412,7 @@ class _MatcherBuilder {
     // TODO(brianwilkerson): Use the static element, if there is one, in order to
     //  get a more exact matcher.
     var prefix = node.prefix;
-    if (prefix.element is PrefixElement2) {
+    if (prefix.element is PrefixElement) {
       var parent = node.parent;
       if ((parent is NamedType && parent.parent is! ConstructorName) ||
           (parent is PropertyAccess && parent.target == node)) {
@@ -459,7 +459,7 @@ class _MatcherBuilder {
     // It looks like we're accessing a member, but we don't know what kind of
     // member, so we include all of the member kinds.
     var container = node.prefix.element;
-    if (container is InterfaceElement2) {
+    if (container is InterfaceElement) {
       _addMatcher(
         components: [node.identifier.name, container.name3!],
         kinds: const [
@@ -471,7 +471,7 @@ class _MatcherBuilder {
           ElementKind.setterKind,
         ],
       );
-    } else if (container is ExtensionElement2) {
+    } else if (container is ExtensionElement) {
       _addMatcher(
         components: [node.identifier.name, container.displayName],
         kinds: const [
@@ -545,9 +545,9 @@ class _MatcherBuilder {
         var element = node.element;
         // Add enclosing element to the matcher for non top level property
         // accessors when possible.
-        if (element is PropertyAccessorElement2) {
+        if (element is PropertyAccessorElement) {
           var enclosingElement = element.enclosingElement2;
-          if (enclosingElement is! LibraryElement2) {
+          if (enclosingElement is! LibraryElement) {
             _addMatcher(
               components: [node.name, enclosingElement.displayName],
               kinds: [],
@@ -587,9 +587,9 @@ class _MatcherBuilder {
     }
     if (element != null) {
       var enclosingElement = element.enclosingElement2;
-      if (enclosingElement is InterfaceElement2) {
+      if (enclosingElement is InterfaceElement) {
         return [identifier.name, enclosingElement.name3!];
-      } else if (enclosingElement is ExtensionElement2) {
+      } else if (enclosingElement is ExtensionElement) {
         var name = enclosingElement.name3;
         if (name != null) {
           return [identifier.name, name];
@@ -601,7 +601,7 @@ class _MatcherBuilder {
 
   /// Returns `true` if the [node] is a prefix.
   static bool _isPrefix(AstNode? node) {
-    return node is SimpleIdentifier && node.element is PrefixElement2;
+    return node is SimpleIdentifier && node.element is PrefixElement;
   }
 
   /// Returns the name of the class associated with the given [target].
diff --git a/pkg/analysis_server/lib/src/services/correction/fix/data_driven/rename_parameter.dart b/pkg/analysis_server/lib/src/services/correction/fix/data_driven/rename_parameter.dart
index 535a90e22be..b00f818b416 100644
--- a/pkg/analysis_server/lib/src/services/correction/fix/data_driven/rename_parameter.dart
+++ b/pkg/analysis_server/lib/src/services/correction/fix/data_driven/rename_parameter.dart
@@ -134,13 +134,11 @@ extension on MethodDeclaration {
   /// Returns the element that this method overrides.
   ///
   /// Returns `null` if this method doesn't override any inherited member.
-  ExecutableElement2? overriddenElement(
-    InheritanceManager3 inheritanceManager,
-  ) {
+  ExecutableElement? overriddenElement(InheritanceManager3 inheritanceManager) {
     var element = declaredFragment?.element;
     if (element != null) {
       var enclosingElement = element.enclosingElement2;
-      if (enclosingElement is InterfaceElement2) {
+      if (enclosingElement is InterfaceElement) {
         var name = Name(enclosingElement.library2.uri, element.name3!);
         return inheritanceManager.getInherited4(enclosingElement, name);
       }
@@ -164,7 +162,7 @@ extension on MethodDeclaration {
   }
 }
 
-extension on ExecutableElement2 {
+extension on ExecutableElement {
   /// Returns the parameter of this executable element whose name matches the
   /// given [name]
   ///
diff --git a/pkg/analysis_server/lib/src/services/correction/fix/data_driven/replaced_by.dart b/pkg/analysis_server/lib/src/services/correction/fix/data_driven/replaced_by.dart
index c7985bb5d14..4ccce4de284 100644
--- a/pkg/analysis_server/lib/src/services/correction/fix/data_driven/replaced_by.dart
+++ b/pkg/analysis_server/lib/src/services/correction/fix/data_driven/replaced_by.dart
@@ -101,7 +101,7 @@ class ReplacedBy extends Change<_Data> {
     }
     if (node is SimpleIdentifier) {
       var element = node.element;
-      if (element is ExecutableElement2 && !element.isStatic) {
+      if (element is ExecutableElement && !element.isStatic) {
         return _instance(node, element);
       }
 
@@ -131,7 +131,7 @@ class ReplacedBy extends Change<_Data> {
           // We have a '<container>.<member>()' pattern, so we replace both parts.
           return _Data(range.startEnd(target, node));
         } else if (target is PrefixedIdentifier) {
-          if (target.prefix.element is PrefixElement2 &&
+          if (target.prefix.element is PrefixElement &&
               target.identifier.name == containerName) {
             // We have a '<prefix>.<container>.<member>()' pattern so we leave
             // the prefix while replacing the rest.
@@ -150,7 +150,7 @@ class ReplacedBy extends Change<_Data> {
           return _Data(range.node(grandparent));
         }
       } else if (parent is PrefixedIdentifier) {
-        if (parent.prefix.element is PrefixElement2) {
+        if (parent.prefix.element is PrefixElement) {
           // We have a '<prefix>.<topLevel>' pattern so we leave the prefix
           // while replacing the rest.
           return _Data(range.node(node));
@@ -225,7 +225,7 @@ class ReplacedBy extends Change<_Data> {
   }
 
   /// Returns a replacement of an instance member.
-  _Data? _instance(AstNode node, ExecutableElement2 element) {
+  _Data? _instance(AstNode node, ExecutableElement element) {
     var newComponents = newElement.components;
     var newKind = newElement.kind;
     var suffix = '';
diff --git a/pkg/analysis_server/lib/src/services/correction/fix/data_driven/transform_set_manager.dart b/pkg/analysis_server/lib/src/services/correction/fix/data_driven/transform_set_manager.dart
index 5c69d871a2c..dafb5941ad2 100644
--- a/pkg/analysis_server/lib/src/services/correction/fix/data_driven/transform_set_manager.dart
+++ b/pkg/analysis_server/lib/src/services/correction/fix/data_driven/transform_set_manager.dart
@@ -38,7 +38,7 @@ class TransformSetManager {
   }
 
   /// Return the transform sets associated with the [library].
-  List<TransformSet> forLibrary(LibraryElement2 library) {
+  List<TransformSet> forLibrary(LibraryElement library) {
     var transformSets = <TransformSet>[];
     var analysisContext = library.session.analysisContext;
     var workspace = analysisContext.contextRoot.workspace;
diff --git a/pkg/analysis_server/lib/src/services/correction/name_suggestion.dart b/pkg/analysis_server/lib/src/services/correction/name_suggestion.dart
index 39c9672ada3..c9b65268ebd 100644
--- a/pkg/analysis_server/lib/src/services/correction/name_suggestion.dart
+++ b/pkg/analysis_server/lib/src/services/correction/name_suggestion.dart
@@ -202,7 +202,7 @@ String? _getBaseNameFromUnwrappedExpression(Expression expression) {
       return namedType.name2.lexeme;
     }
     // new prefix.ClassName()
-    if (importPrefix.element2 is PrefixElement2) {
+    if (importPrefix.element2 is PrefixElement) {
       return namedType.name2.lexeme;
     }
     // new ClassName.constructorName()
diff --git a/pkg/analysis_server/lib/src/services/correction/namespace.dart b/pkg/analysis_server/lib/src/services/correction/namespace.dart
index 0fc57442e43..bf0fe2443ca 100644
--- a/pkg/analysis_server/lib/src/services/correction/namespace.dart
+++ b/pkg/analysis_server/lib/src/services/correction/namespace.dart
@@ -7,8 +7,8 @@ import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/src/dart/element/element.dart';
 import 'package:analyzer/src/dart/resolver/scope.dart';
 
-/// Returns the [Element2] exported from the given [LibraryElement2].
-Element2? getExportedElement(LibraryElement2? library, String name) {
+/// Returns the [Element] exported from the given [LibraryElement].
+Element? getExportedElement(LibraryElement? library, String name) {
   if (library == null) {
     return null;
   }
@@ -30,15 +30,15 @@ LibraryImport? getImportElement(SimpleIdentifier prefixNode) {
 
 /// Return the [LibraryImport] that declared [prefix] and imports [element].
 ///
-/// [libraryElement] - the [LibraryElement2] where reference is.
+/// [libraryElement] - the [LibraryElement] where reference is.
 /// [prefix] - the import prefix, maybe `null`.
 /// [element] - the referenced element.
 LibraryImport? _getImportElement(
-  LibraryElement2 libraryElement,
+  LibraryElement libraryElement,
   String prefix,
-  Element2 element,
+  Element element,
 ) {
-  if (element.enclosingElement2 is! LibraryElement2) {
+  if (element.enclosingElement2 is! LibraryElement) {
     return null;
   }
   var usedLibrary = element.library2;
@@ -74,7 +74,7 @@ LibraryImport? _getImportElement(
     return candidates[0];
   }
 
-  var importElementsMap = <LibraryImport, Set<Element2>>{};
+  var importElementsMap = <LibraryImport, Set<Element>>{};
   // ensure that each ImportElement has set of elements
   for (var importElement in candidates) {
     if (importElementsMap.containsKey(importElement)) {
@@ -97,7 +97,7 @@ LibraryImport? _getImportElement(
 }
 
 /// Returns the [LibraryImport] that is referenced by [prefixNode] with a
-/// [PrefixElement2], maybe `null`.
+/// [PrefixElement], maybe `null`.
 LibraryImport? _getImportElementInfo(SimpleIdentifier prefixNode) {
   // prepare environment
   var parent = prefixNode.parent;
@@ -107,7 +107,7 @@ LibraryImport? _getImportElementInfo(SimpleIdentifier prefixNode) {
     return null;
   }
   // prepare used element
-  Element2? usedElement;
+  Element? usedElement;
   if (parent is PrefixedIdentifier) {
     var prefixed = parent;
     if (prefixed.prefix == prefixNode) {
diff --git a/pkg/analysis_server/lib/src/services/correction/util.dart b/pkg/analysis_server/lib/src/services/correction/util.dart
index a4ca3828158..f86a93c8fdf 100644
--- a/pkg/analysis_server/lib/src/services/correction/util.dart
+++ b/pkg/analysis_server/lib/src/services/correction/util.dart
@@ -37,7 +37,7 @@ Expression climbPropertyAccess(Expression node) {
 /// Return references to the [element] inside the [root] node.
 List<AstNode> findImportPrefixElementReferences(
   AstNode root,
-  PrefixElement2 element,
+  PrefixElement element,
 ) {
   var collector = _ElementReferenceCollector(element);
   root.accept(collector);
@@ -45,7 +45,7 @@ List<AstNode> findImportPrefixElementReferences(
 }
 
 /// Return references to the [element] inside the [root] node.
-List<AstNode> findLocalElementReferences(AstNode root, LocalElement2 element) {
+List<AstNode> findLocalElementReferences(AstNode root, LocalElement element) {
   var collector = _ElementReferenceCollector(element);
   root.accept(collector);
   return collector.references;
@@ -68,20 +68,20 @@ List<SourceRange> getCommentRanges(CompilationUnit unit) {
 
 // TODO(scheglov): replace with nodes once there will be
 // [CompilationUnit.getComments].
-/// Return all [LocalElement2]s defined in the given [node].
-List<LocalElement2> getDefinedLocalElements(AstNode node) {
+/// Return all [LocalElement]s defined in the given [node].
+List<LocalElement> getDefinedLocalElements(AstNode node) {
   var collector = _LocalElementsCollector();
   node.accept(collector);
   return collector.elements;
 }
 
 /// Return the name of the kind of the [element].
-String getElementKindName(Element2 element) {
+String getElementKindName(Element element) {
   return element.kind.displayName;
 }
 
 /// Returns the name to display in the UI for the given [element].
-String getElementQualifiedName(Element2 element) {
+String getElementQualifiedName(Element element) {
   var kind = element.kind;
   if (kind == ElementKind.FIELD || kind == ElementKind.METHOD) {
     return '${element.enclosingElement2!.displayName}.${element.displayName}';
@@ -90,7 +90,7 @@ String getElementQualifiedName(Element2 element) {
     var session = element.session!;
     var pathContext = session.resourceProvider.pathContext;
     var rootPath = session.analysisContext.contextRoot.root.path;
-    var library = element as LibraryElement2;
+    var library = element as LibraryElement;
 
     return pathContext.relative(
       library.firstFragment.source.fullName,
@@ -179,14 +179,14 @@ FormalParameterElement? getFormalParameterElement(SimpleIdentifier node) {
 }
 
 /// Returns the namespace of the given [LibraryImport].
-Map<String, Element2> getImportNamespace(LibraryImport imp) {
+Map<String, Element> getImportNamespace(LibraryImport imp) {
   return imp.namespace.definedNames2;
 }
 
 /// Computes the best URI to import [what] into [from].
 String getLibrarySourceUri(
   path.Context pathContext,
-  LibraryElement2 from,
+  LibraryElement from,
   Uri what,
 ) {
   if (what.isScheme('file')) {
@@ -200,9 +200,9 @@ String getLibrarySourceUri(
 /// Return the variable's element if [node] is a reference to a local variable.
 ///
 /// Returns `null` if it isn't a reference to a local variable.
-LocalVariableElement2? getLocalVariableElement(SimpleIdentifier node) {
+LocalVariableElement? getLocalVariableElement(SimpleIdentifier node) {
   var element = node.element;
-  if (element is LocalVariableElement2) {
+  if (element is LocalVariableElement) {
     return element;
   }
   return null;
@@ -298,7 +298,7 @@ List<Statement> getStatements(Statement statement) {
 }
 
 /// Checks if the given [element]'s display name equals to the given [name].
-bool hasDisplayName(Element2? element, String name) {
+bool hasDisplayName(Element? element, String name) {
   return element?.displayName == name;
 }
 
@@ -440,7 +440,7 @@ class _DeclarationCollector extends RecursiveAstVisitor<void> {
 }
 
 class _ElementReferenceCollector extends RecursiveAstVisitor<void> {
-  final Element2 element;
+  final Element element;
   final List<AstNode> references = [];
 
   _ElementReferenceCollector(this.element);
@@ -483,14 +483,14 @@ class _ElementReferenceCollector extends RecursiveAstVisitor<void> {
   }
 }
 
-/// Visitor that collects defined [LocalElement2]s.
+/// Visitor that collects defined [LocalElement]s.
 class _LocalElementsCollector extends RecursiveAstVisitor<void> {
-  final elements = <LocalElement2>[];
+  final elements = <LocalElement>[];
 
   @override
   void visitVariableDeclaration(VariableDeclaration node) {
     var element = node.declaredFragment?.element;
-    if (element is LocalVariableElement2) {
+    if (element is LocalVariableElement) {
       elements.add(element);
     }
 
diff --git a/pkg/analysis_server/lib/src/services/flutter/class_description.dart b/pkg/analysis_server/lib/src/services/flutter/class_description.dart
index 6aebb5f2f5c..be7c77922f3 100644
--- a/pkg/analysis_server/lib/src/services/flutter/class_description.dart
+++ b/pkg/analysis_server/lib/src/services/flutter/class_description.dart
@@ -18,15 +18,15 @@ import 'package:analyzer/dart/element/type.dart';
 ///
 /// This class provides such "how to materialize" information.
 class ClassDescription {
-  final ClassElement2 element;
-  final ConstructorElement2 constructor;
+  final ClassElement element;
+  final ConstructorElement constructor;
 
   ClassDescription(this.element, this.constructor);
 }
 
 /// The lazy-fill registry of [ClassDescription].
 class ClassDescriptionRegistry {
-  final Map<ClassElement2, ClassDescription> _map = {};
+  final Map<ClassElement, ClassDescription> _map = {};
 
   /// Flush all data, because there was a change to a file.
   void flush() {
@@ -35,8 +35,8 @@ class ClassDescriptionRegistry {
 
   /// If we know how to materialize the [element], return [ClassDescription].
   /// Otherwise return `null`.
-  ClassDescription? get(InterfaceElement2 element) {
-    if (element is! ClassElement2) {
+  ClassDescription? get(InterfaceElement element) {
+    if (element is! ClassElement) {
       return null;
     }
 
@@ -58,7 +58,7 @@ class ClassDescriptionRegistry {
     return false;
   }
 
-  ClassDescription? _classDescription(ClassElement2 element) {
+  ClassDescription? _classDescription(ClassElement element) {
     if (!_isOptedInClass(element)) return null;
 
     var constructor = element.unnamedConstructor2;
@@ -73,8 +73,8 @@ class ClassDescriptionRegistry {
     return ClassDescription(element, constructor);
   }
 
-  bool _isOptedInClass(InterfaceElement2 element) {
-    if (element is! ClassElement2) {
+  bool _isOptedInClass(InterfaceElement element) {
+    if (element is! ClassElement) {
       return false;
     }
 
@@ -90,7 +90,7 @@ class ClassDescriptionRegistry {
         );
   }
 
-  static bool _isClass(ClassElement2 element, String uri, String name) {
+  static bool _isClass(ClassElement element, String uri, String name) {
     return element.name3 == name && element.library2.uri.toString() == uri;
   }
 }
diff --git a/pkg/analysis_server/lib/src/services/flutter/property.dart b/pkg/analysis_server/lib/src/services/flutter/property.dart
index 0596a7c52ed..6f45116368e 100644
--- a/pkg/analysis_server/lib/src/services/flutter/property.dart
+++ b/pkg/analysis_server/lib/src/services/flutter/property.dart
@@ -17,13 +17,13 @@ import 'package:analyzer_plugin/utilities/change_builder/change_builder_dart.dar
 import 'package:analyzer_plugin/utilities/range_factory.dart';
 import 'package:collection/collection.dart';
 
-String? getFieldDocumentation(FieldElement2 field) {
+String? getFieldDocumentation(FieldElement field) {
   var rawComment = field.documentationComment;
   return getDartDocPlainText(rawComment);
 }
 
 String? getParameterDocumentation(FormalParameterElement? parameter) {
-  if (parameter is FieldFormalParameterElement2) {
+  if (parameter is FieldFormalParameterElement) {
     var rawComment = parameter.field2?.documentationComment;
     return getDartDocPlainText(rawComment);
   }
@@ -91,7 +91,7 @@ class PropertyDescription {
   String get name => protocolProperty.name;
 
   /// This property has type `EdgeInsets`, add its nested properties.
-  void addEdgeInsetsNestedProperties(ClassElement2 classEdgeInsets) {
+  void addEdgeInsetsNestedProperties(ClassElement classEdgeInsets) {
     _edgeInsetsProperty = _EdgeInsetsProperty(classEdgeInsets, this)
       ..addNested();
   }
@@ -106,7 +106,7 @@ class PropertyDescription {
 
     var builder = ChangeBuilder(session: resolvedUnit.session);
 
-    InterfaceElement2? enumElement;
+    InterfaceElement? enumElement;
     var enumValue = value.enumValue;
     if (enumValue != null) {
       var helper = AnalysisSessionHelper(resolvedUnit.session);
@@ -389,7 +389,7 @@ class PropertyDescription {
 ///
 /// This class provides information necessary for such materialization.
 class VirtualContainerProperty {
-  final ClassElement2 containerElement;
+  final ClassElement containerElement;
   final InstanceCreationExpression widgetCreation;
 
   /// The existing wrapper around the widget, with semantic that is a subset
@@ -418,13 +418,13 @@ class VirtualContainerProperty {
 ///
 /// We try to generate nice looking code for `EdgeInsets` instances.
 class _EdgeInsetsProperty {
-  final ClassElement2 classEdgeInsets;
+  final ClassElement classEdgeInsets;
 
   /// The property that has type `EdgeInsets`.
   final PropertyDescription property;
 
   /// The constructor `EdgeInsets.only`.
-  ConstructorElement2? onlyConstructor;
+  ConstructorElement? onlyConstructor;
 
   double? leftValue;
   double? topValue;
diff --git a/pkg/analysis_server/lib/src/services/flutter/widget_descriptions.dart b/pkg/analysis_server/lib/src/services/flutter/widget_descriptions.dart
index 43ea2500b7f..e4a95ecc0cc 100644
--- a/pkg/analysis_server/lib/src/services/flutter/widget_descriptions.dart
+++ b/pkg/analysis_server/lib/src/services/flutter/widget_descriptions.dart
@@ -129,7 +129,7 @@ class _WidgetDescriptionComputer {
 
   /// The set of classes for which we are currently adding properties,
   /// used to prevent infinite recursion.
-  final Set<InterfaceElement2> elementsBeingProcessed = {};
+  final Set<InterfaceElement> elementsBeingProcessed = {};
 
   /// The resolved unit with the widget [InstanceCreationExpression].
   final ResolvedUnitResult resolvedUnit;
@@ -137,10 +137,10 @@ class _WidgetDescriptionComputer {
   /// The offset of the widget expression.
   final int widgetOffset;
 
-  ClassElement2? _classAlignment;
-  ClassElement2? _classAlignmentDirectional;
-  ClassElement2? _classContainer;
-  ClassElement2? _classEdgeInsets;
+  ClassElement? _classAlignment;
+  ClassElement? _classAlignmentDirectional;
+  ClassElement? _classContainer;
+  ClassElement? _classEdgeInsets;
 
   _WidgetDescriptionComputer(
     this.classRegistry,
@@ -273,7 +273,7 @@ class _WidgetDescriptionComputer {
     PropertyDescription? parent,
     ClassDescription? classDescription,
     InstanceCreationExpression? instanceCreation,
-    ConstructorElement2? constructorElement,
+    ConstructorElement? constructorElement,
   }) {
     constructorElement ??= instanceCreation?.constructorName.element;
     constructorElement ??= classDescription?.constructor;
@@ -402,7 +402,7 @@ class _WidgetDescriptionComputer {
   }
 
   List<protocol.FlutterWidgetPropertyValueEnumItem> _enumItemsForEnum(
-    EnumElement2 element,
+    EnumElement element,
   ) {
     return element.fields2
         .where((field) => field.isStatic && field.isEnumConstant)
@@ -411,7 +411,7 @@ class _WidgetDescriptionComputer {
   }
 
   List<protocol.FlutterWidgetPropertyValueEnumItem> _enumItemsForStaticFields(
-    ClassElement2 classElement,
+    ClassElement classElement,
   ) {
     return classElement.fields2
         .where((f) => f.isStatic)
@@ -452,7 +452,7 @@ class _WidgetDescriptionComputer {
     }
     if (type is InterfaceType) {
       var classElement = type.element3;
-      if (classElement is EnumElement2) {
+      if (classElement is EnumElement) {
         return protocol.FlutterWidgetPropertyEditor(
           protocol.FlutterWidgetPropertyEditorKind.ENUM,
           enumItems: _enumItemsForEnum(classElement),
@@ -508,8 +508,8 @@ class _WidgetDescriptionComputer {
     }
   }
 
-  protocol.FlutterWidgetPropertyValueEnumItem _toEnumItem(FieldElement2 field) {
-    var interfaceElement = field.enclosingElement2 as InterfaceElement2;
+  protocol.FlutterWidgetPropertyValueEnumItem _toEnumItem(FieldElement field) {
+    var interfaceElement = field.enclosingElement2 as InterfaceElement;
     var libraryUriStr = '${interfaceElement.enclosingElement2.uri}';
     var documentation = getFieldDocumentation(field);
 
@@ -534,8 +534,8 @@ class _WidgetDescriptionComputer {
       var element = valueExpression.element;
       if (element is GetterElement) {
         var field = element.variable3!;
-        if (field is FieldElement2 && field.isStatic) {
-          var enclosingClass = field.enclosingElement2 as InterfaceElement2;
+        if (field is FieldElement && field.isStatic) {
+          var enclosingClass = field.enclosingElement2 as InterfaceElement;
           if (field.isEnumConstant ||
               enclosingClass.isExactAlignment ||
               enclosingClass.isExactAlignmentDirectional) {
diff --git a/pkg/analysis_server/lib/src/services/kythe/kythe_visitors.dart b/pkg/analysis_server/lib/src/services/kythe/kythe_visitors.dart
index 54178e471e4..88c50d2efca 100644
--- a/pkg/analysis_server/lib/src/services/kythe/kythe_visitors.dart
+++ b/pkg/analysis_server/lib/src/services/kythe/kythe_visitors.dart
@@ -13,7 +13,7 @@ import 'schema.dart' as schema;
 ///
 /// This is either '<class-name>' or '<class-name>.<constructor-name>',
 /// depending on whether the constructor is a named constructor.
-String _computeConstructorElementName(ConstructorElement2 constructor) {
+String _computeConstructorElementName(ConstructorElement constructor) {
   var name = constructor.enclosingElement2.name3!;
   var constructorName = constructor.name3;
   if (constructorName != null && constructorName != 'new') {
@@ -22,16 +22,16 @@ String _computeConstructorElementName(ConstructorElement2 constructor) {
   return name;
 }
 
-String? _getNodeKind(Element2 e) {
-  if (e is FieldElement2 && e.isEnumConstant) {
+String? _getNodeKind(Element e) {
+  if (e is FieldElement && e.isEnumConstant) {
     // FieldElement is a kind of VariableElement, so this test case must be
     // before the e is VariableElement check.
     return schema.CONSTANT_KIND;
-  } else if (e is VariableElement2 || e is PrefixElement2) {
+  } else if (e is VariableElement || e is PrefixElement) {
     return schema.VARIABLE_KIND;
-  } else if (e is ExecutableElement2) {
+  } else if (e is ExecutableElement) {
     return schema.FUNCTION_KIND;
-  } else if (e is InterfaceElement2 || e is TypeParameterElement2) {
+  } else if (e is InterfaceElement || e is TypeParameterElement) {
     // TODO(jwren): this should be using absvar instead, see
     // https://kythe.io/docs/schema/#absvar
     return schema.RECORD_KIND;
@@ -41,7 +41,7 @@ String? _getNodeKind(Element2 e) {
 
 String _getPath(
   ResourceProvider provider,
-  Element2? e, {
+  Element? e, {
   String? sdkRootPath,
   String? corpus,
 }) {
@@ -86,7 +86,7 @@ String _getPath(
 /// returned.
 String _getSignature(
   ResourceProvider provider,
-  Element2? element,
+  Element? element,
   String nodeKind,
   String corpus, {
   String? sdkRootPath,
@@ -95,7 +95,7 @@ String _getSignature(
   if (element == null) {
     return schema.DYNAMIC_KIND;
   }
-  if (element is LibraryElement2) {
+  if (element is LibraryElement) {
     return _getPath(
       provider,
       element,
@@ -117,14 +117,14 @@ class CiderKytheHelper {
   CiderKytheHelper(this.resourceProvider, this.corpus, this.sdkRootPath);
 
   /// Returns a URI that can be used to query Kythe.
-  String toKytheUri(Element2 e) {
+  String toKytheUri(Element e) {
     var nodeKind = _getNodeKind(e) ?? schema.RECORD_KIND;
     var vname = _vNameFromElement(e, nodeKind);
     return 'kythe://$corpus?lang=dart?path=${vname.path}#${vname.signature}';
   }
 
   /// Returns the Kythe name for the [element].
-  _KytheVName _vNameFromElement(Element2? e, String nodeKind) {
+  _KytheVName _vNameFromElement(Element? e, String nodeKind) {
     assert(nodeKind != schema.FILE_KIND);
     // general case
     return _KytheVName(
@@ -158,16 +158,16 @@ class _KytheVName {
 class _SignatureBuilder {
   static _SignatureBuilder instance = _SignatureBuilder();
 
-  StringBuffer signatureFor(Element2 element) {
+  StringBuffer signatureFor(Element element) {
     var buffer = StringBuffer();
     _appendSignatureTo(buffer, element);
     return buffer;
   }
 
-  void _appendSignatureTo(StringBuffer buffer, Element2 element) {
-    if (element is LibraryElement2) {
+  void _appendSignatureTo(StringBuffer buffer, Element element) {
+    if (element is LibraryElement) {
       buffer.write('library:${element.displayName}');
-    } else if (element is TypeParameterElement2) {
+    } else if (element is TypeParameterElement) {
       // It is legal to have a named constructor with the same name as a type
       // parameter.  So we distinguish them by using '.' between the class (or
       // typedef) name and the type parameter name.
@@ -181,16 +181,16 @@ class _SignatureBuilder {
       if (buffer.isNotEmpty) {
         buffer.write('#');
       }
-      if (element is MethodElement2 &&
+      if (element is MethodElement &&
           element.name3 == '-' &&
           element.formalParameters.length == 1) {
         buffer.write('unary-');
-      } else if (element is ConstructorElement2) {
+      } else if (element is ConstructorElement) {
         buffer.write(_computeConstructorElementName(element));
       } else {
         buffer.write(element.name3);
       }
-      if (enclosingElt is ExecutableElement2) {
+      if (enclosingElt is ExecutableElement) {
         buffer
           ..write('@')
           ..write(
diff --git a/pkg/analysis_server/lib/src/services/refactoring/agnostic/change_method_signature.dart b/pkg/analysis_server/lib/src/services/refactoring/agnostic/change_method_signature.dart
index ab9a26f1961..81f6af63a6b 100644
--- a/pkg/analysis_server/lib/src/services/refactoring/agnostic/change_method_signature.dart
+++ b/pkg/analysis_server/lib/src/services/refactoring/agnostic/change_method_signature.dart
@@ -242,7 +242,7 @@ final class ValidSelectionState extends SelectionState {
 
   /// The element of the target method, used to find corresponding methods
   /// in the class hierarchy.
-  final ExecutableElement2 element;
+  final ExecutableElement element;
 
   /// The current formal parameters.
   final List<FormalParameterState> formalParameters;
@@ -301,7 +301,7 @@ class _AvailabilityAnalyzer {
 
     _Declaration? buildDeclaration(Declaration node) {
       var element = node.declaredFragment?.element;
-      if (element is ExecutableElement2) {
+      if (element is ExecutableElement) {
         return _Declaration(element: element, node: node, selected: selected);
       }
       return null;
@@ -373,7 +373,7 @@ class _AvailabilityAnalyzer {
   Availability _executableElement() {
     var coveringNode = refactoringContext.coveringNode;
 
-    Element2? element;
+    Element? element;
     if (coveringNode is SimpleIdentifier) {
       var invocation = coveringNode.parent;
       if (invocation is MethodInvocation &&
@@ -382,7 +382,7 @@ class _AvailabilityAnalyzer {
       }
     }
 
-    if (element is! ExecutableElement2) {
+    if (element is! ExecutableElement) {
       return NotAvailableNoExecutableElement();
     }
 
@@ -473,7 +473,7 @@ final class _AvailableWithDeclaration extends Available {
 }
 
 final class _AvailableWithExecutableElement extends Available {
-  final ExecutableElement2 element;
+  final ExecutableElement element;
 
   _AvailableWithExecutableElement({
     required super.refactoringContext,
@@ -488,7 +488,7 @@ final class _AvailableWithExecutableElement extends Available {
 
 /// The target method declaration.
 class _Declaration {
-  final ExecutableElement2 element;
+  final ExecutableElement element;
   final AstNode node;
   final List<FormalParameter> selected;
 
@@ -593,7 +593,7 @@ class _SelectionAnalyzer {
     }
   }
 
-  Future<AstNode?> _elementDeclaration(ExecutableElement2 element) async {
+  Future<AstNode?> _elementDeclaration(ExecutableElement element) async {
     var helper = refactoringContext.sessionHelper;
     var nodeResult = await helper.getFragmentDeclaration(element.firstFragment);
     return nodeResult?.node;
@@ -653,27 +653,27 @@ class _SignatureUpdater {
   /// a function, only the elements itself has to be updated. If the target
   /// is a class method, then every element in this class hierarchy should
   /// be updated.
-  Future<List<ExecutableElement2>> computeElements() async {
+  Future<List<ExecutableElement>> computeElements() async {
     var element = selectionState.element;
     switch (element) {
-      case ConstructorElement2():
-      case MethodElement2():
+      case ConstructorElement():
+      case MethodElement():
         var set = await getHierarchyMembers(searchEngine, element);
-        return set.whereType<ExecutableElement2>().toList();
+        return set.whereType<ExecutableElement>().toList();
       default:
         return [element];
     }
   }
 
-  /// Returns the [MethodDeclaration] for a [MethodElement2].
-  Future<AstNode?> elementDeclaration(ExecutableElement2 element) async {
+  /// Returns the [MethodDeclaration] for a [MethodElement].
+  Future<AstNode?> elementDeclaration(ExecutableElement element) async {
     var helper = sessionHelper;
     var result = await helper.getFragmentDeclaration(element.firstFragment);
     return result?.node;
   }
 
   /// Returns the [Selection] for the [reference], using the resolved unit.
-  /// Used to find [MethodInvocation]s of a [MethodElement2].
+  /// Used to find [MethodInvocation]s of a [MethodElement].
   Future<Selection?> referenceSelection(SearchMatch reference) async {
     var unitResult = await referenceUnitResult(reference);
     return unitResult?.unit.select(
@@ -740,7 +740,7 @@ class _SignatureUpdater {
   /// Replaces formal parameters of [element] with new code as requested
   /// by the formal parameter updates, reordering, changing kind, etc.
   Future<ChangeStatus> updateDeclaration({
-    required ExecutableElement2 element,
+    required ExecutableElement element,
     required ChangeBuilder builder,
   }) async {
     var path = element.firstFragment.libraryFragment.source.fullName;
@@ -961,7 +961,7 @@ class _SignatureUpdater {
 
   /// Updates arguments of invocations of [element].
   Future<ChangeStatus> updateReferences({
-    required ExecutableElement2 element,
+    required ExecutableElement element,
     required ChangeBuilder builder,
   }) async {
     var references = await searchEngine.searchReferences(element);
diff --git a/pkg/analysis_server/lib/src/services/refactoring/legacy/convert_getter_to_method.dart b/pkg/analysis_server/lib/src/services/refactoring/legacy/convert_getter_to_method.dart
index e26e80f46e5..de48070ea47 100644
--- a/pkg/analysis_server/lib/src/services/refactoring/legacy/convert_getter_to_method.dart
+++ b/pkg/analysis_server/lib/src/services/refactoring/legacy/convert_getter_to_method.dart
@@ -50,18 +50,18 @@ class ConvertGetterToMethodRefactoringImpl extends RefactoringImpl
   Future<SourceChange> createChange() async {
     change = SourceChange(refactoringName);
     // function
-    if (element.enclosingElement2 is LibraryElement2) {
+    if (element.enclosingElement2 is LibraryElement) {
       await _updateElementDeclaration(element);
       await _updateElementReferences(element);
     }
     // method
     var field = element.variable3;
-    if (field is FieldElement2 &&
-        (field.enclosingElement2 is InterfaceElement2 ||
-            field.enclosingElement2 is ExtensionElement2)) {
+    if (field is FieldElement &&
+        (field.enclosingElement2 is InterfaceElement ||
+            field.enclosingElement2 is ExtensionElement)) {
       var elements = await getHierarchyMembers(searchEngine, field);
-      await Future.forEach(elements, (Element2 member) async {
-        if (member is FieldElement2) {
+      await Future.forEach(elements, (Element member) async {
+        if (member is FieldElement) {
           var getter = member.getter2;
           if (getter != null && !getter.isSynthetic) {
             await _updateElementDeclaration(getter);
@@ -136,7 +136,7 @@ class ConvertGetterToMethodRefactoringImpl extends RefactoringImpl
     }
   }
 
-  Future<void> _updateElementReferences(Element2 element) async {
+  Future<void> _updateElementReferences(Element element) async {
     var matches = await searchEngine.searchReferences(element);
     var references = getSourceReferences(matches);
     for (var reference in references) {
diff --git a/pkg/analysis_server/lib/src/services/refactoring/legacy/convert_method_to_getter.dart b/pkg/analysis_server/lib/src/services/refactoring/legacy/convert_method_to_getter.dart
index 38eb7567f13..f7bee619d74 100644
--- a/pkg/analysis_server/lib/src/services/refactoring/legacy/convert_method_to_getter.dart
+++ b/pkg/analysis_server/lib/src/services/refactoring/legacy/convert_method_to_getter.dart
@@ -22,7 +22,7 @@ class ConvertMethodToGetterRefactoringImpl extends RefactoringImpl
   final RefactoringWorkspace workspace;
   final SearchEngine searchEngine;
   final AnalysisSessionHelper sessionHelper;
-  final ExecutableElement2 element;
+  final ExecutableElement element;
 
   late SourceChange change;
 
@@ -57,10 +57,10 @@ class ConvertMethodToGetterRefactoringImpl extends RefactoringImpl
       await _updateElementReferences(element);
     }
     // MethodElement
-    if (element is MethodElement2) {
+    if (element is MethodElement) {
       var elements = await getHierarchyMembers(searchEngine, element);
-      await Future.forEach(elements, (Element2 element) async {
-        await _updateElementDeclaration(element as ExecutableElement2);
+      await Future.forEach(elements, (Element element) async {
+        await _updateElementDeclaration(element as ExecutableElement);
         return _updateElementReferences(element);
       });
     }
@@ -82,7 +82,7 @@ class ConvertMethodToGetterRefactoringImpl extends RefactoringImpl
     }
 
     // check Element type
-    if (element is! MethodElement2 && element is! TopLevelFunctionElement) {
+    if (element is! MethodElement && element is! TopLevelFunctionElement) {
       return RefactoringStatus.fatal(
         'Only methods or top-level functions can be converted to getters.',
       );
@@ -103,7 +103,7 @@ class ConvertMethodToGetterRefactoringImpl extends RefactoringImpl
     return RefactoringStatus();
   }
 
-  Future<void> _updateElementDeclaration(ExecutableElement2 element) async {
+  Future<void> _updateElementDeclaration(ExecutableElement element) async {
     // prepare parameters
     FormalParameterList? parameters;
     for (
@@ -136,7 +136,7 @@ class ConvertMethodToGetterRefactoringImpl extends RefactoringImpl
     }
   }
 
-  Future<void> _updateElementReferences(Element2 element) async {
+  Future<void> _updateElementReferences(Element element) async {
     var matches = await searchEngine.searchReferences(element);
     var references = getSourceReferences(matches);
     for (var reference in references) {
diff --git a/pkg/analysis_server/lib/src/services/refactoring/legacy/extract_local.dart b/pkg/analysis_server/lib/src/services/refactoring/legacy/extract_local.dart
index 3369aa886cb..b9a3e791a13 100644
--- a/pkg/analysis_server/lib/src/services/refactoring/legacy/extract_local.dart
+++ b/pkg/analysis_server/lib/src/services/refactoring/legacy/extract_local.dart
@@ -55,7 +55,7 @@ class ExtractLocalRefactoringImpl extends RefactoringImpl
   Expression? singleExpression;
   String? stringLiteralPart;
   final List<SourceRange> occurrences = <SourceRange>[];
-  final Map<Element2, int> elementIds = <Element2, int>{};
+  final Map<Element, int> elementIds = <Element, int>{};
   Set<String> _excludedVariableNames = <String>{};
 
   ExtractLocalRefactoringImpl(
@@ -340,7 +340,7 @@ class ExtractLocalRefactoringImpl extends RefactoringImpl
       if (node is MethodInvocation) {
         var invocation = node;
         var element = invocation.methodName.element;
-        if (element is ExecutableElement2 && element.returnType is VoidType) {
+        if (element is ExecutableElement && element.returnType is VoidType) {
           if (singleExpression == null) {
             return RefactoringStatus.fatal(
               'Cannot extract the void expression.',
@@ -361,7 +361,7 @@ class ExtractLocalRefactoringImpl extends RefactoringImpl
           }
           var element = node.element;
           if (element is LocalFunctionElement ||
-              element is MethodElement2 ||
+              element is MethodElement ||
               element is TopLevelFunctionElement) {
             continue;
           }
@@ -390,9 +390,9 @@ class ExtractLocalRefactoringImpl extends RefactoringImpl
     );
   }
 
-  /// Return an unique identifier for the given [Element2], or `null` if
+  /// Return an unique identifier for the given [Element], or `null` if
   /// [element] is `null`.
-  int? _encodeElement(Element2? element) {
+  int? _encodeElement(Element? element) {
     if (element == null) {
       return null;
     }
@@ -404,8 +404,8 @@ class ExtractLocalRefactoringImpl extends RefactoringImpl
     return id;
   }
 
-  /// Returns an [Element2]-sensitive encoding of [tokens].
-  /// Each [Token] with a [LocalVariableElement2] has a suffix of the element
+  /// Returns an [Element]-sensitive encoding of [tokens].
+  /// Each [Token] with a [LocalVariableElement] has a suffix of the element
   /// ID.
   ///
   /// So, we can distinguish different local variables with the same name, if
@@ -413,7 +413,7 @@ class ExtractLocalRefactoringImpl extends RefactoringImpl
   /// function we are searching occurrences in.
   String _encodeExpressionTokens(Expression expr, List<Token> tokens) {
     // prepare Token -> LocalElement map
-    Map<Token, Element2> map = HashMap<Token, Element2>(
+    Map<Token, Element> map = HashMap<Token, Element>(
       equals: (Token a, Token b) => a.lexeme == b.lexeme,
       hashCode: (Token t) => t.lexeme.hashCode,
     );
@@ -640,14 +640,14 @@ class _OccurrencesVisitor extends GeneralizingAstVisitor<void> {
 }
 
 class _TokenLocalElementVisitor extends RecursiveAstVisitor<void> {
-  final Map<Token, Element2> map;
+  final Map<Token, Element> map;
 
   _TokenLocalElementVisitor(this.map);
 
   @override
   void visitSimpleIdentifier(SimpleIdentifier node) {
     var element = node.element;
-    if (element is LocalVariableElement2) {
+    if (element is LocalVariableElement) {
       map[node.token] = element;
     }
   }
diff --git a/pkg/analysis_server/lib/src/services/refactoring/legacy/extract_method.dart b/pkg/analysis_server/lib/src/services/refactoring/legacy/extract_method.dart
index 85222868f76..cc88c9ca25a 100644
--- a/pkg/analysis_server/lib/src/services/refactoring/legacy/extract_method.dart
+++ b/pkg/analysis_server/lib/src/services/refactoring/legacy/extract_method.dart
@@ -47,7 +47,7 @@ const String _tokenSeparator = '\uFFFF';
 Future<void> addLibraryImports(
   AnalysisSession session,
   SourceChange change,
-  LibraryElement2 targetLibrary2,
+  LibraryElement targetLibrary2,
   Set<Source> libraries,
 ) async {
   var libraryPath = targetLibrary2.firstFragment.source.fullName;
@@ -211,13 +211,13 @@ Future<void> addLibraryImports(
   }
 }
 
-bool isLocalElement(Element2? element) {
-  return element is LocalVariableElement2 ||
+bool isLocalElement(Element? element) {
+  return element is LocalVariableElement ||
       element is FormalParameterElement ||
       element is LocalFunctionElement;
 }
 
-Element2? _getLocalElement(SimpleIdentifier node) {
+Element? _getLocalElement(SimpleIdentifier node) {
   var element = node.writeOrReadElement2;
   if (isLocalElement(element)) {
     return element;
@@ -272,7 +272,7 @@ final class ExtractMethodRefactoringImpl extends RefactoringImpl
   final List<int> lengths = <int>[];
 
   /// The map of local elements to their visibility ranges.
-  late Map<LocalElement2, SourceRange> _visibleRangeMap;
+  late Map<LocalElement, SourceRange> _visibleRangeMap;
 
   /// The map of local names to their visibility ranges.
   final Map<String, List<SourceRange>> _localNames =
@@ -640,7 +640,7 @@ final class ExtractMethodRefactoringImpl extends RefactoringImpl
       return validateCreateFunction(_searchEngine, libraryElement, name);
     }
     // method of class
-    InterfaceElement2? interfaceElement;
+    InterfaceElement? interfaceElement;
     if (parent is ClassDeclaration) {
       interfaceElement = parent.declaredFragment?.element;
     } else if (parent is EnumDeclaration) {
@@ -950,7 +950,7 @@ final class ExtractMethodRefactoringImpl extends RefactoringImpl
     _parametersMap.clear();
     _parameterReferencesMap.clear();
     var result = RefactoringStatus();
-    var assignedUsedVariables = <VariableElement2>[];
+    var assignedUsedVariables = <VariableElement>[];
 
     var unit = _resolveResult.unit;
     _visibleRangeMap = VisibleRangesComputer.forNode(unit);
@@ -1046,7 +1046,7 @@ final class ExtractMethodRefactoringImpl extends RefactoringImpl
   }
 
   /// Checks if the given [element] is declared in [_selectionRange].
-  bool _isDeclaredInSelection(Element2 element) {
+  bool _isDeclaredInSelection(Element element) {
     return _selectionRange.contains(element.firstFragment.nameOffset2!);
   }
 
@@ -1092,7 +1092,7 @@ final class ExtractMethodRefactoringImpl extends RefactoringImpl
   }
 
   /// Checks if [element] is referenced after [_selectionRange].
-  bool _isUsedAfterSelection(Element2 element) {
+  bool _isUsedAfterSelection(Element element) {
     var visitor = _IsUsedAfterSelectionVisitor(this, element);
     _parentMember!.accept(visitor);
     return visitor.result;
@@ -1343,11 +1343,11 @@ class _ExtractMethodAnalyzer extends StatementAnalyzer {
       // method name
       var element = node.writeOrReadElement2;
       if (element is LocalFunctionElement ||
-          element is MethodElement2 ||
+          element is MethodElement ||
           element is TopLevelFunctionElement) {
         invalidSelection('Cannot extract a single method name.');
       }
-      if (element is PrefixElement2) {
+      if (element is PrefixElement) {
         invalidSelection('Cannot extract an import prefix.');
       }
       var parent = node.parent;
@@ -1415,7 +1415,7 @@ class _GetSourcePatternVisitor extends GeneralizingAstVisitor<void> {
     super.visitVariableDeclaration(node);
   }
 
-  void _addPatterns({required Token nameToken, required Element2? element}) {
+  void _addPatterns({required Token nameToken, required Element? element}) {
     var nameRange = range.token(nameToken);
     if (partRange.covers(nameRange)) {
       if (element != null && isLocalElement(element)) {
@@ -1438,8 +1438,8 @@ class _GetSourcePatternVisitor extends GeneralizingAstVisitor<void> {
     }
   }
 
-  DartType _getElementType(Element2 element) {
-    if (element is VariableElement2) {
+  DartType _getElementType(Element element) {
+    if (element is VariableElement) {
       return element.type;
     }
     if (element is LocalFunctionElement) {
@@ -1618,7 +1618,7 @@ class _InitializeOccurrencesVisitor extends GeneralizingAstVisitor<void> {
 
 class _InitializeParametersVisitor extends GeneralizingAstVisitor<void> {
   final ExtractMethodRefactoringImpl ref;
-  final List<VariableElement2> assignedUsedVariables;
+  final List<VariableElement> assignedUsedVariables;
 
   _InitializeParametersVisitor(this.ref, this.assignedUsedVariables);
 
@@ -1669,14 +1669,14 @@ class _InitializeParametersVisitor extends GeneralizingAstVisitor<void> {
       }
       // remember, if assigned and used after selection
       if (isLeftHandOfAssignment(node) && ref._isUsedAfterSelection(element)) {
-        if (element is VariableElement2 &&
+        if (element is VariableElement &&
             !assignedUsedVariables.contains(element)) {
           assignedUsedVariables.add(element);
         }
       }
     }
     // remember information for conflicts checking
-    if (element is LocalElement2) {
+    if (element is LocalElement) {
       // declared local elements
       if (node.inDeclarationContext()) {
         var range = ref._visibleRangeMap[element];
@@ -1707,7 +1707,7 @@ class _InitializeParametersVisitor extends GeneralizingAstVisitor<void> {
       }
 
       // remember information for conflicts checking
-      if (element is LocalVariableElement2) {
+      if (element is LocalVariableElement) {
         // declared local elements
         var range = ref._visibleRangeMap[element];
         if (range != null) {
@@ -1724,7 +1724,7 @@ class _InitializeParametersVisitor extends GeneralizingAstVisitor<void> {
 
 class _IsUsedAfterSelectionVisitor extends GeneralizingAstVisitor<void> {
   final ExtractMethodRefactoringImpl ref;
-  final Element2 element;
+  final Element element;
   bool result = false;
 
   _IsUsedAfterSelectionVisitor(this.ref, this.element);
@@ -1776,7 +1776,7 @@ class _SourcePattern {
   }
 }
 
-extension on LibraryElement2 {
+extension on LibraryElement {
   /// Returns the source to reference [type] in this [CompilationUnit].
   ///
   /// Fills [librariesToImport] with library elements whose elements are
@@ -1862,7 +1862,7 @@ extension on LibraryElement2 {
   /// library.
   ///
   /// Returns `null` if was not imported, i.e. declared in the same library.
-  LibraryImport? _getImportElement(Element2 element) {
+  LibraryImport? _getImportElement(Element element) {
     for (var imp in firstFragment.libraryImports2) {
       var definedNames = imp.namespace.definedNames2;
       if (definedNames.containsValue(element)) {
@@ -1874,7 +1874,7 @@ extension on LibraryElement2 {
 
   String? _getTypeCodeElementArguments({
     required Set<Source> librariesToImport,
-    required Element2 element,
+    required Element element,
     required bool isNullable,
     required List<DartType> typeArguments,
   }) {
diff --git a/pkg/analysis_server/lib/src/services/refactoring/legacy/extract_widget.dart b/pkg/analysis_server/lib/src/services/refactoring/legacy/extract_widget.dart
index 93ba951c1bf..5da798c6d68 100644
--- a/pkg/analysis_server/lib/src/services/refactoring/legacy/extract_widget.dart
+++ b/pkg/analysis_server/lib/src/services/refactoring/legacy/extract_widget.dart
@@ -37,11 +37,11 @@ class ExtractWidgetRefactoringImpl extends RefactoringImpl
 
   late CorrectionUtils utils;
 
-  ClassElement2? classBuildContext;
-  ClassElement2? classKey;
-  ClassElement2? classStatelessWidget;
-  ClassElement2? classWidget;
-  PropertyAccessorElement2? accessorRequired;
+  ClassElement? classBuildContext;
+  ClassElement? classKey;
+  ClassElement? classStatelessWidget;
+  ClassElement? classWidget;
+  PropertyAccessorElement? accessorRequired;
 
   @override
   late String name;
@@ -50,7 +50,7 @@ class ExtractWidgetRefactoringImpl extends RefactoringImpl
   ClassDeclaration? _enclosingClassNode;
 
   /// If [offset] is in a class, the element of this class, `null` otherwise.
-  ClassElement2? _enclosingClassElement;
+  ClassElement? _enclosingClassElement;
 
   /// The [CompilationUnitMember] that encloses the [offset].
   CompilationUnitMember? _enclosingUnitMember;
@@ -244,7 +244,7 @@ class ExtractWidgetRefactoringImpl extends RefactoringImpl
   Future<RefactoringStatus> _initializeClasses() async {
     var result = RefactoringStatus();
 
-    Future<ClassElement2?> getClass(String name) async {
+    Future<ClassElement?> getClass(String name) async {
       var element = await sessionHelper.getFlutterClass(name);
       if (element == null) {
         result.addFatalError("Unable to find '$name' in $widgetsUri");
@@ -252,7 +252,7 @@ class ExtractWidgetRefactoringImpl extends RefactoringImpl
       return element;
     }
 
-    Future<PropertyAccessorElement2?> getAccessor(
+    Future<PropertyAccessorElement?> getAccessor(
       String uri,
       String name,
     ) async {
@@ -577,7 +577,7 @@ class ExtractWidgetRefactoringImpl extends RefactoringImpl
 }
 
 class _MethodInvocationsCollector extends RecursiveAstVisitor<void> {
-  final ExecutableElement2 methodElement;
+  final ExecutableElement methodElement;
   final List<MethodInvocation> invocations = [];
 
   _MethodInvocationsCollector(this.methodElement);
@@ -610,14 +610,14 @@ class _Parameter {
 }
 
 class _ParametersCollector extends RecursiveAstVisitor<void> {
-  final InterfaceElement2? enclosingClass;
+  final InterfaceElement? enclosingClass;
   final SourceRange expressionRange;
 
   final RefactoringStatus status = RefactoringStatus();
-  final Set<Element2> uniqueElements = <Element2>{};
+  final Set<Element> uniqueElements = <Element>{};
   final List<_Parameter> parameters = [];
 
-  List<InterfaceElement2>? enclosingClasses;
+  List<InterfaceElement>? enclosingClasses;
 
   _ParametersCollector(this.enclosingClass, this.expressionRange);
 
@@ -630,13 +630,13 @@ class _ParametersCollector extends RecursiveAstVisitor<void> {
     var elementName = element.displayName;
 
     DartType? type;
-    if (element is MethodElement2) {
+    if (element is MethodElement) {
       if (_isMemberOfEnclosingClass(element)) {
         status.addError(
           'Reference to an enclosing class method cannot be extracted.',
         );
       }
-    } else if (element is LocalVariableElement2) {
+    } else if (element is LocalVariableElement) {
       if (!expressionRange.contains(element.firstFragment.nameOffset)) {
         if (node.inSetterContext()) {
           status.addError("Write to '$elementName' cannot be extracted.");
@@ -644,7 +644,7 @@ class _ParametersCollector extends RecursiveAstVisitor<void> {
           type = element.type;
         }
       }
-    } else if (element is PropertyAccessorElement2) {
+    } else if (element is PropertyAccessorElement) {
       var field = element.variable3;
       if (field == null) {
         return;
@@ -667,11 +667,11 @@ class _ParametersCollector extends RecursiveAstVisitor<void> {
 
   /// Return `true` if the given [element] is a member of the [enclosingClass]
   /// or one of its supertypes, interfaces, or mixins.
-  bool _isMemberOfEnclosingClass(Element2 element) {
+  bool _isMemberOfEnclosingClass(Element element) {
     var enclosingClass = this.enclosingClass;
     if (enclosingClass != null) {
       var enclosingClasses =
-          this.enclosingClasses ??= <InterfaceElement2>[
+          this.enclosingClasses ??= <InterfaceElement>[
             enclosingClass,
             ...enclosingClass.allSupertypes.map((t) => t.element3),
           ];
diff --git a/pkg/analysis_server/lib/src/services/refactoring/legacy/inline_local.dart b/pkg/analysis_server/lib/src/services/refactoring/legacy/inline_local.dart
index 47745ff3c01..7c46fffca21 100644
--- a/pkg/analysis_server/lib/src/services/refactoring/legacy/inline_local.dart
+++ b/pkg/analysis_server/lib/src/services/refactoring/legacy/inline_local.dart
@@ -52,7 +52,7 @@ class InlineLocalRefactoringImpl extends RefactoringImpl
 
   @override
   Future<RefactoringStatus> checkInitialConditions() async {
-    Element2? element;
+    Element? element;
     var offsetNode = resolveResult.unit.nodeCovering(offset: offset);
     if (offsetNode is SimpleIdentifier) {
       element = offsetNode.element;
@@ -60,7 +60,7 @@ class InlineLocalRefactoringImpl extends RefactoringImpl
       element = offsetNode.declaredFragment?.element;
     }
 
-    if (element is! LocalVariableElement2) {
+    if (element is! LocalVariableElement) {
       return _noLocalVariableStatus();
     }
 
@@ -178,7 +178,7 @@ class InlineLocalRefactoringImpl extends RefactoringImpl
 
   /// Checks if [offset] is a variable that can be inlined.
   RefactoringStatus _checkOffset() {
-    Element2? element;
+    Element? element;
     var offsetNode = resolveResult.unit.nodeCovering(offset: offset);
     if (offsetNode is SimpleIdentifier) {
       element = offsetNode.element;
@@ -186,7 +186,7 @@ class InlineLocalRefactoringImpl extends RefactoringImpl
       element = offsetNode.declaredFragment?.element;
     }
 
-    if (element is! LocalVariableElement2) {
+    if (element is! LocalVariableElement) {
       return _noLocalVariableStatus();
     }
 
@@ -257,7 +257,7 @@ class InlineLocalRefactoringImpl extends RefactoringImpl
 }
 
 class _InitialState {
-  final LocalVariableElement2 element;
+  final LocalVariableElement element;
   final VariableDeclaration node;
   final Expression initializer;
   final VariableDeclarationStatement declarationStatement;
diff --git a/pkg/analysis_server/lib/src/services/refactoring/legacy/inline_method.dart b/pkg/analysis_server/lib/src/services/refactoring/legacy/inline_method.dart
index 6f14ae3a40d..13842c03274 100644
--- a/pkg/analysis_server/lib/src/services/refactoring/legacy/inline_method.dart
+++ b/pkg/analysis_server/lib/src/services/refactoring/legacy/inline_method.dart
@@ -147,10 +147,7 @@ String _getMethodSourceForInvocation(
   }
   // prepare edits to replace conflicting variables
   var conflictingNames = _getNamesConflictingAt(contextNode);
-  part._variables.forEach((
-    VariableElement2 variable,
-    List<SourceRange> ranges,
-  ) {
+  part._variables.forEach((VariableElement variable, List<SourceRange> ranges) {
     var originalName = variable.displayName;
     // prepare unique name
     String uniqueName;
@@ -226,7 +223,7 @@ class InlineMethodRefactoringImpl extends RefactoringImpl
   bool deleteSource = false;
   bool inlineAll = true;
 
-  ExecutableElement2? _methodElement;
+  ExecutableElement? _methodElement;
   late CompilationUnit _methodUnit;
   late CorrectionUtils _methodUtils;
   late AstNode _methodNode;
@@ -236,7 +233,7 @@ class InlineMethodRefactoringImpl extends RefactoringImpl
   _SourcePart? _methodExpressionPart;
   _SourcePart? _methodStatementsPart;
   final List<_ReferenceProcessor> _referenceProcessors = [];
-  final Set<Element2> _alreadyMadeAsync = <Element2>{};
+  final Set<Element> _alreadyMadeAsync = <Element>{};
 
   InlineMethodRefactoringImpl(
     this.searchEngine,
@@ -249,7 +246,7 @@ class InlineMethodRefactoringImpl extends RefactoringImpl
   @override
   String? get className {
     var interfaceElement = _methodElement?.enclosingElement2;
-    if (interfaceElement is InterfaceElement2) {
+    if (interfaceElement is InterfaceElement) {
       return interfaceElement.displayName;
     }
     return null;
@@ -262,7 +259,7 @@ class InlineMethodRefactoringImpl extends RefactoringImpl
 
   @override
   String get refactoringName {
-    if (_methodElement is MethodElement2) {
+    if (_methodElement is MethodElement) {
       return 'Inline Method';
     } else {
       return 'Inline Function';
@@ -316,7 +313,7 @@ class InlineMethodRefactoringImpl extends RefactoringImpl
     }
 
     // Disallow inlining an operator.
-    if (methodElement is MethodElement2 && methodElement.isOperator) {
+    if (methodElement is MethodElement && methodElement.isOperator) {
       result = RefactoringStatus.fatal("Can't inline an operator.");
       return result;
     }
@@ -357,7 +354,7 @@ class InlineMethodRefactoringImpl extends RefactoringImpl
     );
 
     var selectedNode = resolveResult.unit.nodeCovering(offset: offset);
-    Element2? element;
+    Element? element;
 
     if (selectedNode is FunctionDeclaration) {
       element = selectedNode.declaredFragment?.element;
@@ -370,14 +367,14 @@ class InlineMethodRefactoringImpl extends RefactoringImpl
     } else {
       return fatalStatus;
     }
-    if (element is! ExecutableElement2) {
+    if (element is! ExecutableElement) {
       return fatalStatus;
     }
     if (element.isSynthetic) {
       return fatalStatus;
     }
     // maybe operator
-    if (element is MethodElement2 && element.isOperator) {
+    if (element is MethodElement && element.isOperator) {
       return RefactoringStatus.fatal("Can't inline an operator.");
     }
     // maybe [a]sync*
@@ -413,7 +410,7 @@ class InlineMethodRefactoringImpl extends RefactoringImpl
 
     // prepare selected SimpleIdentifier
     var selectedNode = resolveResult.unit.nodeCovering(offset: offset);
-    Element2? element;
+    Element? element;
     if (selectedNode is FunctionDeclaration) {
       element = selectedNode.declaredFragment?.element;
       isDeclaration = true;
@@ -427,7 +424,7 @@ class InlineMethodRefactoringImpl extends RefactoringImpl
     }
 
     // prepare selected ExecutableElement
-    if (element is! ExecutableElement2) {
+    if (element is! ExecutableElement) {
       return fatalStatus;
     }
     if (element.isSynthetic) {
@@ -515,12 +512,12 @@ class _ParameterOccurrence {
   });
 }
 
-/// Processor for single [SearchMatch] reference to an [Element2].
+/// Processor for single [SearchMatch] reference to an [Element].
 class _ReferenceProcessor {
   final InlineMethodRefactoringImpl ref;
   final SearchMatch reference;
 
-  late Element2 refElement;
+  late Element refElement;
   late CorrectionUtils _refUtils;
   late SimpleIdentifier _node;
   SourceRange? _refLineRange;
@@ -718,8 +715,8 @@ class _ReferenceProcessor {
             );
             return;
           }
-          if (refElement is ExecutableElement2) {
-            var executable = refElement as ExecutableElement2;
+          if (refElement is ExecutableElement) {
+            var executable = refElement as ExecutableElement;
             if (!executable.returnType.isDartAsyncFuture) {
               status.addFatalError(
                 "Can't inline an 'async' method into a function that doesn't return a 'Future'.",
@@ -749,7 +746,7 @@ class _ReferenceProcessor {
       );
     } else {
       // cannot inline reference to method: var v = new A().method;
-      if (ref._methodElement is MethodElement2) {
+      if (ref._methodElement is MethodElement) {
         status.addFatalError(
           "Can't inline a class method reference.",
           newLocation_fromNode(_node),
@@ -757,7 +754,7 @@ class _ReferenceProcessor {
         return;
       }
       // PropertyAccessorElement
-      if (ref._methodElement is PropertyAccessorElement2) {
+      if (ref._methodElement is PropertyAccessorElement) {
         Expression usage = _node;
         Expression? target;
         var cascade = false;
@@ -856,7 +853,7 @@ class _SourcePart {
       {};
 
   /// The occurrences of the method local variables.
-  final Map<VariableElement2, List<SourceRange>> _variables = {};
+  final Map<VariableElement, List<SourceRange>> _variables = {};
 
   /// The offsets of explicit `this` expression references.
   final List<int> _explicitThisOffsets = [];
@@ -907,7 +904,7 @@ class _SourcePart {
     );
   }
 
-  void addVariable(VariableElement2 element, SourceRange identifierRange) {
+  void addVariable(VariableElement element, SourceRange identifierRange) {
     var ranges = _variables[element];
     if (ranges == null) {
       ranges = [];
@@ -920,8 +917,8 @@ class _SourcePart {
 
 /// A visitor that fills [_SourcePart] with fields, parameters and variables.
 class _VariablesVisitor extends GeneralizingAstVisitor<void> {
-  /// The [ExecutableElement2] being inlined.
-  final ExecutableElement2 methodElement;
+  /// The [ExecutableElement] being inlined.
+  final ExecutableElement methodElement;
 
   /// The [SourceRange] of the element body.
   final SourceRange bodyRange;
@@ -979,8 +976,8 @@ class _VariablesVisitor extends GeneralizingAstVisitor<void> {
     }
     // should be a method or field reference
     var element = node.writeOrReadElement2;
-    if (element is ExecutableElement2) {
-      if (element is MethodElement2 || element is PropertyAccessorElement2) {
+    if (element is ExecutableElement) {
+      if (element is MethodElement || element is PropertyAccessorElement) {
         // OK
       } else {
         return;
@@ -988,7 +985,7 @@ class _VariablesVisitor extends GeneralizingAstVisitor<void> {
     } else {
       return;
     }
-    if (element.enclosingElement2 is! InterfaceElement2) {
+    if (element.enclosingElement2 is! InterfaceElement) {
       return;
     }
     // record the implicit static or instance reference
diff --git a/pkg/analysis_server/lib/src/services/refactoring/legacy/refactoring.dart b/pkg/analysis_server/lib/src/services/refactoring/legacy/refactoring.dart
index 06c7cdbfeba..fd3d3ee3864 100644
--- a/pkg/analysis_server/lib/src/services/refactoring/legacy/refactoring.dart
+++ b/pkg/analysis_server/lib/src/services/refactoring/legacy/refactoring.dart
@@ -66,7 +66,7 @@ abstract class ConvertMethodToGetterRefactoring implements Refactoring {
   factory ConvertMethodToGetterRefactoring(
     RefactoringWorkspace workspace,
     AnalysisSession session,
-    ExecutableElement2 element,
+    ExecutableElement element,
   ) {
     return ConvertMethodToGetterRefactoringImpl(workspace, session, element);
   }
@@ -397,7 +397,7 @@ class RefactoringWorkspace {
   RefactoringWorkspace(this.drivers, this.searchEngine);
 
   /// Whether the [element] is defined in a file that is in a context root.
-  bool containsElement(Element2 element) {
+  bool containsElement(Element element) {
     if (element is MockLibraryImportElement) {
       return containsFile(element.libraryFragment.source.fullName);
     }
@@ -447,14 +447,14 @@ abstract class RenameRefactoring implements Refactoring {
   static RenameRefactoring? create(
     RefactoringWorkspace workspace,
     ResolvedUnitResult resolvedUnit,
-    Element2? element,
+    Element? element,
   ) {
     if (element == null) {
       return null;
     }
     var session = resolvedUnit.session;
     var sessionHelper = AnalysisSessionHelper(session);
-    if (element is PropertyAccessorElement2) {
+    if (element is PropertyAccessorElement) {
       element = element.variable3;
       if (element == null) {
         return null;
@@ -468,10 +468,10 @@ abstract class RenameRefactoring implements Refactoring {
       );
     }
     var enclosingElement = element.enclosingElement2;
-    if (element is PrefixElement2) {
+    if (element is PrefixElement) {
       enclosingElement = element.library2;
     }
-    if (enclosingElement is LibraryElement2) {
+    if (enclosingElement is LibraryElement) {
       return RenameUnitMemberRefactoringImpl(
         workspace,
         sessionHelper,
@@ -479,22 +479,22 @@ abstract class RenameRefactoring implements Refactoring {
         element,
       );
     }
-    if (element is ConstructorElement2) {
+    if (element is ConstructorElement) {
       return RenameConstructorRefactoringImpl(
         workspace,
         sessionHelper,
         element,
       );
     }
-    if (element is LabelElement2) {
+    if (element is LabelElement) {
       return RenameLabelRefactoringImpl(workspace, sessionHelper, element);
     }
-    if (element is LibraryElement2) {
+    if (element is LibraryElement) {
       return RenameLibraryRefactoringImpl(workspace, sessionHelper, element);
     }
-    if (enclosingElement?.thisOrAncestorOfType2<InterfaceElement2>()
+    if (enclosingElement?.thisOrAncestorOfType2<InterfaceElement>()
         case var enclosingElement?) {
-      if (element case FieldFormalParameterElement2(:var field2?)) {
+      if (element case FieldFormalParameterElement(:var field2?)) {
         return RenameClassMemberRefactoringImpl(
           workspace,
           sessionHelper,
@@ -506,17 +506,17 @@ abstract class RenameRefactoring implements Refactoring {
     if (element is FormalParameterElement) {
       return RenameParameterRefactoringImpl(workspace, sessionHelper, element);
     }
-    if (element is LocalElement2) {
+    if (element is LocalElement) {
       return RenameLocalRefactoringImpl(workspace, sessionHelper, element);
     }
-    if (element is TypeParameterElement2) {
+    if (element is TypeParameterElement) {
       return RenameTypeParameterRefactoringImpl(
         workspace,
         sessionHelper,
         element,
       );
     }
-    if (enclosingElement is InterfaceElement2) {
+    if (enclosingElement is InterfaceElement) {
       return RenameClassMemberRefactoringImpl(
         workspace,
         sessionHelper,
@@ -524,7 +524,7 @@ abstract class RenameRefactoring implements Refactoring {
         element,
       );
     }
-    if (enclosingElement is ExtensionElement2) {
+    if (enclosingElement is ExtensionElement) {
       return RenameExtensionMemberRefactoringImpl(
         workspace,
         sessionHelper,
@@ -539,7 +539,7 @@ abstract class RenameRefactoring implements Refactoring {
   /// example, the class when on the `new` keyword).
   static RenameRefactoringElement? getElementToRename(
     AstNode node,
-    Element2? element,
+    Element? element,
   ) {
     // TODO(scheglov): This is bad code.
     SyntacticEntity? nameNode;
@@ -630,7 +630,7 @@ abstract class RenameRefactoring implements Refactoring {
 }
 
 class RenameRefactoringElement {
-  final Element2 element;
+  final Element element;
   final int offset;
   final int length;
 
diff --git a/pkg/analysis_server/lib/src/services/refactoring/legacy/refactoring_internal.dart b/pkg/analysis_server/lib/src/services/refactoring/legacy/refactoring_internal.dart
index b7a5fa9bbe1..c65580ab0a8 100644
--- a/pkg/analysis_server/lib/src/services/refactoring/legacy/refactoring_internal.dart
+++ b/pkg/analysis_server/lib/src/services/refactoring/legacy/refactoring_internal.dart
@@ -67,7 +67,7 @@ class SourceReference {
 
   SourceReference(this._match);
 
-  Element2 get element => _match.element;
+  Element get element => _match.element;
 
   /// The full path of the file containing the match.
   String get file => _match.file;
@@ -87,8 +87,8 @@ class SourceReference {
 
   bool get isResolved => _match.isResolved;
 
-  /// Return the [LibraryElement2] for the [file].
-  LibraryElement2 get libraryElement => _match.libraryElement;
+  /// Return the [LibraryElement] for the [file].
+  LibraryElement get libraryElement => _match.libraryElement;
 
   SourceRange get range => _match.sourceRange;
 
diff --git a/pkg/analysis_server/lib/src/services/refactoring/legacy/refactoring_manager.dart b/pkg/analysis_server/lib/src/services/refactoring/legacy/refactoring_manager.dart
index f87dc32be5f..82232ac306e 100644
--- a/pkg/analysis_server/lib/src/services/refactoring/legacy/refactoring_manager.dart
+++ b/pkg/analysis_server/lib/src/services/refactoring/legacy/refactoring_manager.dart
@@ -238,7 +238,7 @@ class RefactoringManager {
       if (resolvedUnit != null) {
         var node = resolvedUnit.unit.nodeCovering(offset: offset);
         var element = node?.getElement();
-        if (element is ExecutableElement2) {
+        if (element is ExecutableElement) {
           refactoring = ConvertMethodToGetterRefactoring(
             refactoringWorkspace,
             resolvedUnit.session,
diff --git a/pkg/analysis_server/lib/src/services/refactoring/legacy/rename.dart b/pkg/analysis_server/lib/src/services/refactoring/legacy/rename.dart
index 2daf159d6eb..1510bd9260c 100644
--- a/pkg/analysis_server/lib/src/services/refactoring/legacy/rename.dart
+++ b/pkg/analysis_server/lib/src/services/refactoring/legacy/rename.dart
@@ -32,7 +32,7 @@ class RenameProcessor {
   );
 
   /// Add the edit that updates the [element] declaration.
-  void addDeclarationEdit(Element2? element) {
+  void addDeclarationEdit(Element? element) {
     if (element == null) {
       return;
     } else if (element is LibraryElementImpl) {
@@ -66,7 +66,7 @@ class RenameProcessor {
   }
 
   /// Update the [element] declaration and references to it.
-  Future<void> renameElement(Element2 element) async {
+  Future<void> renameElement(Element element) async {
     addDeclarationEdit(element);
     var matches = await workspace.searchEngine.searchReferences(element);
     addReferenceEdits(matches);
@@ -75,7 +75,7 @@ class RenameProcessor {
   /// Add an edit that replaces the specified region with [code].
   /// Uses [referenceElement] to identify the file to update.
   void replace({
-    required Element2 referenceElement,
+    required Element referenceElement,
     required int offset,
     required int length,
     required String code,
@@ -95,7 +95,7 @@ abstract class RenameRefactoringImpl extends RefactoringImpl
   final RefactoringWorkspace workspace;
   final AnalysisSessionHelper sessionHelper;
   final SearchEngine searchEngine;
-  final Element2 _element;
+  final Element _element;
   @override
   final String elementKindName;
   @override
@@ -104,13 +104,13 @@ abstract class RenameRefactoringImpl extends RefactoringImpl
 
   late String newName;
 
-  RenameRefactoringImpl(this.workspace, this.sessionHelper, Element2 element)
+  RenameRefactoringImpl(this.workspace, this.sessionHelper, Element element)
     : searchEngine = workspace.searchEngine,
       _element = element,
       elementKindName = element.kind.displayName,
       oldName = _getOldName(element);
 
-  Element2 get element => _element;
+  Element get element => _element;
 
   @override
   Future<RefactoringStatus> checkInitialConditions() {
@@ -161,8 +161,8 @@ abstract class RenameRefactoringImpl extends RefactoringImpl
           .getAnalysisOptionsForFile(file)
           .codeStyleOptions;
 
-  static String _getOldName(Element2 element) {
-    if (element is ConstructorElement2) {
+  static String _getOldName(Element element) {
+    if (element is ConstructorElement) {
       var name = element.name3;
       if (name == null || name == 'new') {
         return '';
diff --git a/pkg/analysis_server/lib/src/services/refactoring/legacy/rename_class_member.dart b/pkg/analysis_server/lib/src/services/refactoring/legacy/rename_class_member.dart
index b59984262f0..ce75dad339b 100644
--- a/pkg/analysis_server/lib/src/services/refactoring/legacy/rename_class_member.dart
+++ b/pkg/analysis_server/lib/src/services/refactoring/legacy/rename_class_member.dart
@@ -27,7 +27,7 @@ import 'package:analyzer/src/util/performance/operation_performance.dart';
 Future<RefactoringStatus> validateCreateMethod(
   SearchEngine searchEngine,
   AnalysisSessionHelper sessionHelper,
-  InterfaceElement2 interfaceElement,
+  InterfaceElement interfaceElement,
   String name,
 ) {
   return _CreateClassMemberValidator(
@@ -40,7 +40,7 @@ Future<RefactoringStatus> validateCreateMethod(
 
 /// A [Refactoring] for renaming class members.
 class RenameClassMemberRefactoringImpl extends RenameRefactoringImpl {
-  final InterfaceElement2 interfaceElement;
+  final InterfaceElement interfaceElement;
 
   late _RenameClassMemberValidator _validator;
 
@@ -48,14 +48,14 @@ class RenameClassMemberRefactoringImpl extends RenameRefactoringImpl {
     RefactoringWorkspace workspace,
     AnalysisSessionHelper sessionHelper,
     this.interfaceElement,
-    Element2 element,
+    Element element,
   ) : super(workspace, sessionHelper, element);
 
   @override
   String get refactoringName {
-    if (element is TypeParameterElement2) {
+    if (element is TypeParameterElement) {
       return 'Rename Type Parameter';
-    } else if (element is FieldElement2) {
+    } else if (element is FieldElement) {
       return 'Rename Field';
     }
     return 'Rename Method';
@@ -76,7 +76,7 @@ class RenameClassMemberRefactoringImpl extends RenameRefactoringImpl {
   @override
   Future<RefactoringStatus> checkInitialConditions() async {
     var result = await super.checkInitialConditions();
-    if (element is MethodElement2 && (element as MethodElement2).isOperator) {
+    if (element is MethodElement && (element as MethodElement).isOperator) {
       result.addFatalError('Cannot rename operator.');
     }
     return result;
@@ -85,9 +85,9 @@ class RenameClassMemberRefactoringImpl extends RenameRefactoringImpl {
   @override
   RefactoringStatus checkNewName() {
     var result = super.checkNewName();
-    if (element is FieldElement2) {
+    if (element is FieldElement) {
       result.addStatus(validateFieldName(newName));
-    } else if (element is MethodElement2) {
+    } else if (element is MethodElement) {
       result.addStatus(validateMethodName(newName));
     }
     return result;
@@ -98,17 +98,17 @@ class RenameClassMemberRefactoringImpl extends RenameRefactoringImpl {
     var processor = RenameProcessor(workspace, sessionHelper, change, newName);
     // update declarations
     for (var renameElement in _validator.elements) {
-      if (renameElement.isSynthetic && renameElement is FieldElement2) {
+      if (renameElement.isSynthetic && renameElement is FieldElement) {
         processor.addDeclarationEdit(renameElement.getter2);
         processor.addDeclarationEdit(renameElement.setter2);
       } else {
         processor.addDeclarationEdit(renameElement);
         if (!newName.startsWith('_')) {
           var interfaceElement = renameElement.enclosingElement2;
-          if (interfaceElement is InterfaceElement2) {
+          if (interfaceElement is InterfaceElement) {
             for (var constructor in interfaceElement.constructors2) {
               for (var parameter in constructor.formalParameters) {
-                if (parameter is FieldFormalParameterElement2 &&
+                if (parameter is FieldFormalParameterElement &&
                     parameter.field2 == renameElement) {
                   await searchEngine
                       .searchReferences(parameter)
@@ -142,7 +142,7 @@ class RenameClassMemberRefactoringImpl extends RenameRefactoringImpl {
 
   Future<void> _addPrivateNamedFormalParameterEdit(
     SourceReference reference,
-    FieldFormalParameterElement2 element,
+    FieldFormalParameterElement element,
   ) async {
     FieldFormalParameterFragment? fragment = element.firstFragment;
     while (fragment != null) {
@@ -195,14 +195,14 @@ class RenameClassMemberRefactoringImpl extends RenameRefactoringImpl {
       }
 
       if (newName.startsWith('_') &&
-          element is FieldFormalParameterElement2 &&
+          element is FieldFormalParameterElement &&
           element.isNamed) {
         await _addPrivateNamedFormalParameterEdit(reference, element);
         continue;
       }
 
       if (unshadowed.contains(reference.element) &&
-          reference.element is ExecutableElement2) {
+          reference.element is ExecutableElement) {
         await _addThisEdit(reference, newName);
         continue;
       }
@@ -216,7 +216,7 @@ class RenameClassMemberRefactoringImpl extends RenameRefactoringImpl {
 class _BaseClassMemberValidator {
   final SearchEngine searchEngine;
   final AnalysisSessionHelper sessionHelper;
-  final InterfaceElement2 interfaceElement;
+  final InterfaceElement interfaceElement;
   final ElementKind elementKind;
   final String name;
 
@@ -230,7 +230,7 @@ class _BaseClassMemberValidator {
     this.name,
   );
 
-  LibraryElement2 get library => interfaceElement.library2;
+  LibraryElement get library => interfaceElement.library2;
 
   void _checkClassAlreadyDeclares() {
     // check if there is a member with "newName" in the same ClassElement
@@ -250,7 +250,7 @@ class _BaseClassMemberValidator {
 
   Future<void> _checkHierarchy({
     required bool isRename,
-    required Set<InterfaceElement2> subClasses,
+    required Set<InterfaceElement> subClasses,
   }) async {
     var superClasses =
         interfaceElement.allSupertypes.map((e) => e.element3).toSet();
@@ -294,7 +294,7 @@ class _CreateClassMemberValidator extends _BaseClassMemberValidator {
   _CreateClassMemberValidator(
     SearchEngine searchEngine,
     AnalysisSessionHelper sessionHelper,
-    InterfaceElement2 interfaceElement,
+    InterfaceElement interfaceElement,
     String name,
   ) : super(
         searchEngine,
@@ -307,7 +307,7 @@ class _CreateClassMemberValidator extends _BaseClassMemberValidator {
   Future<RefactoringStatus> validate() async {
     _checkClassAlreadyDeclares();
     // do chained computations
-    var subClasses = <InterfaceElement2>{};
+    var subClasses = <InterfaceElement>{};
     await searchEngine.appendAllSubtypes(
       interfaceElement,
       subClasses,
@@ -330,7 +330,7 @@ class _CreateClassMemberValidator extends _BaseClassMemberValidator {
 
 class _LocalElementsCollector extends GeneralizingAstVisitor<void> {
   final String name;
-  final List<Element2> elements = [];
+  final List<Element> elements = [];
 
   _LocalElementsCollector(this.name);
 
@@ -367,7 +367,7 @@ class _LocalElementsCollector extends GeneralizingAstVisitor<void> {
     ) when node == leftHandSide) {
       element = writeElement2;
     }
-    if (element is! PropertyAccessorElement2) {
+    if (element is! PropertyAccessorElement) {
       return;
     }
     if (element.name3 != name) {
@@ -376,7 +376,7 @@ class _LocalElementsCollector extends GeneralizingAstVisitor<void> {
     if (element is! GetterElement && element is! SetterElement) {
       return;
     }
-    if (element.variable3 case TopLevelVariableElement2 variable) {
+    if (element.variable3 case TopLevelVariableElement variable) {
       elements.add(variable);
     }
     super.visitSimpleIdentifier(node);
@@ -386,7 +386,7 @@ class _LocalElementsCollector extends GeneralizingAstVisitor<void> {
   void visitVariableDeclaration(VariableDeclaration node) {
     if (node.name.lexeme == name) {
       var element = node.declaredFragment?.element;
-      if (element is LocalVariableElement2) {
+      if (element is LocalVariableElement) {
         elements.add(element);
       }
     }
@@ -397,14 +397,14 @@ class _LocalElementsCollector extends GeneralizingAstVisitor<void> {
 
 class _MatchShadowedBy {
   final SearchMatch match;
-  final Element2 element;
+  final Element element;
 
   _MatchShadowedBy(this.match, this.element);
 }
 
 class _MatchShadowedByLocal extends _MatchShadowedBy {
   @override
-  final LocalElement2 element;
+  final LocalElement element;
 
   _MatchShadowedByLocal(SearchMatch match, this.element)
     : super(match, element);
@@ -412,16 +412,16 @@ class _MatchShadowedByLocal extends _MatchShadowedBy {
 
 /// Helper to check if the renamed [element] will cause any conflicts.
 class _RenameClassMemberValidator extends _BaseClassMemberValidator {
-  final Element2 element;
+  final Element element;
 
-  Set<Element2> elements = {};
+  Set<Element> elements = {};
   List<SearchMatch> references = [];
   List<SearchMatch> unshadowed = [];
 
   _RenameClassMemberValidator(
     SearchEngine searchEngine,
     AnalysisSessionHelper sessionHelper,
-    InterfaceElement2 elementInterface,
+    InterfaceElement elementInterface,
     this.element,
     String name,
   ) : super(searchEngine, sessionHelper, elementInterface, element.kind, name);
@@ -430,7 +430,7 @@ class _RenameClassMemberValidator extends _BaseClassMemberValidator {
     _checkClassAlreadyDeclares();
     // do chained computations
     await _prepareReferences();
-    var subClasses = <InterfaceElement2>{};
+    var subClasses = <InterfaceElement>{};
     await searchEngine.appendAllSubtypes(
       interfaceElement,
       subClasses,
@@ -439,7 +439,7 @@ class _RenameClassMemberValidator extends _BaseClassMemberValidator {
     // check shadowing of class names
     for (var element in elements) {
       var enclosingElement = element.enclosingElement2;
-      if (enclosingElement is InterfaceElement2 &&
+      if (enclosingElement is InterfaceElement &&
           enclosingElement.name3 == name) {
         result.addError(
           'Renamed ${elementKind.displayName} has the same name as the '
@@ -473,10 +473,10 @@ class _RenameClassMemberValidator extends _BaseClassMemberValidator {
   }
 
   Future<_MatchShadowedBy?> _getLocalShadowingElement() async {
-    var localElementMap = <LibraryFragment, List<Element2>>{};
-    var visibleRangeMap = <Element2, SourceRange>{};
+    var localElementMap = <LibraryFragment, List<Element>>{};
+    var visibleRangeMap = <Element, SourceRange>{};
 
-    Future<List<Element2>> getLocalElements(Element2 element) async {
+    Future<List<Element>> getLocalElements(Element element) async {
       var unitFragment = element.firstFragment.libraryFragment;
       if (unitFragment == null) {
         return const [];
@@ -520,7 +520,7 @@ class _RenameClassMemberValidator extends _BaseClassMemberValidator {
         var elementRange = visibleRangeMap[localElement];
         if (elementRange != null &&
             elementRange.intersects(match.sourceRange)) {
-          if (localElement is LocalElement2) {
+          if (localElement is LocalElement) {
             return _MatchShadowedByLocal(match, localElement);
           }
           return _MatchShadowedBy(match, localElement);
@@ -530,10 +530,10 @@ class _RenameClassMemberValidator extends _BaseClassMemberValidator {
     return null;
   }
 
-  /// Fills [elements] with [Element2]s to rename.
+  /// Fills [elements] with [Element]s to rename.
   Future<void> _prepareElements() async {
     var element = this.element;
-    if (element is FieldElement2 || element is MethodElement2) {
+    if (element is FieldElement || element is MethodElement) {
       elements = await getHierarchyMembers(searchEngine, element);
     } else {
       elements = {element};
@@ -543,7 +543,7 @@ class _RenameClassMemberValidator extends _BaseClassMemberValidator {
   /// Fills [references] with all references to [elements].
   Future<void> _prepareReferences() async {
     await _prepareElements();
-    await Future.forEach(elements, (Element2 element) async {
+    await Future.forEach(elements, (Element element) async {
       var elementReferences = await searchEngine.searchReferences(element);
       references.addAll(elementReferences);
     });
@@ -569,7 +569,7 @@ class _RenameClassMemberValidator extends _BaseClassMemberValidator {
   }
 }
 
-extension on Element2 {
+extension on Element {
   bool get canAvoidShadowForField {
     return switch (kind) {
       ElementKind.LOCAL_VARIABLE ||
@@ -580,8 +580,8 @@ extension on Element2 {
   }
 }
 
-extension on List<Element2> {
-  List<Element2> get avoidableShadowsForField {
+extension on List<Element> {
+  List<Element> get avoidableShadowsForField {
     return where((e) => e.canAvoidShadowForField).toList();
   }
 }
diff --git a/pkg/analysis_server/lib/src/services/refactoring/legacy/rename_constructor.dart b/pkg/analysis_server/lib/src/services/refactoring/legacy/rename_constructor.dart
index 885d986f210..b93ef73030c 100644
--- a/pkg/analysis_server/lib/src/services/refactoring/legacy/rename_constructor.dart
+++ b/pkg/analysis_server/lib/src/services/refactoring/legacy/rename_constructor.dart
@@ -19,16 +19,16 @@ import 'package:analyzer/source/source_range.dart';
 import 'package:analyzer/src/generated/java_core.dart';
 import 'package:analyzer_plugin/utilities/range_factory.dart';
 
-/// A [Refactoring] for renaming [ConstructorElement2]s.
+/// A [Refactoring] for renaming [ConstructorElement]s.
 class RenameConstructorRefactoringImpl extends RenameRefactoringImpl {
   RenameConstructorRefactoringImpl(
     super.workspace,
     super.sessionHelper,
-    ConstructorElement2 super.element,
+    ConstructorElement super.element,
   ) : super();
 
   @override
-  ConstructorElement2 get element => super.element as ConstructorElement2;
+  ConstructorElement get element => super.element as ConstructorElement;
 
   @override
   String get refactoringName {
diff --git a/pkg/analysis_server/lib/src/services/refactoring/legacy/rename_extension_member.dart b/pkg/analysis_server/lib/src/services/refactoring/legacy/rename_extension_member.dart
index b5bd500ad0b..823157590d7 100644
--- a/pkg/analysis_server/lib/src/services/refactoring/legacy/rename_extension_member.dart
+++ b/pkg/analysis_server/lib/src/services/refactoring/legacy/rename_extension_member.dart
@@ -19,9 +19,9 @@ import 'package:analyzer/source/source_range.dart';
 import 'package:analyzer/src/dart/analysis/session_helper.dart';
 import 'package:analyzer/src/generated/java_core.dart';
 
-/// A [Refactoring] for renaming extension member [Element2]s.
+/// A [Refactoring] for renaming extension member [Element]s.
 class RenameExtensionMemberRefactoringImpl extends RenameRefactoringImpl {
-  final ExtensionElement2 extensionElement;
+  final ExtensionElement extensionElement;
 
   late _ExtensionMemberValidator _validator;
 
@@ -34,9 +34,9 @@ class RenameExtensionMemberRefactoringImpl extends RenameRefactoringImpl {
 
   @override
   String get refactoringName {
-    if (element is TypeParameterElement2) {
+    if (element is TypeParameterElement) {
       return 'Rename Type Parameter';
-    } else if (element is FieldElement2) {
+    } else if (element is FieldElement) {
       return 'Rename Field';
     }
     return 'Rename Method';
@@ -57,7 +57,7 @@ class RenameExtensionMemberRefactoringImpl extends RenameRefactoringImpl {
   @override
   Future<RefactoringStatus> checkInitialConditions() async {
     var result = await super.checkInitialConditions();
-    if (element is MethodElement2 && (element as MethodElement2).isOperator) {
+    if (element is MethodElement && (element as MethodElement).isOperator) {
       result.addFatalError('Cannot rename operator.');
     }
     return result;
@@ -66,9 +66,9 @@ class RenameExtensionMemberRefactoringImpl extends RenameRefactoringImpl {
   @override
   RefactoringStatus checkNewName() {
     var result = super.checkNewName();
-    if (element is FieldElement2) {
+    if (element is FieldElement) {
       result.addStatus(validateFieldName(newName));
-    } else if (element is MethodElement2) {
+    } else if (element is MethodElement) {
       result.addStatus(validateMethodName(newName));
     }
     return result;
@@ -80,7 +80,7 @@ class RenameExtensionMemberRefactoringImpl extends RenameRefactoringImpl {
 
     // Update the declaration.
     var renameElement = element;
-    if (renameElement.isSynthetic && renameElement is FieldElement2) {
+    if (renameElement.isSynthetic && renameElement is FieldElement) {
       processor.addDeclarationEdit(renameElement.getter2);
       processor.addDeclarationEdit(renameElement.setter2);
     } else {
@@ -92,14 +92,14 @@ class RenameExtensionMemberRefactoringImpl extends RenameRefactoringImpl {
   }
 }
 
-/// Helper to check if the created or renamed [Element2] will cause any
+/// Helper to check if the created or renamed [Element] will cause any
 /// conflicts.
 class _ExtensionMemberValidator {
   final SearchEngine searchEngine;
   final AnalysisSessionHelper sessionHelper;
-  final LibraryElement2 library;
-  final Element2 element;
-  final ExtensionElement2 elementExtension;
+  final LibraryElement library;
+  final Element element;
+  final ExtensionElement elementExtension;
   final ElementKind elementKind;
   final String name;
   final bool isRename;
@@ -154,10 +154,10 @@ class _ExtensionMemberValidator {
   }
 
   Future<_MatchShadowedByLocal?> _getShadowingLocalElement() async {
-    var localElementMap = <LibraryFragment, List<LocalElement2>>{};
-    var visibleRangeMap = <LocalElement2, SourceRange>{};
+    var localElementMap = <LibraryFragment, List<LocalElement>>{};
+    var visibleRangeMap = <LocalElement, SourceRange>{};
 
-    Future<List<LocalElement2>> getLocalElements(Element2 element) async {
+    Future<List<LocalElement>> getLocalElements(Element element) async {
       var unitFragment = element.firstFragment.libraryFragment;
       if (unitFragment == null) {
         return const [];
@@ -212,7 +212,7 @@ class _ExtensionMemberValidator {
 
 class _LocalElementsCollector extends GeneralizingAstVisitor<void> {
   final String name;
-  final List<LocalElement2> elements = [];
+  final List<LocalElement> elements = [];
 
   _LocalElementsCollector(this.name);
 
@@ -244,7 +244,7 @@ class _LocalElementsCollector extends GeneralizingAstVisitor<void> {
   void visitVariableDeclaration(VariableDeclaration node) {
     if (node.name.lexeme == name) {
       var element = node.declaredFragment?.element;
-      if (element is LocalVariableElement2) {
+      if (element is LocalVariableElement) {
         elements.add(element);
       }
     }
@@ -255,7 +255,7 @@ class _LocalElementsCollector extends GeneralizingAstVisitor<void> {
 
 class _MatchShadowedByLocal {
   final SearchMatch match;
-  final LocalElement2 localElement;
+  final LocalElement localElement;
 
   _MatchShadowedByLocal(this.match, this.localElement);
 }
diff --git a/pkg/analysis_server/lib/src/services/refactoring/legacy/rename_label.dart b/pkg/analysis_server/lib/src/services/refactoring/legacy/rename_label.dart
index 1fe64d6c060..12b657c1ae9 100644
--- a/pkg/analysis_server/lib/src/services/refactoring/legacy/rename_label.dart
+++ b/pkg/analysis_server/lib/src/services/refactoring/legacy/rename_label.dart
@@ -8,16 +8,16 @@ import 'package:analysis_server/src/services/refactoring/legacy/refactoring.dart
 import 'package:analysis_server/src/services/refactoring/legacy/rename.dart';
 import 'package:analyzer/dart/element/element.dart';
 
-/// A [Refactoring] for renaming [LabelElement2]s.
+/// A [Refactoring] for renaming [LabelElement]s.
 class RenameLabelRefactoringImpl extends RenameRefactoringImpl {
   RenameLabelRefactoringImpl(
     super.workspace,
     super.sessionHelper,
-    LabelElement2 super.element,
+    LabelElement super.element,
   ) : super();
 
   @override
-  LabelElement2 get element => super.element as LabelElement2;
+  LabelElement get element => super.element as LabelElement;
 
   @override
   String get refactoringName => 'Rename Label';
diff --git a/pkg/analysis_server/lib/src/services/refactoring/legacy/rename_library.dart b/pkg/analysis_server/lib/src/services/refactoring/legacy/rename_library.dart
index 056e4afac49..9fe4d0f607f 100644
--- a/pkg/analysis_server/lib/src/services/refactoring/legacy/rename_library.dart
+++ b/pkg/analysis_server/lib/src/services/refactoring/legacy/rename_library.dart
@@ -8,16 +8,16 @@ import 'package:analysis_server/src/services/refactoring/legacy/refactoring.dart
 import 'package:analysis_server/src/services/refactoring/legacy/rename.dart';
 import 'package:analyzer/dart/element/element.dart';
 
-/// A [Refactoring] for renaming [LibraryElement2]s.
+/// A [Refactoring] for renaming [LibraryElement]s.
 class RenameLibraryRefactoringImpl extends RenameRefactoringImpl {
   RenameLibraryRefactoringImpl(
     super.workspace,
     super.sessionHelper,
-    LibraryElement2 super.element2,
+    LibraryElement super.element2,
   ) : super();
 
   @override
-  LibraryElement2 get element => super.element as LibraryElement2;
+  LibraryElement get element => super.element as LibraryElement;
 
   @override
   String get refactoringName {
diff --git a/pkg/analysis_server/lib/src/services/refactoring/legacy/rename_local.dart b/pkg/analysis_server/lib/src/services/refactoring/legacy/rename_local.dart
index 2d42554ff96..b485e6f5ef9 100644
--- a/pkg/analysis_server/lib/src/services/refactoring/legacy/rename_local.dart
+++ b/pkg/analysis_server/lib/src/services/refactoring/legacy/rename_local.dart
@@ -22,9 +22,9 @@ import 'package:analyzer/src/generated/java_core.dart';
 class ConflictValidatorVisitor extends RecursiveAstVisitor<void> {
   final RefactoringStatus result;
   final String newName;
-  final LocalElement2 target;
-  final Map<Element2, SourceRange> visibleRangeMap;
-  final Set<Element2> conflictingLocals = <Element2>{};
+  final LocalElement target;
+  final Map<Element, SourceRange> visibleRangeMap;
+  final Set<Element> conflictingLocals = <Element>{};
 
   ConflictValidatorVisitor(
     this.result,
@@ -81,7 +81,7 @@ class ConflictValidatorVisitor extends RecursiveAstVisitor<void> {
   }
 
   void _checkDeclaration({
-    required Element2? declaredElement,
+    required Element? declaredElement,
     required Token nameToken,
   }) {
     if (declaredElement != null && nameToken.lexeme == newName) {
@@ -101,13 +101,13 @@ class ConflictValidatorVisitor extends RecursiveAstVisitor<void> {
     }
   }
 
-  SourceRange? _getVisibleRange(LocalElement2 element) {
+  SourceRange? _getVisibleRange(LocalElement element) {
     return visibleRangeMap[element];
   }
 
   /// Returns whether [element] and [target] are visible together.
-  bool _isVisibleWithTarget(Element2 element) {
-    if (element is LocalElement2) {
+  bool _isVisibleWithTarget(Element element) {
+    if (element is LocalElement) {
       var targetRange = _getVisibleRange(target);
       var elementRange = _getVisibleRange(element);
       return elementRange != null && elementRange.intersects(targetRange);
@@ -121,17 +121,17 @@ class ConflictValidatorVisitor extends RecursiveAstVisitor<void> {
   }
 }
 
-/// A [Refactoring] for renaming [LocalElement2]s (excluding
+/// A [Refactoring] for renaming [LocalElement]s (excluding
 /// [FormalParameterElement]s).
 class RenameLocalRefactoringImpl extends RenameRefactoringImpl {
   RenameLocalRefactoringImpl(
     super.workspace,
     super.sessionHelper,
-    LocalElement2 super.element,
+    LocalElement super.element,
   ) : super();
 
   @override
-  LocalElement2 get element => super.element as LocalElement2;
+  LocalElement get element => super.element as LocalElement;
 
   @override
   String get refactoringName {
@@ -160,7 +160,7 @@ class RenameLocalRefactoringImpl extends RenameRefactoringImpl {
   @override
   RefactoringStatus checkNewName() {
     var result = super.checkNewName();
-    if (element is LocalVariableElement2) {
+    if (element is LocalVariableElement) {
       result.addStatus(validateVariableName(newName));
     } else if (element is LocalFunctionElement) {
       result.addStatus(validateFunctionName(newName));
@@ -173,7 +173,7 @@ class RenameLocalRefactoringImpl extends RenameRefactoringImpl {
     var processor = RenameProcessor(workspace, sessionHelper, change, newName);
 
     var element = this.element;
-    if (element is PatternVariableElement2) {
+    if (element is PatternVariableElement) {
       var rootVariable =
           (element.firstFragment as PatternVariableElementImpl).rootVariable;
       var declaredFragments =
@@ -207,14 +207,14 @@ class RenameLocalRefactoringImpl extends RenameRefactoringImpl {
   }
 }
 
-extension on Element2 {
+extension on Element {
   String get declarationLocation {
     var sourceName = firstFragment.libraryFragment!.source.shortName;
     var executable = enclosingElement2;
     String className = '';
     String executableName = '';
-    if (executable is MethodElement2) {
-      var namescope = executable.enclosingElement2 as ClassElement2?;
+    if (executable is MethodElement) {
+      var namescope = executable.enclosingElement2 as ClassElement?;
       className = namescope?.displayName ?? '';
       if (className.isNotEmpty && executable.displayName.isNotEmpty) {
         className += '.';
diff --git a/pkg/analysis_server/lib/src/services/refactoring/legacy/rename_parameter.dart b/pkg/analysis_server/lib/src/services/refactoring/legacy/rename_parameter.dart
index a572d1d048d..eb2e42f5287 100644
--- a/pkg/analysis_server/lib/src/services/refactoring/legacy/rename_parameter.dart
+++ b/pkg/analysis_server/lib/src/services/refactoring/legacy/rename_parameter.dart
@@ -9,23 +9,24 @@ import 'package:analysis_server/src/services/refactoring/legacy/rename.dart';
 import 'package:analysis_server/src/services/refactoring/legacy/rename_local.dart';
 import 'package:analysis_server/src/services/refactoring/legacy/visible_ranges_computer.dart';
 import 'package:analysis_server/src/services/search/hierarchy.dart';
-import 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/dart/element/element.dart' as analyzer;
 import 'package:analyzer/src/generated/java_core.dart';
 import 'package:analyzer_plugin/protocol/protocol_common.dart';
 
-/// A [Refactoring] for renaming [FormalParameterElement]s.
+/// A [Refactoring] for renaming [analyzer.FormalParameterElement]s.
 class RenameParameterRefactoringImpl extends RenameRefactoringImpl {
-  List<FormalParameterElement> elements = [];
+  List<analyzer.FormalParameterElement> elements = [];
   bool _renameAllPositionalOccurences = false;
 
   RenameParameterRefactoringImpl(
     super.workspace,
     super.sessionHelper,
-    FormalParameterElement super.element,
+    analyzer.FormalParameterElement super.element,
   ) : super();
 
   @override
-  FormalParameterElement get element => super.element as FormalParameterElement;
+  analyzer.FormalParameterElement get element =>
+      super.element as analyzer.FormalParameterElement;
 
   @override
   String get refactoringName {
@@ -101,7 +102,7 @@ class RenameParameterRefactoringImpl extends RenameRefactoringImpl {
         continue;
       }
       var fieldRenamed = false;
-      if (element is FieldFormalParameterElement2) {
+      if (element is analyzer.FieldFormalParameterElement) {
         var field = element.field2;
         if (field != null) {
           await processor.renameElement(field);
@@ -123,7 +124,7 @@ class RenameParameterRefactoringImpl extends RenameRefactoringImpl {
       // References to positional parameters from super-formal.
       if (element.isPositional) {
         references.removeWhere(
-          (match) => match.element is SuperFormalParameterElement2,
+          (match) => match.element is analyzer.SuperFormalParameterElement,
         );
       }
 
@@ -131,7 +132,7 @@ class RenameParameterRefactoringImpl extends RenameRefactoringImpl {
     }
   }
 
-  /// Fills [elements] with [Element2]s to rename.
+  /// Fills [elements] with [Element]s to rename.
   Future<void> _prepareElements() async {
     var element = this.element;
     if (element.isNamed) {
diff --git a/pkg/analysis_server/lib/src/services/refactoring/legacy/rename_type_parameter.dart b/pkg/analysis_server/lib/src/services/refactoring/legacy/rename_type_parameter.dart
index 6dfba2f5c95..ef195b51ac8 100644
--- a/pkg/analysis_server/lib/src/services/refactoring/legacy/rename_type_parameter.dart
+++ b/pkg/analysis_server/lib/src/services/refactoring/legacy/rename_type_parameter.dart
@@ -12,11 +12,11 @@ class RenameTypeParameterRefactoringImpl extends RenameRefactoringImpl {
   RenameTypeParameterRefactoringImpl(
     super.workspace,
     super.sessionHelper,
-    TypeParameterElement2 super.element2,
+    TypeParameterElement super.element2,
   ) : super();
 
   @override
-  TypeParameterElement2 get element => super.element as TypeParameterElement2;
+  TypeParameterElement get element => super.element as TypeParameterElement;
 
   @override
   String get refactoringName {
@@ -28,7 +28,7 @@ class RenameTypeParameterRefactoringImpl extends RenameRefactoringImpl {
     var result = RefactoringStatus();
 
     var enclosing = element.enclosingElement2;
-    if (enclosing is TypeParameterizedElement2) {
+    if (enclosing is TypeParameterizedElement) {
       for (var sibling in enclosing.typeParameters2) {
         if (sibling.name3 == newName) {
           var nodeKind = sibling.kind.displayName;
diff --git a/pkg/analysis_server/lib/src/services/refactoring/legacy/rename_unit_member.dart b/pkg/analysis_server/lib/src/services/refactoring/legacy/rename_unit_member.dart
index a1723a87a54..9f0fb70cce6 100644
--- a/pkg/analysis_server/lib/src/services/refactoring/legacy/rename_unit_member.dart
+++ b/pkg/analysis_server/lib/src/services/refactoring/legacy/rename_unit_member.dart
@@ -21,7 +21,7 @@ import 'package:analyzer/src/utilities/extensions/flutter.dart';
 /// will cause any conflicts.
 Future<RefactoringStatus> validateCreateFunction(
   SearchEngine searchEngine,
-  LibraryElement2 library,
+  LibraryElement library,
   String name,
 ) {
   return _CreateUnitMemberValidator(
@@ -36,19 +36,19 @@ Future<RefactoringStatus> validateCreateFunction(
 /// will cause any conflicts.
 Future<RefactoringStatus> validateRenameTopLevel(
   SearchEngine searchEngine,
-  Element2 element,
+  Element element,
   String name,
 ) {
   return _RenameUnitMemberValidator(searchEngine, element, name).validate();
 }
 
-/// A [Refactoring] for renaming compilation unit member [Element2]s.
+/// A [Refactoring] for renaming compilation unit member [Element]s.
 class RenameUnitMemberRefactoringImpl extends RenameRefactoringImpl {
   final ResolvedUnitResult resolvedUnit;
 
   /// If the element is a Flutter `StatefulWidget` declaration, this is the
   /// corresponding `State` declaration.
-  ClassElement2? _flutterWidgetState;
+  ClassElement? _flutterWidgetState;
 
   /// If [_flutterWidgetState] is set, this is the new name of it.
   String? _flutterWidgetStateNewName;
@@ -62,19 +62,19 @@ class RenameUnitMemberRefactoringImpl extends RenameRefactoringImpl {
 
   @override
   String get refactoringName {
-    if (element is ExtensionElement2) {
+    if (element is ExtensionElement) {
       return 'Rename Extension';
     }
-    if (element is ExtensionTypeElement2) {
+    if (element is ExtensionTypeElement) {
       return 'Rename Extension Type';
     }
     if (element is TopLevelFunctionElement) {
       return 'Rename Top-Level Function';
     }
-    if (element is TopLevelVariableElement2) {
+    if (element is TopLevelVariableElement) {
       return 'Rename Top-Level Variable';
     }
-    if (element is TypeAliasElement2) {
+    if (element is TypeAliasElement) {
       return 'Rename Type Alias';
     }
     return 'Rename Class';
@@ -107,19 +107,19 @@ class RenameUnitMemberRefactoringImpl extends RenameRefactoringImpl {
   @override
   RefactoringStatus checkNewName() {
     var result = super.checkNewName();
-    if (element is ExtensionTypeElement2) {
+    if (element is ExtensionTypeElement) {
       result.addStatus(validateExtensionTypeName(newName));
     }
     if (element is TopLevelFunctionElement) {
       result.addStatus(validateFunctionName(newName));
     }
-    if (element is InterfaceElement2) {
+    if (element is InterfaceElement) {
       result.addStatus(validateClassName(newName));
     }
-    if (element is TopLevelVariableElement2) {
+    if (element is TopLevelVariableElement) {
       result.addStatus(validateVariableName(newName));
     }
-    if (element is TypeAliasElement2) {
+    if (element is TypeAliasElement) {
       result.addStatus(validateTypeAliasName(newName));
     }
     return result;
@@ -128,9 +128,9 @@ class RenameUnitMemberRefactoringImpl extends RenameRefactoringImpl {
   @override
   Future<void> fillChange() async {
     // prepare elements
-    var elements = <Element2>[];
-    if (element is PropertyInducingElement2 && element.isSynthetic) {
-      var property = element as PropertyInducingElement2;
+    var elements = <Element>[];
+    if (element is PropertyInducingElement && element.isSynthetic) {
+      var property = element as PropertyInducingElement;
       var getter = property.getter2;
       var setter = property.setter2;
       if (getter != null) {
@@ -164,7 +164,7 @@ class RenameUnitMemberRefactoringImpl extends RenameRefactoringImpl {
 
   void _findFlutterStateClass() {
     var element = this.element;
-    if (element is ClassElement2 && element.isStatefulWidgetDeclaration) {
+    if (element is ClassElement && element.isStatefulWidgetDeclaration) {
       var oldStateName = '${oldName}State';
       var library = element.library2;
       _flutterWidgetState =
@@ -190,7 +190,7 @@ class RenameUnitMemberRefactoringImpl extends RenameRefactoringImpl {
 /// The base class for the create and rename validators.
 class _BaseUnitMemberValidator {
   final SearchEngine searchEngine;
-  final LibraryElement2 library;
+  final LibraryElement library;
   final ElementKind elementKind;
   final String name;
 
@@ -204,7 +204,7 @@ class _BaseUnitMemberValidator {
   );
 
   /// Returns `true` if [element] is visible at the given [SearchMatch].
-  bool _isVisibleAt(Element2 element, SearchMatch at) {
+  bool _isVisibleAt(Element element, SearchMatch at) {
     var atLibrary = at.element.library2!;
     // may be the same library
     if (library == atLibrary) {
@@ -228,7 +228,7 @@ class _BaseUnitMemberValidator {
   }
 
   /// Validates if an element with the [name] will conflict with another
-  /// top-level [Element2] in the same library.
+  /// top-level [Element] in the same library.
   void _validateWillConflict() {
     for (var element in library.children2) {
       if (hasDisplayName(element, name)) {
@@ -242,12 +242,12 @@ class _BaseUnitMemberValidator {
     }
   }
 
-  /// Validates if renamed [element] will shadow any [Element2] named [name].
-  Future<void> _validateWillShadow(Element2? element) async {
+  /// Validates if renamed [element] will shadow any [Element] named [name].
+  Future<void> _validateWillShadow(Element? element) async {
     var declarations = await searchEngine.searchMemberDeclarations(name);
     for (var declaration in declarations) {
       var member = declaration.element;
-      var declaringClass = member.enclosingElement2 as InterfaceElement2;
+      var declaringClass = member.enclosingElement2 as InterfaceElement;
       var memberReferences = await searchEngine.searchReferences(member);
       for (var memberReference in memberReferences) {
         var refElement = memberReference.element;
@@ -256,7 +256,7 @@ class _BaseUnitMemberValidator {
           continue;
         }
         // cannot be shadowed if declared in the same class as reference
-        var refClass = refElement.thisOrAncestorOfType2<InterfaceElement2>();
+        var refClass = refElement.thisOrAncestorOfType2<InterfaceElement>();
         if (refClass == declaringClass) {
           continue;
         }
@@ -297,7 +297,7 @@ class _CreateUnitMemberValidator extends _BaseUnitMemberValidator {
 
 /// Helper to check if the renamed element will cause any conflicts.
 class _RenameUnitMemberValidator extends _BaseUnitMemberValidator {
-  final Element2 element;
+  final Element element;
   List<SearchMatch> references = <SearchMatch>[];
 
   _RenameUnitMemberValidator(
@@ -338,7 +338,7 @@ class _RenameUnitMemberValidator extends _BaseUnitMemberValidator {
   void _validateWillBeShadowed() {
     for (var reference in references) {
       var refElement = reference.element;
-      var refClass = refElement.thisOrAncestorOfType2<InterfaceElement2>();
+      var refClass = refElement.thisOrAncestorOfType2<InterfaceElement>();
       if (refClass != null) {
         visitChildren(refClass, (shadow) {
           if (hasDisplayName(shadow, name)) {
diff --git a/pkg/analysis_server/lib/src/services/refactoring/legacy/visible_ranges_computer.dart b/pkg/analysis_server/lib/src/services/refactoring/legacy/visible_ranges_computer.dart
index fa1fd72a9cb..668451318ed 100644
--- a/pkg/analysis_server/lib/src/services/refactoring/legacy/visible_ranges_computer.dart
+++ b/pkg/analysis_server/lib/src/services/refactoring/legacy/visible_ranges_computer.dart
@@ -10,7 +10,7 @@ import 'package:analyzer_plugin/utilities/range_factory.dart';
 
 /// Computer of local elements and source ranges in which they are visible.
 class VisibleRangesComputer extends GeneralizingAstVisitor<void> {
-  final Map<LocalElement2, SourceRange> _map = {};
+  final Map<LocalElement, SourceRange> _map = {};
 
   @override
   void visitCatchClause(CatchClause node) {
@@ -77,15 +77,15 @@ class VisibleRangesComputer extends GeneralizingAstVisitor<void> {
     }
   }
 
-  void _addLocalVariable(AstNode scopeNode, Element2? element) {
+  void _addLocalVariable(AstNode scopeNode, Element? element) {
     // TODO(brianwilkerson): Figure out whether this should be testing for
     //  `PromotableElement`. The test is missing parameter elements.
-    if (element is LocalElement2) {
+    if (element is LocalElement) {
       _map[element] = range.node(scopeNode);
     }
   }
 
-  static Map<LocalElement2, SourceRange> forNode(AstNode unit) {
+  static Map<LocalElement, SourceRange> forNode(AstNode unit) {
     var computer = VisibleRangesComputer();
     unit.accept(computer);
     return computer._map;
diff --git a/pkg/analysis_server/lib/src/services/refactoring/move_top_level_to_file.dart b/pkg/analysis_server/lib/src/services/refactoring/move_top_level_to_file.dart
index dc376ba41d5..5cf077984a2 100644
--- a/pkg/analysis_server/lib/src/services/refactoring/move_top_level_to_file.dart
+++ b/pkg/analysis_server/lib/src/services/refactoring/move_top_level_to_file.dart
@@ -150,7 +150,7 @@ class MoveTopLevelToFile extends RefactoringProducer {
         builder.addDeletion(sourceRange);
       }
     });
-    var libraries = <LibraryElement2, Set<Element2>>{};
+    var libraries = <LibraryElement, Set<Element>>{};
     for (var element2 in analyzer.movingDeclarations) {
       var element = element2;
       var matches = await searchEngine.searchReferences(element);
@@ -174,13 +174,13 @@ class MoveTopLevelToFile extends RefactoringProducer {
         );
         // And also for the getter if this might be something like a top-level
         // variable.
-        if (element case PropertyInducingElement2(:var getter2?)) {
+        if (element case PropertyInducingElement(:var getter2?)) {
           prefixes.addAll(
             await searchEngine.searchPrefixesUsedInLibrary(library, getter2),
           );
         }
         // And setters.
-        if (element case PropertyInducingElement2(:var setter2?)) {
+        if (element case PropertyInducingElement(:var setter2?)) {
           prefixes.addAll(
             await searchEngine.searchPrefixesUsedInLibrary(library, setter2),
           );
@@ -501,10 +501,10 @@ class _SealedSubclassIndex {
   final CompilationUnit unit;
 
   /// The set of initial candidate elements.
-  final Set<Element2> candidateElements;
+  final Set<Element> candidateElements;
 
   /// A map of sealed named classes/mixin elements to a set of their subclasses.
-  final Map<Element2, Set<CompilationUnitMember>> sealedTypeSubclasses = {};
+  final Map<Element, Set<CompilationUnitMember>> sealedTypeSubclasses = {};
 
   /// Whether or not the candidate set is invalid.
   ///
@@ -559,11 +559,11 @@ class _SealedSubclassIndex {
 }
 
 extension on CompilationUnitMember {
-  /// Gets all sealed [ClassElement2]s that are superclasses of this member.
-  Iterable<ClassElement2> get sealedSuperclassElements {
+  /// Gets all sealed [ClassElement]s that are superclasses of this member.
+  Iterable<ClassElement> get sealedSuperclassElements {
     return superclasses
         .map((type) => type?.element2)
-        .whereType<ClassElement2>()
+        .whereType<ClassElement>()
         .where((element) => element.isSealed);
   }
 
diff --git a/pkg/analysis_server/lib/src/services/search/element_visitors.dart b/pkg/analysis_server/lib/src/services/search/element_visitors.dart
index e8499a2cf3a..cbc5df14ea3 100644
--- a/pkg/analysis_server/lib/src/services/search/element_visitors.dart
+++ b/pkg/analysis_server/lib/src/services/search/element_visitors.dart
@@ -13,13 +13,13 @@ Fragment? findFragmentByNameOffset(LibraryFragment fragment, int nameOffset) {
 
 /// Uses [processor] to visit all of the children of [element].
 /// If [processor] returns `true`, then children of a child are visited too.
-void visitChildren(Element2 element, BoolElementProcessor processor) {
+void visitChildren(Element element, BoolElementProcessor processor) {
   element.visitChildren2(_ElementVisitorAdapter(processor));
 }
 
-/// An [Element2] processor function type.
+/// An [Element] processor function type.
 /// If `true` is returned, children of [element] will be visited.
-typedef BoolElementProcessor = bool Function(Element2 element);
+typedef BoolElementProcessor = bool Function(Element element);
 
 /// A [GeneralizingElementVisitor2] adapter for [BoolElementProcessor].
 class _ElementVisitorAdapter extends GeneralizingElementVisitor2<void> {
@@ -28,7 +28,7 @@ class _ElementVisitorAdapter extends GeneralizingElementVisitor2<void> {
   _ElementVisitorAdapter(this.processor);
 
   @override
-  void visitElement(Element2 element) {
+  void visitElement(Element element) {
     var visitChildren = processor(element);
     if (visitChildren == true) {
       element.visitChildren2(this);
diff --git a/pkg/analysis_server/lib/src/services/search/hierarchy.dart b/pkg/analysis_server/lib/src/services/search/hierarchy.dart
index af38d6a64c0..1d057853d9d 100644
--- a/pkg/analysis_server/lib/src/services/search/hierarchy.dart
+++ b/pkg/analysis_server/lib/src/services/search/hierarchy.dart
@@ -8,8 +8,8 @@ import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/src/util/performance/operation_performance.dart';
 
 /// Returns direct children of [parent].
-List<Element2> getChildren(Element2 parent, [String? name]) {
-  var children = <Element2>[];
+List<Element> getChildren(Element parent, [String? name]) {
+  var children = <Element>[];
   visitChildren(parent, (element) {
     if (name == null || element.name3 == name) {
       children.add(element);
@@ -19,26 +19,26 @@ List<Element2> getChildren(Element2 parent, [String? name]) {
   return children;
 }
 
-/// Returns direct non-synthetic children of the given [InterfaceElement2].
+/// Returns direct non-synthetic children of the given [InterfaceElement].
 ///
 /// Includes: fields, accessors and methods.
 /// Excludes: constructors and synthetic elements.
-List<Element2> getClassMembers(InterfaceElement2 clazz, [String? name]) {
-  var members = <Element2>[];
-  visitChildren(clazz, (Element2 element) {
+List<Element> getClassMembers(InterfaceElement clazz, [String? name]) {
+  var members = <Element>[];
+  visitChildren(clazz, (Element element) {
     if (element.isSynthetic) {
       return false;
     }
-    if (element is ConstructorElement2) {
+    if (element is ConstructorElement) {
       return false;
     }
     if (name != null && element.displayName != name) {
       return false;
     }
-    if (element is ExecutableElement2) {
+    if (element is ExecutableElement) {
       members.add(element);
     }
-    if (element is FieldElement2) {
+    if (element is FieldElement) {
       members.add(element);
     }
     return false;
@@ -50,25 +50,19 @@ List<Element2> getClassMembers(InterfaceElement2 clazz, [String? name]) {
 ///
 /// The given [searchEngineCache] will be used or filled out as needed
 /// so subsequent calls can utilize it to speed up the computation.
-Future<Set<InterfaceElement2>> getDirectSubClasses(
+Future<Set<InterfaceElement>> getDirectSubClasses(
   SearchEngine searchEngine,
-  InterfaceElement2 seed,
+  InterfaceElement seed,
   SearchEngineCache searchEngineCache,
 ) async {
   var matches = await searchEngine.searchSubtypes(seed, searchEngineCache);
-  return matches
-      .map((match) => match.element)
-      .cast<InterfaceElement2>()
-      .toSet();
+  return matches.map((match) => match.element).cast<InterfaceElement>().toSet();
 }
 
 /// Return the non-synthetic children of the given [extension]. This includes
 /// fields, accessors and methods, but excludes synthetic elements.
-List<Element2> getExtensionMembers(
-  ExtensionElement2 extension, [
-  String? name,
-]) {
-  var members = <Element2>[];
+List<Element> getExtensionMembers(ExtensionElement extension, [String? name]) {
+  var members = <Element>[];
   visitChildren(extension, (element) {
     if (element.isSynthetic) {
       return false;
@@ -76,10 +70,10 @@ List<Element2> getExtensionMembers(
     if (name != null && element.displayName != name) {
       return false;
     }
-    if (element is ExecutableElement2) {
+    if (element is ExecutableElement) {
       members.add(element);
     }
-    if (element is FieldElement2) {
+    if (element is FieldElement) {
       members.add(element);
     }
     return false;
@@ -89,9 +83,9 @@ List<Element2> getExtensionMembers(
 
 /// Returns all implementations of the given [member], including in its
 /// superclasses and their subclasses.
-Future<Set<Element2>> getHierarchyMembers(
+Future<Set<Element>> getHierarchyMembers(
   SearchEngine searchEngine,
-  Element2 member, {
+  Element member, {
   OperationPerformanceImpl? performance,
 }) async {
   var (members, _) = await getHierarchyMembersAndParameters(
@@ -105,35 +99,35 @@ Future<Set<Element2>> getHierarchyMembers(
 /// Returns all implementations of the given [member2], including in its
 /// superclasses and their subclasses.
 ///
-/// If [includeParametersForFields] is true and [member2] is a [FieldElement2],
-/// any [FieldFormalParameterElement2]s for the member will also be provided
+/// If [includeParametersForFields] is true and [member2] is a [FieldElement],
+/// any [FieldFormalParameterElement]s for the member will also be provided
 /// (otherwise, the parameter set will be empty in the result).
-Future<(Set<Element2>, Set<FormalParameterElement>)>
+Future<(Set<Element>, Set<FormalParameterElement>)>
 getHierarchyMembersAndParameters(
   SearchEngine searchEngine,
-  Element2 member2, {
+  Element member2, {
   OperationPerformanceImpl? performance,
   bool includeParametersForFields = false,
 }) async {
   performance ??= OperationPerformanceImpl('<root>');
-  var members = <Element2>{};
+  var members = <Element>{};
   var parameters = <FormalParameterElement>{};
   // extension member
   var enclosingElement = member2.enclosingElement2;
-  if (enclosingElement is ExtensionElement2) {
+  if (enclosingElement is ExtensionElement) {
     members.add(member2);
     return (members, parameters);
   }
   // static elements
   switch (member2) {
-    case ConstructorElement2():
-    case FieldElement2(isStatic: true):
-    case MethodElement2(isStatic: true):
+    case ConstructorElement():
+    case FieldElement(isStatic: true):
+    case MethodElement(isStatic: true):
       members.add(member2);
       return (members, parameters);
   }
   // method, field, etc
-  if (enclosingElement is InterfaceElement2) {
+  if (enclosingElement is InterfaceElement) {
     var name = member2.displayName;
 
     var superElementsToSearch =
@@ -144,7 +138,7 @@ getHierarchyMembersAndParameters(
             })
             .toList();
     var searchClasses = [...superElementsToSearch, enclosingElement];
-    var subClasses = <InterfaceElement2>{};
+    var subClasses = <InterfaceElement>{};
     for (var superClass in searchClasses) {
       // ignore if super- class does not declare member
       if (getClassMembers(superClass, name).isEmpty) {
@@ -167,19 +161,19 @@ getHierarchyMembersAndParameters(
       var subClassMembers = getChildren(subClass, name);
       for (var member in subClassMembers) {
         switch (member) {
-          case ConstructorElement2():
+          case ConstructorElement():
             members.add(member);
-          case FieldElement2():
+          case FieldElement():
             members.add(member);
-          case MethodElement2():
+          case MethodElement():
             members.add(member);
         }
       }
 
-      if (includeParametersForFields && member2 is FieldElement2) {
+      if (includeParametersForFields && member2 is FieldElement) {
         for (var constructor in subClass.constructors2) {
           for (var parameter in constructor.formalParameters) {
-            if (parameter is FieldFormalParameterElement2 &&
+            if (parameter is FieldFormalParameterElement &&
                 parameter.field2 == member2) {
               parameters.add(parameter);
             }
@@ -193,7 +187,7 @@ getHierarchyMembersAndParameters(
   return (members, parameters);
 }
 
-/// If the [element] is a named parameter in a [MethodElement2], return all
+/// If the [element] is a named parameter in a [MethodElement], return all
 /// corresponding named parameters in the method hierarchy.
 Future<List<FormalParameterElement>> getHierarchyNamedParameters(
   SearchEngine searchEngine,
@@ -201,11 +195,11 @@ Future<List<FormalParameterElement>> getHierarchyNamedParameters(
 ) async {
   if (element.isNamed) {
     var method = element.enclosingElement2;
-    if (method is MethodElement2) {
+    if (method is MethodElement) {
       var hierarchyParameters = <FormalParameterElement>[];
       var hierarchyMembers = await getHierarchyMembers(searchEngine, method);
       for (var hierarchyMethod in hierarchyMembers) {
-        if (hierarchyMethod is MethodElement2) {
+        if (hierarchyMethod is MethodElement) {
           for (var hierarchyParameter in hierarchyMethod.formalParameters) {
             if (hierarchyParameter.isNamed &&
                 hierarchyParameter.name3 == element.name3) {
@@ -227,7 +221,7 @@ Future<List<FormalParameterElement>> getHierarchyPositionalParameters(
 ) async {
   if (element.isPositional) {
     var method = element.enclosingElement2;
-    if (method is MethodElement2) {
+    if (method is MethodElement) {
       var index = method.parameterIndex(element);
       // Should not ever happen but this means we can't find the index.
       if (index == null) {
@@ -236,7 +230,7 @@ Future<List<FormalParameterElement>> getHierarchyPositionalParameters(
       var hierarchyParameters = <FormalParameterElement>[];
       var hierarchyMembers = await getHierarchyMembers(searchEngine, method);
       for (var hierarchyMethod in hierarchyMembers) {
-        if (hierarchyMethod is MethodElement2) {
+        if (hierarchyMethod is MethodElement) {
           for (var hierarchyParameter in hierarchyMethod.formalParameters) {
             if (hierarchyParameter.isPositional &&
                 hierarchyMethod.parameterIndex(hierarchyParameter) == index) {
@@ -252,25 +246,25 @@ Future<List<FormalParameterElement>> getHierarchyPositionalParameters(
   return [element];
 }
 
-/// Returns non-synthetic members of the given [InterfaceElement2] and its super
+/// Returns non-synthetic members of the given [InterfaceElement] and its super
 /// classes.
 ///
 /// Includes: fields, accessors and methods.
 ///
 /// Excludes: constructors and synthetic elements.
-List<Element2> getMembers(InterfaceElement2 clazz) {
+List<Element> getMembers(InterfaceElement clazz) {
   var classElements = [...clazz.allSupertypes.map((e) => e.element3), clazz];
-  var members = <Element2>[];
+  var members = <Element>[];
   for (var superClass in classElements) {
     members.addAll(getClassMembers(superClass));
   }
   return members;
 }
 
-/// If the given [element] is a synthetic [PropertyAccessorElement2] returns
+/// If the given [element] is a synthetic [PropertyAccessorElement] returns
 /// its variable, otherwise returns [element].
-Element2 getSyntheticAccessorVariable(Element2 element) {
-  if (element is PropertyAccessorElement2) {
+Element getSyntheticAccessorVariable(Element element) {
+  if (element is PropertyAccessorElement) {
     if (element.isSynthetic) {
       return element.variable3 ?? element;
     }
@@ -278,7 +272,7 @@ Element2 getSyntheticAccessorVariable(Element2 element) {
   return element;
 }
 
-extension on MethodElement2 {
+extension on MethodElement {
   int? parameterIndex(FormalParameterElement parameter) {
     var index = 0;
     for (var positionalParameter in formalParameters.where(
diff --git a/pkg/analysis_server/lib/src/services/search/search_engine.dart b/pkg/analysis_server/lib/src/services/search/search_engine.dart
index 8b628b09526..1a6a9cc7f86 100644
--- a/pkg/analysis_server/lib/src/services/search/search_engine.dart
+++ b/pkg/analysis_server/lib/src/services/search/search_engine.dart
@@ -80,15 +80,15 @@ abstract class SearchEngine {
   /// If [allSubtypes] already contains an element it is assumed that it
   /// contains the entire subtree and the element won't be search on further.
   Future<void> appendAllSubtypes(
-    InterfaceElement2 type,
-    Set<InterfaceElement2> allSubtypes,
+    InterfaceElement type,
+    Set<InterfaceElement> allSubtypes,
     OperationPerformanceImpl performance,
   );
 
   /// If the [type] has subtypes, return the set of names of members which these
   /// subtypes declare, possibly empty.  If the [type] does not have subtypes,
   /// return `null`.
-  Future<Set<String>?> membersOfSubtypes(InterfaceElement2 type);
+  Future<Set<String>?> membersOfSubtypes(InterfaceElement type);
 
   /// Returns references to the given [fragment].
   Future<List<LibraryFragmentSearchMatch>> searchLibraryFragmentReferences(
@@ -115,20 +115,20 @@ abstract class SearchEngine {
   /// compilation units in the [library]. The returned set will include an empty
   /// string if the element is referenced without a prefix.
   Future<Set<String>> searchPrefixesUsedInLibrary(
-    LibraryElement2 library,
-    Element2 element,
+    LibraryElement library,
+    Element element,
   );
 
   /// Returns references to the given [element].
-  Future<List<SearchMatch>> searchReferences(Element2 element);
+  Future<List<SearchMatch>> searchReferences(Element element);
 
   /// Returns direct subtypes of the given [type].
   ///
-  /// [type] - the [InterfaceElement2] being subtyped by the found matches.
+  /// [type] - the [InterfaceElement] being subtyped by the found matches.
   /// [cache] - the [SearchEngineCache] used to speeding up the computation. If
   ///    empty it will be filled out and can be used on any subsequent query.
   Future<List<SearchMatch>> searchSubtypes(
-    InterfaceElement2 type,
+    InterfaceElement type,
     SearchEngineCache cache, {
     OperationPerformanceImpl? performance,
   });
@@ -151,7 +151,7 @@ class SearchEngineCache {
 /// [SearchEngine].
 abstract class SearchMatch {
   /// Return the element containing the match.
-  Element2 get element;
+  Element get element;
 
   /// The absolute path of the file containing the match.
   String get file;
@@ -159,14 +159,14 @@ abstract class SearchMatch {
   /// Is `true` if field or method access is done using qualifier.
   bool get isQualified;
 
-  /// Is `true` if the match is a resolved reference to some [Element2].
+  /// Is `true` if the match is a resolved reference to some [Element].
   bool get isResolved;
 
   /// The kind of the match.
   MatchKind get kind;
 
   /// Return the library element for the [file].
-  LibraryElement2 get libraryElement;
+  LibraryElement get libraryElement;
 
   /// The library [Source] of the reference.
   Source get librarySource;
diff --git a/pkg/analysis_server/lib/src/services/search/search_engine_internal.dart b/pkg/analysis_server/lib/src/services/search/search_engine_internal.dart
index 2a4ad98bfb8..b4f84a9c4f9 100644
--- a/pkg/analysis_server/lib/src/services/search/search_engine_internal.dart
+++ b/pkg/analysis_server/lib/src/services/search/search_engine_internal.dart
@@ -22,13 +22,13 @@ class SearchEngineImpl implements SearchEngine {
 
   @override
   Future<void> appendAllSubtypes(
-    InterfaceElement2 type,
-    Set<InterfaceElement2> allSubtypes,
+    InterfaceElement type,
+    Set<InterfaceElement> allSubtypes,
     OperationPerformanceImpl performance,
   ) async {
     var searchEngineCache = SearchEngineCache();
 
-    Future<void> addSubtypes(InterfaceElement2 type) async {
+    Future<void> addSubtypes(InterfaceElement type) async {
       var directResults = await performance.runAsync(
         '_searchDirectSubtypes',
         (performance) =>
@@ -36,7 +36,7 @@ class SearchEngineImpl implements SearchEngine {
       );
       for (var directResult in directResults) {
         var directSubtype =
-            directResult.enclosingFragment.element as InterfaceElement2;
+            directResult.enclosingFragment.element as InterfaceElement;
         if (allSubtypes.add(directSubtype)) {
           await addSubtypes(directSubtype);
         }
@@ -47,7 +47,7 @@ class SearchEngineImpl implements SearchEngine {
   }
 
   @override
-  Future<Set<String>?> membersOfSubtypes(InterfaceElement2 type) async {
+  Future<Set<String>?> membersOfSubtypes(InterfaceElement type) async {
     var drivers = _drivers.toList();
     var searchedFiles = _createSearchedFiles(drivers);
 
@@ -57,7 +57,7 @@ class SearchEngineImpl implements SearchEngine {
     var members = <String>{};
 
     Future<void> addMembers(
-      InterfaceElement2? type,
+      InterfaceElement? type,
       SubtypeResult? subtype,
     ) async {
       if (subtype != null && !visitedIds.add(subtype.id)) {
@@ -149,7 +149,7 @@ class SearchEngineImpl implements SearchEngine {
   @override
   Future<Set<String>> searchPrefixesUsedInLibrary(
     covariant LibraryElementImpl library,
-    Element2 element,
+    Element element,
   ) async {
     var driver =
         (library.session.analysisContext as DriverBasedAnalysisContext).driver;
@@ -157,7 +157,7 @@ class SearchEngineImpl implements SearchEngine {
   }
 
   @override
-  Future<List<SearchMatch>> searchReferences(Element2 element) async {
+  Future<List<SearchMatch>> searchReferences(Element element) async {
     var allResults = <SearchResult>[];
     var drivers = _drivers.toList();
     var searchedFiles = _createSearchedFiles(drivers);
@@ -170,7 +170,7 @@ class SearchEngineImpl implements SearchEngine {
 
   @override
   Future<List<SearchMatch>> searchSubtypes(
-    InterfaceElement2 type,
+    InterfaceElement type,
     SearchEngineCache searchEngineCache, {
     OperationPerformanceImpl? performance,
   }) async {
@@ -185,7 +185,7 @@ class SearchEngineImpl implements SearchEngine {
 
   @override
   Future<List<SearchMatch>> searchTopLevelDeclarations(String pattern) async {
-    var allElements = HashSet<Element2>(
+    var allElements = HashSet<Element>(
       hashCode: (e) => e.name3.hashCode,
       equals: (a, b) {
         return a.lookupName == b.lookupName &&
@@ -212,7 +212,7 @@ class SearchEngineImpl implements SearchEngine {
   }
 
   Future<List<SearchResult>> _searchDirectSubtypes(
-    InterfaceElement2 type,
+    InterfaceElement type,
     SearchEngineCache searchEngineCache,
     OperationPerformanceImpl performance,
   ) async {
@@ -265,10 +265,10 @@ class SearchMatchImpl implements SearchMatch {
   final Source unitSource;
 
   @override
-  final LibraryElement2 libraryElement;
+  final LibraryElement libraryElement;
 
   @override
-  final Element2 element;
+  final Element element;
 
   @override
   final bool isResolved;
@@ -313,7 +313,7 @@ class SearchMatchImpl implements SearchMatch {
     return buffer.toString();
   }
 
-  static SearchMatchImpl forElement(Element2 element) {
+  static SearchMatchImpl forElement(Element element) {
     var firstFragment = element.firstFragment;
     var libraryFragment = firstFragment.libraryFragment!;
     return SearchMatchImpl(
diff --git a/pkg/analysis_server/lib/src/services/snippets/dart/flutter_stateful_widget.dart b/pkg/analysis_server/lib/src/services/snippets/dart/flutter_stateful_widget.dart
index 0f80fa3423e..bbe99ec0fc7 100644
--- a/pkg/analysis_server/lib/src/services/snippets/dart/flutter_stateful_widget.dart
+++ b/pkg/analysis_server/lib/src/services/snippets/dart/flutter_stateful_widget.dart
@@ -14,12 +14,12 @@ class FlutterStatefulWidget extends FlutterSnippetProducer
   static const prefix = 'stful';
   static const label = 'Flutter Stateful Widget';
 
-  late ClassElement2? classStatefulWidget;
-  late ClassElement2? classState;
+  late ClassElement? classStatefulWidget;
+  late ClassElement? classState;
   @override
-  late ClassElement2? classBuildContext;
+  late ClassElement? classBuildContext;
   @override
-  late ClassElement2? classKey;
+  late ClassElement? classKey;
 
   FlutterStatefulWidget(super.request, {required super.elementImportCache});
 
diff --git a/pkg/analysis_server/lib/src/services/snippets/dart/flutter_stateful_widget_with_animation.dart b/pkg/analysis_server/lib/src/services/snippets/dart/flutter_stateful_widget_with_animation.dart
index 262c2806832..f17722a394b 100644
--- a/pkg/analysis_server/lib/src/services/snippets/dart/flutter_stateful_widget_with_animation.dart
+++ b/pkg/analysis_server/lib/src/services/snippets/dart/flutter_stateful_widget_with_animation.dart
@@ -16,14 +16,14 @@ class FlutterStatefulWidgetWithAnimationController
   static const prefix = 'stanim';
   static const label = 'Flutter Widget with AnimationController';
 
-  late ClassElement2? classStatefulWidget;
-  late ClassElement2? classState;
+  late ClassElement? classStatefulWidget;
+  late ClassElement? classState;
   @override
-  late ClassElement2? classBuildContext;
+  late ClassElement? classBuildContext;
   @override
-  late ClassElement2? classKey;
-  late ClassElement2? classAnimationController;
-  late MixinElement2? classSingleTickerProviderStateMixin;
+  late ClassElement? classKey;
+  late ClassElement? classAnimationController;
+  late MixinElement? classSingleTickerProviderStateMixin;
 
   FlutterStatefulWidgetWithAnimationController(
     super.request, {
diff --git a/pkg/analysis_server/lib/src/services/snippets/dart/flutter_stateless_widget.dart b/pkg/analysis_server/lib/src/services/snippets/dart/flutter_stateless_widget.dart
index 475a4764dc7..d42bba93430 100644
--- a/pkg/analysis_server/lib/src/services/snippets/dart/flutter_stateless_widget.dart
+++ b/pkg/analysis_server/lib/src/services/snippets/dart/flutter_stateless_widget.dart
@@ -13,13 +13,13 @@ class FlutterStatelessWidget extends FlutterSnippetProducer
   static const prefix = 'stless';
   static const label = 'Flutter Stateless Widget';
 
-  late ClassElement2? classStatelessWidget;
+  late ClassElement? classStatelessWidget;
 
   @override
-  late ClassElement2? classBuildContext;
+  late ClassElement? classBuildContext;
 
   @override
-  late ClassElement2? classKey;
+  late ClassElement? classKey;
 
   FlutterStatelessWidget(super.request, {required super.elementImportCache});
 
diff --git a/pkg/analysis_server/lib/src/services/snippets/snippet_manager.dart b/pkg/analysis_server/lib/src/services/snippets/snippet_manager.dart
index 30225b5d867..0dba83fae07 100644
--- a/pkg/analysis_server/lib/src/services/snippets/snippet_manager.dart
+++ b/pkg/analysis_server/lib/src/services/snippets/snippet_manager.dart
@@ -31,7 +31,7 @@ import 'package:analyzer/src/util/file_paths.dart' as file_paths;
 typedef SnippetProducerGenerator =
     SnippetProducer Function(
       DartSnippetRequest, {
-      required Map<Element2, LibraryElement2?> elementImportCache,
+      required Map<Element, LibraryElement?> elementImportCache,
     });
 
 /// [DartSnippetManager] determines if a snippet request is Dart specific
@@ -80,7 +80,7 @@ class DartSnippetManager {
       if (generators == null) {
         return snippets;
       }
-      var elementImportCache = <Element2, LibraryElement2?>{};
+      var elementImportCache = <Element, LibraryElement?>{};
       for (var generator in generators) {
         var producer = generator(
           request,
diff --git a/pkg/analysis_server/lib/src/services/snippets/snippet_producer.dart b/pkg/analysis_server/lib/src/services/snippets/snippet_producer.dart
index 05e40efb635..3a1e5db535f 100644
--- a/pkg/analysis_server/lib/src/services/snippets/snippet_producer.dart
+++ b/pkg/analysis_server/lib/src/services/snippets/snippet_producer.dart
@@ -21,18 +21,18 @@ import 'package:meta/meta.dart';
 abstract class DartSnippetProducer extends SnippetProducer {
   final AnalysisSessionHelper sessionHelper;
   final CorrectionUtils utils;
-  final LibraryElement2 libraryElement;
+  final LibraryElement libraryElement;
   final bool useSuperParams;
 
   /// A cache of mappings from Elements to their public Library Elements.
   ///
   /// Callers can share this cache across multiple snippet producers to avoid
   /// repeated searches where they may add imports for the same elements.
-  final Map<Element2, LibraryElement2?> _elementImportCache;
+  final Map<Element, LibraryElement?> _elementImportCache;
 
   DartSnippetProducer(
     super.request, {
-    required Map<Element2, LibraryElement2?> elementImportCache,
+    required Map<Element, LibraryElement?> elementImportCache,
   }) : sessionHelper = AnalysisSessionHelper(request.analysisSession),
        utils = CorrectionUtils(request.unit),
        libraryElement = request.unit.libraryElement2,
@@ -50,14 +50,14 @@ abstract class DartSnippetProducer extends SnippetProducer {
 }
 
 abstract class FlutterSnippetProducer extends DartSnippetProducer {
-  late ClassElement2? _classWidget;
-  late ClassElement2? _classPlaceholder;
+  late ClassElement? _classWidget;
+  late ClassElement? _classPlaceholder;
 
   /// Elements that need to be imported for generated code to be valid.
   ///
   /// Calling [addImports] will add any required imports to the supplied
   /// builder.
-  final Set<Element2> _requiredElementImports = {};
+  final Set<Element> _requiredElementImports = {};
 
   FlutterSnippetProducer(super.request, {required super.elementImportCache});
 
@@ -75,7 +75,7 @@ abstract class FlutterSnippetProducer extends DartSnippetProducer {
     );
   }
 
-  Future<ClassElement2?> getClass(String name) async {
+  Future<ClassElement?> getClass(String name) async {
     var class_ = await sessionHelper.getFlutterClass(name);
     if (class_ != null) {
       _requiredElementImports.add(class_);
@@ -83,7 +83,7 @@ abstract class FlutterSnippetProducer extends DartSnippetProducer {
     return class_;
   }
 
-  Future<MixinElement2?> getMixin(String name) async {
+  Future<MixinElement?> getMixin(String name) async {
     var mixin = await sessionHelper.getMixin(widgetsUri, name);
     if (mixin != null) {
       _requiredElementImports.add(mixin);
@@ -92,7 +92,7 @@ abstract class FlutterSnippetProducer extends DartSnippetProducer {
   }
 
   DartType getType(
-    InterfaceElement2 classElement, [
+    InterfaceElement classElement, [
     NullabilitySuffix nullabilitySuffix = NullabilitySuffix.none,
   ]) => classElement.instantiate(
     typeArguments: const [],
@@ -117,8 +117,8 @@ abstract class FlutterSnippetProducer extends DartSnippetProducer {
 /// A mixin that provides some common methods for producers that build snippets
 /// for Flutter widget classes.
 mixin FlutterWidgetSnippetProducerMixin on FlutterSnippetProducer {
-  ClassElement2? get classBuildContext;
-  ClassElement2? get classKey;
+  ClassElement? get classBuildContext;
+  ClassElement? get classKey;
   String get widgetClassName => 'MyWidget';
 
   void writeBuildMethod(DartEditBuilder builder) {
diff --git a/pkg/analysis_server/lib/src/status/element_writer.dart b/pkg/analysis_server/lib/src/status/element_writer.dart
index cc9836e2754..6e765f76925 100644
--- a/pkg/analysis_server/lib/src/status/element_writer.dart
+++ b/pkg/analysis_server/lib/src/status/element_writer.dart
@@ -17,7 +17,7 @@ class ElementWriter with TreeWriter {
   /// of visited elements on the given [buffer].
   ElementWriter(this.buffer);
 
-  void write(Element2 element) {
+  void write(Element element) {
     _writeElement(element);
     writeProperties(_computeProperties(element));
     _writeFragments(element);
@@ -33,19 +33,19 @@ class ElementWriter with TreeWriter {
 
   /// Writes a representation of the properties of the given [element] to the
   /// buffer.
-  Map<String, Object?> _computeProperties(Element2 element) {
+  Map<String, Object?> _computeProperties(Element element) {
     var properties = <String, Object?>{};
 
     var firstFragment = element.firstFragment;
     if (element case Annotatable element) {
       properties['annotations'] = element.metadata2.annotations;
     }
-    if (element is InterfaceElement2) {
+    if (element is InterfaceElement) {
       properties['interfaces'] = element.interfaces;
-      properties['isEnum'] = element is EnumElement2;
+      properties['isEnum'] = element is EnumElement;
       properties['mixins'] = element.mixins;
       properties['supertype'] = element.supertype;
-      if (element is ClassElement2) {
+      if (element is ClassElement) {
         properties['hasNonFinalField'] = element.hasNonFinalField;
         properties['isAbstract'] = element.isAbstract;
         properties['isMixinApplication'] = element.isMixinApplication;
@@ -61,37 +61,37 @@ class ElementWriter with TreeWriter {
     if (firstFragment is ConstTopLevelVariableElementImpl) {
       properties['evaluationResult'] = firstFragment.evaluationResult;
     }
-    if (element is ConstructorElement2) {
+    if (element is ConstructorElement) {
       properties['isConst'] = element.isConst;
       properties['isDefaultConstructor'] = element.isDefaultConstructor;
       properties['isFactory'] = element.isFactory;
       properties['redirectedConstructor'] = element.redirectedConstructor2;
     }
-    if (element is ExecutableElement2) {
+    if (element is ExecutableElement) {
       properties['hasImplicitReturnType'] = element.hasImplicitReturnType;
       properties['isAbstract'] = element.isAbstract;
       properties['isExternal'] = element.isExternal;
-      if (element is MethodElement2) {
+      if (element is MethodElement) {
         properties['isOperator'] = element.isOperator;
       }
       properties['isStatic'] = element.isStatic;
       properties['returnType'] = element.returnType;
       properties['type'] = element.type;
     }
-    if (element is FieldElement2) {
+    if (element is FieldElement) {
       properties['isEnumConstant'] = element.isEnumConstant;
     }
-    if (element is FieldFormalParameterElement2) {
+    if (element is FieldFormalParameterElement) {
       properties['field'] = element.field2;
     }
     if (element is TopLevelFunctionElement) {
       properties['isEntryPoint'] = element.isEntryPoint;
     }
-    if (element is FunctionTypedElement2) {
+    if (element is FunctionTypedElement) {
       properties['returnType'] = element.returnType;
       properties['type'] = element.type;
     }
-    if (element is LibraryElement2) {
+    if (element is LibraryElement) {
       properties['entryPoint'] = element.entryPoint2;
       properties['isDartAsync'] = element.isDartAsync;
       properties['isDartCore'] = element.isDartCore;
@@ -112,16 +112,16 @@ class ElementWriter with TreeWriter {
         properties['parameterKind'] = 'unknown kind';
       }
     }
-    if (element is PropertyInducingElement2) {
+    if (element is PropertyInducingElement) {
       properties['isStatic'] = element.isStatic;
     }
-    if (element is TypeParameterElement2) {
+    if (element is TypeParameterElement) {
       properties['bound'] = element.bound;
     }
-    if (element is TypeParameterizedElement2) {
+    if (element is TypeParameterizedElement) {
       properties['typeParameters'] = element.typeParameters2;
     }
-    if (element is VariableElement2) {
+    if (element is VariableElement) {
       properties['hasImplicitType'] = element.hasImplicitType;
       properties['isConst'] = element.isConst;
       properties['isFinal'] = element.isFinal;
@@ -133,7 +133,7 @@ class ElementWriter with TreeWriter {
   }
 
   /// Write a representation of the given [element] to the buffer.
-  void _writeElement(Element2 element) {
+  void _writeElement(Element element) {
     indent();
     if (element.isSynthetic) {
       buffer.write('<i>');
@@ -186,7 +186,7 @@ class ElementWriter with TreeWriter {
     writeProperties(properties);
   }
 
-  void _writeFragments(Element2 element) {
+  void _writeFragments(Element element) {
     indentLevel++;
     try {
       var index = 0;
diff --git a/pkg/analysis_server/lib/src/utilities/element_location2.dart b/pkg/analysis_server/lib/src/utilities/element_location2.dart
index 1e9a9910217..1edbdc315f8 100644
--- a/pkg/analysis_server/lib/src/utilities/element_location2.dart
+++ b/pkg/analysis_server/lib/src/utilities/element_location2.dart
@@ -7,8 +7,8 @@ import 'package:analyzer/dart/analysis/session.dart';
 import 'package:analyzer/dart/element/element.dart';
 import 'package:collection/collection.dart';
 
-/// Represents the location of an [Element2] that exists in a chain of elements
-/// from a [LibraryElement2].
+/// Represents the location of an [Element] that exists in a chain of elements
+/// from a [LibraryElement].
 ///
 /// Elements with [Fragment]s or Elements with `null` names anywhere in the
 /// chain are not representable.
@@ -16,7 +16,7 @@ class ElementLocation {
   /// The library that this element belongs to.
   final String _libraryUri;
 
-  /// The [Element2.lookupName] for this element, or the containing element if
+  /// The [Element.lookupName] for this element, or the containing element if
   /// this location is a [_MemberElementLocation].
   final String _topLevelName;
 
@@ -39,11 +39,11 @@ class ElementLocation {
 
   String get encoding => '$_libraryUri;$_topLevelName';
 
-  /// Locates the [Element2] represented by this [ElementLocation] in
+  /// Locates the [Element] represented by this [ElementLocation] in
   /// [session].
   ///
-  /// Returns `null` if the [Element2] cannot be located.
-  Future<Element2?> locateIn(AnalysisSession session) async {
+  /// Returns `null` if the [Element] cannot be located.
+  Future<Element?> locateIn(AnalysisSession session) async {
     var result = await session.getLibraryByUri(_libraryUri);
     if (result is! LibraryElementResult) return null;
 
@@ -56,7 +56,7 @@ class ElementLocation {
   ///
   /// Returns `null` if this element is neither a top level element or a
   /// member of a top level element, or if either do not have a `lookupName`.
-  static ElementLocation? forElement(Element2 element) {
+  static ElementLocation? forElement(Element element) {
     var library = element.library2;
     if (library == null) return null;
     var libraryUri = library.uri.toString();
@@ -79,7 +79,7 @@ class ElementLocation {
 }
 
 class _MemberElementLocation extends ElementLocation {
-  /// The [Element2.lookupName] for this member within [_topLevelName].
+  /// The [Element.lookupName] for this member within [_topLevelName].
   final String _memberName;
 
   _MemberElementLocation._(
@@ -91,12 +91,12 @@ class _MemberElementLocation extends ElementLocation {
   @override
   String get encoding => '${super.encoding};$_memberName';
 
-  /// Locates the [Element2] represented by this [_MemberElementLocation] in
+  /// Locates the [Element] represented by this [_MemberElementLocation] in
   /// [session].
   ///
-  /// Returns `null` if the [Element2] cannot be located.
+  /// Returns `null` if the [Element] cannot be located.
   @override
-  Future<Element2?> locateIn(AnalysisSession session) async {
+  Future<Element?> locateIn(AnalysisSession session) async {
     var topLevel = await super.locateIn(session);
 
     return topLevel?.children2.firstWhereOrNull(
diff --git a/pkg/analysis_server/lib/src/utilities/extensions/ast.dart b/pkg/analysis_server/lib/src/utilities/extensions/ast.dart
index 48dd900815f..ea6cfac2f4c 100644
--- a/pkg/analysis_server/lib/src/utilities/extensions/ast.dart
+++ b/pkg/analysis_server/lib/src/utilities/extensions/ast.dart
@@ -75,8 +75,8 @@ extension AnnotatedNodeExtension on AnnotatedNode {
 }
 
 extension AstNodeExtension on AstNode {
-  /// Returns [ExtensionElement2] declared by an enclosing node.
-  ExtensionElement2? get enclosingExtensionElement {
+  /// Returns [ExtensionElement] declared by an enclosing node.
+  ExtensionElement? get enclosingExtensionElement {
     for (var node in withParents) {
       if (node is ExtensionDeclaration) {
         return node.declaredFragment?.element;
@@ -97,8 +97,8 @@ extension AstNodeExtension on AstNode {
     return null;
   }
 
-  /// Returns [InterfaceElement2] declared by an enclosing node.
-  InterfaceElement2? get enclosingInterfaceElement {
+  /// Returns [InterfaceElement] declared by an enclosing node.
+  InterfaceElement? get enclosingInterfaceElement {
     for (var node in withParents) {
       if (node is ClassDeclaration) {
         return node.declaredFragment?.element;
@@ -200,7 +200,7 @@ extension AstNodeExtension on AstNode {
   /// this work-around.
   ///
   /// Returns `null` if `this` is `null` or doesn't have an element.
-  Element2? getElement({bool useMockForImport = false}) {
+  Element? getElement({bool useMockForImport = false}) {
     AstNode? node = this;
     if (node is SimpleIdentifier && node.parent is LibraryIdentifier) {
       node = node.parent;
@@ -212,7 +212,7 @@ extension AstNodeExtension on AstNode {
       return null;
     }
 
-    Element2? element;
+    Element? element;
     if (useMockForImport && node is ImportDirective) {
       element = MockLibraryImportElement(node.libraryImport!);
     } else {
@@ -220,7 +220,7 @@ extension AstNodeExtension on AstNode {
     }
     if (useMockForImport &&
         node is SimpleIdentifier &&
-        element is PrefixElement2) {
+        element is PrefixElement) {
       element = MockLibraryImportElement(getImportElement(node)!);
     }
     return element;
@@ -305,8 +305,8 @@ extension DeclaredVariablePatternExtension on DeclaredVariablePattern {
 }
 
 extension DirectiveExtension on Directive {
-  /// If the target imports or exports a [LibraryElement2], returns it.
-  LibraryElement2? get referencedLibrary {
+  /// If the target imports or exports a [LibraryElement], returns it.
+  LibraryElement? get referencedLibrary {
     switch (this) {
       case ExportDirective directive:
         return directive.libraryExport?.exportedLibrary2;
@@ -375,21 +375,21 @@ extension MethodInvocationExtension on MethodInvocation {
   /// from either Iterable`, `List`, `Map`, or `Set`.
   bool get isCastMethodInvocation {
     var element = methodName.element;
-    return element is MethodElement2 && element.isCastMethod;
+    return element is MethodElement && element.isCastMethod;
   }
 
   /// Returns whether this expression is an invocation of the method `toList`
   /// from `Iterable`.
   bool get isToListMethodInvocation {
     var element = methodName.element;
-    return element is MethodElement2 && element.isToListMethod;
+    return element is MethodElement && element.isToListMethod;
   }
 
   /// Returns whether this expression is an invocation of the method `toSet`
   /// from `Iterable`.
   bool get isToSetMethodInvocation {
     var element = methodName.element;
-    return element is MethodElement2 && element.isToSetMethod;
+    return element is MethodElement && element.isToSetMethod;
   }
 }
 
diff --git a/pkg/analysis_server/lib/src/utilities/extensions/completion_request.dart b/pkg/analysis_server/lib/src/utilities/extensions/completion_request.dart
index 86a8d70a5bc..a4f56a2b29c 100644
--- a/pkg/analysis_server/lib/src/utilities/extensions/completion_request.dart
+++ b/pkg/analysis_server/lib/src/utilities/extensions/completion_request.dart
@@ -15,7 +15,7 @@ extension DartCompletionRequestExtensions on DartCompletionRequest {
   ///
   // TODO(scheglov): Validate that suggesting a tear-off instead of invocation
   // is statistically a good choice.
-  bool shouldSuggestTearOff(InterfaceElement2 element) {
+  bool shouldSuggestTearOff(InterfaceElement element) {
     if (!libraryElement.featureSet.isEnabled(Feature.constructor_tearoffs)) {
       return false;
     }
diff --git a/pkg/analysis_server/lib/src/utilities/extensions/element.dart b/pkg/analysis_server/lib/src/utilities/extensions/element.dart
index cfe0c0b5260..ce02cecb67d 100644
--- a/pkg/analysis_server/lib/src/utilities/extensions/element.dart
+++ b/pkg/analysis_server/lib/src/utilities/extensions/element.dart
@@ -4,7 +4,7 @@
 
 import 'package:analyzer/dart/element/element.dart';
 
-extension ClassElementExtensions on ClassElement2 {
+extension ClassElementExtensions on ClassElement {
   /// Return `true` if this element represents the class `Iterable` from
   /// `dart:core`.
   bool get isDartCoreIterable => name3 == 'Iterable' && library2.isDartCore;
@@ -22,7 +22,7 @@ extension ClassElementExtensions on ClassElement2 {
   bool get isDartCoreSet => name3 == 'Set' && library2.isDartCore;
 }
 
-extension ElementExtensions on Element2 {
+extension ElementExtensions on Element {
   /// The content of the documentation comment (including delimiters) for this
   /// element.
   ///
@@ -49,17 +49,17 @@ extension ElementExtensions on Element2 {
     }
 
     var ancestor = enclosingElement2;
-    if (ancestor is InterfaceElement2) {
+    if (ancestor is InterfaceElement) {
       if (ancestor.metadata2.hasDeprecated) {
         return true;
       }
       ancestor = ancestor.enclosingElement2;
     }
-    return ancestor is LibraryElement2 && ancestor.metadata2.hasDeprecated;
+    return ancestor is LibraryElement && ancestor.metadata2.hasDeprecated;
   }
 
   /// Return this element and all its enclosing elements.
-  Iterable<Element2> get withAncestors sync* {
+  Iterable<Element> get withAncestors sync* {
     var current = this;
     while (true) {
       yield current;
@@ -87,7 +87,7 @@ extension FragmentExtensions on Fragment {
   }
 }
 
-extension MethodElementExtensions on MethodElement2 {
+extension MethodElementExtensions on MethodElement {
   /// Return `true` if this element represents the method `cast` from either
   /// `Iterable`, `List`, `Map`, or `Set`.
   bool get isCastMethod {
@@ -95,7 +95,7 @@ extension MethodElementExtensions on MethodElement2 {
       return false;
     }
     var definingClass = enclosingElement2;
-    if (definingClass is! ClassElement2) {
+    if (definingClass is! ClassElement) {
       return false;
     }
     return definingClass.isDartCoreIterable ||
@@ -111,7 +111,7 @@ extension MethodElementExtensions on MethodElement2 {
       return false;
     }
     var definingClass = enclosingElement2;
-    if (definingClass is! ClassElement2) {
+    if (definingClass is! ClassElement) {
       return false;
     }
     return definingClass.isDartCoreIterable;
@@ -124,7 +124,7 @@ extension MethodElementExtensions on MethodElement2 {
       return false;
     }
     var definingClass = enclosingElement2;
-    if (definingClass is! ClassElement2) {
+    if (definingClass is! ClassElement) {
       return false;
     }
     return definingClass.isDartCoreIterable;
diff --git a/pkg/analysis_server/lib/src/utilities/import_analyzer.dart b/pkg/analysis_server/lib/src/utilities/import_analyzer.dart
index 4c23f374ecc..ec284bb6c6d 100644
--- a/pkg/analysis_server/lib/src/utilities/import_analyzer.dart
+++ b/pkg/analysis_server/lib/src/utilities/import_analyzer.dart
@@ -21,18 +21,18 @@ class ImportAnalyzer {
   final ResolvedLibraryResult result;
 
   /// The elements for the declarations to be moved.
-  final Set<Element2> movingDeclarations = {};
+  final Set<Element> movingDeclarations = {};
 
   /// The elements for the declarations that are staying.
-  final Set<Element2> stayingDeclarations = {};
+  final Set<Element> stayingDeclarations = {};
 
   /// A map from the elements referenced by the declarations to be moved to the
   /// set of imports used to reference those declarations.
-  final Map<Element2, Set<LibraryImport>> movingReferences = {};
+  final Map<Element, Set<LibraryImport>> movingReferences = {};
 
   /// A map from the elements referenced by the declarations that are staying to
   /// the set of imports used to reference those declarations.
-  final Map<Element2, Set<LibraryImport>> stayingReferences = {};
+  final Map<Element, Set<LibraryImport>> stayingReferences = {};
 
   /// Analyzes the given library [result] to find the declarations and
   /// references being moved and that are staying.
@@ -103,7 +103,7 @@ class _ElementRecorder {
   /// is being moved. Not necessary the offset of the name. For example to
   /// a [MethodDeclaration] it would be the offset of the enclosing
   /// [ClassDeclaration] because we move the whole top-level declarations.
-  void recordDeclaration(int offset, Element2? declaredElement) {
+  void recordDeclaration(int offset, Element? declaredElement) {
     if (declaredElement == null) {
       return;
     }
@@ -119,11 +119,11 @@ class _ElementRecorder {
   /// [referenceOffset]. [import] is the specific import used to reference the
   /// including any prefix, show, hide.
   void recordReference(
-    Element2 referencedElement,
+    Element referencedElement,
     int referenceOffset,
     LibraryImport? import,
   ) {
-    if (referencedElement is PropertyAccessorElement2) {
+    if (referencedElement is PropertyAccessorElement) {
       if (referencedElement.isSynthetic) {
         var variable = referencedElement.variable3;
         if (variable == null) {
@@ -311,7 +311,7 @@ class _ReferenceFinder extends RecursiveAstVisitor<void> {
 
   /// Finds the [LibraryImport] that is used to import [element] for use
   /// in [node].
-  LibraryImport? _getImportForElement(AstNode? node, Element2 element) {
+  LibraryImport? _getImportForElement(AstNode? node, Element element) {
     var prefix = _getPrefixFromExpression(node)?.name3;
 
     var lookupName = () {
@@ -343,7 +343,7 @@ class _ReferenceFinder extends RecursiveAstVisitor<void> {
 
     // Extensions can be used without a prefix, so we can use any import that
     // brings in the extension.
-    if (import == null && prefix == null && element is ExtensionElement2) {
+    if (import == null && prefix == null && element is ExtensionElement) {
       import =
           _importsByPrefix.values.flattenedToList
               .where(
@@ -364,18 +364,18 @@ class _ReferenceFinder extends RecursiveAstVisitor<void> {
   }
 
   /// Return the prefix used in [node].
-  PrefixElement2? _getPrefixFromExpression(AstNode? node) {
+  PrefixElement? _getPrefixFromExpression(AstNode? node) {
     if (node is PrefixedIdentifier) {
       var prefix = node.prefix;
       var element = prefix.element;
-      if (element is PrefixElement2) {
+      if (element is PrefixElement) {
         return element;
       }
     } else if (node is PropertyAccess) {
       var target = node.target;
       if (target is PrefixedIdentifier) {
         var element = target.prefix.element;
-        if (element is PrefixElement2) {
+        if (element is PrefixElement) {
           return element;
         }
       }
@@ -383,7 +383,7 @@ class _ReferenceFinder extends RecursiveAstVisitor<void> {
       var target = node.target;
       if (target is SimpleIdentifier) {
         var element = target.element;
-        if (element is PrefixElement2) {
+        if (element is PrefixElement) {
           return element;
         }
       }
@@ -395,9 +395,9 @@ class _ReferenceFinder extends RecursiveAstVisitor<void> {
 
   /// Records a reference to [element] (if not null) at the offset of [node],
   /// extracting any prefix from [prefixNode].
-  void _recordReference(Element2? element, AstNode node, AstNode? prefixNode) {
-    if (element is ExecutableElement2 &&
-        element.enclosingElement2 is ExtensionElement2 &&
+  void _recordReference(Element? element, AstNode node, AstNode? prefixNode) {
+    if (element is ExecutableElement &&
+        element.enclosingElement2 is ExtensionElement &&
         !element.isStatic) {
       element = element.enclosingElement2;
     }
@@ -413,10 +413,10 @@ class _ReferenceFinder extends RecursiveAstVisitor<void> {
   }
 }
 
-extension on Element2 {
+extension on Element {
   /// Return `true` if this element reference is an interesting reference from
   /// the perspective of determining which imports need to be added.
   bool get isInterestingReference {
-    return this is! PrefixElement2 && enclosingElement2 is LibraryElement2;
+    return this is! PrefixElement && enclosingElement2 is LibraryElement;
   }
 }
diff --git a/pkg/analysis_server/test/abstract_single_unit.dart b/pkg/analysis_server/test/abstract_single_unit.dart
index dc0f8d2183f..09029967ad3 100644
--- a/pkg/analysis_server/test/abstract_single_unit.dart
+++ b/pkg/analysis_server/test/abstract_single_unit.dart
@@ -26,7 +26,7 @@ class AbstractSingleUnitTest extends AbstractContextTest {
   late CompilationUnit testUnit;
   late FindNode findNode;
   late FindElement2 findElement2;
-  late LibraryElement2 testLibraryElement;
+  late LibraryElement testLibraryElement;
   TestCode get parsedTestCode => _parsedTestCode!;
   set parsedTestCode(TestCode value) {
     if (_parsedTestCode != null) {
diff --git a/pkg/analysis_server/test/services/refactoring/agnostic/change_method_signature_test.dart b/pkg/analysis_server/test/services/refactoring/agnostic/change_method_signature_test.dart
index d2eaeb6fb6e..f3cc5c55e61 100644
--- a/pkg/analysis_server/test/services/refactoring/agnostic/change_method_signature_test.dart
+++ b/pkg/analysis_server/test/services/refactoring/agnostic/change_method_signature_test.dart
@@ -114,7 +114,7 @@ class AbstractChangeMethodSignatureTest extends AbstractContextTest {
     );
   }
 
-  String _elementToReferenceString(Element2 element) {
+  String _elementToReferenceString(Element element) {
     var enclosingElement = element.enclosingElement2;
     var reference = switch (element) {
       ElementImpl2() =>
diff --git a/pkg/analysis_server/test/services/refactoring/legacy/abstract_rename.dart b/pkg/analysis_server/test/services/refactoring/legacy/abstract_rename.dart
index 986550e2480..82491221b4a 100644
--- a/pkg/analysis_server/test/services/refactoring/legacy/abstract_rename.dart
+++ b/pkg/analysis_server/test/services/refactoring/legacy/abstract_rename.dart
@@ -43,7 +43,7 @@ class RenameRefactoringTest extends RefactoringTest {
   void createRenameRefactoringAtString(String search) {
     var node = findNode.any(search);
 
-    Element2? element;
+    Element? element;
     switch (node) {
       case ImportDirective():
         element = MockLibraryImportElement(node.libraryImport!);
@@ -51,7 +51,7 @@ class RenameRefactoringTest extends RefactoringTest {
         element = ElementLocator.locate2(node);
     }
 
-    if (node is SimpleIdentifier && element is PrefixElement2) {
+    if (node is SimpleIdentifier && element is PrefixElement) {
       element = MockLibraryImportElement(getImportElement(node)!);
     }
 
@@ -60,7 +60,7 @@ class RenameRefactoringTest extends RefactoringTest {
 
   /// Creates a new [RenameRefactoring] in [refactoring] for [element].
   /// Fails if no [RenameRefactoring] can be created.
-  void createRenameRefactoringForElement2(Element2? element) {
+  void createRenameRefactoringForElement2(Element? element) {
     var workspace = RefactoringWorkspace([driverFor(testFile)], searchEngine);
     var refactoring = RenameRefactoring.create(
       workspace,
diff --git a/pkg/analysis_server/test/services/refactoring/legacy/convert_method_to_getter_test.dart b/pkg/analysis_server/test/services/refactoring/legacy/convert_method_to_getter_test.dart
index da754d88d58..13235e85fb3 100644
--- a/pkg/analysis_server/test/services/refactoring/legacy/convert_method_to_getter_test.dart
+++ b/pkg/analysis_server/test/services/refactoring/legacy/convert_method_to_getter_test.dart
@@ -227,7 +227,7 @@ void test() {}
     assertTestChangeResult(expectedCode);
   }
 
-  void _createRefactoringForElement(ExecutableElement2 element) {
+  void _createRefactoringForElement(ExecutableElement element) {
     refactoring = ConvertMethodToGetterRefactoring(
       refactoringWorkspace,
       testAnalysisResult.session,
diff --git a/pkg/analysis_server/test/services/search/search_engine_test.dart b/pkg/analysis_server/test/services/search/search_engine_test.dart
index 5373a8e10dd..b651c429dd6 100644
--- a/pkg/analysis_server/test/services/search/search_engine_test.dart
+++ b/pkg/analysis_server/test/services/search/search_engine_test.dart
@@ -214,7 +214,7 @@ class C implements B {}
 
     var element = findElement2.class_('T');
 
-    var subtypes = <InterfaceElement2>{};
+    var subtypes = <InterfaceElement>{};
     await searchEngine.appendAllSubtypes(
       element,
       subtypes,
@@ -243,7 +243,7 @@ class C extends B {}
     await resolveFile2(a);
     var element = findElement2.class_('T');
 
-    var subtypes = <InterfaceElement2>{};
+    var subtypes = <InterfaceElement>{};
     await searchEngine.appendAllSubtypes(
       element,
       subtypes,
@@ -264,7 +264,7 @@ extension type C(int it) implements A {}
 
     var element = findElement2.class_('A');
 
-    var subtypes = <InterfaceElement2>{};
+    var subtypes = <InterfaceElement>{};
     await searchEngine.appendAllSubtypes(
       element,
       subtypes,
@@ -290,7 +290,7 @@ mixin E implements C {}
 
     var element = findElement2.class_('T');
 
-    var subtypes = <InterfaceElement2>{};
+    var subtypes = <InterfaceElement>{};
     await searchEngine.appendAllSubtypes(
       element,
       subtypes,
@@ -768,12 +768,12 @@ class B extends A {}
   }
 
   static void _assertContainsClass(
-    Set<InterfaceElement2> subtypes,
+    Set<InterfaceElement> subtypes,
     String name,
   ) {
     expect(
       subtypes,
-      contains(predicate((InterfaceElement2 e) => e.name3 == name)),
+      contains(predicate((InterfaceElement e) => e.name3 == name)),
     );
   }
 }
@@ -797,7 +797,7 @@ void f(A<int> a, A<double> b) {}
     var element = findElement2.typeAlias('A');
     var matches = await searchEngine.searchReferences(element);
 
-    Matcher hasOne(Element2 element, String search) {
+    Matcher hasOne(Element element, String search) {
       return predicate((SearchMatch match) {
         return match.element == element &&
             match.sourceRange.offset == findNode.offset(search);
diff --git a/pkg/analysis_server/test/services/snippets/snippet_manager_test.dart b/pkg/analysis_server/test/services/snippets/snippet_manager_test.dart
index 542dd03af9d..b14b9135c8f 100644
--- a/pkg/analysis_server/test/services/snippets/snippet_manager_test.dart
+++ b/pkg/analysis_server/test/services/snippets/snippet_manager_test.dart
@@ -70,7 +70,7 @@ class SnippetManagerTest extends AbstractSingleUnitTest {
       SnippetContext.inClass: [
         (
           context, {
-          required Map<Element2, LibraryElement2?> elementImportCache,
+          required Map<Element, LibraryElement?> elementImportCache,
         }) => throw 'Tried to create producer for wrong context',
       ],
     });
@@ -114,7 +114,7 @@ class _NotValidSnippetProducer extends SnippetProducer {
 
   static _NotValidSnippetProducer newInstance(
     DartSnippetRequest request, {
-    required Map<Element2, LibraryElement2?> elementImportCache,
+    required Map<Element, LibraryElement?> elementImportCache,
   }) => _NotValidSnippetProducer._(request);
 }
 
@@ -148,6 +148,6 @@ class _ValidSnippetProducer extends SnippetProducer {
 
   static _ValidSnippetProducer newInstance(
     DartSnippetRequest request, {
-    required Map<Element2, LibraryElement2?> elementImportCache,
+    required Map<Element, LibraryElement?> elementImportCache,
   }) => _ValidSnippetProducer._(request);
 }
diff --git a/pkg/analysis_server/test/src/utilities/import_analyzer_test.dart b/pkg/analysis_server/test/src/utilities/import_analyzer_test.dart
index 5ad211b8476..a4eceb08ede 100644
--- a/pkg/analysis_server/test/src/utilities/import_analyzer_test.dart
+++ b/pkg/analysis_server/test/src/utilities/import_analyzer_test.dart
@@ -39,10 +39,10 @@ class D {}
 !]
 ''',
       expectedMovingDeclarations: [
-        element<ClassElement2>(name: 'A'),
-        element<ClassElement2>(name: 'B'),
-        element<ClassElement2>(name: 'C'),
-        element<ClassElement2>(name: 'D'),
+        element<ClassElement>(name: 'A'),
+        element<ClassElement>(name: 'B'),
+        element<ClassElement>(name: 'C'),
+        element<ClassElement>(name: 'D'),
       ],
       expectedStayingDeclarations: [],
     );
@@ -59,12 +59,12 @@ class C {}
 class D {}
 ''',
       expectedMovingDeclarations: [
-        element<ClassElement2>(name: 'A'),
-        element<ClassElement2>(name: 'B'),
+        element<ClassElement>(name: 'A'),
+        element<ClassElement>(name: 'B'),
       ],
       expectedStayingDeclarations: [
-        element<ClassElement2>(name: 'C'),
-        element<ClassElement2>(name: 'D'),
+        element<ClassElement>(name: 'C'),
+        element<ClassElement>(name: 'D'),
       ],
     );
   }
@@ -80,12 +80,12 @@ class D {}
 !]
 ''',
       expectedMovingDeclarations: [
-        element<ClassElement2>(name: 'C'),
-        element<ClassElement2>(name: 'D'),
+        element<ClassElement>(name: 'C'),
+        element<ClassElement>(name: 'D'),
       ],
       expectedStayingDeclarations: [
-        element<ClassElement2>(name: 'A'),
-        element<ClassElement2>(name: 'B'),
+        element<ClassElement>(name: 'A'),
+        element<ClassElement>(name: 'B'),
       ],
     );
   }
@@ -101,12 +101,12 @@ class C {}
 class D {}
 ''',
       expectedMovingDeclarations: [
-        element<ClassElement2>(name: 'B'),
-        element<ClassElement2>(name: 'C'),
+        element<ClassElement>(name: 'B'),
+        element<ClassElement>(name: 'C'),
       ],
       expectedStayingDeclarations: [
-        element<ClassElement2>(name: 'A'),
-        element<ClassElement2>(name: 'D'),
+        element<ClassElement>(name: 'A'),
+        element<ClassElement>(name: 'D'),
       ],
     );
   }
@@ -119,8 +119,8 @@ class C {}
 !]
 class D {}
 ''',
-      expectedMovingDeclarations: [element<ClassElement2>(name: 'C')],
-      expectedStayingDeclarations: [element<ClassElement2>(name: 'D')],
+      expectedMovingDeclarations: [element<ClassElement>(name: 'C')],
+      expectedStayingDeclarations: [element<ClassElement>(name: 'D')],
     );
   }
 
@@ -132,8 +132,8 @@ class B {}
 class C {}
 !]
 ''',
-      expectedMovingDeclarations: [element<ClassElement2>(name: 'C')],
-      expectedStayingDeclarations: [element<ClassElement2>(name: 'B')],
+      expectedMovingDeclarations: [element<ClassElement>(name: 'C')],
+      expectedStayingDeclarations: [element<ClassElement>(name: 'B')],
     );
   }
 
@@ -146,10 +146,10 @@ class C {}
 !]
 class D {}
 ''',
-      expectedMovingDeclarations: [element<ClassElement2>(name: 'C')],
+      expectedMovingDeclarations: [element<ClassElement>(name: 'C')],
       expectedStayingDeclarations: [
-        element<ClassElement2>(name: 'B'),
-        element<ClassElement2>(name: 'D'),
+        element<ClassElement>(name: 'B'),
+        element<ClassElement>(name: 'D'),
       ],
     );
   }
@@ -161,7 +161,7 @@ class D {}
 class C {}
 !]
 ''',
-      expectedMovingDeclarations: [element<ClassElement2>(name: 'C')],
+      expectedMovingDeclarations: [element<ClassElement>(name: 'C')],
       expectedStayingDeclarations: [],
     );
   }
@@ -201,32 +201,32 @@ int set s2(x) {}
 int v2 = 0;
 ''',
       expectedMovingDeclarations: [
-        element<ClassElement2>(name: 'C1'),
-        element<ClassElement2>(name: 'D1'),
-        element<EnumElement2>(name: 'E1'),
-        element<TypeAliasElement2>(name: 'F1'),
-        element<TypeAliasElement2>(name: 'G1'),
-        element<MixinElement2>(name: 'M1'),
-        element<TypeAliasElement2>(name: 'T1'),
-        element<ExtensionElement2>(name: 'X1'),
+        element<ClassElement>(name: 'C1'),
+        element<ClassElement>(name: 'D1'),
+        element<EnumElement>(name: 'E1'),
+        element<TypeAliasElement>(name: 'F1'),
+        element<TypeAliasElement>(name: 'G1'),
+        element<MixinElement>(name: 'M1'),
+        element<TypeAliasElement>(name: 'T1'),
+        element<ExtensionElement>(name: 'X1'),
         element<TopLevelFunctionElement>(name: 'f1'),
         element<GetterElement>(name: 'g1'),
         element<SetterElement>(name: 's1'),
-        element<TopLevelVariableElement2>(name: 'v1'),
+        element<TopLevelVariableElement>(name: 'v1'),
       ],
       expectedStayingDeclarations: [
-        element<ClassElement2>(name: 'C2'),
-        element<ClassElement2>(name: 'D2'),
-        element<EnumElement2>(name: 'E2'),
-        element<TypeAliasElement2>(name: 'F2'),
-        element<TypeAliasElement2>(name: 'G2'),
-        element<MixinElement2>(name: 'M2'),
-        element<TypeAliasElement2>(name: 'T2'),
-        element<ExtensionElement2>(name: 'X2'),
+        element<ClassElement>(name: 'C2'),
+        element<ClassElement>(name: 'D2'),
+        element<EnumElement>(name: 'E2'),
+        element<TypeAliasElement>(name: 'F2'),
+        element<TypeAliasElement>(name: 'G2'),
+        element<MixinElement>(name: 'M2'),
+        element<TypeAliasElement>(name: 'T2'),
+        element<ExtensionElement>(name: 'X2'),
         element<TopLevelFunctionElement>(name: 'f2'),
         element<GetterElement>(name: 'g2'),
         element<SetterElement>(name: 's2'),
-        element<TopLevelVariableElement2>(name: 'v2'),
+        element<TopLevelVariableElement>(name: 'v2'),
       ],
     );
   }
@@ -249,7 +249,7 @@ class C {
 ''',
       expectedStayingReferences: {},
       expectedMovingReferences: {
-        element<ClassElement2>(name: 'File'): [''],
+        element<ClassElement>(name: 'File'): [''],
       },
     );
   }
@@ -278,7 +278,7 @@ class C extends A {}
 ''',
       expectedStayingReferences: {},
       expectedMovingReferences: {
-        element<ClassElement2>(name: 'A'): [''],
+        element<ClassElement>(name: 'A'): [''],
       },
     );
   }
@@ -296,7 +296,7 @@ class C {}
 !]
 ''',
       expectedStayingReferences: {
-        element<ClassElement2>(name: 'File'): [''],
+        element<ClassElement>(name: 'File'): [''],
       },
       expectedMovingReferences: {},
     );
@@ -311,7 +311,7 @@ class C {}
 !]
 ''',
       expectedStayingReferences: {
-        element<ClassElement2>(name: 'C'): [''],
+        element<ClassElement>(name: 'C'): [''],
       },
       expectedMovingReferences: {},
     );
@@ -346,7 +346,7 @@ class C {}
 !]
 ''',
       expectedStayingReferences: {
-        element<ClassElement2>(name: 'C'): [''],
+        element<ClassElement>(name: 'C'): [''],
       },
     );
   }
@@ -360,7 +360,7 @@ C? c;
 !]
 ''',
       expectedMovingReferences: {
-        element<ClassElement2>(name: 'C'): [''],
+        element<ClassElement>(name: 'C'): [''],
       },
     );
   }
@@ -374,7 +374,7 @@ enum E {}
 !]
 ''',
       expectedStayingReferences: {
-        element<EnumElement2>(name: 'E'): [''],
+        element<EnumElement>(name: 'E'): [''],
       },
     );
   }
@@ -388,7 +388,7 @@ E? e;
 !]
 ''',
       expectedMovingReferences: {
-        element<EnumElement2>(name: 'E'): [''],
+        element<EnumElement>(name: 'E'): [''],
       },
     );
   }
@@ -404,7 +404,7 @@ extension X on int {
 !]
 ''',
       expectedStayingReferences: {
-        element<ExtensionElement2>(name: 'X'): [''],
+        element<ExtensionElement>(name: 'X'): [''],
       },
     );
   }
@@ -420,7 +420,7 @@ var x = 2.g;
 !]
 ''',
       expectedMovingReferences: {
-        element<ExtensionElement2>(name: 'X'): [''],
+        element<ExtensionElement>(name: 'X'): [''],
       },
     );
   }
@@ -437,7 +437,7 @@ extension X on A {
 !]
 ''',
       expectedStayingReferences: {
-        element<ExtensionElement2>(name: 'X'): [''],
+        element<ExtensionElement>(name: 'X'): [''],
       },
     );
   }
@@ -454,8 +454,8 @@ var x = A() + A();
 !]
 ''',
       expectedMovingReferences: {
-        element<ExtensionElement2>(name: 'X'): [''],
-        element<ClassElement2>(name: 'A'): [''],
+        element<ExtensionElement>(name: 'X'): [''],
+        element<ClassElement>(name: 'A'): [''],
       },
     );
   }
@@ -471,7 +471,7 @@ extension X on int {
 !]
 ''',
       expectedStayingReferences: {
-        element<ExtensionElement2>(name: 'X'): [''],
+        element<ExtensionElement>(name: 'X'): [''],
       },
     );
   }
@@ -487,7 +487,7 @@ var x = X(2).g;
 !]
 ''',
       expectedMovingReferences: {
-        element<ExtensionElement2>(name: 'X'): [''],
+        element<ExtensionElement>(name: 'X'): [''],
       },
     );
   }
@@ -501,7 +501,7 @@ typedef void F();
 !]
 ''',
       expectedStayingReferences: {
-        element<TypeAliasElement2>(name: 'F'): [''],
+        element<TypeAliasElement>(name: 'F'): [''],
       },
     );
   }
@@ -515,7 +515,7 @@ F? f;
 !]
 ''',
       expectedMovingReferences: {
-        element<TypeAliasElement2>(name: 'F'): [''],
+        element<TypeAliasElement>(name: 'F'): [''],
       },
     );
   }
@@ -529,7 +529,7 @@ typedef G = void Function();
 !]
 ''',
       expectedStayingReferences: {
-        element<TypeAliasElement2>(name: 'G'): [''],
+        element<TypeAliasElement>(name: 'G'): [''],
       },
     );
   }
@@ -543,7 +543,7 @@ G? g;
 !]
 ''',
       expectedMovingReferences: {
-        element<TypeAliasElement2>(name: 'G'): [''],
+        element<TypeAliasElement>(name: 'G'): [''],
       },
     );
   }
@@ -557,7 +557,7 @@ mixin M {}
 !]
 ''',
       expectedStayingReferences: {
-        element<MixinElement2>(name: 'M'): [''],
+        element<MixinElement>(name: 'M'): [''],
       },
     );
   }
@@ -571,7 +571,7 @@ M? m;
 !]
 ''',
       expectedMovingReferences: {
-        element<MixinElement2>(name: 'M'): [''],
+        element<MixinElement>(name: 'M'): [''],
       },
     );
   }
@@ -587,7 +587,7 @@ mixin M {}
 !]
 ''',
       expectedStayingReferences: {
-        element<ClassElement2>(name: 'D'): [''],
+        element<ClassElement>(name: 'D'): [''],
       },
     );
   }
@@ -603,7 +603,7 @@ D? d;
 !]
 ''',
       expectedMovingReferences: {
-        element<ClassElement2>(name: 'D'): [''],
+        element<ClassElement>(name: 'D'): [''],
       },
     );
   }
@@ -740,7 +740,7 @@ int v = 0;
 !]
 ''',
       expectedStayingReferences: {
-        element<TopLevelVariableElement2>(name: 'v'): [''],
+        element<TopLevelVariableElement>(name: 'v'): [''],
       },
     );
   }
@@ -755,7 +755,7 @@ void f() => v += 1;
 !]
 ''',
       expectedMovingReferences: {
-        element<TopLevelVariableElement2>(name: 'v'): [''],
+        element<TopLevelVariableElement>(name: 'v'): [''],
       },
     );
   }
@@ -769,7 +769,7 @@ int v = 0;
 !]
 ''',
       expectedStayingReferences: {
-        element<TopLevelVariableElement2>(name: 'v'): [''],
+        element<TopLevelVariableElement>(name: 'v'): [''],
       },
     );
   }
@@ -783,7 +783,7 @@ var x = v;
 !]
 ''',
       expectedMovingReferences: {
-        element<TopLevelVariableElement2>(name: 'v'): [''],
+        element<TopLevelVariableElement>(name: 'v'): [''],
       },
     );
   }
@@ -832,7 +832,7 @@ int v = 0;
 !]
 ''',
       expectedStayingReferences: {
-        element<TopLevelVariableElement2>(name: 'v'): [''],
+        element<TopLevelVariableElement>(name: 'v'): [''],
       },
     );
   }
@@ -847,7 +847,7 @@ void f() => v++;
 !]
 ''',
       expectedMovingReferences: {
-        element<TopLevelVariableElement2>(name: 'v'): [''],
+        element<TopLevelVariableElement>(name: 'v'): [''],
       },
     );
   }
@@ -896,7 +896,7 @@ int v = 0;
 !]
 ''',
       expectedStayingReferences: {
-        element<TopLevelVariableElement2>(name: 'v'): [''],
+        element<TopLevelVariableElement>(name: 'v'): [''],
       },
     );
   }
@@ -911,7 +911,7 @@ void f() => ++v;
 !]
 ''',
       expectedMovingReferences: {
-        element<TopLevelVariableElement2>(name: 'v'): [''],
+        element<TopLevelVariableElement>(name: 'v'): [''],
       },
     );
   }
@@ -926,7 +926,7 @@ class C {}
 !]
 ''',
       expectedStayingReferences: {
-        element<TypeAliasElement2>(name: 'T'): [''],
+        element<TypeAliasElement>(name: 'T'): [''],
       },
     );
   }
@@ -941,7 +941,7 @@ T? t;
 !]
 ''',
       expectedMovingReferences: {
-        element<TypeAliasElement2>(name: 'T'): [''],
+        element<TypeAliasElement>(name: 'T'): [''],
       },
     );
   }
@@ -968,10 +968,10 @@ c.Directory? d2;
 d.Directory? d3;
 ''',
       expectedMovingReferences: {
-        element<ClassElement2>(name: 'File'): ['', 'a', 'b'],
+        element<ClassElement>(name: 'File'): ['', 'a', 'b'],
       },
       expectedStayingReferences: {
-        element<ClassElement2>(name: 'Directory'): ['', 'c', 'd'],
+        element<ClassElement>(name: 'Directory'): ['', 'c', 'd'],
       },
     );
   }
@@ -1042,16 +1042,16 @@ abstract class ImportAnalyzerTest extends PubPackageAnalysisServerTest {
     }
   }
 
-  _ExpectedElement<T> element<T extends Element2>({required String name}) =>
+  _ExpectedElement<T> element<T extends Element>({required String name}) =>
       _ExpectedElement<T>(name: name);
 }
 
-class _ExpectedElement<T extends Element2> {
+class _ExpectedElement<T extends Element> {
   final String name;
 
   _ExpectedElement({required this.name});
 
-  void assertMatches(Element2 element) {
+  void assertMatches(Element element) {
     expect(element, isA<T>());
     expect(element.name3, name);
   }
diff --git a/pkg/analysis_server/test/src/utilities/selection_coverage_test.dart b/pkg/analysis_server/test/src/utilities/selection_coverage_test.dart
index 79df7197a09..92eeffb2464 100644
--- a/pkg/analysis_server/test/src/utilities/selection_coverage_test.dart
+++ b/pkg/analysis_server/test/src/utilities/selection_coverage_test.dart
@@ -20,7 +20,7 @@ void main() {
 }
 
 class AstImplData {
-  final List<ClassElement2> instantiableInterfaces = [];
+  final List<ClassElement> instantiableInterfaces = [];
 
   AstImplData();
 }
@@ -28,24 +28,24 @@ class AstImplData {
 class AstInterfaceData {
   /// A table mapping the element for a class to a list of the elements for the
   /// supertypes of that class.
-  final Map<ClassElement2, List<ClassElement2>> supertypes = {};
+  final Map<ClassElement, List<ClassElement>> supertypes = {};
 
   /// A table mapping class element to a list of the getters declared directly
   /// in that class that return a `NodeList`.
-  final Map<ClassElement2, List<ExecutableElement2>> declaredLists = {};
+  final Map<ClassElement, List<ExecutableElement>> declaredLists = {};
 
   AstInterfaceData();
 
-  List<ExecutableElement2> nodeListsFor(ClassElement2 class_) {
-    var lists = <ExecutableElement2>[];
-    _addListsFor(lists, class_, <ClassElement2>{});
+  List<ExecutableElement> nodeListsFor(ClassElement class_) {
+    var lists = <ExecutableElement>[];
+    _addListsFor(lists, class_, <ClassElement>{});
     return lists;
   }
 
   void _addListsFor(
-    List<ExecutableElement2> lists,
-    ClassElement2 class_,
-    Set<ClassElement2> visited,
+    List<ExecutableElement> lists,
+    ClassElement class_,
+    Set<ClassElement> visited,
   ) {
     if (!visited.add(class_)) {
       return;
@@ -77,7 +77,7 @@ class SelectionCoverageTest {
         if (implementsClause != null) {
           for (var type in implementsClause.interfaces) {
             var element = type.type?.element3;
-            if (element is ClassElement2 && element.name3 == interfaceName) {
+            if (element is ClassElement && element.name3 == interfaceName) {
               data.instantiableInterfaces.add(element);
             }
           }
@@ -99,7 +99,7 @@ class SelectionCoverageTest {
         if (implementsClause != null) {
           for (var supertype in implementsClause.interfaces) {
             var supertypeElement = supertype.type?.element3;
-            if (supertypeElement is ClassElement2) {
+            if (supertypeElement is ClassElement) {
               data.supertypes
                   .putIfAbsent(subtypeElement, () => [])
                   .add(supertypeElement);
@@ -108,7 +108,7 @@ class SelectionCoverageTest {
         }
 
         // Build the node list map.
-        var nodeLists = <ExecutableElement2>[];
+        var nodeLists = <ExecutableElement>[];
         for (var member in declaration.members) {
           if (member is MethodDeclaration && member.isGetter) {
             var returnType = member.returnType;
@@ -145,7 +145,7 @@ class SelectionCoverageTest {
                     ?.element
                     .type
                     .element3;
-            if (visitedClass is ClassElement2) {
+            if (visitedClass is ClassElement) {
               var visitor = VisitMethodVisitor();
               member.body.accept(visitor);
               data.visitedLists[visitedClass] = visitor.visitedLists;
@@ -245,7 +245,7 @@ class SelectionCoverageTest {
         for (var visitedNodeList in visitedNodeLists) {
           unvisitedNodeLists.remove(visitedNodeList);
           var overridden = inheritanceManager.getOverridden4(
-            visitedNodeList.enclosingElement2 as InterfaceElement2,
+            visitedNodeList.enclosingElement2 as InterfaceElement,
             Name(visitedNodeList.library2.uri, visitedNodeList.name3!),
           );
           if (overridden != null) {
@@ -269,13 +269,13 @@ class SelectionCoverageTest {
 }
 
 class SelectionData {
-  final Map<ClassElement2, List<ExecutableElement2>> visitedLists = {};
+  final Map<ClassElement, List<ExecutableElement>> visitedLists = {};
 
   SelectionData();
 }
 
 class VisitMethodVisitor extends RecursiveAstVisitor<void> {
-  List<ExecutableElement2> visitedLists = [];
+  List<ExecutableElement> visitedLists = [];
 
   VisitMethodVisitor();
 
@@ -284,9 +284,9 @@ class VisitMethodVisitor extends RecursiveAstVisitor<void> {
     if (node.methodName.name == '_fromList') {
       var argument = node.argumentList.arguments.first;
       if (argument is PrefixedIdentifier) {
-        visitedLists.add(argument.identifier.element as ExecutableElement2);
+        visitedLists.add(argument.identifier.element as ExecutableElement);
       } else if (argument is PropertyAccess) {
-        visitedLists.add(argument.propertyName.element as ExecutableElement2);
+        visitedLists.add(argument.propertyName.element as ExecutableElement);
       }
     }
   }
diff --git a/pkg/analysis_server/tool/code_completion/completion_metrics.dart b/pkg/analysis_server/tool/code_completion/completion_metrics.dart
index ff961a8d8f8..6fecad55959 100644
--- a/pkg/analysis_server/tool/code_completion/completion_metrics.dart
+++ b/pkg/analysis_server/tool/code_completion/completion_metrics.dart
@@ -26,20 +26,20 @@ import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/ast/token.dart';
 import 'package:analyzer/dart/element/element.dart'
     show
-        Element2,
-        EnumElement2,
-        ExecutableElement2,
-        ExtensionElement2,
-        FieldElement2,
+        Element,
+        EnumElement,
+        ExecutableElement,
+        ExtensionElement,
+        FieldElement,
         FormalParameterElement,
-        InterfaceElement2,
-        LibraryElement2,
+        InterfaceElement,
+        LibraryElement,
         LocalFunctionElement,
-        LocalVariableElement2,
-        MixinElement2,
-        PrefixElement2,
-        TypeParameterElement2,
-        VariableElement2;
+        LocalVariableElement,
+        MixinElement,
+        PrefixElement,
+        TypeParameterElement,
+        VariableElement;
 import 'package:analyzer/file_system/file_system.dart';
 import 'package:analyzer/file_system/physical_file_system.dart';
 import 'package:analyzer/src/util/performance/operation_performance.dart';
@@ -1713,23 +1713,23 @@ class CompletionResult {
     var element = _getElement(entity);
     if (element != null) {
       var parent = element.enclosingElement2;
-      if (parent is InterfaceElement2 || parent is ExtensionElement2) {
+      if (parent is InterfaceElement || parent is ExtensionElement) {
         if (_isStatic(element)) {
           return CompletionGroup.staticMember;
         } else {
           return CompletionGroup.instanceMember;
         }
-      } else if (parent is LibraryElement2 &&
-          element is! InterfaceElement2 &&
-          element is! ExtensionElement2) {
+      } else if (parent is LibraryElement &&
+          element is! InterfaceElement &&
+          element is! ExtensionElement) {
         return CompletionGroup.topLevelMember;
       }
 
-      if (element is EnumElement2) {
+      if (element is EnumElement) {
         return CompletionGroup.enumElement;
-      } else if (element is MixinElement2) {
+      } else if (element is MixinElement) {
         return CompletionGroup.mixinElement;
-      } else if (element is InterfaceElement2) {
+      } else if (element is InterfaceElement) {
         if (entity is SimpleIdentifier &&
             entity.parent is NamedType &&
             entity.parent!.parent is ConstructorName &&
@@ -1737,17 +1737,17 @@ class CompletionResult {
           return CompletionGroup.constructorElement;
         }
         return CompletionGroup.classElement;
-      } else if (element is ExtensionElement2) {
+      } else if (element is ExtensionElement) {
         return CompletionGroup.extensionElement;
       } else if (element is LocalFunctionElement) {
         return CompletionGroup.localFunctionElement;
-      } else if (element is LocalVariableElement2) {
+      } else if (element is LocalVariableElement) {
         return CompletionGroup.localVariableElement;
       } else if (element is FormalParameterElement) {
         return CompletionGroup.parameterElement;
-      } else if (element is PrefixElement2) {
+      } else if (element is PrefixElement) {
         return CompletionGroup.prefixElement;
-      } else if (element is TypeParameterElement2) {
+      } else if (element is TypeParameterElement) {
         return CompletionGroup.typeParameterElement;
       }
     }
@@ -1782,7 +1782,7 @@ class CompletionResult {
 
   /// Return the element associated with the syntactic [entity], or `null` if
   /// there is no such element.
-  Element2? _getElement(SyntacticEntity entity) {
+  Element? _getElement(SyntacticEntity entity) {
     if (entity is SimpleIdentifier) {
       var element = entity.element;
       if (element != null) {
@@ -1812,12 +1812,12 @@ class CompletionResult {
 
   /// Return `true` if the [element] is static (either top-level or a static
   /// member of a class or extension).
-  bool _isStatic(Element2 element) {
-    if (element is ExecutableElement2) {
+  bool _isStatic(Element element) {
+    if (element is ExecutableElement) {
       return element.isStatic;
-    } else if (element is FieldElement2) {
+    } else if (element is FieldElement) {
       return element.isStatic;
-    } else if (element is VariableElement2) {
+    } else if (element is VariableElement) {
       return element.isStatic;
     }
     return true;
diff --git a/pkg/analysis_server/tool/code_completion/relevance_metrics.dart b/pkg/analysis_server/tool/code_completion/relevance_metrics.dart
index 4774ef03e69..2f57be0e804 100644
--- a/pkg/analysis_server/tool/code_completion/relevance_metrics.dart
+++ b/pkg/analysis_server/tool/code_completion/relevance_metrics.dart
@@ -17,11 +17,11 @@ import 'package:analyzer/dart/ast/token.dart';
 import 'package:analyzer/dart/ast/visitor.dart';
 import 'package:analyzer/dart/element/element.dart'
     show
-        Element2,
-        ExecutableElement2,
-        ExtensionElement2,
-        InterfaceElement2,
-        LibraryElement2,
+        Element,
+        ExecutableElement,
+        ExtensionElement,
+        InterfaceElement,
+        LibraryElement,
         FormalParameterElement,
         SetterElement;
 import 'package:analyzer/dart/element/type.dart';
@@ -264,7 +264,7 @@ class RelevanceDataCollector extends RecursiveAstVisitor<void> {
   InheritanceManager3 inheritanceManager = InheritanceManager3();
 
   /// The library containing the compilation unit being visited.
-  late LibraryElement2 enclosingLibrary;
+  late LibraryElement enclosingLibrary;
 
   /// A flag indicating whether we are currently in a context in which type
   /// parameters are visible.
@@ -1131,7 +1131,7 @@ class RelevanceDataCollector extends RecursiveAstVisitor<void> {
     var fragment = node.declaredFragment!;
     var element = fragment.element;
     var enclosingElement = element.enclosingElement2;
-    if (!element.isStatic && enclosingElement is InterfaceElement2) {
+    if (!element.isStatic && enclosingElement is InterfaceElement) {
       var overriddenMembers = inheritanceManager.getOverridden4(
         enclosingElement,
         Name(fragment.libraryFragment.source.uri, element.name3!),
@@ -1628,12 +1628,12 @@ class RelevanceDataCollector extends RecursiveAstVisitor<void> {
   /// 2: top-level decl
   /// 3: class member
   /// 4+: local function
-  int _depth(Element2 element) {
+  int _depth(Element element) {
     if (element.library2 != enclosingLibrary) {
       return 0;
     }
     var depth = 0;
-    Element2? currentElement = element;
+    Element? currentElement = element;
     while (currentElement != enclosingLibrary) {
       depth++;
       currentElement = currentElement?.enclosingElement2;
@@ -1656,8 +1656,7 @@ class RelevanceDataCollector extends RecursiveAstVisitor<void> {
 
   /// Return the element associated with the left-most identifier that is a
   /// child of the [node].
-  Element2? _leftMostElement(AstNode node) =>
-      _leftMostIdentifier(node)?.element;
+  Element? _leftMostElement(AstNode node) => _leftMostIdentifier(node)?.element;
 
   /// Return the left-most child of the [node] if it is a simple identifier, or
   /// `null` if the left-most child is not a simple identifier. Comments and
@@ -1689,7 +1688,7 @@ class RelevanceDataCollector extends RecursiveAstVisitor<void> {
     if (element == null) {
       return null;
     }
-    if (element is InterfaceElement2) {
+    if (element is InterfaceElement) {
       var parent = node.parent;
       if (parent is Annotation && parent.arguments != null) {
         element = parent.element2!;
@@ -1712,7 +1711,7 @@ class RelevanceDataCollector extends RecursiveAstVisitor<void> {
 
   /// Return the number of functions between the [reference] and the [function]
   /// in which the referenced parameter is declared.
-  int _parameterReferenceDepth(AstNode? reference, Element2 function) {
+  int _parameterReferenceDepth(AstNode? reference, Element function) {
     var depth = 0;
     var node = reference;
     while (node != null) {
@@ -1801,27 +1800,27 @@ class RelevanceDataCollector extends RecursiveAstVisitor<void> {
 
   /// Record the distance between the static type of the target (the
   /// [targetType]) and the [member] to which the reference was resolved.
-  void _recordMemberDepth(DartType? targetType, Element2? member) {
+  void _recordMemberDepth(DartType? targetType, Element? member) {
     if (member == null) {
       return;
     }
     if (targetType is InterfaceType) {
       var targetClass = targetType.element3;
-      var extension = member.thisOrAncestorOfType2<ExtensionElement2>();
+      var extension = member.thisOrAncestorOfType2<ExtensionElement>();
       if (extension != null) {
         _recordDistance('member (extension)', 0);
         return;
       }
       // TODO(brianwilkerson): It might be interesting to also know whether the
       //  [element] was found in a class, interface, or mixin.
-      var memberClass = member.thisOrAncestorOfType2<InterfaceElement2>();
+      var memberClass = member.thisOrAncestorOfType2<InterfaceElement>();
       if (memberClass != null) {
         /// Return the distance between the [targetClass] and the [memberClass]
         /// along the superclass chain. This includes all of the implicit
         /// superclasses caused by mixins.
         int getSuperclassDepth() {
           var depth = 0;
-          InterfaceElement2? currentClass = targetClass;
+          InterfaceElement? currentClass = targetClass;
           while (currentClass != null) {
             if (currentClass == memberClass) {
               return depth;
@@ -1842,7 +1841,7 @@ class RelevanceDataCollector extends RecursiveAstVisitor<void> {
         /// includes all of the implicit superclasses caused by mixins.
         int getTargetDepth() {
           var depth = 0;
-          InterfaceElement2? currentClass = targetClass;
+          InterfaceElement? currentClass = targetClass;
           while (currentClass != null) {
             depth += currentClass.mixins.length + 1;
             currentClass = currentClass.supertype?.element3;
@@ -1873,8 +1872,8 @@ class RelevanceDataCollector extends RecursiveAstVisitor<void> {
   }
 
   void _recordOverride(
-    ExecutableElement2 override,
-    ExecutableElement2 overridden,
+    ExecutableElement override,
+    ExecutableElement overridden,
   ) {
     var positionalInOverride = <FormalParameterElement>[];
     var namedInOverride = <String, FormalParameterElement>{};
@@ -2035,7 +2034,7 @@ class RelevanceDataCollector extends RecursiveAstVisitor<void> {
       var firstTokenType = identifier.staticType;
       if (firstTokenType == null) {
         var element = identifier.element;
-        if (element is InterfaceElement2) {
+        if (element is InterfaceElement) {
           // This is effectively treating a reference to a class name as having
           // the same type as an instance of the class, which isn't valid, but
           // on the other hand, the spec doesn't define the static type of a
@@ -2112,8 +2111,8 @@ class RelevanceDataCollector extends RecursiveAstVisitor<void> {
 
   /// Return the return type of the [element], or `null` if the element doesn't
   /// have a return type.
-  DartType? _returnType(Element2? element) {
-    if (element is ExecutableElement2) {
+  DartType? _returnType(Element? element) {
+    if (element is ExecutableElement) {
       return element.returnType;
     }
     return null;
diff --git a/pkg/analysis_server/tool/code_completion/relevance_table_generator.dart b/pkg/analysis_server/tool/code_completion/relevance_table_generator.dart
index 6d2fe8780db..83bc4e53128 100644
--- a/pkg/analysis_server/tool/code_completion/relevance_table_generator.dart
+++ b/pkg/analysis_server/tool/code_completion/relevance_table_generator.dart
@@ -15,7 +15,7 @@ import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/ast/token.dart';
 import 'package:analyzer/dart/ast/visitor.dart';
 import 'package:analyzer/dart/element/element.dart'
-    show Element2, InterfaceElement2, LibraryElement2;
+    show Element, InterfaceElement, LibraryElement;
 import 'package:analyzer/dart/element/type_provider.dart';
 import 'package:analyzer/dart/element/type_system.dart';
 import 'package:analyzer/diagnostic/diagnostic.dart';
@@ -306,7 +306,7 @@ class RelevanceDataCollector extends RecursiveAstVisitor<void> {
   late InheritanceManager3 inheritanceManager = InheritanceManager3();
 
   /// The library containing the compilation unit being visited.
-  late LibraryElement2 enclosingLibrary;
+  late LibraryElement enclosingLibrary;
 
   /// The type provider associated with the current compilation unit.
   late TypeProvider typeProvider;
@@ -1525,8 +1525,7 @@ class RelevanceDataCollector extends RecursiveAstVisitor<void> {
 
   /// Return the element associated with the left-most identifier that is a
   /// child of the [node].
-  Element2? _leftMostElement(AstNode node) =>
-      _leftMostIdentifier(node)?.element;
+  Element? _leftMostElement(AstNode node) => _leftMostIdentifier(node)?.element;
 
   /// Return the left-most child of the [node] if it is a simple identifier, or
   /// `null` if the left-most child is not a simple identifier. Comments and
@@ -1558,7 +1557,7 @@ class RelevanceDataCollector extends RecursiveAstVisitor<void> {
     if (element == null) {
       return null;
     }
-    if (element is InterfaceElement2) {
+    if (element is InterfaceElement) {
       var parent = node.parent;
       if (parent is Annotation && parent.arguments != null) {
         element = parent.element2!;
diff --git a/pkg/analysis_server_plugin/lib/edit/dart/correction_producer.dart b/pkg/analysis_server_plugin/lib/edit/dart/correction_producer.dart
index 618c92a3b82..c4b92288e9c 100644
--- a/pkg/analysis_server_plugin/lib/edit/dart/correction_producer.dart
+++ b/pkg/analysis_server_plugin/lib/edit/dart/correction_producer.dart
@@ -349,7 +349,7 @@ abstract class MultiCorrectionProducer
 
   /// The library element for the library in which a correction is being
   /// produced.
-  LibraryElement2 get libraryElement2 => unitResult.libraryElement2;
+  LibraryElement get libraryElement2 => unitResult.libraryElement2;
 
   @override
   ResolvedLibraryResult get libraryResult =>
@@ -400,7 +400,7 @@ abstract class ResolvedCorrectionProducer
 
   /// The library element for the library in which a correction is being
   /// produced.
-  LibraryElement2 get libraryElement2 => unitResult.libraryElement2;
+  LibraryElement get libraryElement2 => unitResult.libraryElement2;
 
   @override
   ResolvedLibraryResult get libraryResult =>
@@ -477,13 +477,13 @@ abstract class ResolvedCorrectionProducer
 
   /// Returns the class element associated with the [target], or `null` if there
   /// is no such element.
-  InterfaceElement2? getTargetInterfaceElement(Expression target) {
+  InterfaceElement? getTargetInterfaceElement(Expression target) {
     var type = target.staticType;
     if (type is InterfaceType) {
       return type.element3;
     } else if (target is Identifier) {
       var element = target.element;
-      if (element is InterfaceElement2) {
+      if (element is InterfaceElement) {
         return element;
       }
     }
@@ -769,7 +769,7 @@ sealed class _AbstractCorrectionProducer<T extends ParsedUnitResult> {
   /// library, and has the requested base name.
   ///
   /// For getters and setters the corresponding top-level variable is returned.
-  Future<Map<LibraryElement2, Element2>> getTopLevelDeclarations(
+  Future<Map<LibraryElement, Element>> getTopLevelDeclarations(
     String baseName,
   ) async {
     return await _context.dartFixContext!.getTopLevelDeclarations(baseName);
@@ -799,7 +799,7 @@ sealed class _AbstractCorrectionProducer<T extends ParsedUnitResult> {
 
   /// Returns libraries with extensions that declare non-static public
   /// extension members with the [memberName].
-  Stream<LibraryElement2> librariesWithExtensions(Name memberName) {
+  Stream<LibraryElement> librariesWithExtensions(Name memberName) {
     return _context.dartFixContext!.librariesWithExtensions(memberName);
   }
 }
diff --git a/pkg/analysis_server_plugin/lib/edit/fix/dart_fix_context.dart b/pkg/analysis_server_plugin/lib/edit/fix/dart_fix_context.dart
index 334341794b9..36e22000800 100644
--- a/pkg/analysis_server_plugin/lib/edit/fix/dart_fix_context.dart
+++ b/pkg/analysis_server_plugin/lib/edit/fix/dart_fix_context.dart
@@ -45,7 +45,7 @@ class DartFixContext implements FixContext {
   /// It's been observed that the same request is fired multiple times for at
   /// least some getFixes requsts. Caching the response can speed up such
   /// requests.
-  final Map<String, Future<Map<LibraryElement2, Element2>>>
+  final Map<String, Future<Map<LibraryElement, Element>>>
       _cachedTopLevelDeclarations = {};
 
   @override
@@ -65,7 +65,7 @@ class DartFixContext implements FixContext {
   /// this library, and has the requested base name.
   ///
   /// For getters and setters the corresponding top-level variable is returned.
-  Future<Map<LibraryElement2, Element2>> getTopLevelDeclarations(String name) {
+  Future<Map<LibraryElement, Element>> getTopLevelDeclarations(String name) {
     var cachedResult = _cachedTopLevelDeclarations[name];
     if (cachedResult != null) return cachedResult;
     var result = TopLevelDeclarations(unitResult).withName(name);
@@ -75,7 +75,7 @@ class DartFixContext implements FixContext {
 
   /// Returns libraries with extensions that declare non-static public
   /// extension members with the [memberName].
-  Stream<LibraryElement2> librariesWithExtensions(Name memberName) async* {
+  Stream<LibraryElement> librariesWithExtensions(Name memberName) async* {
     var analysisContext = unitResult.session.analysisContext;
     if (analysisContext is! DriverBasedAnalysisContext) {
       return;
diff --git a/pkg/analyzer/CHANGELOG.md b/pkg/analyzer/CHANGELOG.md
index 763df4a3108..f0af91e7a09 100644
--- a/pkg/analyzer/CHANGELOG.md
+++ b/pkg/analyzer/CHANGELOG.md
@@ -5,6 +5,7 @@
 * Remove deprecated `RecordType.sortedNamedTypes`.
 * Remove `ElementLocation` class, its values are not returned anymore.
 * Deprecated `element2.dart` library, import `element.dart`.
+* Deprecated `XyzElement2` classes, use `XyzElement` instead.
 
 ## 7.4.1
 * Restore `InstanceElement.augmented` getter.
diff --git a/pkg/analyzer/api.txt b/pkg/analyzer/api.txt
index 5fec3f9fb71..c103a89da7f 100644
--- a/pkg/analyzer/api.txt
+++ b/pkg/analyzer/api.txt
@@ -189,7 +189,7 @@ package:analyzer/dart/analysis/results.dart:
     new (constructor: InvalidResult Function())
   LibraryElementResult (class extends Object implements SomeLibraryElementResult):
     new (constructor: LibraryElementResult Function())
-    element2 (getter: LibraryElement2, experimental)
+    element2 (getter: LibraryElement, experimental)
   NotElementOfThisSessionResult (class extends Object implements InvalidResult, SomeParsedLibraryResult, SomeResolvedLibraryResult):
     new (constructor: NotElementOfThisSessionResult Function())
   NotLibraryButPartResult (class extends Object implements InvalidResult, SomeLibraryElementResult, SomeParsedLibraryResult, SomeResolvedLibraryResult):
@@ -212,14 +212,14 @@ package:analyzer/dart/analysis/results.dart:
     unit (getter: CompilationUnit)
   ResolvedLibraryResult (class extends Object implements ParsedLibraryResult, SomeResolvedLibraryResult):
     new (constructor: ResolvedLibraryResult Function())
-    element2 (getter: LibraryElement2, experimental)
+    element2 (getter: LibraryElement, experimental)
     typeProvider (getter: TypeProvider)
     units (getter: List<ResolvedUnitResult>)
     unitWithPath (method: ResolvedUnitResult? Function(String))
   ResolvedUnitResult (class extends Object implements ParsedUnitResult, SomeResolvedUnitResult):
     new (constructor: ResolvedUnitResult Function())
     exists (getter: bool)
-    libraryElement2 (getter: LibraryElement2, experimental)
+    libraryElement2 (getter: LibraryElement, experimental)
     libraryFragment (getter: LibraryFragment, experimental)
     typeProvider (getter: TypeProvider)
     typeSystem (getter: TypeSystem)
@@ -257,10 +257,10 @@ package:analyzer/dart/analysis/session.dart:
     getFile (method: SomeFileResult Function(String))
     getLibraryByUri (method: Future<SomeLibraryElementResult> Function(String))
     getParsedLibrary (method: SomeParsedLibraryResult Function(String))
-    getParsedLibraryByElement2 (method: SomeParsedLibraryResult Function(LibraryElement2), experimental)
+    getParsedLibraryByElement2 (method: SomeParsedLibraryResult Function(LibraryElement), experimental)
     getParsedUnit (method: SomeParsedUnitResult Function(String))
     getResolvedLibrary (method: Future<SomeResolvedLibraryResult> Function(String))
-    getResolvedLibraryByElement2 (method: Future<SomeResolvedLibraryResult> Function(LibraryElement2), experimental)
+    getResolvedLibraryByElement2 (method: Future<SomeResolvedLibraryResult> Function(LibraryElement), experimental)
     getResolvedLibraryContaining (method: Future<SomeResolvedLibraryResult> Function(String))
     getResolvedUnit (method: Future<SomeResolvedUnitResult> Function(String))
     getUnitElement (method: Future<SomeUnitElementResult> Function(String))
@@ -287,7 +287,7 @@ package:analyzer/dart/ast/ast.dart:
     arguments (getter: ArgumentList?)
     atSign (getter: Token)
     constructorName (getter: SimpleIdentifier?)
-    element2 (getter: Element2?, experimental)
+    element2 (getter: Element?, experimental)
     elementAnnotation (getter: ElementAnnotation?)
     name (getter: Identifier)
     parent (getter: AstNode)
@@ -312,7 +312,7 @@ package:analyzer/dart/ast/ast.dart:
     message (getter: Expression?)
     rightParenthesis (getter: Token)
   AssignedVariablePattern (class extends Object implements VariablePattern):
-    element2 (getter: Element2?, experimental)
+    element2 (getter: Element?, experimental)
   AssignmentExpression (class extends Object implements NullShortableExpression, MethodReferenceExpression, CompoundAssignmentExpression):
     leftHandSide (getter: Expression)
     operator (getter: Token)
@@ -565,7 +565,7 @@ package:analyzer/dart/ast/ast.dart:
     rightParenthesis (getter: Token?)
     stackTraceParameter (getter: CatchClauseParameter?)
   CatchClauseParameter (class extends AstNode):
-    declaredElement2 (getter: LocalVariableElement2?, experimental)
+    declaredElement2 (getter: LocalVariableElement?, experimental)
     declaredFragment (getter: LocalVariableFragment?, experimental)
     name (getter: Token)
   ClassDeclaration (class extends Object implements NamedCompilationUnitMember):
@@ -629,9 +629,9 @@ package:analyzer/dart/ast/ast.dart:
     sortedDirectivesAndDeclarations (getter: List<AstNode>)
   CompilationUnitMember (class extends Object implements Declaration)
   CompoundAssignmentExpression (class extends Object implements Expression):
-    readElement2 (getter: Element2?, experimental)
+    readElement2 (getter: Element?, experimental)
     readType (getter: DartType?)
-    writeElement2 (getter: Element2?, experimental)
+    writeElement2 (getter: Element?, experimental)
     writeType (getter: DartType?)
   ConditionalExpression (class extends Object implements Expression):
     colon (getter: Token)
@@ -679,7 +679,7 @@ package:analyzer/dart/ast/ast.dart:
   ConstructorReference (class extends Object implements Expression, CommentReferableExpression):
     constructorName (getter: ConstructorName)
   ConstructorReferenceNode (class extends Object implements AstNode):
-    element (getter: ConstructorElement2?, experimental)
+    element (getter: ConstructorElement?, experimental)
   ConstructorSelector (class extends Object implements AstNode):
     name (getter: SimpleIdentifier)
     period (getter: Token)
@@ -695,7 +695,7 @@ package:analyzer/dart/ast/ast.dart:
   Declaration (class extends Object implements AnnotatedNode):
     declaredFragment (getter: Fragment?, experimental)
   DeclaredIdentifier (class extends Object implements Declaration):
-    declaredElement2 (getter: LocalVariableElement2?, experimental)
+    declaredElement2 (getter: LocalVariableElement?, experimental)
     declaredFragment (getter: LocalVariableFragment?)
     isConst (getter: bool)
     isFinal (getter: bool)
@@ -703,7 +703,7 @@ package:analyzer/dart/ast/ast.dart:
     name (getter: Token)
     type (getter: TypeAnnotation?)
   DeclaredVariablePattern (class extends Object implements VariablePattern, sealed (immediate subtypes: DeclaredVariablePatternImpl)):
-    declaredElement2 (getter: BindPatternVariableElement2?, experimental)
+    declaredElement2 (getter: BindPatternVariableElement?, experimental)
     declaredFragment (getter: BindPatternVariableFragment?)
     keyword (getter: Token?)
     type (getter: TypeAnnotation?)
@@ -745,7 +745,7 @@ package:analyzer/dart/ast/ast.dart:
   EnumConstantDeclaration (class extends Object implements Declaration):
     arguments (getter: EnumConstantArguments?)
     augmentKeyword (getter: Token?, experimental)
-    constructorElement2 (getter: ConstructorElement2?, experimental)
+    constructorElement2 (getter: ConstructorElement?, experimental)
     declaredFragment (getter: FieldFragment?, experimental)
     name (getter: Token)
   EnumDeclaration (class extends Object implements NamedCompilationUnitMember):
@@ -798,7 +798,7 @@ package:analyzer/dart/ast/ast.dart:
     onKeyword (getter: Token)
   ExtensionOverride (class extends Object implements Expression):
     argumentList (getter: ArgumentList)
-    element2 (getter: ExtensionElement2, experimental)
+    element2 (getter: ExtensionElement, experimental)
     extendedType (getter: DartType?)
     importPrefix (getter: ImportPrefixReference?)
     isNullAware (getter: bool)
@@ -899,7 +899,7 @@ package:analyzer/dart/ast/ast.dart:
     isSynchronous (getter: bool)
     keyword (getter: Token?)
     star (getter: Token?)
-    isPotentiallyMutatedInScope2 (method: bool Function(VariableElement2), experimental)
+    isPotentiallyMutatedInScope2 (method: bool Function(VariableElement), experimental)
   FunctionDeclaration (class extends Object implements NamedCompilationUnitMember):
     augmentKeyword (getter: Token?, experimental)
     declaredFragment (getter: ExecutableFragment?, experimental)
@@ -917,7 +917,7 @@ package:analyzer/dart/ast/ast.dart:
     parameters (getter: FormalParameterList?)
     typeParameters (getter: TypeParameterList?)
   FunctionExpressionInvocation (class extends Object implements NullShortableExpression, InvocationExpression):
-    element (getter: ExecutableElement2?, experimental)
+    element (getter: ExecutableElement?, experimental)
     function (getter: Expression)
   FunctionReference (class extends Object implements Expression, CommentReferableExpression):
     function (getter: Expression)
@@ -952,7 +952,7 @@ package:analyzer/dart/ast/ast.dart:
     hiddenNames (getter: NodeList<SimpleIdentifier>)
   Identifier (class extends Object implements Expression, CommentReferableExpression, sealed (immediate subtypes: IdentifierImpl, LibraryIdentifier, PrefixedIdentifier, SimpleIdentifier)):
     isPrivateName (static method: bool Function(String))
-    element (getter: Element2?, experimental)
+    element (getter: Element?, experimental)
     name (getter: String)
   IfElement (class extends Object implements CollectionElement):
     caseClause (getter: CaseClause?)
@@ -986,7 +986,7 @@ package:analyzer/dart/ast/ast.dart:
     libraryImport (getter: LibraryImport?, experimental)
     prefix (getter: SimpleIdentifier?)
   ImportPrefixReference (class extends Object implements AstNode):
-    element2 (getter: Element2?, experimental)
+    element2 (getter: Element?, experimental)
     name (getter: Token)
     period (getter: Token)
   IndexExpression (class extends Object implements NullShortableExpression, MethodReferenceExpression):
@@ -1038,7 +1038,7 @@ package:analyzer/dart/ast/ast.dart:
     labels (getter: NodeList<Label>)
     statement (getter: Statement)
   LibraryDirective (class extends Object implements Directive):
-    element2 (getter: LibraryElement2?, experimental)
+    element2 (getter: LibraryElement?, experimental)
     libraryKeyword (getter: Token)
     name2 (getter: LibraryIdentifier?)
     semicolon (getter: Token)
@@ -1106,7 +1106,7 @@ package:analyzer/dart/ast/ast.dart:
     realTarget (getter: Expression?)
     target (getter: Expression?)
   MethodReferenceExpression (class extends Object implements Expression):
-    element (getter: MethodElement2?, experimental)
+    element (getter: MethodElement?, experimental)
   MixinDeclaration (class extends Object implements NamedCompilationUnitMember):
     augmentKeyword (getter: Token?)
     baseKeyword (getter: Token?)
@@ -1128,7 +1128,7 @@ package:analyzer/dart/ast/ast.dart:
     expression (getter: Expression)
     name (getter: Label)
   NamedType (class extends Object implements TypeAnnotation):
-    element2 (getter: Element2?, experimental)
+    element2 (getter: Element?, experimental)
     importPrefix (getter: ImportPrefixReference?)
     isDeferred (getter: bool)
     name2 (getter: Token)
@@ -1201,7 +1201,7 @@ package:analyzer/dart/ast/ast.dart:
     pattern (getter: DartPattern)
   PatternField (class extends Object implements AstNode):
     effectiveName (getter: String?)
-    element2 (getter: Element2?, experimental)
+    element2 (getter: Element?, experimental)
     name (getter: PatternFieldName?)
     pattern (getter: DartPattern)
   PatternFieldName (class extends Object implements AstNode):
@@ -1216,11 +1216,11 @@ package:analyzer/dart/ast/ast.dart:
     declaration (getter: PatternVariableDeclaration)
     semicolon (getter: Token)
   PostfixExpression (class extends Object implements Expression, NullShortableExpression, MethodReferenceExpression, CompoundAssignmentExpression):
-    element (getter: MethodElement2?)
+    element (getter: MethodElement?)
     operand (getter: Expression)
     operator (getter: Token)
   PrefixExpression (class extends Object implements Expression, NullShortableExpression, MethodReferenceExpression, CompoundAssignmentExpression):
-    element (getter: MethodElement2?)
+    element (getter: MethodElement?)
     operand (getter: Expression)
     operator (getter: Token)
   PrefixedIdentifier (class extends Object implements Identifier):
@@ -1267,7 +1267,7 @@ package:analyzer/dart/ast/ast.dart:
     period (getter: Token?)
     thisKeyword (getter: Token)
   RelationalPattern (class extends Object implements DartPattern):
-    element2 (getter: MethodElement2?, experimental)
+    element2 (getter: MethodElement?, experimental)
     operand (getter: Expression)
     operator (getter: Token)
   RepresentationConstructorName (class extends Object implements AstNode, experimental):
@@ -1426,7 +1426,7 @@ package:analyzer/dart/ast/ast.dart:
   UriBasedDirective (class extends Object implements Directive, sealed (immediate subtypes: NamespaceDirective, PartDirective, UriBasedDirectiveImpl)):
     uri (getter: StringLiteral)
   VariableDeclaration (class extends Object implements Declaration):
-    declaredElement2 (getter: LocalVariableElement2?, experimental)
+    declaredElement2 (getter: LocalVariableElement?, experimental)
     declaredFragment (getter: VariableFragment?, experimental)
     equals (getter: Token?)
     initializer (getter: Expression?)
@@ -2952,11 +2952,11 @@ package:analyzer/dart/constant/value.dart:
     hasKnownValue (getter: bool)
     isNull (getter: bool)
     type (getter: DartType?)
-    variable2 (getter: VariableElement2?)
+    variable2 (getter: VariableElement?)
     getField (method: DartObject? Function(String))
     toBoolValue (method: bool? Function())
     toDoubleValue (method: double? Function())
-    toFunctionValue2 (method: ExecutableElement2? Function(), experimental)
+    toFunctionValue2 (method: ExecutableElement? Function(), experimental)
     toIntValue (method: int? Function())
     toListValue (method: List<DartObject>? Function())
     toMapValue (method: Map<DartObject?, DartObject?>? Function())
@@ -2970,17 +2970,17 @@ package:analyzer/dart/element/element.dart:
     new (constructor: Annotatable Function())
     documentationComment (getter: String?)
     metadata2 (getter: Metadata)
-  BindPatternVariableElement2 (class extends Object implements PatternVariableElement2):
-    new (constructor: BindPatternVariableElement2 Function())
+  BindPatternVariableElement (class extends Object implements PatternVariableElement):
+    new (constructor: BindPatternVariableElement Function())
     firstFragment (getter: BindPatternVariableFragment)
     fragments (getter: List<BindPatternVariableFragment>)
   BindPatternVariableFragment (class extends Object implements PatternVariableFragment):
     new (constructor: BindPatternVariableFragment Function())
-    element (getter: BindPatternVariableElement2)
+    element (getter: BindPatternVariableElement)
     nextFragment (getter: BindPatternVariableFragment?)
     previousFragment (getter: BindPatternVariableFragment?)
-  ClassElement2 (class extends Object implements InterfaceElement2):
-    new (constructor: ClassElement2 Function())
+  ClassElement (class extends Object implements InterfaceElement):
+    new (constructor: ClassElement Function())
     firstFragment (getter: ClassFragment)
     fragments (getter: List<ClassFragment>)
     hasNonFinalField (getter: bool)
@@ -2996,12 +2996,12 @@ package:analyzer/dart/element/element.dart:
     isMixinClass (getter: bool)
     isSealed (getter: bool)
     isValidMixin (getter: bool)
-    isExtendableIn2 (method: bool Function(LibraryElement2))
-    isImplementableIn2 (method: bool Function(LibraryElement2))
-    isMixableIn2 (method: bool Function(LibraryElement2))
+    isExtendableIn2 (method: bool Function(LibraryElement))
+    isImplementableIn2 (method: bool Function(LibraryElement))
+    isMixableIn2 (method: bool Function(LibraryElement))
   ClassFragment (class extends Object implements InterfaceFragment):
     new (constructor: ClassFragment Function())
-    element (getter: ClassElement2)
+    element (getter: ClassElement)
     nextFragment (getter: ClassFragment?)
     previousFragment (getter: ClassFragment?)
   ConstantInitializer (class extends Object):
@@ -3009,10 +3009,10 @@ package:analyzer/dart/element/element.dart:
     expression (getter: Expression)
     fragment (getter: VariableFragment)
     evaluate (method: DartObject? Function())
-  ConstructorElement2 (class extends Object implements ExecutableElement2, HasSinceSdkVersion):
-    new (constructor: ConstructorElement2 Function())
-    baseElement (getter: ConstructorElement2)
-    enclosingElement2 (getter: InterfaceElement2)
+  ConstructorElement (class extends Object implements ExecutableElement, HasSinceSdkVersion):
+    new (constructor: ConstructorElement Function())
+    baseElement (getter: ConstructorElement)
+    enclosingElement2 (getter: InterfaceElement)
     firstFragment (getter: ConstructorFragment)
     fragments (getter: List<ConstructorFragment>)
     isConst (getter: bool)
@@ -3020,12 +3020,12 @@ package:analyzer/dart/element/element.dart:
     isFactory (getter: bool)
     isGenerative (getter: bool)
     name3 (getter: String?)
-    redirectedConstructor2 (getter: ConstructorElement2?)
+    redirectedConstructor2 (getter: ConstructorElement?)
     returnType (getter: InterfaceType)
-    superConstructor2 (getter: ConstructorElement2?)
+    superConstructor2 (getter: ConstructorElement?)
   ConstructorFragment (class extends Object implements ExecutableFragment):
     new (constructor: ConstructorFragment Function())
-    element (getter: ConstructorElement2)
+    element (getter: ConstructorElement)
     enclosingFragment (getter: InstanceFragment?)
     name2 (getter: String)
     nextFragment (getter: ConstructorFragment?)
@@ -3038,7 +3038,7 @@ package:analyzer/dart/element/element.dart:
     new (constructor: DirectiveUri Function())
   DirectiveUriWithLibrary (class extends DirectiveUriWithSource):
     new (constructor: DirectiveUriWithLibrary Function())
-    library2 (getter: LibraryElement2)
+    library2 (getter: LibraryElement)
   DirectiveUriWithRelativeUri (class extends DirectiveUriWithRelativeUriString):
     new (constructor: DirectiveUriWithRelativeUri Function())
     relativeUri (getter: Uri)
@@ -3051,12 +3051,12 @@ package:analyzer/dart/element/element.dart:
   DirectiveUriWithUnit (class extends DirectiveUriWithSource):
     new (constructor: DirectiveUriWithUnit Function())
     libraryFragment (getter: LibraryFragment, experimental)
-  Element2 (class extends Object):
-    new (constructor: Element2 Function())
-    baseElement (getter: Element2)
-    children2 (getter: List<Element2>)
+  Element (class extends Object):
+    new (constructor: Element Function())
+    baseElement (getter: Element)
+    children2 (getter: List<Element>)
     displayName (getter: String)
-    enclosingElement2 (getter: Element2?)
+    enclosingElement2 (getter: Element?)
     firstFragment (getter: Fragment)
     fragments (getter: List<Fragment>)
     id (getter: int)
@@ -3064,22 +3064,22 @@ package:analyzer/dart/element/element.dart:
     isPublic (getter: bool)
     isSynthetic (getter: bool)
     kind (getter: ElementKind)
-    library2 (getter: LibraryElement2?)
+    library2 (getter: LibraryElement?)
     lookupName (getter: String?)
     name3 (getter: String?)
-    nonSynthetic2 (getter: Element2)
+    nonSynthetic2 (getter: Element)
     session (getter: AnalysisSession?)
     accept2 (method: T? Function<T>(ElementVisitor2<T>))
     displayString2 (method: String Function({bool multiline, bool preferTypeAlias}))
     getExtendedDisplayName2 (method: String Function({String? shortName}))
-    isAccessibleIn2 (method: bool Function(LibraryElement2))
-    thisOrAncestorMatching2 (method: Element2? Function(bool Function(Element2)))
-    thisOrAncestorOfType2 (method: E? Function<E extends Element2>())
+    isAccessibleIn2 (method: bool Function(LibraryElement))
+    thisOrAncestorMatching2 (method: Element? Function(bool Function(Element)))
+    thisOrAncestorOfType2 (method: E? Function<E extends Element>())
     visitChildren2 (method: void Function<T>(ElementVisitor2<T>))
   ElementAnnotation (class extends Object implements ConstantEvaluationTarget):
     new (constructor: ElementAnnotation Function())
     constantEvaluationErrors (getter: List<AnalysisError>?)
-    element2 (getter: Element2?)
+    element2 (getter: Element?)
     isAlwaysThrows (getter: bool)
     isAwaitNotRequired (getter: bool)
     isDeprecated (getter: bool)
@@ -3160,44 +3160,44 @@ package:analyzer/dart/element/element.dart:
     toString (method: String Function())
   ElementVisitor2 (class<R> extends Object):
     new (constructor: ElementVisitor2<R> Function())
-    visitClassElement (method: R? Function(ClassElement2))
-    visitConstructorElement (method: R? Function(ConstructorElement2))
-    visitEnumElement (method: R? Function(EnumElement2))
-    visitExtensionElement (method: R? Function(ExtensionElement2))
-    visitExtensionTypeElement (method: R? Function(ExtensionTypeElement2))
-    visitFieldElement (method: R? Function(FieldElement2))
-    visitFieldFormalParameterElement (method: R? Function(FieldFormalParameterElement2))
+    visitClassElement (method: R? Function(ClassElement))
+    visitConstructorElement (method: R? Function(ConstructorElement))
+    visitEnumElement (method: R? Function(EnumElement))
+    visitExtensionElement (method: R? Function(ExtensionElement))
+    visitExtensionTypeElement (method: R? Function(ExtensionTypeElement))
+    visitFieldElement (method: R? Function(FieldElement))
+    visitFieldFormalParameterElement (method: R? Function(FieldFormalParameterElement))
     visitFormalParameterElement (method: R? Function(FormalParameterElement))
-    visitGenericFunctionTypeElement (method: R? Function(GenericFunctionTypeElement2))
+    visitGenericFunctionTypeElement (method: R? Function(GenericFunctionTypeElement))
     visitGetterElement (method: R? Function(GetterElement))
-    visitLabelElement (method: R? Function(LabelElement2))
-    visitLibraryElement (method: R? Function(LibraryElement2))
+    visitLabelElement (method: R? Function(LabelElement))
+    visitLibraryElement (method: R? Function(LibraryElement))
     visitLocalFunctionElement (method: R? Function(LocalFunctionElement))
-    visitLocalVariableElement (method: R? Function(LocalVariableElement2))
-    visitMethodElement (method: R? Function(MethodElement2))
-    visitMixinElement (method: R? Function(MixinElement2))
-    visitMultiplyDefinedElement (method: R? Function(MultiplyDefinedElement2))
-    visitPrefixElement (method: R? Function(PrefixElement2))
+    visitLocalVariableElement (method: R? Function(LocalVariableElement))
+    visitMethodElement (method: R? Function(MethodElement))
+    visitMixinElement (method: R? Function(MixinElement))
+    visitMultiplyDefinedElement (method: R? Function(MultiplyDefinedElement))
+    visitPrefixElement (method: R? Function(PrefixElement))
     visitSetterElement (method: R? Function(SetterElement))
-    visitSuperFormalParameterElement (method: R? Function(SuperFormalParameterElement2))
+    visitSuperFormalParameterElement (method: R? Function(SuperFormalParameterElement))
     visitTopLevelFunctionElement (method: R? Function(TopLevelFunctionElement))
-    visitTopLevelVariableElement (method: R? Function(TopLevelVariableElement2))
-    visitTypeAliasElement (method: R? Function(TypeAliasElement2))
-    visitTypeParameterElement (method: R? Function(TypeParameterElement2))
-  EnumElement2 (class extends Object implements InterfaceElement2):
-    new (constructor: EnumElement2 Function())
-    constants2 (getter: List<FieldElement2>)
+    visitTopLevelVariableElement (method: R? Function(TopLevelVariableElement))
+    visitTypeAliasElement (method: R? Function(TypeAliasElement))
+    visitTypeParameterElement (method: R? Function(TypeParameterElement))
+  EnumElement (class extends Object implements InterfaceElement):
+    new (constructor: EnumElement Function())
+    constants2 (getter: List<FieldElement>)
     firstFragment (getter: EnumFragment)
     fragments (getter: List<EnumFragment>)
   EnumFragment (class extends Object implements InterfaceFragment):
     new (constructor: EnumFragment Function())
-    constants2 (getter: List<FieldElement2>)
-    element (getter: EnumElement2)
+    constants2 (getter: List<FieldElement>)
+    element (getter: EnumElement)
     nextFragment (getter: EnumFragment?)
     previousFragment (getter: EnumFragment?)
-  ExecutableElement2 (class extends Object implements FunctionTypedElement2):
-    new (constructor: ExecutableElement2 Function())
-    baseElement (getter: ExecutableElement2)
+  ExecutableElement (class extends Object implements FunctionTypedElement):
+    new (constructor: ExecutableElement Function())
+    baseElement (getter: ExecutableElement)
     firstFragment (getter: ExecutableFragment)
     fragments (getter: List<ExecutableFragment>)
     hasImplicitReturnType (getter: bool)
@@ -3207,7 +3207,7 @@ package:analyzer/dart/element/element.dart:
     isStatic (getter: bool)
   ExecutableFragment (class extends Object implements FunctionTypedFragment):
     new (constructor: ExecutableFragment Function())
-    element (getter: ExecutableElement2)
+    element (getter: ExecutableElement)
     isAsynchronous (getter: bool)
     isAugmentation (getter: bool)
     isGenerator (getter: bool)
@@ -3216,35 +3216,35 @@ package:analyzer/dart/element/element.dart:
     libraryFragment (getter: LibraryFragment)
     nextFragment (getter: ExecutableFragment?)
     previousFragment (getter: ExecutableFragment?)
-  ExtensionElement2 (class extends Object implements InstanceElement2):
-    new (constructor: ExtensionElement2 Function())
+  ExtensionElement (class extends Object implements InstanceElement):
+    new (constructor: ExtensionElement Function())
     extendedType (getter: DartType)
     firstFragment (getter: ExtensionFragment)
     fragments (getter: List<ExtensionFragment>)
   ExtensionFragment (class extends Object implements InstanceFragment):
     new (constructor: ExtensionFragment Function())
-    element (getter: ExtensionElement2)
+    element (getter: ExtensionElement)
     nextFragment (getter: ExtensionFragment?)
     offset (getter: int)
     previousFragment (getter: ExtensionFragment?)
-  ExtensionTypeElement2 (class extends Object implements InterfaceElement2):
-    new (constructor: ExtensionTypeElement2 Function())
+  ExtensionTypeElement (class extends Object implements InterfaceElement):
+    new (constructor: ExtensionTypeElement Function())
     firstFragment (getter: ExtensionTypeFragment)
     fragments (getter: List<ExtensionTypeFragment>)
-    primaryConstructor2 (getter: ConstructorElement2)
-    representation2 (getter: FieldElement2)
+    primaryConstructor2 (getter: ConstructorElement)
+    representation2 (getter: FieldElement)
     typeErasure (getter: DartType)
   ExtensionTypeFragment (class extends Object implements InterfaceFragment):
     new (constructor: ExtensionTypeFragment Function())
-    element (getter: ExtensionTypeElement2)
+    element (getter: ExtensionTypeElement)
     nextFragment (getter: ExtensionTypeFragment?)
     previousFragment (getter: ExtensionTypeFragment?)
     primaryConstructor2 (getter: ConstructorFragment)
     representation2 (getter: FieldFragment)
-  FieldElement2 (class extends Object implements PropertyInducingElement2):
-    new (constructor: FieldElement2 Function())
-    baseElement (getter: FieldElement2)
-    enclosingElement2 (getter: InstanceElement2)
+  FieldElement (class extends Object implements PropertyInducingElement):
+    new (constructor: FieldElement Function())
+    baseElement (getter: FieldElement)
+    enclosingElement2 (getter: InstanceElement)
     firstFragment (getter: FieldFragment)
     fragments (getter: List<FieldFragment>)
     isAbstract (getter: bool)
@@ -3252,23 +3252,23 @@ package:analyzer/dart/element/element.dart:
     isEnumConstant (getter: bool)
     isExternal (getter: bool)
     isPromotable (getter: bool)
-  FieldFormalParameterElement2 (class extends Object implements FormalParameterElement):
-    new (constructor: FieldFormalParameterElement2 Function())
-    field2 (getter: FieldElement2?)
+  FieldFormalParameterElement (class extends Object implements FormalParameterElement):
+    new (constructor: FieldFormalParameterElement Function())
+    field2 (getter: FieldElement?)
     firstFragment (getter: FieldFormalParameterFragment)
     fragments (getter: List<FieldFormalParameterFragment>)
   FieldFormalParameterFragment (class extends Object implements FormalParameterFragment):
     new (constructor: FieldFormalParameterFragment Function())
-    element (getter: FieldFormalParameterElement2)
+    element (getter: FieldFormalParameterElement)
     nextFragment (getter: FieldFormalParameterFragment?)
     previousFragment (getter: FieldFormalParameterFragment?)
   FieldFragment (class extends Object implements PropertyInducingFragment):
     new (constructor: FieldFragment Function())
-    element (getter: FieldElement2)
+    element (getter: FieldElement)
     nextFragment (getter: FieldFragment?)
     offset (getter: int)
     previousFragment (getter: FieldFragment?)
-  FormalParameterElement (class extends Object implements PromotableElement2, Annotatable, HasSinceSdkVersion, LocalElement2):
+  FormalParameterElement (class extends Object implements PromotableElement, Annotatable, HasSinceSdkVersion, LocalElement):
     new (constructor: FormalParameterElement Function())
     baseElement (getter: FormalParameterElement)
     defaultValueCode (getter: String?)
@@ -3287,7 +3287,7 @@ package:analyzer/dart/element/element.dart:
     isRequiredNamed (getter: bool)
     isRequiredPositional (getter: bool)
     isSuperFormal (getter: bool)
-    typeParameters2 (getter: List<TypeParameterElement2>)
+    typeParameters2 (getter: List<TypeParameterElement>)
     appendToWithoutDelimiters2 (method: void Function(StringBuffer))
   FormalParameterFragment (class extends Object implements PromotableFragment, Annotatable, LocalFragment):
     new (constructor: FormalParameterFragment Function())
@@ -3298,7 +3298,7 @@ package:analyzer/dart/element/element.dart:
   Fragment (class extends Object):
     new (constructor: Fragment Function())
     children3 (getter: List<Fragment>)
-    element (getter: Element2)
+    element (getter: Element)
     enclosingFragment (getter: Fragment?)
     libraryFragment (getter: LibraryFragment?)
     name2 (getter: String?)
@@ -3306,8 +3306,8 @@ package:analyzer/dart/element/element.dart:
     nextFragment (getter: Fragment?)
     offset (getter: int)
     previousFragment (getter: Fragment?)
-  FunctionTypedElement2 (class extends Object implements TypeParameterizedElement2):
-    new (constructor: FunctionTypedElement2 Function())
+  FunctionTypedElement (class extends Object implements TypeParameterizedElement):
+    new (constructor: FunctionTypedElement Function())
     firstFragment (getter: FunctionTypedFragment)
     formalParameters (getter: List<FormalParameterElement>)
     fragments (getter: List<FunctionTypedFragment>)
@@ -3315,21 +3315,21 @@ package:analyzer/dart/element/element.dart:
     type (getter: FunctionType)
   FunctionTypedFragment (class extends Object implements TypeParameterizedFragment):
     new (constructor: FunctionTypedFragment Function())
-    element (getter: FunctionTypedElement2)
+    element (getter: FunctionTypedElement)
     formalParameters (getter: List<FormalParameterFragment>)
     nextFragment (getter: FunctionTypedFragment?)
     previousFragment (getter: FunctionTypedFragment?)
-  GenericFunctionTypeElement2 (class extends Object implements FunctionTypedElement2):
-    new (constructor: GenericFunctionTypeElement2 Function())
+  GenericFunctionTypeElement (class extends Object implements FunctionTypedElement):
+    new (constructor: GenericFunctionTypeElement Function())
     firstFragment (getter: GenericFunctionTypeFragment)
     fragments (getter: List<GenericFunctionTypeFragment>)
   GenericFunctionTypeFragment (class extends Object implements FunctionTypedFragment):
     new (constructor: GenericFunctionTypeFragment Function())
-    element (getter: GenericFunctionTypeElement2)
+    element (getter: GenericFunctionTypeElement)
     nextFragment (getter: GenericFunctionTypeFragment?)
     offset (getter: int)
     previousFragment (getter: GenericFunctionTypeFragment?)
-  GetterElement (class extends Object implements PropertyAccessorElement2):
+  GetterElement (class extends Object implements PropertyAccessorElement):
     new (constructor: GetterElement Function())
     baseElement (getter: GetterElement)
     correspondingSetter2 (getter: SetterElement?)
@@ -3347,27 +3347,27 @@ package:analyzer/dart/element/element.dart:
   HideElementCombinator (class extends Object implements NamespaceCombinator):
     new (constructor: HideElementCombinator Function())
     hiddenNames (getter: List<String>)
-  InstanceElement2 (class extends Object implements TypeDefiningElement2, TypeParameterizedElement2, HasSinceSdkVersion):
-    new (constructor: InstanceElement2 Function())
-    baseElement (getter: InstanceElement2)
-    enclosingElement2 (getter: LibraryElement2)
-    fields2 (getter: List<FieldElement2>)
+  InstanceElement (class extends Object implements TypeDefiningElement, TypeParameterizedElement, HasSinceSdkVersion):
+    new (constructor: InstanceElement Function())
+    baseElement (getter: InstanceElement)
+    enclosingElement2 (getter: LibraryElement)
+    fields2 (getter: List<FieldElement>)
     firstFragment (getter: InstanceFragment)
     fragments (getter: List<InstanceFragment>)
     getters2 (getter: List<GetterElement>)
-    methods2 (getter: List<MethodElement2>)
+    methods2 (getter: List<MethodElement>)
     setters2 (getter: List<SetterElement>)
     thisType (getter: DartType)
-    getField2 (method: FieldElement2? Function(String))
+    getField2 (method: FieldElement? Function(String))
     getGetter2 (method: GetterElement? Function(String))
-    getMethod2 (method: MethodElement2? Function(String))
+    getMethod2 (method: MethodElement? Function(String))
     getSetter2 (method: SetterElement? Function(String))
-    lookUpGetter2 (method: GetterElement? Function({required LibraryElement2 library, required String name}))
-    lookUpMethod2 (method: MethodElement2? Function({required LibraryElement2 library, required String name}))
-    lookUpSetter2 (method: SetterElement? Function({required LibraryElement2 library, required String name}))
+    lookUpGetter2 (method: GetterElement? Function({required LibraryElement library, required String name}))
+    lookUpMethod2 (method: MethodElement? Function({required LibraryElement library, required String name}))
+    lookUpSetter2 (method: SetterElement? Function({required LibraryElement library, required String name}))
   InstanceFragment (class extends Object implements TypeDefiningFragment, TypeParameterizedFragment):
     new (constructor: InstanceFragment Function())
-    element (getter: InstanceElement2)
+    element (getter: InstanceElement)
     enclosingFragment (getter: LibraryFragment?)
     fields2 (getter: List<FieldFragment>)
     getters (getter: List<GetterFragment>)
@@ -3377,71 +3377,71 @@ package:analyzer/dart/element/element.dart:
     nextFragment (getter: InstanceFragment?)
     previousFragment (getter: InstanceFragment?)
     setters (getter: List<SetterFragment>)
-  InterfaceElement2 (class extends Object implements InstanceElement2):
-    new (constructor: InterfaceElement2 Function())
+  InterfaceElement (class extends Object implements InstanceElement):
+    new (constructor: InterfaceElement Function())
     allSupertypes (getter: List<InterfaceType>)
-    constructors2 (getter: List<ConstructorElement2>)
+    constructors2 (getter: List<ConstructorElement>)
     firstFragment (getter: InterfaceFragment)
     fragments (getter: List<InterfaceFragment>)
-    inheritedConcreteMembers (getter: Map<Name, ExecutableElement2>)
-    inheritedMembers (getter: Map<Name, ExecutableElement2>)
-    interfaceMembers (getter: Map<Name, ExecutableElement2>)
+    inheritedConcreteMembers (getter: Map<Name, ExecutableElement>)
+    inheritedMembers (getter: Map<Name, ExecutableElement>)
+    interfaceMembers (getter: Map<Name, ExecutableElement>)
     interfaces (getter: List<InterfaceType>)
     mixins (getter: List<InterfaceType>)
     supertype (getter: InterfaceType?)
     thisType (getter: InterfaceType)
-    unnamedConstructor2 (getter: ConstructorElement2?)
-    getInheritedConcreteMember (method: ExecutableElement2? Function(Name))
-    getInheritedMember (method: ExecutableElement2? Function(Name))
-    getInterfaceMember (method: ExecutableElement2? Function(Name))
-    getNamedConstructor2 (method: ConstructorElement2? Function(String))
-    getOverridden (method: List<ExecutableElement2>? Function(Name))
+    unnamedConstructor2 (getter: ConstructorElement?)
+    getInheritedConcreteMember (method: ExecutableElement? Function(Name))
+    getInheritedMember (method: ExecutableElement? Function(Name))
+    getInterfaceMember (method: ExecutableElement? Function(Name))
+    getNamedConstructor2 (method: ConstructorElement? Function(String))
+    getOverridden (method: List<ExecutableElement>? Function(Name))
     instantiate (method: InterfaceType Function({required NullabilitySuffix nullabilitySuffix, required List<DartType> typeArguments}))
-    lookUpConcreteMethod (method: MethodElement2? Function(String, LibraryElement2))
-    lookUpInheritedMethod2 (method: MethodElement2? Function({required LibraryElement2 library, required String methodName}))
+    lookUpConcreteMethod (method: MethodElement? Function(String, LibraryElement))
+    lookUpInheritedMethod2 (method: MethodElement? Function({required LibraryElement library, required String methodName}))
   InterfaceFragment (class extends Object implements InstanceFragment):
     new (constructor: InterfaceFragment Function())
     constructors2 (getter: List<ConstructorFragment>)
-    element (getter: InterfaceElement2)
+    element (getter: InterfaceElement)
     interfaces (getter: List<InterfaceType>)
     mixins (getter: List<InterfaceType>)
     nextFragment (getter: InterfaceFragment?)
     previousFragment (getter: InterfaceFragment?)
     supertype (getter: InterfaceType?)
-  JoinPatternVariableElement2 (class extends Object implements PatternVariableElement2):
-    new (constructor: JoinPatternVariableElement2 Function())
+  JoinPatternVariableElement (class extends Object implements PatternVariableElement):
+    new (constructor: JoinPatternVariableElement Function())
     firstFragment (getter: JoinPatternVariableFragment)
     fragments (getter: List<JoinPatternVariableFragment>)
     isConsistent (getter: bool)
-    variables2 (getter: List<PatternVariableElement2>)
+    variables2 (getter: List<PatternVariableElement>)
   JoinPatternVariableFragment (class extends Object implements PatternVariableFragment):
     new (constructor: JoinPatternVariableFragment Function())
-    element (getter: JoinPatternVariableElement2)
+    element (getter: JoinPatternVariableElement)
     isConsistent (getter: bool)
     nextFragment (getter: JoinPatternVariableFragment?)
     offset (getter: int)
     previousFragment (getter: JoinPatternVariableFragment?)
     variables2 (getter: List<PatternVariableFragment>)
-  LabelElement2 (class extends Object implements Element2):
-    new (constructor: LabelElement2 Function())
-    enclosingElement2 (getter: ExecutableElement2?)
+  LabelElement (class extends Object implements Element):
+    new (constructor: LabelElement Function())
+    enclosingElement2 (getter: ExecutableElement?)
     firstFragment (getter: LabelFragment)
     fragments (getter: List<LabelFragment>)
-    library2 (getter: LibraryElement2)
+    library2 (getter: LibraryElement)
   LabelFragment (class extends Object implements Fragment):
     new (constructor: LabelFragment Function())
-    element (getter: LabelElement2)
+    element (getter: LabelElement)
     nextFragment (getter: LabelFragment?)
     previousFragment (getter: LabelFragment?)
-  LibraryElement2 (class extends Object implements Element2, Annotatable, HasSinceSdkVersion):
-    new (constructor: LibraryElement2 Function())
-    classes (getter: List<ClassElement2>)
+  LibraryElement (class extends Object implements Element, Annotatable, HasSinceSdkVersion):
+    new (constructor: LibraryElement Function())
+    classes (getter: List<ClassElement>)
     entryPoint2 (getter: TopLevelFunctionElement?)
-    enums (getter: List<EnumElement2>)
+    enums (getter: List<EnumElement>)
     exportNamespace (getter: Namespace)
-    exportedLibraries2 (getter: List<LibraryElement2>)
-    extensionTypes (getter: List<ExtensionTypeElement2>)
-    extensions (getter: List<ExtensionElement2>)
+    exportedLibraries2 (getter: List<LibraryElement>)
+    extensionTypes (getter: List<ExtensionTypeElement>)
+    extensions (getter: List<ExtensionElement>)
     featureSet (getter: FeatureSet)
     firstFragment (getter: LibraryFragment)
     fragments (getter: List<LibraryFragment>)
@@ -3451,45 +3451,45 @@ package:analyzer/dart/element/element.dart:
     isDartCore (getter: bool)
     isInSdk (getter: bool)
     languageVersion (getter: LibraryLanguageVersion)
-    library2 (getter: LibraryElement2)
+    library2 (getter: LibraryElement)
     loadLibraryFunction2 (getter: TopLevelFunctionElement)
-    mixins (getter: List<MixinElement2>)
+    mixins (getter: List<MixinElement>)
     publicNamespace (getter: Namespace)
     session (getter: AnalysisSession)
     setters (getter: List<SetterElement>)
     topLevelFunctions (getter: List<TopLevelFunctionElement>)
-    topLevelVariables (getter: List<TopLevelVariableElement2>)
-    typeAliases (getter: List<TypeAliasElement2>)
+    topLevelVariables (getter: List<TopLevelVariableElement>)
+    typeAliases (getter: List<TypeAliasElement>)
     typeProvider (getter: TypeProvider)
     typeSystem (getter: TypeSystem)
     uri (getter: Uri)
-    getClass2 (method: ClassElement2? Function(String))
-    getEnum2 (method: EnumElement2? Function(String))
-    getExtension (method: ExtensionElement2? Function(String))
-    getExtensionType (method: ExtensionTypeElement2? Function(String))
+    getClass2 (method: ClassElement? Function(String))
+    getEnum2 (method: EnumElement? Function(String))
+    getExtension (method: ExtensionElement? Function(String))
+    getExtensionType (method: ExtensionTypeElement? Function(String))
     getGetter (method: GetterElement? Function(String))
-    getMixin2 (method: MixinElement2? Function(String))
+    getMixin2 (method: MixinElement? Function(String))
     getSetter (method: SetterElement? Function(String))
     getTopLevelFunction (method: TopLevelFunctionElement? Function(String))
-    getTopLevelVariable (method: TopLevelVariableElement2? Function(String))
-    getTypeAlias (method: TypeAliasElement2? Function(String))
+    getTopLevelVariable (method: TopLevelVariableElement? Function(String))
+    getTypeAlias (method: TypeAliasElement? Function(String))
   LibraryExport (class extends Object implements ElementDirective):
     new (constructor: LibraryExport Function())
     combinators (getter: List<NamespaceCombinator>)
     exportKeywordOffset (getter: int)
-    exportedLibrary2 (getter: LibraryElement2?)
+    exportedLibrary2 (getter: LibraryElement?)
   LibraryFragment (class extends Object implements Fragment, Annotatable):
     new (constructor: LibraryFragment Function())
-    accessibleExtensions2 (getter: List<ExtensionElement2>)
+    accessibleExtensions2 (getter: List<ExtensionElement>)
     classes2 (getter: List<ClassFragment>)
-    element (getter: LibraryElement2)
+    element (getter: LibraryElement)
     enclosingFragment (getter: LibraryFragment?)
     enums2 (getter: List<EnumFragment>)
     extensionTypes2 (getter: List<ExtensionTypeFragment>)
     extensions2 (getter: List<ExtensionFragment>)
     functions2 (getter: List<TopLevelFunctionFragment>)
     getters (getter: List<GetterFragment>)
-    importedLibraries2 (getter: List<LibraryElement2>)
+    importedLibraries2 (getter: List<LibraryElement>)
     libraryExports2 (getter: List<LibraryExport>)
     libraryImports2 (getter: List<LibraryImport>)
     lineInfo (getter: LineInfo)
@@ -3497,7 +3497,7 @@ package:analyzer/dart/element/element.dart:
     nextFragment (getter: LibraryFragment?)
     offset (getter: int)
     partIncludes (getter: List<PartInclude>)
-    prefixes (getter: List<PrefixElement2>)
+    prefixes (getter: List<PrefixElement>)
     previousFragment (getter: LibraryFragment?)
     scope (getter: Scope)
     setters (getter: List<SetterFragment>)
@@ -3508,7 +3508,7 @@ package:analyzer/dart/element/element.dart:
     new (constructor: LibraryImport Function())
     combinators (getter: List<NamespaceCombinator>)
     importKeywordOffset (getter: int)
-    importedLibrary2 (getter: LibraryElement2?)
+    importedLibrary2 (getter: LibraryElement?)
     isSynthetic (getter: bool)
     namespace (getter: Namespace)
     prefix2 (getter: PrefixFragment?)
@@ -3517,11 +3517,11 @@ package:analyzer/dart/element/element.dart:
     effective (getter: Version)
     override (getter: Version?)
     package (getter: Version)
-  LocalElement2 (class extends Object implements Element2):
-    new (constructor: LocalElement2 Function())
+  LocalElement (class extends Object implements Element):
+    new (constructor: LocalElement Function())
   LocalFragment (class extends Object implements Fragment):
     new (constructor: LocalFragment Function())
-  LocalFunctionElement (class extends Object implements ExecutableElement2, LocalElement2):
+  LocalFunctionElement (class extends Object implements ExecutableElement, LocalElement):
     new (constructor: LocalFunctionElement Function())
     firstFragment (getter: LocalFunctionFragment)
     fragments (getter: List<LocalFunctionFragment>)
@@ -3531,15 +3531,15 @@ package:analyzer/dart/element/element.dart:
     nextFragment (getter: LocalFunctionFragment?)
     offset (getter: int)
     previousFragment (getter: LocalFunctionFragment?)
-  LocalVariableElement2 (class extends Object implements PromotableElement2, LocalElement2, Annotatable):
-    new (constructor: LocalVariableElement2 Function())
-    baseElement (getter: LocalVariableElement2)
+  LocalVariableElement (class extends Object implements PromotableElement, LocalElement, Annotatable):
+    new (constructor: LocalVariableElement Function())
+    baseElement (getter: LocalVariableElement)
     firstFragment (getter: LocalVariableFragment)
     fragments (getter: List<LocalVariableFragment>)
     hasInitializer (getter: bool)
   LocalVariableFragment (class extends Object implements PromotableFragment, LocalFragment):
     new (constructor: LocalVariableFragment Function())
-    element (getter: LocalVariableElement2)
+    element (getter: LocalVariableElement)
     hasInitializer (getter: bool)
     nameOffset (getter: int)
     nextFragment (getter: LocalVariableFragment?)
@@ -3576,47 +3576,47 @@ package:analyzer/dart/element/element.dart:
     hasVisibleForTesting (getter: bool)
     hasVisibleOutsideTemplate (getter: bool)
     hasWidgetFactory (getter: bool)
-  MethodElement2 (class extends Object implements ExecutableElement2, HasSinceSdkVersion):
+  MethodElement (class extends Object implements ExecutableElement, HasSinceSdkVersion):
     CALL_METHOD_NAME (static getter: String)
     NO_SUCH_METHOD_METHOD_NAME (static getter: String)
-    new (constructor: MethodElement2 Function())
-    baseElement (getter: MethodElement2)
+    new (constructor: MethodElement Function())
+    baseElement (getter: MethodElement)
     firstFragment (getter: MethodFragment)
     fragments (getter: List<MethodFragment>)
     isOperator (getter: bool)
   MethodFragment (class extends Object implements ExecutableFragment):
     new (constructor: MethodFragment Function())
-    element (getter: MethodElement2)
+    element (getter: MethodElement)
     enclosingFragment (getter: InstanceFragment?)
     nextFragment (getter: MethodFragment?)
     previousFragment (getter: MethodFragment?)
-  MixinElement2 (class extends Object implements InterfaceElement2):
-    new (constructor: MixinElement2 Function())
+  MixinElement (class extends Object implements InterfaceElement):
+    new (constructor: MixinElement Function())
     firstFragment (getter: MixinFragment)
     fragments (getter: List<MixinFragment>)
     isBase (getter: bool)
     superclassConstraints (getter: List<InterfaceType>)
-    isImplementableIn2 (method: bool Function(LibraryElement2))
+    isImplementableIn2 (method: bool Function(LibraryElement))
   MixinFragment (class extends Object implements InterfaceFragment):
     new (constructor: MixinFragment Function())
-    element (getter: MixinElement2)
+    element (getter: MixinElement)
     nextFragment (getter: MixinFragment?)
     previousFragment (getter: MixinFragment?)
     superclassConstraints (getter: List<InterfaceType>)
-  MultiplyDefinedElement2 (class extends Object implements Element2):
-    new (constructor: MultiplyDefinedElement2 Function())
-    conflictingElements2 (getter: List<Element2>)
+  MultiplyDefinedElement (class extends Object implements Element):
+    new (constructor: MultiplyDefinedElement Function())
+    conflictingElements2 (getter: List<Element>)
     firstFragment (getter: MultiplyDefinedFragment)
     fragments (getter: List<MultiplyDefinedFragment>)
   MultiplyDefinedFragment (class extends Object implements Fragment):
     new (constructor: MultiplyDefinedFragment Function())
-    element (getter: MultiplyDefinedElement2)
+    element (getter: MultiplyDefinedElement)
     nextFragment (getter: Null)
     offset (getter: int)
     previousFragment (getter: Null)
   Name (class extends Object):
-    forElement (static method: Name? Function(Element2))
-    forLibrary (constructor: Name Function(LibraryElement2?, String))
+    forElement (static method: Name? Function(Element))
+    forLibrary (constructor: Name Function(LibraryElement?, String))
     new (constructor: Name Function(Uri?, String))
     forGetter (getter: Name)
     forSetter (getter: Name)
@@ -3633,65 +3633,65 @@ package:analyzer/dart/element/element.dart:
   PartInclude (class extends Object implements ElementDirective):
     new (constructor: PartInclude Function())
     includedFragment (getter: LibraryFragment?)
-  PatternVariableElement2 (class extends Object implements LocalVariableElement2):
-    new (constructor: PatternVariableElement2 Function())
+  PatternVariableElement (class extends Object implements LocalVariableElement):
+    new (constructor: PatternVariableElement Function())
     firstFragment (getter: PatternVariableFragment)
     fragments (getter: List<PatternVariableFragment>)
-    join2 (getter: JoinPatternVariableElement2?)
+    join2 (getter: JoinPatternVariableElement?)
   PatternVariableFragment (class extends Object implements LocalVariableFragment):
     new (constructor: PatternVariableFragment Function())
-    element (getter: PatternVariableElement2)
+    element (getter: PatternVariableElement)
     join2 (getter: JoinPatternVariableFragment?)
     nextFragment (getter: PatternVariableFragment?)
     previousFragment (getter: PatternVariableFragment?)
-  PrefixElement2 (class extends Object implements Element2):
-    new (constructor: PrefixElement2 Function())
+  PrefixElement (class extends Object implements Element):
+    new (constructor: PrefixElement Function())
     enclosingElement2 (getter: Null)
     firstFragment (getter: PrefixFragment)
     fragments (getter: List<PrefixFragment>)
     imports (getter: List<LibraryImport>)
-    library2 (getter: LibraryElement2)
+    library2 (getter: LibraryElement)
     scope (getter: Scope)
   PrefixFragment (class extends Object implements Fragment):
     new (constructor: PrefixFragment Function())
-    element (getter: PrefixElement2)
+    element (getter: PrefixElement)
     enclosingFragment (getter: LibraryFragment?)
     isDeferred (getter: bool)
     nextFragment (getter: PrefixFragment?)
     previousFragment (getter: PrefixFragment?)
-  PromotableElement2 (class extends Object implements VariableElement2):
-    new (constructor: PromotableElement2 Function())
+  PromotableElement (class extends Object implements VariableElement):
+    new (constructor: PromotableElement Function())
     firstFragment (getter: PromotableFragment)
     fragments (getter: List<PromotableFragment>)
   PromotableFragment (class extends Object implements VariableFragment):
     new (constructor: PromotableFragment Function())
-    element (getter: PromotableElement2)
+    element (getter: PromotableElement)
     nextFragment (getter: PromotableFragment?)
     previousFragment (getter: PromotableFragment?)
-  PropertyAccessorElement2 (class extends Object implements ExecutableElement2):
-    new (constructor: PropertyAccessorElement2 Function())
-    baseElement (getter: PropertyAccessorElement2)
-    enclosingElement2 (getter: Element2)
+  PropertyAccessorElement (class extends Object implements ExecutableElement):
+    new (constructor: PropertyAccessorElement Function())
+    baseElement (getter: PropertyAccessorElement)
+    enclosingElement2 (getter: Element)
     firstFragment (getter: PropertyAccessorFragment)
     fragments (getter: List<PropertyAccessorFragment>)
-    variable3 (getter: PropertyInducingElement2?)
+    variable3 (getter: PropertyInducingElement?)
   PropertyAccessorFragment (class extends Object implements ExecutableFragment):
     new (constructor: PropertyAccessorFragment Function())
-    element (getter: PropertyAccessorElement2)
+    element (getter: PropertyAccessorElement)
     nextFragment (getter: PropertyAccessorFragment?)
     previousFragment (getter: PropertyAccessorFragment?)
     variable3 (getter: PropertyInducingFragment?)
-  PropertyInducingElement2 (class extends Object implements VariableElement2, Annotatable, HasSinceSdkVersion):
-    new (constructor: PropertyInducingElement2 Function())
+  PropertyInducingElement (class extends Object implements VariableElement, Annotatable, HasSinceSdkVersion):
+    new (constructor: PropertyInducingElement Function())
     firstFragment (getter: PropertyInducingFragment)
     fragments (getter: List<PropertyInducingFragment>)
     getter2 (getter: GetterElement?)
     hasInitializer (getter: bool)
-    library2 (getter: LibraryElement2)
+    library2 (getter: LibraryElement)
     setter2 (getter: SetterElement?)
   PropertyInducingFragment (class extends Object implements VariableFragment, Annotatable):
     new (constructor: PropertyInducingFragment Function())
-    element (getter: PropertyInducingElement2)
+    element (getter: PropertyInducingElement)
     getter2 (getter: GetterFragment?)
     hasInitializer (getter: bool)
     isAugmentation (getter: bool)
@@ -3700,7 +3700,7 @@ package:analyzer/dart/element/element.dart:
     nextFragment (getter: PropertyInducingFragment?)
     previousFragment (getter: PropertyInducingFragment?)
     setter2 (getter: SetterFragment?)
-  SetterElement (class extends Object implements PropertyAccessorElement2):
+  SetterElement (class extends Object implements PropertyAccessorElement):
     new (constructor: SetterElement Function())
     baseElement (getter: SetterElement)
     correspondingGetter2 (getter: GetterElement?)
@@ -3715,17 +3715,17 @@ package:analyzer/dart/element/element.dart:
   ShowElementCombinator (class extends Object implements NamespaceCombinator):
     new (constructor: ShowElementCombinator Function())
     shownNames (getter: List<String>)
-  SuperFormalParameterElement2 (class extends Object implements FormalParameterElement):
-    new (constructor: SuperFormalParameterElement2 Function())
+  SuperFormalParameterElement (class extends Object implements FormalParameterElement):
+    new (constructor: SuperFormalParameterElement Function())
     firstFragment (getter: SuperFormalParameterFragment)
     fragments (getter: List<SuperFormalParameterFragment>)
     superConstructorParameter2 (getter: FormalParameterElement?)
   SuperFormalParameterFragment (class extends Object implements FormalParameterFragment):
     new (constructor: SuperFormalParameterFragment Function())
-    element (getter: SuperFormalParameterElement2)
+    element (getter: SuperFormalParameterElement)
     nextFragment (getter: SuperFormalParameterFragment?)
     previousFragment (getter: SuperFormalParameterFragment?)
-  TopLevelFunctionElement (class extends Object implements ExecutableElement2, HasSinceSdkVersion):
+  TopLevelFunctionElement (class extends Object implements ExecutableElement, HasSinceSdkVersion):
     LOAD_LIBRARY_NAME (static getter: String)
     MAIN_FUNCTION_NAME (static getter: String)
     new (constructor: TopLevelFunctionElement Function())
@@ -3739,68 +3739,68 @@ package:analyzer/dart/element/element.dart:
     element (getter: TopLevelFunctionElement)
     nextFragment (getter: TopLevelFunctionFragment?)
     previousFragment (getter: TopLevelFunctionFragment?)
-  TopLevelVariableElement2 (class extends Object implements PropertyInducingElement2):
-    new (constructor: TopLevelVariableElement2 Function())
-    baseElement (getter: TopLevelVariableElement2)
+  TopLevelVariableElement (class extends Object implements PropertyInducingElement):
+    new (constructor: TopLevelVariableElement Function())
+    baseElement (getter: TopLevelVariableElement)
     firstFragment (getter: TopLevelVariableFragment)
     fragments (getter: List<TopLevelVariableFragment>)
     isExternal (getter: bool)
   TopLevelVariableFragment (class extends Object implements PropertyInducingFragment):
     new (constructor: TopLevelVariableFragment Function())
-    element (getter: TopLevelVariableElement2)
+    element (getter: TopLevelVariableElement)
     nextFragment (getter: TopLevelVariableFragment?)
     previousFragment (getter: TopLevelVariableFragment?)
-  TypeAliasElement2 (class extends Object implements TypeParameterizedElement2, TypeDefiningElement2, HasSinceSdkVersion):
-    new (constructor: TypeAliasElement2 Function())
-    aliasedElement2 (getter: Element2?)
+  TypeAliasElement (class extends Object implements TypeParameterizedElement, TypeDefiningElement, HasSinceSdkVersion):
+    new (constructor: TypeAliasElement Function())
+    aliasedElement2 (getter: Element?)
     aliasedType (getter: DartType)
-    enclosingElement2 (getter: LibraryElement2)
+    enclosingElement2 (getter: LibraryElement)
     firstFragment (getter: TypeAliasFragment)
     fragments (getter: List<TypeAliasFragment>)
     instantiate (method: DartType Function({required NullabilitySuffix nullabilitySuffix, required List<DartType> typeArguments}))
   TypeAliasFragment (class extends Object implements TypeParameterizedFragment, TypeDefiningFragment):
     new (constructor: TypeAliasFragment Function())
-    element (getter: TypeAliasElement2)
+    element (getter: TypeAliasElement)
     enclosingFragment (getter: LibraryFragment?)
     nextFragment (getter: TypeAliasFragment?)
     previousFragment (getter: TypeAliasFragment?)
-  TypeDefiningElement2 (class extends Object implements Element2, Annotatable):
-    new (constructor: TypeDefiningElement2 Function())
+  TypeDefiningElement (class extends Object implements Element, Annotatable):
+    new (constructor: TypeDefiningElement Function())
     firstFragment (getter: TypeDefiningFragment)
     fragments (getter: List<TypeDefiningFragment>)
   TypeDefiningFragment (class extends Object implements Fragment, Annotatable):
     new (constructor: TypeDefiningFragment Function())
-    element (getter: TypeDefiningElement2)
+    element (getter: TypeDefiningElement)
     nextFragment (getter: TypeDefiningFragment?)
     offset (getter: int)
     previousFragment (getter: TypeDefiningFragment?)
-  TypeParameterElement2 (class extends Object implements TypeDefiningElement2):
-    new (constructor: TypeParameterElement2 Function())
-    baseElement (getter: TypeParameterElement2)
+  TypeParameterElement (class extends Object implements TypeDefiningElement):
+    new (constructor: TypeParameterElement Function())
+    baseElement (getter: TypeParameterElement)
     bound (getter: DartType?)
     firstFragment (getter: TypeParameterFragment)
     fragments (getter: List<TypeParameterFragment>)
     instantiate (method: TypeParameterType Function({required NullabilitySuffix nullabilitySuffix}))
   TypeParameterFragment (class extends Object implements TypeDefiningFragment):
     new (constructor: TypeParameterFragment Function())
-    element (getter: TypeParameterElement2)
+    element (getter: TypeParameterElement)
     nextFragment (getter: TypeParameterFragment?)
     previousFragment (getter: TypeParameterFragment?)
-  TypeParameterizedElement2 (class extends Object implements Element2, Annotatable):
-    new (constructor: TypeParameterizedElement2 Function())
+  TypeParameterizedElement (class extends Object implements Element, Annotatable):
+    new (constructor: TypeParameterizedElement Function())
     firstFragment (getter: TypeParameterizedFragment)
     fragments (getter: List<TypeParameterizedFragment>)
     isSimplyBounded (getter: bool)
-    library2 (getter: LibraryElement2)
-    typeParameters2 (getter: List<TypeParameterElement2>)
+    library2 (getter: LibraryElement)
+    typeParameters2 (getter: List<TypeParameterElement>)
   TypeParameterizedFragment (class extends Object implements Fragment, Annotatable):
     new (constructor: TypeParameterizedFragment Function())
-    element (getter: TypeParameterizedElement2)
+    element (getter: TypeParameterizedElement)
     nextFragment (getter: TypeParameterizedFragment?)
     previousFragment (getter: TypeParameterizedFragment?)
     typeParameters2 (getter: List<TypeParameterFragment>)
-  VariableElement2 (class extends Object implements Element2):
-    new (constructor: VariableElement2 Function())
+  VariableElement (class extends Object implements Element):
+    new (constructor: VariableElement Function())
     constantInitializer2 (getter: ConstantInitializer?)
     firstFragment (getter: VariableFragment)
     fragments (getter: List<VariableFragment>)
@@ -3813,18 +3813,52 @@ package:analyzer/dart/element/element.dart:
     computeConstantValue (method: DartObject? Function())
   VariableFragment (class extends Object implements Fragment):
     new (constructor: VariableFragment Function())
-    element (getter: VariableElement2)
+    element (getter: VariableElement)
     initializer (getter: Expression?)
     nextFragment (getter: VariableFragment?)
     previousFragment (getter: VariableFragment?)
+  BindPatternVariableElement2 (type alias for BindPatternVariableElement, deprecated)
+  ClassElement2 (type alias for ClassElement, deprecated)
+  ConstructorElement2 (type alias for ConstructorElement, deprecated)
+  Element2 (type alias for Element, deprecated)
+  EnumElement2 (type alias for EnumElement, deprecated)
+  ExecutableElement2 (type alias for ExecutableElement, deprecated)
+  ExtensionElement2 (type alias for ExtensionElement, deprecated)
+  ExtensionTypeElement2 (type alias for ExtensionTypeElement, deprecated)
+  FieldElement2 (type alias for FieldElement, deprecated)
+  FieldFormalParameterElement2 (type alias for FieldFormalParameterElement, deprecated)
+  FunctionTypedElement2 (type alias for FunctionTypedElement, deprecated)
+  GenericFunctionTypeElement2 (type alias for GenericFunctionTypeElement, deprecated)
+  InstanceElement2 (type alias for InstanceElement, deprecated)
+  InterfaceElement2 (type alias for InterfaceElement, deprecated)
+  JoinPatternVariableElement2 (type alias for JoinPatternVariableElement, deprecated)
+  LabelElement2 (type alias for LabelElement, deprecated)
+  LibraryElement2 (type alias for LibraryElement, deprecated)
+  LocalElement2 (type alias for LocalElement, deprecated)
+  LocalVariableElement2 (type alias for LocalVariableElement, deprecated)
+  MethodElement2 (type alias for MethodElement, deprecated)
+  MixinElement2 (type alias for MixinElement, deprecated)
+  MultiplyDefinedElement2 (type alias for MultiplyDefinedElement, deprecated)
+  PatternVariableElement2 (type alias for PatternVariableElement, deprecated)
+  PrefixElement2 (type alias for PrefixElement, deprecated)
+  PromotableElement2 (type alias for PromotableElement, deprecated)
+  PropertyAccessorElement2 (type alias for PropertyAccessorElement, deprecated)
+  PropertyInducingElement2 (type alias for PropertyInducingElement, deprecated)
+  SuperFormalParameterElement2 (type alias for SuperFormalParameterElement, deprecated)
+  TopLevelVariableElement2 (type alias for TopLevelVariableElement, deprecated)
+  TypeAliasElement2 (type alias for TypeAliasElement, deprecated)
+  TypeDefiningElement2 (type alias for TypeDefiningElement, deprecated)
+  TypeParameterElement2 (type alias for TypeParameterElement, deprecated)
+  TypeParameterizedElement2 (type alias for TypeParameterizedElement, deprecated)
+  VariableElement2 (type alias for VariableElement, deprecated)
 package:analyzer/dart/element/element2.dart:
   Annotatable (see above)
-  BindPatternVariableElement2 (see above)
+  BindPatternVariableElement (see above)
   BindPatternVariableFragment (see above)
-  ClassElement2 (see above)
+  ClassElement (see above)
   ClassFragment (see above)
   ConstantInitializer (see above)
-  ConstructorElement2 (see above)
+  ConstructorElement (see above)
   ConstructorFragment (see above)
   DirectiveUri (see above)
   DirectiveUriWithLibrary (see above)
@@ -3832,92 +3866,126 @@ package:analyzer/dart/element/element2.dart:
   DirectiveUriWithRelativeUriString (see above)
   DirectiveUriWithSource (see above)
   DirectiveUriWithUnit (see above)
-  Element2 (see above)
+  Element (see above)
   ElementAnnotation (see above)
   ElementDirective (see above)
   ElementKind (see above)
   ElementVisitor2 (see above)
-  EnumElement2 (see above)
+  EnumElement (see above)
   EnumFragment (see above)
-  ExecutableElement2 (see above)
+  ExecutableElement (see above)
   ExecutableFragment (see above)
-  ExtensionElement2 (see above)
+  ExtensionElement (see above)
   ExtensionFragment (see above)
-  ExtensionTypeElement2 (see above)
+  ExtensionTypeElement (see above)
   ExtensionTypeFragment (see above)
-  FieldElement2 (see above)
-  FieldFormalParameterElement2 (see above)
+  FieldElement (see above)
+  FieldFormalParameterElement (see above)
   FieldFormalParameterFragment (see above)
   FieldFragment (see above)
   FormalParameterElement (see above)
   FormalParameterFragment (see above)
   Fragment (see above)
-  FunctionTypedElement2 (see above)
+  FunctionTypedElement (see above)
   FunctionTypedFragment (see above)
-  GenericFunctionTypeElement2 (see above)
+  GenericFunctionTypeElement (see above)
   GenericFunctionTypeFragment (see above)
   GetterElement (see above)
   GetterFragment (see above)
   HasSinceSdkVersion (see above)
   HideElementCombinator (see above)
-  InstanceElement2 (see above)
+  InstanceElement (see above)
   InstanceFragment (see above)
-  InterfaceElement2 (see above)
+  InterfaceElement (see above)
   InterfaceFragment (see above)
-  JoinPatternVariableElement2 (see above)
+  JoinPatternVariableElement (see above)
   JoinPatternVariableFragment (see above)
-  LabelElement2 (see above)
+  LabelElement (see above)
   LabelFragment (see above)
-  LibraryElement2 (see above)
+  LibraryElement (see above)
   LibraryExport (see above)
   LibraryFragment (see above)
   LibraryImport (see above)
   LibraryLanguageVersion (see above)
-  LocalElement2 (see above)
+  LocalElement (see above)
   LocalFragment (see above)
   LocalFunctionElement (see above)
   LocalFunctionFragment (see above)
-  LocalVariableElement2 (see above)
+  LocalVariableElement (see above)
   LocalVariableFragment (see above)
   Metadata (see above)
-  MethodElement2 (see above)
+  MethodElement (see above)
   MethodFragment (see above)
-  MixinElement2 (see above)
+  MixinElement (see above)
   MixinFragment (see above)
-  MultiplyDefinedElement2 (see above)
+  MultiplyDefinedElement (see above)
   MultiplyDefinedFragment (see above)
   Name (see above)
   NamespaceCombinator (see above)
   PartInclude (see above)
-  PatternVariableElement2 (see above)
+  PatternVariableElement (see above)
   PatternVariableFragment (see above)
-  PrefixElement2 (see above)
+  PrefixElement (see above)
   PrefixFragment (see above)
-  PromotableElement2 (see above)
+  PromotableElement (see above)
   PromotableFragment (see above)
-  PropertyAccessorElement2 (see above)
+  PropertyAccessorElement (see above)
   PropertyAccessorFragment (see above)
-  PropertyInducingElement2 (see above)
+  PropertyInducingElement (see above)
   PropertyInducingFragment (see above)
   SetterElement (see above)
   SetterFragment (see above)
   ShowElementCombinator (see above)
-  SuperFormalParameterElement2 (see above)
+  SuperFormalParameterElement (see above)
   SuperFormalParameterFragment (see above)
   TopLevelFunctionElement (see above)
   TopLevelFunctionFragment (see above)
-  TopLevelVariableElement2 (see above)
+  TopLevelVariableElement (see above)
   TopLevelVariableFragment (see above)
-  TypeAliasElement2 (see above)
+  TypeAliasElement (see above)
   TypeAliasFragment (see above)
-  TypeDefiningElement2 (see above)
+  TypeDefiningElement (see above)
   TypeDefiningFragment (see above)
-  TypeParameterElement2 (see above)
+  TypeParameterElement (see above)
   TypeParameterFragment (see above)
-  TypeParameterizedElement2 (see above)
+  TypeParameterizedElement (see above)
   TypeParameterizedFragment (see above)
-  VariableElement2 (see above)
+  VariableElement (see above)
   VariableFragment (see above)
+  BindPatternVariableElement2 (see above)
+  ClassElement2 (see above)
+  ConstructorElement2 (see above)
+  Element2 (see above)
+  EnumElement2 (see above)
+  ExecutableElement2 (see above)
+  ExtensionElement2 (see above)
+  ExtensionTypeElement2 (see above)
+  FieldElement2 (see above)
+  FieldFormalParameterElement2 (see above)
+  FunctionTypedElement2 (see above)
+  GenericFunctionTypeElement2 (see above)
+  InstanceElement2 (see above)
+  InterfaceElement2 (see above)
+  JoinPatternVariableElement2 (see above)
+  LabelElement2 (see above)
+  LibraryElement2 (see above)
+  LocalElement2 (see above)
+  LocalVariableElement2 (see above)
+  MethodElement2 (see above)
+  MixinElement2 (see above)
+  MultiplyDefinedElement2 (see above)
+  PatternVariableElement2 (see above)
+  PrefixElement2 (see above)
+  PromotableElement2 (see above)
+  PropertyAccessorElement2 (see above)
+  PropertyInducingElement2 (see above)
+  SuperFormalParameterElement2 (see above)
+  TopLevelVariableElement2 (see above)
+  TypeAliasElement2 (see above)
+  TypeDefiningElement2 (see above)
+  TypeParameterElement2 (see above)
+  TypeParameterizedElement2 (see above)
+  VariableElement2 (see above)
 package:analyzer/dart/element/nullability_suffix.dart:
   NullabilitySuffix (enum):
     none (static getter: NullabilitySuffix)
@@ -3930,13 +3998,13 @@ package:analyzer/dart/element/scope.dart:
     lookup (method: ScopeLookupResult Function(String))
   ScopeLookupResult (class extends Object):
     new (constructor: ScopeLookupResult Function())
-    getter2 (getter: Element2?)
-    setter2 (getter: Element2?)
+    getter2 (getter: Element?)
+    setter2 (getter: Element?)
 package:analyzer/dart/element/type.dart:
   DartType (class extends Object):
     new (constructor: DartType Function())
     alias (getter: InstantiatedTypeAliasElement?)
-    element3 (getter: Element2?, experimental)
+    element3 (getter: Element?, experimental)
     extensionTypeErasure (getter: DartType)
     isBottom (getter: bool)
     isDartAsyncFuture (getter: bool)
@@ -3962,7 +4030,7 @@ package:analyzer/dart/element/type.dart:
     nullabilitySuffix (getter: NullabilitySuffix)
     accept (method: R Function<R>(TypeVisitor<R>))
     acceptWithArgument (method: R Function<R, A>(TypeVisitorWithArgument<R, A>, A))
-    asInstanceOf2 (method: InterfaceType? Function(InterfaceElement2), experimental)
+    asInstanceOf2 (method: InterfaceType? Function(InterfaceElement), experimental)
     getDisplayString (method: String Function({bool withNullability}))
   DynamicType (class extends Object implements DartType):
     new (constructor: DynamicType Function())
@@ -3974,31 +4042,31 @@ package:analyzer/dart/element/type.dart:
     normalParameterTypes (getter: List<DartType>)
     optionalParameterTypes (getter: List<DartType>)
     returnType (getter: DartType)
-    typeParameters (getter: List<TypeParameterElement2>, experimental)
+    typeParameters (getter: List<TypeParameterElement>, experimental)
     instantiate (method: FunctionType Function(List<DartType>))
   InstantiatedTypeAliasElement (class extends Object):
     new (constructor: InstantiatedTypeAliasElement Function())
-    element2 (getter: TypeAliasElement2, experimental)
+    element2 (getter: TypeAliasElement, experimental)
     typeArguments (getter: List<DartType>)
   InterfaceType (class extends Object implements ParameterizedType):
     new (constructor: InterfaceType Function())
     allSupertypes (getter: List<InterfaceType>)
-    constructors2 (getter: List<ConstructorElement2>, experimental)
-    element3 (getter: InterfaceElement2, experimental)
+    constructors2 (getter: List<ConstructorElement>, experimental)
+    element3 (getter: InterfaceElement, experimental)
     getters (getter: List<GetterElement>, experimental)
     interfaces (getter: List<InterfaceType>)
-    methods2 (getter: List<MethodElement2>, experimental)
+    methods2 (getter: List<MethodElement>, experimental)
     mixins (getter: List<InterfaceType>)
     setters (getter: List<SetterElement>, experimental)
     superclass (getter: InterfaceType?)
     superclassConstraints (getter: List<InterfaceType>)
     getGetter2 (method: GetterElement? Function(String))
-    getMethod2 (method: MethodElement2? Function(String))
+    getMethod2 (method: MethodElement? Function(String))
     getSetter2 (method: SetterElement? Function(String))
-    lookUpConstructor2 (method: ConstructorElement2? Function(String?, LibraryElement2))
-    lookUpGetter3 (method: GetterElement? Function(String, LibraryElement2, {bool concrete, bool inherited, bool recoveryStatic}))
-    lookUpMethod3 (method: MethodElement2? Function(String, LibraryElement2, {bool concrete, bool inherited, bool recoveryStatic}))
-    lookUpSetter3 (method: SetterElement? Function(String, LibraryElement2, {bool concrete, bool inherited, bool recoveryStatic}))
+    lookUpConstructor2 (method: ConstructorElement? Function(String?, LibraryElement))
+    lookUpGetter3 (method: GetterElement? Function(String, LibraryElement, {bool concrete, bool inherited, bool recoveryStatic}))
+    lookUpMethod3 (method: MethodElement? Function(String, LibraryElement, {bool concrete, bool inherited, bool recoveryStatic}))
+    lookUpSetter3 (method: SetterElement? Function(String, LibraryElement, {bool concrete, bool inherited, bool recoveryStatic}))
   InvalidType (class extends Object implements DartType):
     new (constructor: InvalidType Function())
   NeverType (class extends Object implements DartType):
@@ -4022,59 +4090,59 @@ package:analyzer/dart/element/type.dart:
   TypeParameterType (class extends Object implements DartType):
     new (constructor: TypeParameterType Function())
     bound (getter: DartType)
-    element3 (getter: TypeParameterElement2, experimental)
+    element3 (getter: TypeParameterElement, experimental)
   VoidType (class extends Object implements DartType):
     new (constructor: VoidType Function())
     element3 (getter: Null)
 package:analyzer/dart/element/type_provider.dart:
   TypeProvider (class extends Object):
     new (constructor: TypeProvider Function())
-    boolElement2 (getter: ClassElement2, experimental)
+    boolElement2 (getter: ClassElement, experimental)
     boolType (getter: InterfaceType)
     bottomType (getter: DartType)
     deprecatedType (getter: InterfaceType)
-    doubleElement2 (getter: ClassElement2, experimental)
+    doubleElement2 (getter: ClassElement, experimental)
     doubleType (getter: InterfaceType)
     dynamicType (getter: DartType)
-    enumElement2 (getter: ClassElement2?, experimental)
+    enumElement2 (getter: ClassElement?, experimental)
     enumType (getter: InterfaceType?)
     functionType (getter: InterfaceType)
     futureDynamicType (getter: InterfaceType)
-    futureElement2 (getter: ClassElement2, experimental)
+    futureElement2 (getter: ClassElement, experimental)
     futureNullType (getter: InterfaceType)
-    futureOrElement2 (getter: ClassElement2, experimental)
+    futureOrElement2 (getter: ClassElement, experimental)
     futureOrNullType (getter: InterfaceType)
-    intElement2 (getter: ClassElement2, experimental)
+    intElement2 (getter: ClassElement, experimental)
     intType (getter: InterfaceType)
     iterableDynamicType (getter: InterfaceType)
-    iterableElement2 (getter: ClassElement2, experimental)
+    iterableElement2 (getter: ClassElement, experimental)
     iterableObjectType (getter: InterfaceType)
-    listElement2 (getter: ClassElement2, experimental)
-    mapElement2 (getter: ClassElement2, experimental)
+    listElement2 (getter: ClassElement, experimental)
+    mapElement2 (getter: ClassElement, experimental)
     mapObjectObjectType (getter: InterfaceType)
     neverType (getter: NeverType)
-    nullElement2 (getter: ClassElement2, experimental)
+    nullElement2 (getter: ClassElement, experimental)
     nullType (getter: InterfaceType)
-    numElement2 (getter: ClassElement2, experimental)
+    numElement2 (getter: ClassElement, experimental)
     numType (getter: InterfaceType)
-    objectElement2 (getter: ClassElement2, experimental)
+    objectElement2 (getter: ClassElement, experimental)
     objectQuestionType (getter: InterfaceType)
     objectType (getter: InterfaceType)
-    recordElement2 (getter: ClassElement2, experimental)
+    recordElement2 (getter: ClassElement, experimental)
     recordType (getter: InterfaceType)
-    setElement2 (getter: ClassElement2, experimental)
+    setElement2 (getter: ClassElement, experimental)
     stackTraceType (getter: InterfaceType)
     streamDynamicType (getter: InterfaceType)
-    streamElement2 (getter: ClassElement2, experimental)
-    stringElement2 (getter: ClassElement2, experimental)
+    streamElement2 (getter: ClassElement, experimental)
+    stringElement2 (getter: ClassElement, experimental)
     stringType (getter: InterfaceType)
-    symbolElement2 (getter: ClassElement2, experimental)
+    symbolElement2 (getter: ClassElement, experimental)
     symbolType (getter: InterfaceType)
     typeType (getter: InterfaceType)
     voidType (getter: VoidType)
     futureOrType (method: InterfaceType Function(DartType))
     futureType (method: InterfaceType Function(DartType))
-    isNonSubtypableClass2 (method: bool Function(InterfaceElement2))
+    isNonSubtypableClass2 (method: bool Function(InterfaceElement))
     isObjectGetter (method: bool Function(String))
     isObjectMember (method: bool Function(String))
     isObjectMethod (method: bool Function(String))
@@ -4088,8 +4156,8 @@ package:analyzer/dart/element/type_system.dart:
     new (constructor: TypeSystem Function())
     flatten (method: DartType Function(DartType))
     greatestLowerBound (method: DartType Function(DartType, DartType))
-    instantiateInterfaceToBounds2 (method: InterfaceType Function({required InterfaceElement2 element, required NullabilitySuffix nullabilitySuffix}), experimental)
-    instantiateTypeAliasToBounds2 (method: DartType Function({required TypeAliasElement2 element, required NullabilitySuffix nullabilitySuffix}), experimental)
+    instantiateInterfaceToBounds2 (method: InterfaceType Function({required InterfaceElement element, required NullabilitySuffix nullabilitySuffix}), experimental)
+    instantiateTypeAliasToBounds2 (method: DartType Function({required TypeAliasElement element, required NullabilitySuffix nullabilitySuffix}), experimental)
     isAssignableTo (method: bool Function(DartType, DartType, {bool strictCasts}))
     isNonNullable (method: bool Function(DartType))
     isNullable (method: bool Function(DartType))
@@ -4146,113 +4214,113 @@ package:analyzer/dart/element/type_visitor.dart:
 package:analyzer/dart/element/visitor2.dart:
   GeneralizingElementVisitor2 (class<R> extends Object implements ElementVisitor2<R>):
     new (constructor: GeneralizingElementVisitor2<R> Function())
-    visitClassElement (method: R? Function(ClassElement2))
-    visitConstructorElement (method: R? Function(ConstructorElement2))
-    visitElement (method: R? Function(Element2))
-    visitEnumElement (method: R? Function(EnumElement2))
-    visitExecutableElement (method: R? Function(ExecutableElement2))
-    visitExtensionElement (method: R? Function(ExtensionElement2))
-    visitExtensionTypeElement (method: R? Function(ExtensionTypeElement2))
-    visitFieldElement (method: R? Function(FieldElement2))
-    visitFieldFormalParameterElement (method: R? Function(FieldFormalParameterElement2))
+    visitClassElement (method: R? Function(ClassElement))
+    visitConstructorElement (method: R? Function(ConstructorElement))
+    visitElement (method: R? Function(Element))
+    visitEnumElement (method: R? Function(EnumElement))
+    visitExecutableElement (method: R? Function(ExecutableElement))
+    visitExtensionElement (method: R? Function(ExtensionElement))
+    visitExtensionTypeElement (method: R? Function(ExtensionTypeElement))
+    visitFieldElement (method: R? Function(FieldElement))
+    visitFieldFormalParameterElement (method: R? Function(FieldFormalParameterElement))
     visitFormalParameterElement (method: R? Function(FormalParameterElement))
-    visitGenericFunctionTypeElement (method: R? Function(GenericFunctionTypeElement2))
+    visitGenericFunctionTypeElement (method: R? Function(GenericFunctionTypeElement))
     visitGetterElement (method: R? Function(GetterElement))
-    visitLabelElement (method: R? Function(LabelElement2))
-    visitLibraryElement (method: R? Function(LibraryElement2))
+    visitLabelElement (method: R? Function(LabelElement))
+    visitLibraryElement (method: R? Function(LibraryElement))
     visitLocalFunctionElement (method: R? Function(LocalFunctionElement))
-    visitLocalVariableElement (method: R? Function(LocalVariableElement2))
-    visitMethodElement (method: R? Function(MethodElement2))
-    visitMixinElement (method: R? Function(MixinElement2))
-    visitMultiplyDefinedElement (method: R? Function(MultiplyDefinedElement2))
-    visitPrefixElement (method: R? Function(PrefixElement2))
-    visitPropertyAccessorElement (method: R? Function(PropertyAccessorElement2))
-    visitPropertyInducingElement (method: R? Function(PropertyInducingElement2))
+    visitLocalVariableElement (method: R? Function(LocalVariableElement))
+    visitMethodElement (method: R? Function(MethodElement))
+    visitMixinElement (method: R? Function(MixinElement))
+    visitMultiplyDefinedElement (method: R? Function(MultiplyDefinedElement))
+    visitPrefixElement (method: R? Function(PrefixElement))
+    visitPropertyAccessorElement (method: R? Function(PropertyAccessorElement))
+    visitPropertyInducingElement (method: R? Function(PropertyInducingElement))
     visitSetterElement (method: R? Function(SetterElement))
-    visitSuperFormalParameterElement (method: R? Function(SuperFormalParameterElement2))
+    visitSuperFormalParameterElement (method: R? Function(SuperFormalParameterElement))
     visitTopLevelFunctionElement (method: R? Function(TopLevelFunctionElement))
-    visitTopLevelVariableElement (method: R? Function(TopLevelVariableElement2))
-    visitTypeAliasElement (method: R? Function(TypeAliasElement2))
-    visitTypeParameterElement (method: R? Function(TypeParameterElement2))
-    visitVariableElement (method: R? Function(VariableElement2))
+    visitTopLevelVariableElement (method: R? Function(TopLevelVariableElement))
+    visitTypeAliasElement (method: R? Function(TypeAliasElement))
+    visitTypeParameterElement (method: R? Function(TypeParameterElement))
+    visitVariableElement (method: R? Function(VariableElement))
   RecursiveElementVisitor2 (class<R> extends Object implements ElementVisitor2<R>):
     new (constructor: RecursiveElementVisitor2<R> Function())
-    visitClassElement (method: R? Function(ClassElement2))
-    visitConstructorElement (method: R? Function(ConstructorElement2))
-    visitEnumElement (method: R? Function(EnumElement2))
-    visitExtensionElement (method: R? Function(ExtensionElement2))
-    visitExtensionTypeElement (method: R? Function(ExtensionTypeElement2))
-    visitFieldElement (method: R? Function(FieldElement2))
-    visitFieldFormalParameterElement (method: R? Function(FieldFormalParameterElement2))
+    visitClassElement (method: R? Function(ClassElement))
+    visitConstructorElement (method: R? Function(ConstructorElement))
+    visitEnumElement (method: R? Function(EnumElement))
+    visitExtensionElement (method: R? Function(ExtensionElement))
+    visitExtensionTypeElement (method: R? Function(ExtensionTypeElement))
+    visitFieldElement (method: R? Function(FieldElement))
+    visitFieldFormalParameterElement (method: R? Function(FieldFormalParameterElement))
     visitFormalParameterElement (method: R? Function(FormalParameterElement))
-    visitGenericFunctionTypeElement (method: R? Function(GenericFunctionTypeElement2))
+    visitGenericFunctionTypeElement (method: R? Function(GenericFunctionTypeElement))
     visitGetterElement (method: R? Function(GetterElement))
-    visitLabelElement (method: R? Function(LabelElement2))
-    visitLibraryElement (method: R? Function(LibraryElement2))
+    visitLabelElement (method: R? Function(LabelElement))
+    visitLibraryElement (method: R? Function(LibraryElement))
     visitLocalFunctionElement (method: R? Function(LocalFunctionElement))
-    visitLocalVariableElement (method: R? Function(LocalVariableElement2))
-    visitMethodElement (method: R? Function(MethodElement2))
-    visitMixinElement (method: R? Function(MixinElement2))
-    visitMultiplyDefinedElement (method: R? Function(MultiplyDefinedElement2))
-    visitPrefixElement (method: R? Function(PrefixElement2))
+    visitLocalVariableElement (method: R? Function(LocalVariableElement))
+    visitMethodElement (method: R? Function(MethodElement))
+    visitMixinElement (method: R? Function(MixinElement))
+    visitMultiplyDefinedElement (method: R? Function(MultiplyDefinedElement))
+    visitPrefixElement (method: R? Function(PrefixElement))
     visitSetterElement (method: R? Function(SetterElement))
-    visitSuperFormalParameterElement (method: R? Function(SuperFormalParameterElement2))
+    visitSuperFormalParameterElement (method: R? Function(SuperFormalParameterElement))
     visitTopLevelFunctionElement (method: R? Function(TopLevelFunctionElement))
-    visitTopLevelVariableElement (method: R? Function(TopLevelVariableElement2))
-    visitTypeAliasElement (method: R? Function(TypeAliasElement2))
-    visitTypeParameterElement (method: R? Function(TypeParameterElement2))
+    visitTopLevelVariableElement (method: R? Function(TopLevelVariableElement))
+    visitTypeAliasElement (method: R? Function(TypeAliasElement))
+    visitTypeParameterElement (method: R? Function(TypeParameterElement))
   SimpleElementVisitor2 (class<R> extends Object implements ElementVisitor2<R>):
     new (constructor: SimpleElementVisitor2<R> Function())
-    visitClassElement (method: R? Function(ClassElement2))
-    visitConstructorElement (method: R? Function(ConstructorElement2))
-    visitEnumElement (method: R? Function(EnumElement2))
-    visitExtensionElement (method: R? Function(ExtensionElement2))
-    visitExtensionTypeElement (method: R? Function(ExtensionTypeElement2))
-    visitFieldElement (method: R? Function(FieldElement2))
-    visitFieldFormalParameterElement (method: R? Function(FieldFormalParameterElement2))
+    visitClassElement (method: R? Function(ClassElement))
+    visitConstructorElement (method: R? Function(ConstructorElement))
+    visitEnumElement (method: R? Function(EnumElement))
+    visitExtensionElement (method: R? Function(ExtensionElement))
+    visitExtensionTypeElement (method: R? Function(ExtensionTypeElement))
+    visitFieldElement (method: R? Function(FieldElement))
+    visitFieldFormalParameterElement (method: R? Function(FieldFormalParameterElement))
     visitFormalParameterElement (method: R? Function(FormalParameterElement))
-    visitGenericFunctionTypeElement (method: R? Function(GenericFunctionTypeElement2))
+    visitGenericFunctionTypeElement (method: R? Function(GenericFunctionTypeElement))
     visitGetterElement (method: R? Function(GetterElement))
-    visitLabelElement (method: R? Function(LabelElement2))
-    visitLibraryElement (method: R? Function(LibraryElement2))
+    visitLabelElement (method: R? Function(LabelElement))
+    visitLibraryElement (method: R? Function(LibraryElement))
     visitLocalFunctionElement (method: R? Function(LocalFunctionElement))
-    visitLocalVariableElement (method: R? Function(LocalVariableElement2))
-    visitMethodElement (method: R? Function(MethodElement2))
-    visitMixinElement (method: R? Function(MixinElement2))
-    visitMultiplyDefinedElement (method: R? Function(MultiplyDefinedElement2))
-    visitPrefixElement (method: R? Function(PrefixElement2))
+    visitLocalVariableElement (method: R? Function(LocalVariableElement))
+    visitMethodElement (method: R? Function(MethodElement))
+    visitMixinElement (method: R? Function(MixinElement))
+    visitMultiplyDefinedElement (method: R? Function(MultiplyDefinedElement))
+    visitPrefixElement (method: R? Function(PrefixElement))
     visitSetterElement (method: R? Function(SetterElement))
-    visitSuperFormalParameterElement (method: R? Function(SuperFormalParameterElement2))
+    visitSuperFormalParameterElement (method: R? Function(SuperFormalParameterElement))
     visitTopLevelFunctionElement (method: R? Function(TopLevelFunctionElement))
-    visitTopLevelVariableElement (method: R? Function(TopLevelVariableElement2))
-    visitTypeAliasElement (method: R? Function(TypeAliasElement2))
-    visitTypeParameterElement (method: R? Function(TypeParameterElement2))
+    visitTopLevelVariableElement (method: R? Function(TopLevelVariableElement))
+    visitTypeAliasElement (method: R? Function(TypeAliasElement))
+    visitTypeParameterElement (method: R? Function(TypeParameterElement))
   ThrowingElementVisitor2 (class<R> extends Object implements ElementVisitor2<R>):
     new (constructor: ThrowingElementVisitor2<R> Function())
-    visitClassElement (method: R? Function(ClassElement2))
-    visitConstructorElement (method: R? Function(ConstructorElement2))
-    visitEnumElement (method: R? Function(EnumElement2))
-    visitExtensionElement (method: R? Function(ExtensionElement2))
-    visitExtensionTypeElement (method: R? Function(ExtensionTypeElement2))
-    visitFieldElement (method: R? Function(FieldElement2))
-    visitFieldFormalParameterElement (method: R? Function(FieldFormalParameterElement2))
+    visitClassElement (method: R? Function(ClassElement))
+    visitConstructorElement (method: R? Function(ConstructorElement))
+    visitEnumElement (method: R? Function(EnumElement))
+    visitExtensionElement (method: R? Function(ExtensionElement))
+    visitExtensionTypeElement (method: R? Function(ExtensionTypeElement))
+    visitFieldElement (method: R? Function(FieldElement))
+    visitFieldFormalParameterElement (method: R? Function(FieldFormalParameterElement))
     visitFormalParameterElement (method: R? Function(FormalParameterElement))
-    visitGenericFunctionTypeElement (method: R? Function(GenericFunctionTypeElement2))
+    visitGenericFunctionTypeElement (method: R? Function(GenericFunctionTypeElement))
     visitGetterElement (method: R? Function(GetterElement))
-    visitLabelElement (method: R? Function(LabelElement2))
-    visitLibraryElement (method: R? Function(LibraryElement2))
+    visitLabelElement (method: R? Function(LabelElement))
+    visitLibraryElement (method: R? Function(LibraryElement))
     visitLocalFunctionElement (method: R? Function(LocalFunctionElement))
-    visitLocalVariableElement (method: R? Function(LocalVariableElement2))
-    visitMethodElement (method: R? Function(MethodElement2))
-    visitMixinElement (method: R? Function(MixinElement2))
-    visitMultiplyDefinedElement (method: R? Function(MultiplyDefinedElement2))
-    visitPrefixElement (method: R? Function(PrefixElement2))
+    visitLocalVariableElement (method: R? Function(LocalVariableElement))
+    visitMethodElement (method: R? Function(MethodElement))
+    visitMixinElement (method: R? Function(MixinElement))
+    visitMultiplyDefinedElement (method: R? Function(MultiplyDefinedElement))
+    visitPrefixElement (method: R? Function(PrefixElement))
     visitSetterElement (method: R? Function(SetterElement))
-    visitSuperFormalParameterElement (method: R? Function(SuperFormalParameterElement2))
+    visitSuperFormalParameterElement (method: R? Function(SuperFormalParameterElement))
     visitTopLevelFunctionElement (method: R? Function(TopLevelFunctionElement))
-    visitTopLevelVariableElement (method: R? Function(TopLevelVariableElement2))
-    visitTypeAliasElement (method: R? Function(TypeAliasElement2))
-    visitTypeParameterElement (method: R? Function(TypeParameterElement2))
+    visitTopLevelVariableElement (method: R? Function(TopLevelVariableElement))
+    visitTypeAliasElement (method: R? Function(TypeAliasElement))
+    visitTypeParameterElement (method: R? Function(TypeParameterElement))
 package:analyzer/dart/sdk/build_sdk_summary.dart:
   buildSdkSummary (function: Future<Uint8List> Function({String? embedderYamlPath, required ResourceProvider resourceProvider, required String sdkPath}))
 package:analyzer/diagnostic/diagnostic.dart:
@@ -4362,7 +4430,7 @@ package:analyzer/error/listener.dart:
     lockLevel= (setter: int)
     source (getter: Source)
     atConstructorDeclaration (method: void Function(ConstructorDeclaration, ErrorCode, {List<Object>? arguments, List<DiagnosticMessage>? contextMessages, Object? data}))
-    atElement2 (method: void Function(Element2, ErrorCode, {List<Object>? arguments, List<DiagnosticMessage>? contextMessages, Object? data}), experimental)
+    atElement2 (method: void Function(Element, ErrorCode, {List<Object>? arguments, List<DiagnosticMessage>? contextMessages, Object? data}), experimental)
     atEntity (method: void Function(SyntacticEntity, ErrorCode, {List<Object>? arguments, List<DiagnosticMessage>? contextMessages, Object? data}))
     atNode (method: void Function(AstNode, ErrorCode, {List<Object>? arguments, List<DiagnosticMessage>? contextMessages, Object? data}))
     atOffset (method: void Function({List<Object>? arguments, List<DiagnosticMessage>? contextMessages, Object? data, required ErrorCode errorCode, required int length, required int offset}))
@@ -4717,17 +4785,17 @@ package:analyzer/src/dart/constant/evaluation.dart:
     new (constructor: ConstantEvaluationTarget Function())
     context (getter: AnalysisContext@2)
     isConstantEvaluated (getter: bool)
-    library2 (getter: LibraryElement2?)
+    library2 (getter: LibraryElement?)
     librarySource (getter: Source?)
     source (getter: Source?)
 package:analyzer/src/dart/resolver/scope.dart:
   Namespace (class extends Object):
     EMPTY (static getter: Namespace)
     EMPTY= (static setter: Namespace)
-    new (constructor: Namespace Function(Map<String, Element2>))
-    definedNames2 (getter: Map<String, Element2>)
-    get2 (method: Element2? Function(String))
-    getPrefixed2 (method: Element2? Function(String, String))
+    new (constructor: Namespace Function(Map<String, Element>))
+    definedNames2 (getter: Map<String, Element>)
+    get2 (method: Element? Function(String))
+    getPrefixed2 (method: Element? Function(String, String))
 package:analyzer/src/generated/engine.dart:
   AnalysisContext@2 (class extends Object):
     new (constructor: AnalysisContext@2 Function())
@@ -4752,8 +4820,8 @@ package:analyzer/utilities/extensions/ast.dart:
   AstNodeExtension (extension on AstNode):
     nodeCovering (method: AstNode? Function({int length, required int offset}))
 package:analyzer/utilities/extensions/element.dart:
-  LibraryElement2Extension (extension on LibraryElement2):
-    exportedExtensions (getter: Iterable<ExtensionElement2>)
+  LibraryElement2Extension (extension on LibraryElement):
+    exportedExtensions (getter: Iterable<ExtensionElement>)
 package:analyzer/utilities/extensions/uri.dart:
   UriExtension (extension on Uri):
     isImplementation (getter: bool)
diff --git a/pkg/analyzer/doc/tutorial/element.md b/pkg/analyzer/doc/tutorial/element.md
index 3f51eafbef5..ffa0d6fcc79 100644
--- a/pkg/analyzer/doc/tutorial/element.md
+++ b/pkg/analyzer/doc/tutorial/element.md
@@ -70,15 +70,15 @@ print the names of all of the members of each class in a given library,
 it might look something like this:
 
 ```dart
-void printMembers(LibraryElement2 libraryElement) {
-  for (ClassElement2 classElement in libraryElement.classes) {
+void printMembers(LibraryElement libraryElement) {
+  for (ClassElement classElement in libraryElement.classes) {
     print(classElement.name3);
-    for (ConstructorElement2 constructorElement in classElement.constructors2) {
+    for (ConstructorElement constructorElement in classElement.constructors2) {
       if (!constructorElement.isSynthetic) {
         print('  ${constructorElement.displayName}');
       }
     }
-    for (FieldElement2 fieldElement in classElement.fields2) {
+    for (FieldElement fieldElement in classElement.fields2) {
       if (!fieldElement.isSynthetic) {
         print('  ${fieldElement.name3}');
       }
@@ -93,7 +93,7 @@ void printMembers(LibraryElement2 libraryElement) {
         print('  ${setterElement.name3}');
       }
     }
-    for (MethodElement2 methodElement in classElement.methods2) {
+    for (MethodElement methodElement in classElement.methods2) {
       if (!methodElement.isSynthetic) {
         print('  ${methodElement.name3}');
       }
@@ -144,7 +144,7 @@ class ParameterCounter extends GeneralizingElementVisitor2<void> {
   int maxParameterCount = 0;
 
   @override
-  void visitExecutableElement(ExecutableElement2 element) {
+  void visitExecutableElement(ExecutableElement element) {
     maxParameterCount = math.max(maxParameterCount, element.formalParameters.length);
     super.visitExecutableElement(element);
   }
diff --git a/pkg/analyzer/lib/dart/analysis/results.dart b/pkg/analyzer/lib/dart/analysis/results.dart
index 0d37e80e5fd..4df00533c7c 100644
--- a/pkg/analyzer/lib/dart/analysis/results.dart
+++ b/pkg/analyzer/lib/dart/analysis/results.dart
@@ -164,7 +164,7 @@ abstract class InvalidResult {}
 abstract class LibraryElementResult implements SomeLibraryElementResult {
   /// The element representing the library.
   @experimental
-  LibraryElement2 get element2;
+  LibraryElement get element2;
 }
 
 /// The type of [InvalidResult] returned when the given element was not
@@ -269,7 +269,7 @@ abstract class ResolvedLibraryResult
     implements ParsedLibraryResult, SomeResolvedLibraryResult {
   /// The element representing this library.
   @experimental
-  LibraryElement2 get element2;
+  LibraryElement get element2;
 
   /// The type provider used when resolving the library.
   TypeProvider get typeProvider;
@@ -294,7 +294,7 @@ abstract class ResolvedUnitResult
 
   /// The element representing the library containing the compilation [unit].
   @experimental
-  LibraryElement2 get libraryElement2;
+  LibraryElement get libraryElement2;
 
   /// The fragment corresponding to the [unit].
   @experimental
diff --git a/pkg/analyzer/lib/dart/analysis/session.dart b/pkg/analyzer/lib/dart/analysis/session.dart
index 4b89b1f6584..f729bae9520 100644
--- a/pkg/analyzer/lib/dart/analysis/session.dart
+++ b/pkg/analyzer/lib/dart/analysis/session.dart
@@ -53,7 +53,7 @@ abstract class AnalysisSession {
   /// Return information about the results of parsing units of the library file
   /// with the given library [element].
   @experimental
-  SomeParsedLibraryResult getParsedLibraryByElement2(LibraryElement2 element);
+  SomeParsedLibraryResult getParsedLibraryByElement2(LibraryElement element);
 
   /// Return information about the results of parsing the file with the given
   /// absolute, normalized [path].
@@ -70,7 +70,7 @@ abstract class AnalysisSession {
   /// Throw [ArgumentError] if the [element] was not produced by this session.
   @experimental
   Future<SomeResolvedLibraryResult> getResolvedLibraryByElement2(
-    LibraryElement2 element,
+    LibraryElement element,
   );
 
   /// Return a future that will complete with information about the results of
diff --git a/pkg/analyzer/lib/dart/constant/value.dart b/pkg/analyzer/lib/dart/constant/value.dart
index b6523832d5c..7ca3a3c63bb 100644
--- a/pkg/analyzer/lib/dart/constant/value.dart
+++ b/pkg/analyzer/lib/dart/constant/value.dart
@@ -68,7 +68,7 @@ abstract class DartObject {
   DartType? get type;
 
   /// If this object is the value of a constant variable, the variable.
-  VariableElement2? get variable2;
+  VariableElement? get variable2;
 
   /// Return a representation of the value of the field with the given [name].
   ///
@@ -102,7 +102,7 @@ abstract class DartObject {
   /// * the value of the object being represented is not known, or
   /// * the value of the object being represented is `null`.
   @experimental
-  ExecutableElement2? toFunctionValue2();
+  ExecutableElement? toFunctionValue2();
 
   /// Return an integer corresponding to the value of the object being
   /// represented, or `null` if
diff --git a/pkg/analyzer/lib/dart/element/element.dart b/pkg/analyzer/lib/dart/element/element.dart
index 9793b1221e6..8c9602c3a87 100644
--- a/pkg/analyzer/lib/dart/element/element.dart
+++ b/pkg/analyzer/lib/dart/element/element.dart
@@ -9,7 +9,7 @@
 /// [AST structure](../dart_ast_ast/dart_ast_ast-library.html).
 ///
 /// The element model consists of three closely related kinds of objects:
-/// elements (instances of a subclass of [Element2]), fragments (instances of a
+/// elements (instances of a subclass of [Element]), fragments (instances of a
 /// subclass of [Fragment]) and types. This library defines the elements and
 /// fragments; the types are defined in
 /// [type.dart](../dart_element_type/dart_element_type-library.html).
@@ -21,7 +21,7 @@
 /// For example, the elements representing the methods and fields in a class are
 /// children of the element representing the class.
 ///
-/// Some elements, such as a [LocalVariableElement2] are declared by a single
+/// Some elements, such as a [LocalVariableElement] are declared by a single
 /// declaration, but most elements can be declared by multiple declarations. A
 /// fragment represents a single declaration when the corresponding element
 /// can have multiple declarations. There is no fragment for an element that can
@@ -31,7 +31,7 @@
 /// structures parallel each other.
 ///
 /// Every complete element structure is rooted by an instance of the class
-/// [LibraryElement2]. A library element represents a single Dart library. Every
+/// [LibraryElement]. A library element represents a single Dart library. Every
 /// library is defined by one or more compilation units (the library and all of
 /// its parts). The compilation units are represented by the class
 /// [LibraryFragment].
@@ -65,6 +65,108 @@ import 'package:pub_semver/pub_semver.dart';
 
 export 'package:analyzer/src/dart/element/inheritance_manager3.dart' show Name;
 
+@Deprecated('Use BindPatternVariableElement instead')
+typedef BindPatternVariableElement2 = BindPatternVariableElement;
+
+@Deprecated('Use ClassElement instead')
+typedef ClassElement2 = ClassElement;
+
+@Deprecated('Use ConstructorElement instead')
+typedef ConstructorElement2 = ConstructorElement;
+
+@Deprecated('Use Element instead')
+typedef Element2 = Element;
+
+@Deprecated('Use EnumElement instead')
+typedef EnumElement2 = EnumElement;
+
+@Deprecated('Use ExecutableElement instead')
+typedef ExecutableElement2 = ExecutableElement;
+
+@Deprecated('Use ExtensionElement instead')
+typedef ExtensionElement2 = ExtensionElement;
+
+@Deprecated('Use ExtensionTypeElement instead')
+typedef ExtensionTypeElement2 = ExtensionTypeElement;
+
+@Deprecated('Use FieldElement instead')
+typedef FieldElement2 = FieldElement;
+
+@Deprecated('Use FormalParameterElement instead')
+typedef FieldFormalParameterElement2 = FieldFormalParameterElement;
+
+@Deprecated('Use FunctionTypedElement instead')
+typedef FunctionTypedElement2 = FunctionTypedElement;
+
+@Deprecated('Use GenericFunctionTypeElement instead')
+typedef GenericFunctionTypeElement2 = GenericFunctionTypeElement;
+
+@Deprecated('Use InstanceElement instead')
+typedef InstanceElement2 = InstanceElement;
+
+@Deprecated('Use InterfaceElement instead')
+typedef InterfaceElement2 = InterfaceElement;
+
+@Deprecated('Use JoinPatternVariableElement instead')
+typedef JoinPatternVariableElement2 = JoinPatternVariableElement;
+
+@Deprecated('Use LabelElement instead')
+typedef LabelElement2 = LabelElement;
+
+@Deprecated('Use LibraryElement instead')
+typedef LibraryElement2 = LibraryElement;
+
+@Deprecated('Use LocalElement instead')
+typedef LocalElement2 = LocalElement;
+
+@Deprecated('Use LocalVariableElement instead')
+typedef LocalVariableElement2 = LocalVariableElement;
+
+@Deprecated('Use MethodElement instead')
+typedef MethodElement2 = MethodElement;
+
+@Deprecated('Use MixinElement instead')
+typedef MixinElement2 = MixinElement;
+
+@Deprecated('Use MultiplyDefinedElement instead')
+typedef MultiplyDefinedElement2 = MultiplyDefinedElement;
+
+@Deprecated('Use PatternVariableElement instead')
+typedef PatternVariableElement2 = PatternVariableElement;
+
+@Deprecated('Use PrefixElement instead')
+typedef PrefixElement2 = PrefixElement;
+
+@Deprecated('Use PromotableElement instead')
+typedef PromotableElement2 = PromotableElement;
+
+@Deprecated('Use PropertyAccessorElement instead')
+typedef PropertyAccessorElement2 = PropertyAccessorElement;
+
+@Deprecated('Use PropertyInducingElement instead')
+typedef PropertyInducingElement2 = PropertyInducingElement;
+
+@Deprecated('Use SuperFormalParameterElement instead')
+typedef SuperFormalParameterElement2 = SuperFormalParameterElement;
+
+@Deprecated('Use TopLevelVariableElement instead')
+typedef TopLevelVariableElement2 = TopLevelVariableElement;
+
+@Deprecated('Use TypeAliasElement instead')
+typedef TypeAliasElement2 = TypeAliasElement;
+
+@Deprecated('Use TypeDefiningElement instead')
+typedef TypeDefiningElement2 = TypeDefiningElement;
+
+@Deprecated('Use TypeParameterElement instead')
+typedef TypeParameterElement2 = TypeParameterElement;
+
+@Deprecated('Use TypeParameterizedElement instead')
+typedef TypeParameterizedElement2 = TypeParameterizedElement;
+
+@Deprecated('Use VariableElement instead')
+typedef VariableElement2 = VariableElement;
+
 /// An element or fragment that can have either annotations (metadata), a
 /// documentation comment, or both associated with it.
 abstract class Annotatable {
@@ -90,7 +192,7 @@ abstract class Annotatable {
 /// A pattern variable that is explicitly declared.
 ///
 /// Clients may not extend, implement or mix-in this class.
-abstract class BindPatternVariableElement2 implements PatternVariableElement2 {
+abstract class BindPatternVariableElement implements PatternVariableElement {
   @override
   BindPatternVariableFragment get firstFragment;
 
@@ -98,13 +200,13 @@ abstract class BindPatternVariableElement2 implements PatternVariableElement2 {
   List<BindPatternVariableFragment> get fragments;
 }
 
-/// The portion of a [BindPatternVariableElement2] contributed by a single
+/// The portion of a [BindPatternVariableElement] contributed by a single
 /// declaration.
 ///
 /// Clients may not extend, implement or mix-in this class.
 abstract class BindPatternVariableFragment implements PatternVariableFragment {
   @override
-  BindPatternVariableElement2 get element;
+  BindPatternVariableElement get element;
 
   @override
   BindPatternVariableFragment? get nextFragment;
@@ -119,7 +221,7 @@ abstract class BindPatternVariableFragment implements PatternVariableFragment {
 /// or a mixin application (without a class body).
 ///
 /// Clients may not extend, implement or mix-in this class.
-abstract class ClassElement2 implements InterfaceElement2 {
+abstract class ClassElement implements InterfaceElement {
   @override
   ClassFragment get firstFragment;
 
@@ -207,18 +309,18 @@ abstract class ClassElement2 implements InterfaceElement2 {
 
   /// Whether the class, assuming that it is within scope, can be extended by
   /// classes in the given [library].
-  bool isExtendableIn2(LibraryElement2 library);
+  bool isExtendableIn2(LibraryElement library);
 
   /// Whether the class, assuming that it is within scope, can be implemented by
   /// classes, mixins, and enums in the given [library].
-  bool isImplementableIn2(LibraryElement2 library);
+  bool isImplementableIn2(LibraryElement library);
 
   /// Whether the class, assuming that it is within scope, can be mixed-in by
   /// classes and enums in the given [library].
-  bool isMixableIn2(LibraryElement2 library);
+  bool isMixableIn2(LibraryElement library);
 }
 
-/// The portion of a [ClassElement2] contributed by a single declaration.
+/// The portion of a [ClassElement] contributed by a single declaration.
 ///
 /// The fragment can be defined by either a class declaration (with a class
 /// body), or a mixin application (without a class body).
@@ -226,7 +328,7 @@ abstract class ClassElement2 implements InterfaceElement2 {
 /// Clients may not extend, implement or mix-in this class.
 abstract class ClassFragment implements InterfaceFragment {
   @override
-  ClassElement2 get element;
+  ClassElement get element;
 
   @override
   ClassFragment? get nextFragment;
@@ -260,13 +362,13 @@ abstract class ConstantInitializer {
 /// type.
 ///
 /// Clients may not extend, implement or mix-in this class.
-abstract class ConstructorElement2
-    implements ExecutableElement2, HasSinceSdkVersion {
+abstract class ConstructorElement
+    implements ExecutableElement, HasSinceSdkVersion {
   @override
-  ConstructorElement2 get baseElement;
+  ConstructorElement get baseElement;
 
   @override
-  InterfaceElement2 get enclosingElement2;
+  InterfaceElement get enclosingElement2;
 
   @override
   ConstructorFragment get firstFragment;
@@ -298,7 +400,7 @@ abstract class ConstructorElement2
   /// Returns `null` if this constructor does not redirect to another
   /// constructor or if the library containing this constructor has not yet been
   /// resolved.
-  ConstructorElement2? get redirectedConstructor2;
+  ConstructorElement? get redirectedConstructor2;
 
   @override
   InterfaceType get returnType;
@@ -306,15 +408,15 @@ abstract class ConstructorElement2
   /// The constructor of the superclass that this constructor invokes, or
   /// `null` if this constructor redirects to another constructor, or if the
   /// library containing this constructor has not yet been resolved.
-  ConstructorElement2? get superConstructor2;
+  ConstructorElement? get superConstructor2;
 }
 
-/// The portion of a [ConstructorElement2] contributed by a single declaration.
+/// The portion of a [ConstructorElement] contributed by a single declaration.
 ///
 /// Clients may not extend, implement or mix-in this class.
 abstract class ConstructorFragment implements ExecutableFragment {
   @override
-  ConstructorElement2 get element;
+  ConstructorElement get element;
 
   @override
   InstanceFragment? get enclosingFragment;
@@ -367,12 +469,12 @@ abstract class ConstructorFragment implements ExecutableFragment {
 /// Clients may not extend, implement or mix-in this class.
 abstract class DirectiveUri {}
 
-/// [DirectiveUriWithSource] that references a [LibraryElement2].
+/// [DirectiveUriWithSource] that references a [LibraryElement].
 ///
 /// Clients may not extend, implement or mix-in this class.
 abstract class DirectiveUriWithLibrary extends DirectiveUriWithSource {
   /// The library referenced by the [source].
-  LibraryElement2 get library2;
+  LibraryElement get library2;
 }
 
 /// [DirectiveUriWithRelativeUriString] that can be parsed into a relative URI.
@@ -433,7 +535,7 @@ abstract class DirectiveUriWithUnit extends DirectiveUriWithSource {
 /// structure of the program.
 ///
 /// Clients may not extend, implement or mix-in this class.
-abstract class Element2 {
+abstract class Element {
   /// The non-[Member] version of this element.
   ///
   /// If the receiver is a view on an element, such as a method from an
@@ -443,13 +545,13 @@ abstract class Element2 {
   /// If the receiver is already a non-[Member] element (or a synthetic element,
   /// such as a synthetic property accessor), this getter will return the
   /// receiver.
-  Element2 get baseElement;
+  Element get baseElement;
 
   /// The children of this element.
   ///
   /// There is no guarantee of the order in which the children will be returned.
   /// In particular, they are not guaranteed to be in lexical order.
-  List<Element2> get children2;
+  List<Element> get children2;
 
   /// The display name of this element, or an empty string if the element does
   /// not have a name.
@@ -463,7 +565,7 @@ abstract class Element2 {
   ///
   /// Returns `null` if this element is a library because libraries are the
   /// top-level elements in the model.
-  Element2? get enclosingElement2;
+  Element? get enclosingElement2;
 
   /// The first fragment in the chain of fragments that are merged to make this
   /// element.
@@ -503,9 +605,9 @@ abstract class Element2 {
   /// Library that contains this element.
   ///
   /// This will be the element itself if it's a library element. This will be
-  /// `null` if this element is a [MultiplyDefinedElement2] that isn't contained
+  /// `null` if this element is a [MultiplyDefinedElement] that isn't contained
   /// in a single library.
-  LibraryElement2? get library2;
+  LibraryElement? get library2;
 
   /// The name to use for lookup in maps.
   ///
@@ -535,7 +637,7 @@ abstract class Element2 {
   /// element is returned. For example, for a synthetic getter of a
   /// non-synthetic field the field is returned; for a synthetic constructor
   /// the enclosing class is returned.
-  Element2 get nonSynthetic2;
+  Element get nonSynthetic2;
 
   /// The analysis session in which this element is defined.
   AnalysisSession? get session;
@@ -575,19 +677,19 @@ abstract class Element2 {
   /// A declaration <i>m</i> is accessible to a library <i>L</i> if <i>m</i> is
   /// declared in <i>L</i> or if <i>m</i> is public.
   /// </blockquote>
-  bool isAccessibleIn2(LibraryElement2 library);
+  bool isAccessibleIn2(LibraryElement library);
 
   /// Returns either this element or the most immediate ancestor of this element
   /// for which the [predicate] returns `true`.
   ///
   /// Returns `null` if there is no such element.
-  Element2? thisOrAncestorMatching2(bool Function(Element2) predicate);
+  Element? thisOrAncestorMatching2(bool Function(Element) predicate);
 
   /// Returns either this element or the most immediate ancestor of this element
   /// that has the given type.
   ///
   /// Returns `null` if there is no such element.
-  E? thisOrAncestorOfType2<E extends Element2>();
+  E? thisOrAncestorOfType2<E extends Element>();
 
   /// Uses the given [visitor] to visit all of the children of this element.
   /// There is no guarantee of the order in which the children will be visited.
@@ -609,11 +711,11 @@ abstract class ElementAnnotation implements ConstantEvaluationTarget {
   ///
   /// In valid code this element can be a [GetterElement] of a constant
   /// top-level variable, or a constant static field of a class; or a
-  /// constant [ConstructorElement2].
+  /// constant [ConstructorElement].
   ///
   /// In invalid code this element can be `null`, or a reference to any
   /// other element.
-  Element2? get element2;
+  Element? get element2;
 
   /// Whether the annotation marks the associated function as always throwing.
   bool get isAlwaysThrows;
@@ -948,61 +1050,61 @@ class ElementKind implements Comparable<ElementKind> {
 /// * ThrowingElementVisitor which implements every visit method by throwing an
 ///   exception.
 abstract class ElementVisitor2<R> {
-  R? visitClassElement(ClassElement2 element);
+  R? visitClassElement(ClassElement element);
 
-  R? visitConstructorElement(ConstructorElement2 element);
+  R? visitConstructorElement(ConstructorElement element);
 
-  R? visitEnumElement(EnumElement2 element);
+  R? visitEnumElement(EnumElement element);
 
-  R? visitExtensionElement(ExtensionElement2 element);
+  R? visitExtensionElement(ExtensionElement element);
 
-  R? visitExtensionTypeElement(ExtensionTypeElement2 element);
+  R? visitExtensionTypeElement(ExtensionTypeElement element);
 
-  R? visitFieldElement(FieldElement2 element);
+  R? visitFieldElement(FieldElement element);
 
-  R? visitFieldFormalParameterElement(FieldFormalParameterElement2 element);
+  R? visitFieldFormalParameterElement(FieldFormalParameterElement element);
 
   R? visitFormalParameterElement(FormalParameterElement element);
 
-  R? visitGenericFunctionTypeElement(GenericFunctionTypeElement2 element);
+  R? visitGenericFunctionTypeElement(GenericFunctionTypeElement element);
 
   R? visitGetterElement(GetterElement element);
 
-  R? visitLabelElement(LabelElement2 element);
+  R? visitLabelElement(LabelElement element);
 
-  R? visitLibraryElement(LibraryElement2 element);
+  R? visitLibraryElement(LibraryElement element);
 
   R? visitLocalFunctionElement(LocalFunctionElement element);
 
-  R? visitLocalVariableElement(LocalVariableElement2 element);
+  R? visitLocalVariableElement(LocalVariableElement element);
 
-  R? visitMethodElement(MethodElement2 element);
+  R? visitMethodElement(MethodElement element);
 
-  R? visitMixinElement(MixinElement2 element);
+  R? visitMixinElement(MixinElement element);
 
-  R? visitMultiplyDefinedElement(MultiplyDefinedElement2 element);
+  R? visitMultiplyDefinedElement(MultiplyDefinedElement element);
 
-  R? visitPrefixElement(PrefixElement2 element);
+  R? visitPrefixElement(PrefixElement element);
 
   R? visitSetterElement(SetterElement element);
 
-  R? visitSuperFormalParameterElement(SuperFormalParameterElement2 element);
+  R? visitSuperFormalParameterElement(SuperFormalParameterElement element);
 
   R? visitTopLevelFunctionElement(TopLevelFunctionElement element);
 
-  R? visitTopLevelVariableElement(TopLevelVariableElement2 element);
+  R? visitTopLevelVariableElement(TopLevelVariableElement element);
 
-  R? visitTypeAliasElement(TypeAliasElement2 element);
+  R? visitTypeAliasElement(TypeAliasElement element);
 
-  R? visitTypeParameterElement(TypeParameterElement2 element);
+  R? visitTypeParameterElement(TypeParameterElement element);
 }
 
 /// An element that represents an enum.
 ///
 /// Clients may not extend, implement or mix-in this class.
-abstract class EnumElement2 implements InterfaceElement2 {
+abstract class EnumElement implements InterfaceElement {
   /// The constants defined by the enum.
-  List<FieldElement2> get constants2;
+  List<FieldElement> get constants2;
 
   @override
   EnumFragment get firstFragment;
@@ -1011,15 +1113,15 @@ abstract class EnumElement2 implements InterfaceElement2 {
   List<EnumFragment> get fragments;
 }
 
-/// The portion of an [EnumElement2] contributed by a single declaration.
+/// The portion of an [EnumElement] contributed by a single declaration.
 ///
 /// Clients may not extend, implement or mix-in this class.
 abstract class EnumFragment implements InterfaceFragment {
   /// The constants defined by this fragment of the enum.
-  List<FieldElement2> get constants2;
+  List<FieldElement> get constants2;
 
   @override
-  EnumElement2 get element;
+  EnumElement get element;
 
   @override
   EnumFragment? get nextFragment;
@@ -1032,9 +1134,9 @@ abstract class EnumFragment implements InterfaceFragment {
 /// constructors, getters, and setters.
 ///
 /// Clients may not extend, implement or mix-in this class.
-abstract class ExecutableElement2 implements FunctionTypedElement2 {
+abstract class ExecutableElement implements FunctionTypedElement {
   @override
-  ExecutableElement2 get baseElement;
+  ExecutableElement get baseElement;
 
   @override
   ExecutableFragment get firstFragment;
@@ -1068,12 +1170,12 @@ abstract class ExecutableElement2 implements FunctionTypedElement2 {
   bool get isStatic;
 }
 
-/// The portion of an [ExecutableElement2] contributed by a single declaration.
+/// The portion of an [ExecutableElement] contributed by a single declaration.
 ///
 /// Clients may not extend, implement or mix-in this class.
 abstract class ExecutableFragment implements FunctionTypedFragment {
   @override
-  ExecutableElement2 get element;
+  ExecutableElement get element;
 
   /// Whether the body is marked as being asynchronous.
   bool get isAsynchronous;
@@ -1110,7 +1212,7 @@ abstract class ExecutableFragment implements FunctionTypedFragment {
 /// An extension.
 ///
 /// Clients may not extend, implement or mix-in this class.
-abstract class ExtensionElement2 implements InstanceElement2 {
+abstract class ExtensionElement implements InstanceElement {
   /// The type that is extended by this extension.
   DartType get extendedType;
 
@@ -1121,13 +1223,13 @@ abstract class ExtensionElement2 implements InstanceElement2 {
   List<ExtensionFragment> get fragments;
 }
 
-/// The portion of an [ExtensionElement2] contributed by a single
+/// The portion of an [ExtensionElement] contributed by a single
 /// declaration.
 ///
 /// Clients may not extend, implement, or mix-in this class.
 abstract class ExtensionFragment implements InstanceFragment {
   @override
-  ExtensionElement2 get element;
+  ExtensionElement get element;
 
   @override
   ExtensionFragment? get nextFragment;
@@ -1146,7 +1248,7 @@ abstract class ExtensionFragment implements InstanceFragment {
 /// An extension type.
 ///
 /// Clients may not extend, implement or mix-in this class.
-abstract class ExtensionTypeElement2 implements InterfaceElement2 {
+abstract class ExtensionTypeElement implements InterfaceElement {
   @override
   ExtensionTypeFragment get firstFragment;
 
@@ -1154,10 +1256,10 @@ abstract class ExtensionTypeElement2 implements InterfaceElement2 {
   List<ExtensionTypeFragment> get fragments;
 
   /// The primary constructor of this extension.
-  ConstructorElement2 get primaryConstructor2;
+  ConstructorElement get primaryConstructor2;
 
   /// The representation of this extension.
-  FieldElement2 get representation2;
+  FieldElement get representation2;
 
   /// The extension type erasure, obtained by recursively replacing every
   /// subterm which is an extension type by the corresponding representation
@@ -1165,13 +1267,13 @@ abstract class ExtensionTypeElement2 implements InterfaceElement2 {
   DartType get typeErasure;
 }
 
-/// The portion of an [ExtensionTypeElement2] contributed by a single
+/// The portion of an [ExtensionTypeElement] contributed by a single
 /// declaration.
 ///
 /// Clients may not extend, implement, or mix-in this class.
 abstract class ExtensionTypeFragment implements InterfaceFragment {
   @override
-  ExtensionTypeElement2 get element;
+  ExtensionTypeElement get element;
 
   @override
   ExtensionTypeFragment? get nextFragment;
@@ -1188,12 +1290,12 @@ abstract class ExtensionTypeFragment implements InterfaceFragment {
 /// A field defined within a class, enum, extension, or mixin.
 ///
 /// Clients may not extend, implement or mix-in this class.
-abstract class FieldElement2 implements PropertyInducingElement2 {
+abstract class FieldElement implements PropertyInducingElement {
   @override
-  FieldElement2 get baseElement;
+  FieldElement get baseElement;
 
   @override
-  InstanceElement2 get enclosingElement2;
+  InstanceElement get enclosingElement2;
 
   @override
   FieldFragment get firstFragment;
@@ -1223,11 +1325,11 @@ abstract class FieldElement2 implements PropertyInducingElement2 {
 /// A field formal parameter defined within a constructor element.
 ///
 /// Clients may not extend, implement or mix-in this class.
-abstract class FieldFormalParameterElement2 implements FormalParameterElement {
+abstract class FieldFormalParameterElement implements FormalParameterElement {
   /// The field element associated with this field formal parameter.
   ///
   /// Returns `null` if the parameter references a field that doesn't exist.
-  FieldElement2? get field2;
+  FieldElement? get field2;
 
   @override
   FieldFormalParameterFragment get firstFragment;
@@ -1236,13 +1338,13 @@ abstract class FieldFormalParameterElement2 implements FormalParameterElement {
   List<FieldFormalParameterFragment> get fragments;
 }
 
-/// The portion of a [FieldFormalParameterElement2] contributed by a single
+/// The portion of a [FieldFormalParameterElement] contributed by a single
 /// declaration.
 ///
 /// Clients may not extend, implement, or mix-in this class.
 abstract class FieldFormalParameterFragment implements FormalParameterFragment {
   @override
-  FieldFormalParameterElement2 get element;
+  FieldFormalParameterElement get element;
 
   @override
   FieldFormalParameterFragment? get nextFragment;
@@ -1251,12 +1353,12 @@ abstract class FieldFormalParameterFragment implements FormalParameterFragment {
   FieldFormalParameterFragment? get previousFragment;
 }
 
-/// The portion of a [FieldElement2] contributed by a single declaration.
+/// The portion of a [FieldElement] contributed by a single declaration.
 ///
 /// Clients may not extend, implement, or mix-in this class.
 abstract class FieldFragment implements PropertyInducingFragment {
   @override
-  FieldElement2 get element;
+  FieldElement get element;
 
   @override
   FieldFragment? get nextFragment;
@@ -1278,10 +1380,10 @@ abstract class FieldFragment implements PropertyInducingFragment {
 /// Clients may not extend, implement or mix-in this class.
 abstract class FormalParameterElement
     implements
-        PromotableElement2,
+        PromotableElement,
         Annotatable,
         HasSinceSdkVersion,
-        LocalElement2 {
+        LocalElement {
   @override
   FormalParameterElement get baseElement;
 
@@ -1368,7 +1470,7 @@ abstract class FormalParameterElement
   ///
   /// A parameter will only define type parameters if it is a function typed
   /// parameter.
-  List<TypeParameterElement2> get typeParameters2;
+  List<TypeParameterElement> get typeParameters2;
 
   /// Appends the type, name and possibly the default value of this parameter
   /// to the given [buffer].
@@ -1417,7 +1519,7 @@ abstract class Fragment {
   List<Fragment> get children3;
 
   /// The element composed from this fragment and possibly other fragments.
-  Element2 get element;
+  Element get element;
 
   /// The fragment that either physically or logically encloses this fragment.
   ///
@@ -1440,7 +1542,7 @@ abstract class Fragment {
   /// For an unnamed [ConstructorFragment] the name is `new`, but [nameOffset2]
   /// is `null`. If there is an explicit `ClassName.new`, the name is also
   /// `new`, and [nameOffset2] is not `null`. For a synthetic default unnamed
-  /// [ConstructorElement2] there is always a synthetic [ConstructorFragment]
+  /// [ConstructorElement] there is always a synthetic [ConstructorFragment]
   /// with the name `new`, and [nameOffset2] is `null`.
   ///
   /// If the fragment declaration node does not have the name specified, and
@@ -1498,7 +1600,7 @@ abstract class Fragment {
 /// This also provides convenient access to the parameters and return type.
 ///
 /// Clients may not extend, implement or mix-in this class.
-abstract class FunctionTypedElement2 implements TypeParameterizedElement2 {
+abstract class FunctionTypedElement implements TypeParameterizedElement {
   @override
   FunctionTypedFragment get firstFragment;
 
@@ -1515,12 +1617,12 @@ abstract class FunctionTypedElement2 implements TypeParameterizedElement2 {
   FunctionType get type;
 }
 
-/// The portion of a [FunctionTypedElement2] contributed by a single declaration.
+/// The portion of a [FunctionTypedElement] contributed by a single declaration.
 ///
 /// Clients may not extend, implement, or mix-in this class.
 abstract class FunctionTypedFragment implements TypeParameterizedFragment {
   @override
-  FunctionTypedElement2 get element;
+  FunctionTypedElement get element;
 
   /// The formal parameters defined by this fragment.
   List<FormalParameterFragment> get formalParameters;
@@ -1535,7 +1637,7 @@ abstract class FunctionTypedFragment implements TypeParameterizedFragment {
 /// The pseudo-declaration that defines a generic function type.
 ///
 /// Clients may not extend, implement, or mix-in this class.
-abstract class GenericFunctionTypeElement2 implements FunctionTypedElement2 {
+abstract class GenericFunctionTypeElement implements FunctionTypedElement {
   @override
   GenericFunctionTypeFragment get firstFragment;
 
@@ -1543,13 +1645,13 @@ abstract class GenericFunctionTypeElement2 implements FunctionTypedElement2 {
   List<GenericFunctionTypeFragment> get fragments;
 }
 
-/// The portion of a [GenericFunctionTypeElement2] coming from a single
+/// The portion of a [GenericFunctionTypeElement] coming from a single
 /// declaration.
 ///
 /// Clients may not extend, implement or mix-in this class.
 abstract class GenericFunctionTypeFragment implements FunctionTypedFragment {
   @override
-  GenericFunctionTypeElement2 get element;
+  GenericFunctionTypeElement get element;
 
   @override
   GenericFunctionTypeFragment? get nextFragment;
@@ -1571,7 +1673,7 @@ abstract class GenericFunctionTypeFragment implements FunctionTypedFragment {
 /// top-level variable or a field. Induced getters are synthetic.
 ///
 /// Clients may not extend, implement or mix-in this class.
-abstract class GetterElement implements PropertyAccessorElement2 {
+abstract class GetterElement implements PropertyAccessorElement {
   @override
   GetterElement get baseElement;
 
@@ -1642,19 +1744,19 @@ abstract class HideElementCombinator implements NamespaceCombinator {
 /// An element whose instance members can refer to `this`.
 ///
 /// Clients may not extend, implement or mix-in this class.
-abstract class InstanceElement2
+abstract class InstanceElement
     implements
-        TypeDefiningElement2,
-        TypeParameterizedElement2,
+        TypeDefiningElement,
+        TypeParameterizedElement,
         HasSinceSdkVersion {
   @override
-  InstanceElement2 get baseElement;
+  InstanceElement get baseElement;
 
   @override
-  LibraryElement2 get enclosingElement2;
+  LibraryElement get enclosingElement2;
 
   /// The fields declared in this element.
-  List<FieldElement2> get fields2;
+  List<FieldElement> get fields2;
 
   @override
   InstanceFragment get firstFragment;
@@ -1666,7 +1768,7 @@ abstract class InstanceElement2
   List<GetterElement> get getters2;
 
   /// The methods declared in this element.
-  List<MethodElement2> get methods2;
+  List<MethodElement> get methods2;
 
   /// The setters declared in this element.
   List<SetterElement> get setters2;
@@ -1675,13 +1777,13 @@ abstract class InstanceElement2
   DartType get thisType;
 
   /// Returns the field from [fields2] that has the given [name].
-  FieldElement2? getField2(String name);
+  FieldElement? getField2(String name);
 
   /// Returns the getter from [getters2] that has the given [name].
   GetterElement? getGetter2(String name);
 
   /// Returns the method from [methods2] that has the given [name].
-  MethodElement2? getMethod2(String name);
+  MethodElement? getMethod2(String name);
 
   /// Returns the setter from [setters2] that has the given [name].
   SetterElement? getSetter2(String name);
@@ -1694,7 +1796,7 @@ abstract class InstanceElement2
   /// in section 17.18 Lookup.
   GetterElement? lookUpGetter2({
     required String name,
-    required LibraryElement2 library,
+    required LibraryElement library,
   });
 
   /// Returns the element representing the method that results from looking up
@@ -1703,9 +1805,9 @@ abstract class InstanceElement2
   ///
   /// The behavior of this method is defined by the Dart Language Specification
   /// in section 17.18 Lookup.
-  MethodElement2? lookUpMethod2({
+  MethodElement? lookUpMethod2({
     required String name,
-    required LibraryElement2 library,
+    required LibraryElement library,
   });
 
   /// Returns the element representing the setter that results from looking up
@@ -1716,17 +1818,17 @@ abstract class InstanceElement2
   /// in section 17.18 Lookup.
   SetterElement? lookUpSetter2({
     required String name,
-    required LibraryElement2 library,
+    required LibraryElement library,
   });
 }
 
-/// The portion of an [InstanceElement2] contributed by a single declaration.
+/// The portion of an [InstanceElement] contributed by a single declaration.
 ///
 /// Clients may not extend, implement or mix-in this class.
 abstract class InstanceFragment
     implements TypeDefiningFragment, TypeParameterizedFragment {
   @override
-  InstanceElement2 get element;
+  InstanceElement get element;
 
   @override
   LibraryFragment? get enclosingFragment;
@@ -1761,7 +1863,7 @@ abstract class InstanceFragment
 /// An element that defines an [InterfaceType].
 ///
 /// Clients may not extend, implement or mix-in this class.
-abstract class InterfaceElement2 implements InstanceElement2 {
+abstract class InterfaceElement implements InstanceElement {
   /// All the supertypes defined for this element and its supertypes.
   ///
   /// This includes superclasses, mixins, interfaces, and superclass
@@ -1770,8 +1872,8 @@ abstract class InterfaceElement2 implements InstanceElement2 {
 
   /// The constructors defined for this element.
   ///
-  /// The list is empty for [MixinElement2].
-  List<ConstructorElement2> get constructors2;
+  /// The list is empty for [MixinElement].
+  List<ConstructorElement> get constructors2;
 
   @override
   InterfaceFragment get firstFragment;
@@ -1794,7 +1896,7 @@ abstract class InterfaceElement2 implements InstanceElement2 {
   /// This method is potentially expensive, since it needs to consider all
   /// possible inherited names. If you only need to look up a certain specific
   /// name (or names), use [getInheritedConcreteMember] instead.
-  Map<Name, ExecutableElement2> get inheritedConcreteMembers;
+  Map<Name, ExecutableElement> get inheritedConcreteMembers;
 
   /// Returns a map of all members that this type inherits from supertypes via
   /// `extends`, `with`, `implements`, or `on` clauses, keyed by the member's
@@ -1811,7 +1913,7 @@ abstract class InterfaceElement2 implements InstanceElement2 {
   /// This method is potentially expensive, since it needs to consider all
   /// possible inherited names. If you only need to look up a certain specific
   /// name (or names), use [getInheritedMember] instead.
-  Map<Name, ExecutableElement2> get inheritedMembers;
+  Map<Name, ExecutableElement> get inheritedMembers;
 
   /// Returns a map of all members in the type's interface, keyed by the
   /// member's [Name].
@@ -1822,7 +1924,7 @@ abstract class InterfaceElement2 implements InstanceElement2 {
   /// This method is potentially expensive, since it needs to consider all
   /// possible interface names. If you only need to look up a certain specific
   /// name (or names), use [getInterfaceMember] instead.
-  Map<Name, ExecutableElement2> get interfaceMembers;
+  Map<Name, ExecutableElement> get interfaceMembers;
 
   /// The interfaces that are implemented by this class.
   ///
@@ -1836,9 +1938,9 @@ abstract class InterfaceElement2 implements InstanceElement2 {
   /// The mixins that are applied to the class being extended in order to
   /// derive the superclass of this class.
   ///
-  /// [ClassElement2] and [EnumElement2] can have mixins.
+  /// [ClassElement] and [EnumElement] can have mixins.
   ///
-  /// [MixinElement2] cannot have mixins, so an empty list is returned.
+  /// [MixinElement] cannot have mixins, so an empty list is returned.
   ///
   /// <b>Note:</b> Because the element model represents the state of the code,
   /// it is possible for it to be semantically invalid. In particular, it is not
@@ -1849,13 +1951,13 @@ abstract class InterfaceElement2 implements InstanceElement2 {
 
   /// The superclass of this element.
   ///
-  /// For [ClassElement2] returns `null` only if this class is `Object`. If the
+  /// For [ClassElement] returns `null` only if this class is `Object`. If the
   /// superclass is not explicitly specified, or the superclass cannot be
   /// resolved, then the implicit superclass `Object` is returned.
   ///
-  /// For [EnumElement2] returns `Enum` from `dart:core`.
+  /// For [EnumElement] returns `Enum` from `dart:core`.
   ///
-  /// For [MixinElement2] always returns `null`.
+  /// For [MixinElement] always returns `null`.
   ///
   /// <b>Note:</b> Because the element model represents the state of the code,
   /// it is possible for it to be semantically invalid. In particular, it is not
@@ -1871,7 +1973,7 @@ abstract class InterfaceElement2 implements InstanceElement2 {
   ///
   /// If the class does not declare any constructors, a synthetic default
   /// constructor will be returned.
-  ConstructorElement2? get unnamedConstructor2;
+  ConstructorElement? get unnamedConstructor2;
 
   /// Returns the most specific member with the given [name] that this type
   /// inherits from a superclass or mixin.
@@ -1882,7 +1984,7 @@ abstract class InterfaceElement2 implements InstanceElement2 {
   /// [inheritedConcreteMembers] and then using the `[]` operator, but it
   /// potentially has better performance, since it does not need to consider all
   /// possible inherited names.
-  ExecutableElement2? getInheritedConcreteMember(Name name);
+  ExecutableElement? getInheritedConcreteMember(Name name);
 
   /// Returns the most specific member with the given [name] that this type
   /// inherits from a supertype via an `extends`, `with`, `implements`, or `on`
@@ -1894,7 +1996,7 @@ abstract class InterfaceElement2 implements InstanceElement2 {
   /// This method is semantically equivalent to calling [inheritedMembers] and
   /// then using the `[]` operator, but it potentially has better performance,
   /// since it does not need to consider all possible inherited names.
-  ExecutableElement2? getInheritedMember(Name name);
+  ExecutableElement? getInheritedMember(Name name);
 
   /// Returns the most specific member with the given [name] in this type's
   /// interface.
@@ -1906,10 +2008,10 @@ abstract class InterfaceElement2 implements InstanceElement2 {
   /// This method is semantically equivalent to calling [interfaceMembers] and
   /// then using the `[]` operator, but it potentially has better performance,
   /// since it does not need to consider all possible interface names.
-  ExecutableElement2? getInterfaceMember(Name name);
+  ExecutableElement? getInterfaceMember(Name name);
 
   /// Returns the constructor from [constructors2] that has the given [name].
-  ConstructorElement2? getNamedConstructor2(String name);
+  ConstructorElement? getNamedConstructor2(String name);
 
   /// Returns all members of mixins, superclasses, and interfaces that a member
   /// with the given [name], defined in this element, would override; or `null`
@@ -1928,7 +2030,7 @@ abstract class InterfaceElement2 implements InstanceElement2 {
   /// However, if the example were changed so that `class C` both `extends B`
   /// *and* `implements A`, then a list containing both `A.m` and `B.m` would be
   /// returned.
-  List<ExecutableElement2>? getOverridden(Name name);
+  List<ExecutableElement>? getOverridden(Name name);
 
   /// Create the [InterfaceType] for this element with the given
   /// [typeArguments] and [nullabilitySuffix].
@@ -1953,9 +2055,9 @@ abstract class InterfaceElement2 implements InstanceElement2 {
   /// failed.
   /// </blockquote>
   // TODO(scheglov): Deprecate and remove it.
-  MethodElement2? lookUpConcreteMethod(
+  MethodElement? lookUpConcreteMethod(
     String methodName,
-    LibraryElement2 library,
+    LibraryElement library,
   );
 
   /// Returns the element representing the method that results from looking up
@@ -1974,13 +2076,13 @@ abstract class InterfaceElement2 implements InstanceElement2 {
   /// failed.
   /// </blockquote>
   // TODO(scheglov): Deprecate and remove it.
-  MethodElement2? lookUpInheritedMethod2({
+  MethodElement? lookUpInheritedMethod2({
     required String methodName,
-    required LibraryElement2 library,
+    required LibraryElement library,
   });
 }
 
-/// The portion of an [InterfaceElement2] contributed by a single declaration.
+/// The portion of an [InterfaceElement] contributed by a single declaration.
 ///
 /// Clients may not extend, implement or mix-in this class.
 abstract class InterfaceFragment implements InstanceFragment {
@@ -1990,7 +2092,7 @@ abstract class InterfaceFragment implements InstanceFragment {
   List<ConstructorFragment> get constructors2;
 
   @override
-  InterfaceElement2 get element;
+  InterfaceElement get element;
 
   /// The interfaces that are implemented by this fragment.
   List<InterfaceType> get interfaces;
@@ -2016,7 +2118,7 @@ abstract class InterfaceFragment implements InstanceFragment {
 /// for a logical-or patterns, or shared `case` bodies in `switch` statements.
 ///
 /// Clients may not extend, implement or mix-in this class.
-abstract class JoinPatternVariableElement2 implements PatternVariableElement2 {
+abstract class JoinPatternVariableElement implements PatternVariableElement {
   @override
   JoinPatternVariableFragment get firstFragment;
 
@@ -2030,16 +2132,16 @@ abstract class JoinPatternVariableElement2 implements PatternVariableElement2 {
   bool get isConsistent;
 
   /// The variables that join into this variable.
-  List<PatternVariableElement2> get variables2;
+  List<PatternVariableElement> get variables2;
 }
 
-/// The portion of a [JoinPatternVariableElement2] contributed by a single
+/// The portion of a [JoinPatternVariableElement] contributed by a single
 /// declaration.
 ///
 /// Clients may not extend, implement or mix-in this class.
 abstract class JoinPatternVariableFragment implements PatternVariableFragment {
   @override
-  JoinPatternVariableElement2 get element;
+  JoinPatternVariableElement get element;
 
   /// Whether the [variables2] are consistent.
   ///
@@ -2064,10 +2166,10 @@ abstract class JoinPatternVariableFragment implements PatternVariableFragment {
 /// A label associated with a statement.
 ///
 /// Clients may not extend, implement or mix-in this class.
-abstract class LabelElement2 implements Element2 {
+abstract class LabelElement implements Element {
   @override
   // TODO(brianwilkerson): We shouldn't be inheriting this member.
-  ExecutableElement2? get enclosingElement2;
+  ExecutableElement? get enclosingElement2;
 
   @override
   LabelFragment get firstFragment;
@@ -2076,15 +2178,15 @@ abstract class LabelElement2 implements Element2 {
   List<LabelFragment> get fragments;
 
   @override
-  LibraryElement2 get library2;
+  LibraryElement get library2;
 }
 
-/// The portion of a [LabelElement2] contributed by a single declaration.
+/// The portion of a [LabelElement] contributed by a single declaration.
 ///
 /// Clients may not extend, implement or mix-in this class.
 abstract class LabelFragment implements Fragment {
   @override
-  LabelElement2 get element;
+  LabelElement get element;
 
   @override
   LabelFragment? get nextFragment;
@@ -2096,13 +2198,13 @@ abstract class LabelFragment implements Fragment {
 /// A library.
 ///
 /// Clients may not extend, implement or mix-in this class.
-abstract class LibraryElement2
-    implements Element2, Annotatable, HasSinceSdkVersion {
+abstract class LibraryElement
+    implements Element, Annotatable, HasSinceSdkVersion {
   /// The classes defined in this library.
   ///
   /// There is no guarantee of the order in which the classes will be returned.
   /// In particular, they are not guaranteed to be in lexical order.
-  List<ClassElement2> get classes;
+  List<ClassElement> get classes;
 
   /// The entry point for this library.
   ///
@@ -2116,7 +2218,7 @@ abstract class LibraryElement2
   ///
   /// There is no guarantee of the order in which the enums will be returned.
   /// In particular, they are not guaranteed to be in lexical order.
-  List<EnumElement2> get enums;
+  List<EnumElement> get enums;
 
   /// The libraries that are exported from this library.
   ///
@@ -2124,7 +2226,7 @@ abstract class LibraryElement2
   /// returned. In particular, they are not guaranteed to be in lexical order.
   // TODO(brianwilkerson): Consider removing this from the public API. It isn't
   //  clear that it's useful, given that it ignores hide and show clauses.
-  List<LibraryElement2> get exportedLibraries2;
+  List<LibraryElement> get exportedLibraries2;
 
   /// The export [Namespace] of this library.
   Namespace get exportNamespace;
@@ -2133,13 +2235,13 @@ abstract class LibraryElement2
   ///
   /// There is no guarantee of the order in which the extensions will be
   /// returned. In particular, they are not guaranteed to be in lexical order.
-  List<ExtensionElement2> get extensions;
+  List<ExtensionElement> get extensions;
 
   /// The extension types defined in this library.
   ///
   /// There is no guarantee of the order in which the extension types will be
   /// returned. In particular, they are not guaranteed to be in lexical order.
-  List<ExtensionTypeElement2> get extensionTypes;
+  List<ExtensionTypeElement> get extensionTypes;
 
   /// The set of features available to this library.
   ///
@@ -2181,7 +2283,7 @@ abstract class LibraryElement2
   LibraryLanguageVersion get languageVersion;
 
   @override
-  LibraryElement2 get library2;
+  LibraryElement get library2;
 
   /// The element representing the synthetic function `loadLibrary`.
   ///
@@ -2194,7 +2296,7 @@ abstract class LibraryElement2
   ///
   /// There is no guarantee of the order in which the mixins will be returned.
   /// In particular, they are not guaranteed to be in lexical order.
-  List<MixinElement2> get mixins;
+  List<MixinElement> get mixins;
 
   /// The public [Namespace] of this library.
   Namespace get publicNamespace;
@@ -2220,13 +2322,13 @@ abstract class LibraryElement2
   /// There is no guarantee of the order in which the top level variables will
   /// be returned. In particular, they are not guaranteed to be in lexical
   /// order.
-  List<TopLevelVariableElement2> get topLevelVariables;
+  List<TopLevelVariableElement> get topLevelVariables;
 
   /// The type aliases defined in this library.
   ///
   /// There is no guarantee of the order in which the type aliases will be
   /// returned. In particular, they are not guaranteed to be in lexical order.
-  List<TypeAliasElement2> get typeAliases;
+  List<TypeAliasElement> get typeAliases;
 
   /// The [TypeProvider] that is used in this library.
   TypeProvider get typeProvider;
@@ -2240,23 +2342,23 @@ abstract class LibraryElement2
   Uri get uri;
 
   /// Returns the class defined in this library that has the given [name].
-  ClassElement2? getClass2(String name);
+  ClassElement? getClass2(String name);
 
   /// Returns the enum defined in this library that has the given [name].
-  EnumElement2? getEnum2(String name);
+  EnumElement? getEnum2(String name);
 
   /// Returns the extension defined in this library that has the given [name].
-  ExtensionElement2? getExtension(String name);
+  ExtensionElement? getExtension(String name);
 
   /// Returns the extension type defined in this library that has the
   /// given [name].
-  ExtensionTypeElement2? getExtensionType(String name);
+  ExtensionTypeElement? getExtensionType(String name);
 
   /// Returns the getter defined in this library that has the given [name].
   GetterElement? getGetter(String name);
 
   /// Returns the mixin defined in this library that has the given [name].
-  MixinElement2? getMixin2(String name);
+  MixinElement? getMixin2(String name);
 
   /// Returns the setter defined in this library that has the given [name].
   SetterElement? getSetter(String name);
@@ -2266,10 +2368,10 @@ abstract class LibraryElement2
 
   /// Returns the top-level variable defined in this library that has the
   /// given [name].
-  TopLevelVariableElement2? getTopLevelVariable(String name);
+  TopLevelVariableElement? getTopLevelVariable(String name);
 
   /// Returns the type alias defined in this library that has the given [name].
-  TypeAliasElement2? getTypeAlias(String name);
+  TypeAliasElement? getTypeAlias(String name);
 }
 
 /// An `export` directive within a library fragment.
@@ -2281,23 +2383,23 @@ abstract class LibraryExport implements ElementDirective {
   /// The combinators are in the order in which they were specified.
   List<NamespaceCombinator> get combinators;
 
-  /// The [LibraryElement2], if [uri] is a [DirectiveUriWithLibrary].
-  LibraryElement2? get exportedLibrary2;
+  /// The [LibraryElement], if [uri] is a [DirectiveUriWithLibrary].
+  LibraryElement? get exportedLibrary2;
 
   /// The offset of the `export` keyword.
   int get exportKeywordOffset;
 }
 
-/// The portion of a [LibraryElement2] coming from a single compilation unit.
+/// The portion of a [LibraryElement] coming from a single compilation unit.
 abstract class LibraryFragment implements Fragment, Annotatable {
   /// The extension elements accessible within this fragment.
-  List<ExtensionElement2> get accessibleExtensions2;
+  List<ExtensionElement> get accessibleExtensions2;
 
   /// The fragments of the classes declared in this fragment.
   List<ClassFragment> get classes2;
 
   @override
-  LibraryElement2 get element;
+  LibraryElement get element;
 
   @override
   LibraryFragment? get enclosingFragment;
@@ -2321,7 +2423,7 @@ abstract class LibraryFragment implements Fragment, Annotatable {
   ///
   /// This includes all of the libraries that are imported using a prefix, and
   /// those that are imported without a prefix.
-  List<LibraryElement2> get importedLibraries2;
+  List<LibraryElement> get importedLibraries2;
 
   /// The libraries exported by this unit.
   List<LibraryExport> get libraryExports2;
@@ -2349,7 +2451,7 @@ abstract class LibraryFragment implements Fragment, Annotatable {
   /// The prefixes used by [libraryImports2].
   ///
   /// Each prefix can be used in more than one `import` directive.
-  List<PrefixElement2> get prefixes;
+  List<PrefixElement> get prefixes;
 
   @override
   LibraryFragment? get previousFragment;
@@ -2382,8 +2484,8 @@ abstract class LibraryImport implements ElementDirective {
   /// The combinators are in the order in which they were specified.
   List<NamespaceCombinator> get combinators;
 
-  /// The [LibraryElement2], if [uri] is a [DirectiveUriWithLibrary].
-  LibraryElement2? get importedLibrary2;
+  /// The [LibraryElement], if [uri] is a [DirectiveUriWithLibrary].
+  LibraryElement? get importedLibrary2;
 
   /// The offset of the `import` keyword.
   int get importKeywordOffset;
@@ -2423,9 +2525,9 @@ class LibraryLanguageVersion {
 /// or function (an [ExecutableFragment]).
 ///
 /// Clients may not extend, implement or mix-in this class.
-abstract class LocalElement2 implements Element2 {}
+abstract class LocalElement implements Element {}
 
-/// The portion of an [LocalElement2] contributed by a single declaration.
+/// The portion of an [LocalElement] contributed by a single declaration.
 ///
 /// Clients may not extend, implement or mix-in this class.
 abstract class LocalFragment implements Fragment {}
@@ -2436,8 +2538,7 @@ abstract class LocalFragment implements Fragment {}
 /// expression for a field or variable.
 ///
 /// Clients may not extend, implement or mix-in this class.
-abstract class LocalFunctionElement
-    implements ExecutableElement2, LocalElement2 {
+abstract class LocalFunctionElement implements ExecutableElement, LocalElement {
   @override
   LocalFunctionFragment get firstFragment;
 
@@ -2471,10 +2572,10 @@ abstract class LocalFunctionFragment
 /// A local variable.
 ///
 /// Clients may not extend, implement or mix-in this class.
-abstract class LocalVariableElement2
-    implements PromotableElement2, LocalElement2, Annotatable {
+abstract class LocalVariableElement
+    implements PromotableElement, LocalElement, Annotatable {
   @override
-  LocalVariableElement2 get baseElement;
+  LocalVariableElement get baseElement;
 
   @override
   LocalVariableFragment get firstFragment;
@@ -2486,14 +2587,14 @@ abstract class LocalVariableElement2
   bool get hasInitializer;
 }
 
-/// The portion of a [LocalVariableElement2] contributed by a single
+/// The portion of a [LocalVariableElement] contributed by a single
 /// declaration.
 ///
 /// Clients may not extend, implement or mix-in this class.
 abstract class LocalVariableFragment
     implements PromotableFragment, LocalFragment {
   @override
-  LocalVariableElement2 get element;
+  LocalVariableElement get element;
 
   /// Whether the variable has an initializer at declaration.
   bool get hasInitializer;
@@ -2617,8 +2718,7 @@ abstract class Metadata {
 /// method.
 ///
 /// Clients may not extend, implement or mix-in this class.
-abstract class MethodElement2
-    implements ExecutableElement2, HasSinceSdkVersion {
+abstract class MethodElement implements ExecutableElement, HasSinceSdkVersion {
   /// The name of the method that can be implemented by a class to allow its
   /// instances to be invoked as if they were a function.
   static final String CALL_METHOD_NAME = "call";
@@ -2628,7 +2728,7 @@ abstract class MethodElement2
   static final String NO_SUCH_METHOD_METHOD_NAME = "noSuchMethod";
 
   @override
-  MethodElement2 get baseElement;
+  MethodElement get baseElement;
 
   @override
   MethodFragment get firstFragment;
@@ -2643,12 +2743,12 @@ abstract class MethodElement2
   bool get isOperator;
 }
 
-/// The portion of a [MethodElement2] contributed by a single declaration.
+/// The portion of a [MethodElement] contributed by a single declaration.
 ///
 /// Clients may not extend, implement or mix-in this class.
 abstract class MethodFragment implements ExecutableFragment {
   @override
-  MethodElement2 get element;
+  MethodElement get element;
 
   @override
   InstanceFragment? get enclosingFragment;
@@ -2663,7 +2763,7 @@ abstract class MethodFragment implements ExecutableFragment {
 /// An element that represents a mixin.
 ///
 /// Clients may not extend, implement or mix-in this class.
-abstract class MixinElement2 implements InterfaceElement2 {
+abstract class MixinElement implements InterfaceElement {
   @override
   MixinFragment get firstFragment;
 
@@ -2690,15 +2790,15 @@ abstract class MixinElement2 implements InterfaceElement2 {
 
   /// Whether the element, assuming that it is within scope, is
   /// implementable to classes, mixins, and enums in the given [library].
-  bool isImplementableIn2(LibraryElement2 library);
+  bool isImplementableIn2(LibraryElement library);
 }
 
-/// The portion of a [PrefixElement2] contributed by a single declaration.
+/// The portion of a [PrefixElement] contributed by a single declaration.
 ///
 /// Clients may not extend, implement or mix-in this class.
 abstract class MixinFragment implements InterfaceFragment {
   @override
-  MixinElement2 get element;
+  MixinElement get element;
 
   @override
   MixinFragment? get nextFragment;
@@ -2726,9 +2826,9 @@ abstract class MixinFragment implements InterfaceFragment {
 /// and will return useless results.
 ///
 /// Clients may not extend, implement or mix-in this class.
-abstract class MultiplyDefinedElement2 implements Element2 {
+abstract class MultiplyDefinedElement implements Element {
   /// The elements that were defined within the scope to have the same name.
-  List<Element2> get conflictingElements2;
+  List<Element> get conflictingElements2;
 
   @override
   MultiplyDefinedFragment get firstFragment;
@@ -2737,7 +2837,7 @@ abstract class MultiplyDefinedElement2 implements Element2 {
   List<MultiplyDefinedFragment> get fragments;
 }
 
-/// The fragment for a [MultiplyDefinedElement2].
+/// The fragment for a [MultiplyDefinedElement].
 ///
 /// It has no practical use, and exists for consistency, so that the
 /// corresponding element has a fragment.
@@ -2745,7 +2845,7 @@ abstract class MultiplyDefinedElement2 implements Element2 {
 /// Clients may not extend, implement or mix-in this class.
 abstract class MultiplyDefinedFragment implements Fragment {
   @override
-  MultiplyDefinedElement2 get element;
+  MultiplyDefinedElement get element;
 
   @override
   Null get nextFragment;
@@ -2781,7 +2881,7 @@ abstract class PartInclude implements ElementDirective {
 /// A pattern variable.
 ///
 /// Clients may not extend, implement or mix-in this class.
-abstract class PatternVariableElement2 implements LocalVariableElement2 {
+abstract class PatternVariableElement implements LocalVariableElement {
   @override
   PatternVariableFragment get firstFragment;
 
@@ -2790,16 +2890,16 @@ abstract class PatternVariableElement2 implements LocalVariableElement2 {
 
   /// The variable in which this variable joins with other pattern variables
   /// with the same name, in a logical-or pattern, or shared case scope.
-  JoinPatternVariableElement2? get join2;
+  JoinPatternVariableElement? get join2;
 }
 
-/// The portion of a [PatternVariableElement2] contributed by a single
+/// The portion of a [PatternVariableElement] contributed by a single
 /// declaration.
 ///
 /// Clients may not extend, implement or mix-in this class.
 abstract class PatternVariableFragment implements LocalVariableFragment {
   @override
-  PatternVariableElement2 get element;
+  PatternVariableElement get element;
 
   /// The variable in which this variable joins with other pattern variables
   /// with the same name, in a logical-or pattern, or shared case scope.
@@ -2815,7 +2915,7 @@ abstract class PatternVariableFragment implements LocalVariableFragment {
 /// A prefix used to import one or more libraries into another library.
 ///
 /// Clients may not extend, implement or mix-in this class.
-abstract class PrefixElement2 implements Element2 {
+abstract class PrefixElement implements Element {
   /// There is no enclosing element for import prefixes, which are elements,
   /// but exist inside a single [LibraryFragment], not an element.
   @override
@@ -2831,7 +2931,7 @@ abstract class PrefixElement2 implements Element2 {
   List<LibraryImport> get imports;
 
   @override
-  LibraryElement2 get library2;
+  LibraryElement get library2;
 
   /// The name lookup scope for this import prefix.
   ///
@@ -2841,12 +2941,12 @@ abstract class PrefixElement2 implements Element2 {
   Scope get scope;
 }
 
-/// The portion of a [PrefixElement2] contributed by a single declaration.
+/// The portion of a [PrefixElement] contributed by a single declaration.
 ///
 /// Clients may not extend, implement or mix-in this class.
 abstract class PrefixFragment implements Fragment {
   @override
-  PrefixElement2 get element;
+  PrefixElement get element;
 
   @override
   LibraryFragment? get enclosingFragment;
@@ -2865,7 +2965,7 @@ abstract class PrefixFragment implements Fragment {
 /// variable or a parameter.
 ///
 /// Clients may not extend, implement or mix-in this class.
-abstract class PromotableElement2 implements VariableElement2 {
+abstract class PromotableElement implements VariableElement {
   @override
   PromotableFragment get firstFragment;
 
@@ -2873,12 +2973,12 @@ abstract class PromotableElement2 implements VariableElement2 {
   List<PromotableFragment> get fragments;
 }
 
-/// The portion of a [PromotableElement2] contributed by a single declaration.
+/// The portion of a [PromotableElement] contributed by a single declaration.
 ///
 /// Clients may not extend, implement or mix-in this class.
 abstract class PromotableFragment implements VariableFragment {
   @override
-  PromotableElement2 get element;
+  PromotableElement get element;
 
   @override
   PromotableFragment? get nextFragment;
@@ -2894,12 +2994,12 @@ abstract class PromotableFragment implements VariableFragment {
 /// synthetic.
 ///
 /// Clients may not extend, implement or mix-in this class.
-abstract class PropertyAccessorElement2 implements ExecutableElement2 {
+abstract class PropertyAccessorElement implements ExecutableElement {
   @override
-  PropertyAccessorElement2 get baseElement;
+  PropertyAccessorElement get baseElement;
 
   @override
-  Element2 get enclosingElement2;
+  Element get enclosingElement2;
 
   @override
   PropertyAccessorFragment get firstFragment;
@@ -2911,7 +3011,7 @@ abstract class PropertyAccessorElement2 implements ExecutableElement2 {
   ///
   /// If this getter was explicitly defined (is not synthetic) then the variable
   /// associated with it will be synthetic.
-  PropertyInducingElement2? get variable3;
+  PropertyInducingElement? get variable3;
 }
 
 /// The portion of a [GetterElement] contributed by a single declaration.
@@ -2919,7 +3019,7 @@ abstract class PropertyAccessorElement2 implements ExecutableElement2 {
 /// Clients may not extend, implement or mix-in this class.
 abstract class PropertyAccessorFragment implements ExecutableFragment {
   @override
-  PropertyAccessorElement2 get element;
+  PropertyAccessorElement get element;
 
   @override
   PropertyAccessorFragment? get nextFragment;
@@ -2941,18 +3041,18 @@ abstract class PropertyAccessorFragment implements ExecutableFragment {
 /// explicitly defined getters and setters. The following rules apply:
 ///
 /// * Every explicit variable is represented by a non-synthetic
-///   [PropertyInducingElement2].
+///   [PropertyInducingElement].
 /// * Every explicit variable induces a synthetic [GetterElement],
 ///   possibly a synthetic [SetterElement.
 /// * Every explicit getter by a non-synthetic [GetterElement].
 /// * Every explicit setter by a non-synthetic [SetterElement].
 /// * Every explicit getter or setter (or pair thereof if they have the same
 ///   name) induces a variable that is represented by a synthetic
-///   [PropertyInducingElement2].
+///   [PropertyInducingElement].
 ///
 /// Clients may not extend, implement or mix-in this class.
-abstract class PropertyInducingElement2
-    implements VariableElement2, Annotatable, HasSinceSdkVersion {
+abstract class PropertyInducingElement
+    implements VariableElement, Annotatable, HasSinceSdkVersion {
   @override
   PropertyInducingFragment get firstFragment;
 
@@ -2969,7 +3069,7 @@ abstract class PropertyInducingElement2
   bool get hasInitializer;
 
   @override
-  LibraryElement2 get library2;
+  LibraryElement get library2;
 
   /// The setter associated with this variable.
   ///
@@ -2984,14 +3084,14 @@ abstract class PropertyInducingElement2
   SetterElement? get setter2;
 }
 
-/// The portion of a [PropertyInducingElement2] contributed by a single
+/// The portion of a [PropertyInducingElement] contributed by a single
 /// declaration.
 ///
 /// Clients may not extend, implement or mix-in this class.
 abstract class PropertyInducingFragment
     implements VariableFragment, Annotatable {
   @override
-  PropertyInducingElement2 get element;
+  PropertyInducingElement get element;
 
   /// The getter associated with this variable.
   ///
@@ -3043,7 +3143,7 @@ abstract class PropertyInducingFragment
 /// top-level variable or a field. Induced setters are synthetic.
 ///
 /// Clients may not extend, implement or mix-in this class.
-abstract class SetterElement implements PropertyAccessorElement2 {
+abstract class SetterElement implements PropertyAccessorElement {
   @override
   SetterElement get baseElement;
 
@@ -3095,7 +3195,7 @@ abstract class ShowElementCombinator implements NamespaceCombinator {
 /// Super formal parameters can only be defined within a constructor element.
 ///
 /// Clients may not extend, implement or mix-in this class.
-abstract class SuperFormalParameterElement2 implements FormalParameterElement {
+abstract class SuperFormalParameterElement implements FormalParameterElement {
   @override
   SuperFormalParameterFragment get firstFragment;
 
@@ -3111,13 +3211,13 @@ abstract class SuperFormalParameterElement2 implements FormalParameterElement {
   FormalParameterElement? get superConstructorParameter2;
 }
 
-/// The portion of a [SuperFormalParameterElement2] contributed by a single
+/// The portion of a [SuperFormalParameterElement] contributed by a single
 /// declaration.
 ///
 /// Clients may not extend, implement or mix-in this class.
 abstract class SuperFormalParameterFragment implements FormalParameterFragment {
   @override
-  SuperFormalParameterElement2 get element;
+  SuperFormalParameterElement get element;
 
   @override
   SuperFormalParameterFragment? get nextFragment;
@@ -3130,7 +3230,7 @@ abstract class SuperFormalParameterFragment implements FormalParameterFragment {
 ///
 /// Clients may not extend, implement or mix-in this class.
 abstract class TopLevelFunctionElement
-    implements ExecutableElement2, HasSinceSdkVersion {
+    implements ExecutableElement, HasSinceSdkVersion {
   /// The name of the function used as an entry point.
   static const String MAIN_FUNCTION_NAME = "main";
 
@@ -3174,9 +3274,9 @@ abstract class TopLevelFunctionFragment implements ExecutableFragment {
 /// A top-level variable.
 ///
 /// Clients may not extend, implement or mix-in this class.
-abstract class TopLevelVariableElement2 implements PropertyInducingElement2 {
+abstract class TopLevelVariableElement implements PropertyInducingElement {
   @override
-  TopLevelVariableElement2 get baseElement;
+  TopLevelVariableElement get baseElement;
 
   @override
   TopLevelVariableFragment get firstFragment;
@@ -3188,13 +3288,13 @@ abstract class TopLevelVariableElement2 implements PropertyInducingElement2 {
   bool get isExternal;
 }
 
-/// The portion of a [TopLevelVariableElement2] contributed by a single
+/// The portion of a [TopLevelVariableElement] contributed by a single
 /// declaration.
 ///
 /// Clients may not extend, implement or mix-in this class.
 abstract class TopLevelVariableFragment implements PropertyInducingFragment {
   @override
-  TopLevelVariableElement2 get element;
+  TopLevelVariableElement get element;
 
   @override
   TopLevelVariableFragment? get nextFragment;
@@ -3206,16 +3306,16 @@ abstract class TopLevelVariableFragment implements PropertyInducingFragment {
 /// A type alias (`typedef`).
 ///
 /// Clients may not extend, implement or mix-in this class.
-abstract class TypeAliasElement2
+abstract class TypeAliasElement
     implements
-        TypeParameterizedElement2,
-        TypeDefiningElement2,
+        TypeParameterizedElement,
+        TypeDefiningElement,
         HasSinceSdkVersion {
   /// If the aliased type has structure, return the corresponding element.
-  /// For example, it could be [GenericFunctionTypeElement2].
+  /// For example, it could be [GenericFunctionTypeElement].
   ///
   /// If there is no structure, return `null`.
-  Element2? get aliasedElement2;
+  Element? get aliasedElement2;
 
   /// The aliased type.
   ///
@@ -3225,7 +3325,7 @@ abstract class TypeAliasElement2
   DartType get aliasedType;
 
   @override
-  LibraryElement2 get enclosingElement2;
+  LibraryElement get enclosingElement2;
 
   @override
   TypeAliasFragment get firstFragment;
@@ -3237,7 +3337,7 @@ abstract class TypeAliasElement2
   /// [typeArguments] and [nullabilitySuffix].
   ///
   /// Note that this always instantiates the typedef itself, so for a
-  /// [TypeAliasElement2] the returned [DartType] might still be a generic
+  /// [TypeAliasElement] the returned [DartType] might still be a generic
   /// type, with type formals. For example, if the typedef is:
   ///
   ///     typedef F<T> = void Function<U>(T, U);
@@ -3249,13 +3349,13 @@ abstract class TypeAliasElement2
   });
 }
 
-/// The portion of a [TypeAliasElement2] contributed by a single declaration.
+/// The portion of a [TypeAliasElement] contributed by a single declaration.
 ///
 /// Clients may not extend, implement or mix-in this class.
 abstract class TypeAliasFragment
     implements TypeParameterizedFragment, TypeDefiningFragment {
   @override
-  TypeAliasElement2 get element;
+  TypeAliasElement get element;
 
   @override
   LibraryFragment? get enclosingFragment;
@@ -3270,7 +3370,7 @@ abstract class TypeAliasFragment
 /// An element that defines a type.
 ///
 /// Clients may not extend, implement or mix-in this class.
-abstract class TypeDefiningElement2 implements Element2, Annotatable {
+abstract class TypeDefiningElement implements Element, Annotatable {
   // TODO(brianwilkerson): Evaluate to see whether this type is actually needed
   //  after converting clients to the new API.
 
@@ -3281,12 +3381,12 @@ abstract class TypeDefiningElement2 implements Element2, Annotatable {
   List<TypeDefiningFragment> get fragments;
 }
 
-/// The portion of a [TypeDefiningElement2] contributed by a single declaration.
+/// The portion of a [TypeDefiningElement] contributed by a single declaration.
 ///
 /// Clients may not extend, implement or mix-in this class.
 abstract class TypeDefiningFragment implements Fragment, Annotatable {
   @override
-  TypeDefiningElement2 get element;
+  TypeDefiningElement get element;
 
   @override
   TypeDefiningFragment? get nextFragment;
@@ -3305,9 +3405,9 @@ abstract class TypeDefiningFragment implements Fragment, Annotatable {
 /// A type parameter.
 ///
 /// Clients may not extend, implement or mix-in this class.
-abstract class TypeParameterElement2 implements TypeDefiningElement2 {
+abstract class TypeParameterElement implements TypeDefiningElement {
   @override
-  TypeParameterElement2 get baseElement;
+  TypeParameterElement get baseElement;
 
   /// The type representing the bound associated with this parameter.
   ///
@@ -3327,13 +3427,13 @@ abstract class TypeParameterElement2 implements TypeDefiningElement2 {
   TypeParameterType instantiate({required NullabilitySuffix nullabilitySuffix});
 }
 
-/// The portion of a [TypeParameterElement2] contributed by a single
+/// The portion of a [TypeParameterElement] contributed by a single
 /// declaration.
 ///
 /// Clients may not extend, implement or mix-in this class.
 abstract class TypeParameterFragment implements TypeDefiningFragment {
   @override
-  TypeParameterElement2 get element;
+  TypeParameterElement get element;
 
   @override
   TypeParameterFragment? get nextFragment;
@@ -3345,7 +3445,7 @@ abstract class TypeParameterFragment implements TypeDefiningFragment {
 /// An element that has type parameters, such as a class, typedef, or method.
 ///
 /// Clients may not extend, implement or mix-in this class.
-abstract class TypeParameterizedElement2 implements Element2, Annotatable {
+abstract class TypeParameterizedElement implements Element, Annotatable {
   @override
   TypeParameterizedFragment get firstFragment;
 
@@ -3360,22 +3460,22 @@ abstract class TypeParameterizedElement2 implements Element2, Annotatable {
   bool get isSimplyBounded;
 
   @override
-  LibraryElement2 get library2;
+  LibraryElement get library2;
 
   /// The type parameters declared by this element directly.
   ///
   /// This does not include type parameters that are declared by any enclosing
   /// elements.
-  List<TypeParameterElement2> get typeParameters2;
+  List<TypeParameterElement> get typeParameters2;
 }
 
-/// The portion of a [TypeParameterizedElement2] contributed by a single
+/// The portion of a [TypeParameterizedElement] contributed by a single
 /// declaration.
 ///
 /// Clients may not extend, implement or mix-in this class.
 abstract class TypeParameterizedFragment implements Fragment, Annotatable {
   @override
-  TypeParameterizedElement2 get element;
+  TypeParameterizedElement get element;
 
   @override
   TypeParameterizedFragment? get nextFragment;
@@ -3395,7 +3495,7 @@ abstract class TypeParameterizedFragment implements Fragment, Annotatable {
 /// There are more specific subclasses for more specific kinds of variables.
 ///
 /// Clients may not extend, implement or mix-in this class.
-abstract class VariableElement2 implements Element2 {
+abstract class VariableElement implements Element {
   /// The constant initializer for this constant variable, or the default
   /// value for this formal parameter.
   ///
@@ -3450,12 +3550,12 @@ abstract class VariableElement2 implements Element2 {
   DartObject? computeConstantValue();
 }
 
-/// The portion of a [VariableElement2] contributed by a single declaration.
+/// The portion of a [VariableElement] contributed by a single declaration.
 ///
 /// Clients may not extend, implement or mix-in this class.
 abstract class VariableFragment implements Fragment {
   @override
-  VariableElement2 get element;
+  VariableElement get element;
 
   /// The initializer for this constant variable fragment, or the default value
   /// for this formal parameter fragment.
diff --git a/pkg/analyzer/lib/dart/element/scope.dart b/pkg/analyzer/lib/dart/element/scope.dart
index 1bd1a3a5bc9..85e42c3a4e7 100644
--- a/pkg/analyzer/lib/dart/element/scope.dart
+++ b/pkg/analyzer/lib/dart/element/scope.dart
@@ -20,7 +20,7 @@ abstract class Scope {
 ///
 /// Clients may not extend, implement or mix-in this class.
 abstract class ScopeLookupResult {
-  Element2? get getter2;
+  Element? get getter2;
 
-  Element2? get setter2;
+  Element? get setter2;
 }
diff --git a/pkg/analyzer/lib/dart/element/type.dart b/pkg/analyzer/lib/dart/element/type.dart
index 0e7ec8fb883..7f7a844b8ea 100644
--- a/pkg/analyzer/lib/dart/element/type.dart
+++ b/pkg/analyzer/lib/dart/element/type.dart
@@ -12,7 +12,7 @@
 /// interface defined by a class (an instance of [InterfaceType]) or the type of
 /// a function (an instance of [FunctionType]).
 ///
-/// We make a distinction between the declaration of a class (a [ClassElement2])
+/// We make a distinction between the declaration of a class (a [ClassElement])
 /// and the type defined by that class (an [InterfaceType]). The biggest reason
 /// for the distinction is to allow us to more cleanly represent the distinction
 /// between type parameters and type arguments. For example, if we define a
@@ -39,7 +39,7 @@ abstract class DartType {
   /// Return the element representing the declaration of this type, or `null`
   /// if the type is not associated with an element.
   @experimental
-  Element2? get element3;
+  Element? get element3;
 
   /// The extension type erasure of this type.
   ///
@@ -162,7 +162,7 @@ abstract class DartType {
   /// For a [TypeParameterType] with a bound (declared or promoted), returns
   /// the interface implemented by the bound.
   @experimental
-  InterfaceType? asInstanceOf2(InterfaceElement2 element);
+  InterfaceType? asInstanceOf2(InterfaceElement element);
 
   /// Return the presentation of this type as it should appear when presented
   /// to users in contexts such as error messages.
@@ -237,7 +237,7 @@ abstract class FunctionType implements DartType {
 
   /// The type parameters.
   @experimental
-  List<TypeParameterElement2> get typeParameters;
+  List<TypeParameterElement> get typeParameters;
 
   /// Produces a new function type by substituting type parameters of this
   /// function type with the given [argumentTypes].
@@ -246,12 +246,12 @@ abstract class FunctionType implements DartType {
   FunctionType instantiate(List<DartType> argumentTypes);
 }
 
-/// Information about an instantiated [TypeAliasElement2] and the type
+/// Information about an instantiated [TypeAliasElement] and the type
 /// arguments with which it is instantiated.
 abstract class InstantiatedTypeAliasElement {
   /// The alias element that is instantiated to produce a [DartType].
   @experimental
-  TypeAliasElement2 get element2;
+  TypeAliasElement get element2;
 
   /// The type arguments with which the [element2] was instantiated.
   /// This list will be empty if the [element2] is not generic.
@@ -269,11 +269,11 @@ abstract class InterfaceType implements ParameterizedType {
 
   /// Return a list containing all of the constructors declared in this type.
   @experimental
-  List<ConstructorElement2> get constructors2;
+  List<ConstructorElement> get constructors2;
 
   @experimental
   @override
-  InterfaceElement2 get element3;
+  InterfaceElement get element3;
 
   /// Return a list containing all of the getters declared in this type.
   @experimental
@@ -287,7 +287,7 @@ abstract class InterfaceType implements ParameterizedType {
 
   /// Return a list containing all of the methods declared in this type.
   @experimental
-  List<MethodElement2> get methods2;
+  List<MethodElement> get methods2;
 
   /// Return a list containing all of the mixins that are applied to the class
   /// being extended in order to derive the superclass of this class. Note that
@@ -320,7 +320,7 @@ abstract class InterfaceType implements ParameterizedType {
   /// Return the element representing the method with the given [name] that is
   /// declared in this class, or `null` if this class does not declare a method
   /// with the given name.
-  MethodElement2? getMethod2(String name);
+  MethodElement? getMethod2(String name);
 
   /// Return the element representing the setter with the given [name] that is
   /// declared in this class, or `null` if this class does not declare a setter
@@ -337,10 +337,7 @@ abstract class InterfaceType implements ParameterizedType {
   /// <i>T<i>. Otherwise, if <i>q</i> is not defined or not accessible, a
   /// NoSuchMethodException is thrown.
   /// </blockquote>
-  ConstructorElement2? lookUpConstructor2(
-    String? name,
-    LibraryElement2 library,
-  );
+  ConstructorElement? lookUpConstructor2(String? name, LibraryElement library);
 
   /// Return the getter with the given [name].
   ///
@@ -354,7 +351,7 @@ abstract class InterfaceType implements ParameterizedType {
   /// and its superclasses are considered. Clients should not use it.
   GetterElement? lookUpGetter3(
     String name,
-    LibraryElement2 library, {
+    LibraryElement library, {
     bool concrete = false,
     bool inherited = false,
     bool recoveryStatic = false,
@@ -370,9 +367,9 @@ abstract class InterfaceType implements ParameterizedType {
   ///
   /// If [recoveryStatic] is `true`, then static methods of the class,
   /// and its superclasses are considered. Clients should not use it.
-  MethodElement2? lookUpMethod3(
+  MethodElement? lookUpMethod3(
     String name,
-    LibraryElement2 library, {
+    LibraryElement library, {
     bool concrete = false,
     bool inherited = false,
     bool recoveryStatic = false,
@@ -390,7 +387,7 @@ abstract class InterfaceType implements ParameterizedType {
   /// and its superclasses are considered. Clients should not use it.
   SetterElement? lookUpSetter3(
     String name,
-    LibraryElement2 library, {
+    LibraryElement library, {
     bool concrete = false,
     bool inherited = false,
     bool recoveryStatic = false,
@@ -415,7 +412,7 @@ abstract class NeverType implements DartType {}
 ///
 /// This substitution will be propagated to its members. For example, say our
 /// `Foo<T>` class has a field `T bar;`. When we look up this field, we will get
-/// back a [FieldElement2] that tracks the substituted type as `{S/T}T`, so when
+/// back a [FieldElement] that tracks the substituted type as `{S/T}T`, so when
 /// we ask for the field type we will get `S`.
 ///
 /// Clients may not extend, implement or mix-in this class.
@@ -481,7 +478,7 @@ abstract class TypeParameterType implements DartType {
 
   @experimental
   @override
-  TypeParameterElement2 get element3;
+  TypeParameterElement get element3;
 }
 
 /// The special type `void` is used to indicate that the value of an
diff --git a/pkg/analyzer/lib/dart/element/type_provider.dart b/pkg/analyzer/lib/dart/element/type_provider.dart
index 864109b1b08..8700eb8eaee 100644
--- a/pkg/analyzer/lib/dart/element/type_provider.dart
+++ b/pkg/analyzer/lib/dart/element/type_provider.dart
@@ -13,7 +13,7 @@ import 'package:meta/meta.dart';
 abstract class TypeProvider {
   /// Return the element representing the built-in class `bool`.
   @experimental
-  ClassElement2 get boolElement2;
+  ClassElement get boolElement2;
 
   /// Return the type representing the built-in type `bool`.
   InterfaceType get boolType;
@@ -26,7 +26,7 @@ abstract class TypeProvider {
 
   /// Return the element representing the built-in class `double`.
   @experimental
-  ClassElement2 get doubleElement2;
+  ClassElement get doubleElement2;
 
   /// Return the type representing the built-in type `double`.
   InterfaceType get doubleType;
@@ -37,7 +37,7 @@ abstract class TypeProvider {
   /// Return the element representing the built-in type `Enum`, or `null` if
   /// the SDK does not have definition of `Enum`.
   @experimental
-  ClassElement2? get enumElement2;
+  ClassElement? get enumElement2;
 
   /// Return the type representing the built-in type `Enum`, or `null` if
   /// the SDK does not have definition of `Enum`.
@@ -51,21 +51,21 @@ abstract class TypeProvider {
 
   /// Return the element representing the built-in class `Future`.
   @experimental
-  ClassElement2 get futureElement2;
+  ClassElement get futureElement2;
 
   /// Return the type representing `Future<Null>`.
   InterfaceType get futureNullType;
 
   /// Return the element representing the built-in class `FutureOr`.
   @experimental
-  ClassElement2 get futureOrElement2;
+  ClassElement get futureOrElement2;
 
   /// Return the type representing `FutureOr<Null>`.
   InterfaceType get futureOrNullType;
 
   /// Return the element representing the built-in class `int`.
   @experimental
-  ClassElement2 get intElement2;
+  ClassElement get intElement2;
 
   /// Return the type representing the built-in type `int`.
   InterfaceType get intType;
@@ -75,18 +75,18 @@ abstract class TypeProvider {
 
   /// Return the element representing the built-in class `Iterable`.
   @experimental
-  ClassElement2 get iterableElement2;
+  ClassElement get iterableElement2;
 
   /// Return the type representing the type `Iterable<Object>`.
   InterfaceType get iterableObjectType;
 
   /// Return the element representing the built-in class `List`.
   @experimental
-  ClassElement2 get listElement2;
+  ClassElement get listElement2;
 
   /// Return the element representing the built-in class `Map`.
   @experimental
-  ClassElement2 get mapElement2;
+  ClassElement get mapElement2;
 
   /// Return the type representing `Map<Object, Object>`.
   InterfaceType get mapObjectObjectType;
@@ -96,21 +96,21 @@ abstract class TypeProvider {
 
   /// Return the element representing the built-in class `Null`.
   @experimental
-  ClassElement2 get nullElement2;
+  ClassElement get nullElement2;
 
   /// Return the type representing the built-in type `Null`.
   InterfaceType get nullType;
 
   /// Return the element representing the built-in class `num`.
   @experimental
-  ClassElement2 get numElement2;
+  ClassElement get numElement2;
 
   /// Return the type representing the built-in type `num`.
   InterfaceType get numType;
 
   /// Return the element representing the built-in class `Object`.
   @experimental
-  ClassElement2 get objectElement2;
+  ClassElement get objectElement2;
 
   /// Return the type representing the built-in type `Object?`.
   InterfaceType get objectQuestionType;
@@ -120,14 +120,14 @@ abstract class TypeProvider {
 
   /// Return the element representing the built-in class `Record`.
   @experimental
-  ClassElement2 get recordElement2;
+  ClassElement get recordElement2;
 
   /// Return the type representing the built-in type `Record`.
   InterfaceType get recordType;
 
   /// Return the element representing the built-in class `Set`.
   @experimental
-  ClassElement2 get setElement2;
+  ClassElement get setElement2;
 
   /// Return the type representing the built-in type `StackTrace`.
   InterfaceType get stackTraceType;
@@ -137,18 +137,18 @@ abstract class TypeProvider {
 
   /// Return the element representing the built-in class `Stream`.
   @experimental
-  ClassElement2 get streamElement2;
+  ClassElement get streamElement2;
 
   /// Return the element representing the built-in class `String`.
   @experimental
-  ClassElement2 get stringElement2;
+  ClassElement get stringElement2;
 
   /// Return the type representing the built-in type `String`.
   InterfaceType get stringType;
 
   /// Return the element representing the built-in class `Symbol`.
   @experimental
-  ClassElement2 get symbolElement2;
+  ClassElement get symbolElement2;
 
   /// Return the type representing the built-in type `Symbol`.
   InterfaceType get symbolType;
@@ -168,7 +168,7 @@ abstract class TypeProvider {
   InterfaceType futureType(DartType valueType);
 
   /// Return `true` if [element] cannot be extended, implemented, or mixed in.
-  bool isNonSubtypableClass2(InterfaceElement2 element);
+  bool isNonSubtypableClass2(InterfaceElement element);
 
   /// Return 'true' if [id] is the name of a getter on the `Object` type.
   bool isObjectGetter(String id);
diff --git a/pkg/analyzer/lib/dart/element/type_system.dart b/pkg/analyzer/lib/dart/element/type_system.dart
index dd75bd19270..c69642cddb9 100644
--- a/pkg/analyzer/lib/dart/element/type_system.dart
+++ b/pkg/analyzer/lib/dart/element/type_system.dart
@@ -44,14 +44,14 @@ abstract class TypeSystem {
   /// Instantiate the given [element] with default type arguments.
   @experimental
   InterfaceType instantiateInterfaceToBounds2({
-    required InterfaceElement2 element,
+    required InterfaceElement element,
     required NullabilitySuffix nullabilitySuffix,
   });
 
   /// Instantiate the given [element] with default type arguments.
   @experimental
   DartType instantiateTypeAliasToBounds2({
-    required TypeAliasElement2 element,
+    required TypeAliasElement element,
     required NullabilitySuffix nullabilitySuffix,
   });
 
diff --git a/pkg/analyzer/lib/dart/element/visitor2.dart b/pkg/analyzer/lib/dart/element/visitor2.dart
index a97068362b8..d5c51006f6d 100644
--- a/pkg/analyzer/lib/dart/element/visitor2.dart
+++ b/pkg/analyzer/lib/dart/element/visitor2.dart
@@ -29,12 +29,12 @@ import 'package:analyzer/dart/element/element.dart';
 /// addition, when an element of a specific type is visited not only will the
 /// visit method for that specific type of element be invoked, but additional
 /// methods for the supertypes of that element will also be invoked. For
-/// example, using an instance of this class to visit a [MethodElement2] will
+/// example, using an instance of this class to visit a [MethodElement] will
 /// cause the method [visitMethodElement] to be invoked but will also cause the
 /// methods [visitExecutableElement] and [visitElement] to be subsequently
 /// invoked. This allows visitors to be written that visit all executable
 /// elements without needing to override the visit method for each of the
-/// specific subclasses of [ExecutableElement2].
+/// specific subclasses of [ExecutableElement].
 ///
 /// Note, however, that unlike many visitors, element visitors visit objects
 /// based on the interfaces implemented by those elements. Because interfaces
@@ -45,29 +45,29 @@ import 'package:analyzer/dart/element/element.dart';
 /// structured in the following way:
 ///
 /// <pre>
-/// [Element2]
-///   [ClassElement2]
-///   [ExecutableElement2]
-///       [ConstructorElement2]
+/// [Element]
+///   [ClassElement]
+///   [ExecutableElement]
+///       [ConstructorElement]
 ///       [GetterElement]
 ///       [LocalFunctionElement]
-///       [MethodElement2]
+///       [MethodElement]
 ///       [SetterElement]
-///   [LabelElement2]
-///   [LibraryElement2]
-///   [MultiplyDefinedElement2]
-///   [PrefixElement2]
-///   [TypeAliasElement2]
-///   [TypeParameterElement2]
-///   [VariableElement2]
-///       [PropertyInducingElement2]
-///           [FieldElement2]
-///           [TopLevelVariableElement2]
-///       [PromotableElement2]
-///           [LocalVariableElement2]
+///   [LabelElement]
+///   [LibraryElement]
+///   [MultiplyDefinedElement]
+///   [PrefixElement]
+///   [TypeAliasElement]
+///   [TypeParameterElement]
+///   [VariableElement]
+///       [PropertyInducingElement]
+///           [FieldElement]
+///           [TopLevelVariableElement]
+///       [PromotableElement]
+///           [LocalVariableElement]
 ///           [FormalParameterElement]
-///               [FieldFormalParameterElement2]
-///               [SuperFormalParameterElement2]
+///               [FieldFormalParameterElement]
+///               [SuperFormalParameterElement]
 /// </pre>
 ///
 /// Subclasses that override a visit method must either invoke the overridden
@@ -78,36 +78,35 @@ import 'package:analyzer/dart/element/element.dart';
 /// Clients may extend this class.
 class GeneralizingElementVisitor2<R> implements ElementVisitor2<R> {
   @override
-  R? visitClassElement(ClassElement2 element) => visitElement(element);
+  R? visitClassElement(ClassElement element) => visitElement(element);
 
   @override
-  R? visitConstructorElement(ConstructorElement2 element) =>
+  R? visitConstructorElement(ConstructorElement element) =>
       visitExecutableElement(element);
 
-  R? visitElement(Element2 element) {
+  R? visitElement(Element element) {
     element.visitChildren2(this);
     return null;
   }
 
   @override
-  R? visitEnumElement(EnumElement2 element) => visitElement(element);
+  R? visitEnumElement(EnumElement element) => visitElement(element);
 
-  R? visitExecutableElement(ExecutableElement2 element) =>
+  R? visitExecutableElement(ExecutableElement element) => visitElement(element);
+
+  @override
+  R? visitExtensionElement(ExtensionElement element) => visitElement(element);
+
+  @override
+  R? visitExtensionTypeElement(ExtensionTypeElement element) =>
       visitElement(element);
 
   @override
-  R? visitExtensionElement(ExtensionElement2 element) => visitElement(element);
-
-  @override
-  R? visitExtensionTypeElement(ExtensionTypeElement2 element) =>
-      visitElement(element);
-
-  @override
-  R? visitFieldElement(FieldElement2 element) =>
+  R? visitFieldElement(FieldElement element) =>
       visitPropertyInducingElement(element);
 
   @override
-  R? visitFieldFormalParameterElement(FieldFormalParameterElement2 element) =>
+  R? visitFieldFormalParameterElement(FieldFormalParameterElement element) =>
       visitFormalParameterElement(element);
 
   @override
@@ -115,7 +114,7 @@ class GeneralizingElementVisitor2<R> implements ElementVisitor2<R> {
       visitElement(element);
 
   @override
-  R? visitGenericFunctionTypeElement(GenericFunctionTypeElement2 element) =>
+  R? visitGenericFunctionTypeElement(GenericFunctionTypeElement element) =>
       visitElement(element);
 
   @override
@@ -123,12 +122,12 @@ class GeneralizingElementVisitor2<R> implements ElementVisitor2<R> {
       visitPropertyAccessorElement(element);
 
   @override
-  R? visitLabelElement(LabelElement2 element) {
+  R? visitLabelElement(LabelElement element) {
     return visitElement(element);
   }
 
   @override
-  R? visitLibraryElement(LibraryElement2 element) => visitElement(element);
+  R? visitLibraryElement(LibraryElement element) => visitElement(element);
 
   @override
   R? visitLocalFunctionElement(LocalFunctionElement element) {
@@ -136,30 +135,30 @@ class GeneralizingElementVisitor2<R> implements ElementVisitor2<R> {
   }
 
   @override
-  R? visitLocalVariableElement(LocalVariableElement2 element) {
+  R? visitLocalVariableElement(LocalVariableElement element) {
     return visitVariableElement(element);
   }
 
   @override
-  R? visitMethodElement(MethodElement2 element) =>
+  R? visitMethodElement(MethodElement element) =>
       visitExecutableElement(element);
 
   @override
-  R? visitMixinElement(MixinElement2 element) => visitElement(element);
+  R? visitMixinElement(MixinElement element) => visitElement(element);
 
   @override
-  R? visitMultiplyDefinedElement(MultiplyDefinedElement2 element) =>
+  R? visitMultiplyDefinedElement(MultiplyDefinedElement element) =>
       visitElement(element);
 
   @override
-  R? visitPrefixElement(PrefixElement2 element) {
+  R? visitPrefixElement(PrefixElement element) {
     return visitElement(element);
   }
 
-  R? visitPropertyAccessorElement(PropertyAccessorElement2 element) =>
+  R? visitPropertyAccessorElement(PropertyAccessorElement element) =>
       visitExecutableElement(element);
 
-  R? visitPropertyInducingElement(PropertyInducingElement2 element) =>
+  R? visitPropertyInducingElement(PropertyInducingElement element) =>
       visitVariableElement(element);
 
   @override
@@ -167,7 +166,7 @@ class GeneralizingElementVisitor2<R> implements ElementVisitor2<R> {
       visitPropertyAccessorElement(element);
 
   @override
-  R? visitSuperFormalParameterElement(SuperFormalParameterElement2 element) =>
+  R? visitSuperFormalParameterElement(SuperFormalParameterElement element) =>
       visitFormalParameterElement(element);
 
   @override
@@ -175,17 +174,17 @@ class GeneralizingElementVisitor2<R> implements ElementVisitor2<R> {
       visitExecutableElement(element);
 
   @override
-  R? visitTopLevelVariableElement(TopLevelVariableElement2 element) =>
+  R? visitTopLevelVariableElement(TopLevelVariableElement element) =>
       visitPropertyInducingElement(element);
 
   @override
-  R? visitTypeAliasElement(TypeAliasElement2 element) => visitElement(element);
+  R? visitTypeAliasElement(TypeAliasElement element) => visitElement(element);
 
   @override
-  R? visitTypeParameterElement(TypeParameterElement2 element) =>
+  R? visitTypeParameterElement(TypeParameterElement element) =>
       visitElement(element);
 
-  R? visitVariableElement(VariableElement2 element) => visitElement(element);
+  R? visitVariableElement(VariableElement element) => visitElement(element);
 }
 
 /// A visitor that will recursively visit all of the element in an element
@@ -201,43 +200,43 @@ class GeneralizingElementVisitor2<R> implements ElementVisitor2<R> {
 /// Clients may extend this class.
 class RecursiveElementVisitor2<R> implements ElementVisitor2<R> {
   @override
-  R? visitClassElement(ClassElement2 element) {
+  R? visitClassElement(ClassElement element) {
     element.visitChildren2(this);
     return null;
   }
 
   @override
-  R? visitConstructorElement(ConstructorElement2 element) {
+  R? visitConstructorElement(ConstructorElement element) {
     element.visitChildren2(this);
     return null;
   }
 
   @override
-  R? visitEnumElement(EnumElement2 element) {
+  R? visitEnumElement(EnumElement element) {
     element.visitChildren2(this);
     return null;
   }
 
   @override
-  R? visitExtensionElement(ExtensionElement2 element) {
+  R? visitExtensionElement(ExtensionElement element) {
     element.visitChildren2(this);
     return null;
   }
 
   @override
-  R? visitExtensionTypeElement(ExtensionTypeElement2 element) {
+  R? visitExtensionTypeElement(ExtensionTypeElement element) {
     element.visitChildren2(this);
     return null;
   }
 
   @override
-  R? visitFieldElement(FieldElement2 element) {
+  R? visitFieldElement(FieldElement element) {
     element.visitChildren2(this);
     return null;
   }
 
   @override
-  R? visitFieldFormalParameterElement(FieldFormalParameterElement2 element) {
+  R? visitFieldFormalParameterElement(FieldFormalParameterElement element) {
     element.visitChildren2(this);
     return null;
   }
@@ -249,7 +248,7 @@ class RecursiveElementVisitor2<R> implements ElementVisitor2<R> {
   }
 
   @override
-  R? visitGenericFunctionTypeElement(GenericFunctionTypeElement2 element) {
+  R? visitGenericFunctionTypeElement(GenericFunctionTypeElement element) {
     element.visitChildren2(this);
     return null;
   }
@@ -261,13 +260,13 @@ class RecursiveElementVisitor2<R> implements ElementVisitor2<R> {
   }
 
   @override
-  R? visitLabelElement(LabelElement2 element) {
+  R? visitLabelElement(LabelElement element) {
     element.visitChildren2(this);
     return null;
   }
 
   @override
-  R? visitLibraryElement(LibraryElement2 element) {
+  R? visitLibraryElement(LibraryElement element) {
     element.visitChildren2(this);
     return null;
   }
@@ -279,31 +278,31 @@ class RecursiveElementVisitor2<R> implements ElementVisitor2<R> {
   }
 
   @override
-  R? visitLocalVariableElement(LocalVariableElement2 element) {
+  R? visitLocalVariableElement(LocalVariableElement element) {
     element.visitChildren2(this);
     return null;
   }
 
   @override
-  R? visitMethodElement(MethodElement2 element) {
+  R? visitMethodElement(MethodElement element) {
     element.visitChildren2(this);
     return null;
   }
 
   @override
-  R? visitMixinElement(MixinElement2 element) {
+  R? visitMixinElement(MixinElement element) {
     element.visitChildren2(this);
     return null;
   }
 
   @override
-  R? visitMultiplyDefinedElement(MultiplyDefinedElement2 element) {
+  R? visitMultiplyDefinedElement(MultiplyDefinedElement element) {
     element.visitChildren2(this);
     return null;
   }
 
   @override
-  R? visitPrefixElement(PrefixElement2 element) {
+  R? visitPrefixElement(PrefixElement element) {
     element.visitChildren2(this);
     return null;
   }
@@ -315,7 +314,7 @@ class RecursiveElementVisitor2<R> implements ElementVisitor2<R> {
   }
 
   @override
-  R? visitSuperFormalParameterElement(SuperFormalParameterElement2 element) {
+  R? visitSuperFormalParameterElement(SuperFormalParameterElement element) {
     element.visitChildren2(this);
     return null;
   }
@@ -327,19 +326,19 @@ class RecursiveElementVisitor2<R> implements ElementVisitor2<R> {
   }
 
   @override
-  R? visitTopLevelVariableElement(TopLevelVariableElement2 element) {
+  R? visitTopLevelVariableElement(TopLevelVariableElement element) {
     element.visitChildren2(this);
     return null;
   }
 
   @override
-  R? visitTypeAliasElement(TypeAliasElement2 element) {
+  R? visitTypeAliasElement(TypeAliasElement element) {
     element.visitChildren2(this);
     return null;
   }
 
   @override
-  R? visitTypeParameterElement(TypeParameterElement2 element) {
+  R? visitTypeParameterElement(TypeParameterElement element) {
     element.visitChildren2(this);
     return null;
   }
@@ -353,44 +352,44 @@ class RecursiveElementVisitor2<R> implements ElementVisitor2<R> {
 /// Clients may extend this class.
 class SimpleElementVisitor2<R> implements ElementVisitor2<R> {
   @override
-  R? visitClassElement(ClassElement2 element) => null;
+  R? visitClassElement(ClassElement element) => null;
 
   @override
-  R? visitConstructorElement(ConstructorElement2 element) => null;
+  R? visitConstructorElement(ConstructorElement element) => null;
 
   @override
-  R? visitEnumElement(EnumElement2 element) => null;
+  R? visitEnumElement(EnumElement element) => null;
 
   @override
-  R? visitExtensionElement(ExtensionElement2 element) => null;
+  R? visitExtensionElement(ExtensionElement element) => null;
 
   @override
-  R? visitExtensionTypeElement(ExtensionTypeElement2 element) => null;
+  R? visitExtensionTypeElement(ExtensionTypeElement element) => null;
 
   @override
-  R? visitFieldElement(FieldElement2 element) => null;
+  R? visitFieldElement(FieldElement element) => null;
 
   @override
-  R? visitFieldFormalParameterElement(FieldFormalParameterElement2 element) =>
+  R? visitFieldFormalParameterElement(FieldFormalParameterElement element) =>
       null;
 
   @override
   R? visitFormalParameterElement(FormalParameterElement element) => null;
 
   @override
-  R? visitGenericFunctionTypeElement(GenericFunctionTypeElement2 element) =>
+  R? visitGenericFunctionTypeElement(GenericFunctionTypeElement element) =>
       null;
 
   @override
   R? visitGetterElement(GetterElement element) => null;
 
   @override
-  R? visitLabelElement(LabelElement2 element) {
+  R? visitLabelElement(LabelElement element) {
     return null;
   }
 
   @override
-  R? visitLibraryElement(LibraryElement2 element) => null;
+  R? visitLibraryElement(LibraryElement element) => null;
 
   @override
   R? visitLocalFunctionElement(LocalFunctionElement element) {
@@ -398,21 +397,21 @@ class SimpleElementVisitor2<R> implements ElementVisitor2<R> {
   }
 
   @override
-  R? visitLocalVariableElement(LocalVariableElement2 element) {
+  R? visitLocalVariableElement(LocalVariableElement element) {
     return null;
   }
 
   @override
-  R? visitMethodElement(MethodElement2 element) => null;
+  R? visitMethodElement(MethodElement element) => null;
 
   @override
-  R? visitMixinElement(MixinElement2 element) => null;
+  R? visitMixinElement(MixinElement element) => null;
 
   @override
-  R? visitMultiplyDefinedElement(MultiplyDefinedElement2 element) => null;
+  R? visitMultiplyDefinedElement(MultiplyDefinedElement element) => null;
 
   @override
-  R? visitPrefixElement(PrefixElement2 element) {
+  R? visitPrefixElement(PrefixElement element) {
     return null;
   }
 
@@ -420,20 +419,20 @@ class SimpleElementVisitor2<R> implements ElementVisitor2<R> {
   R? visitSetterElement(SetterElement element) => null;
 
   @override
-  R? visitSuperFormalParameterElement(SuperFormalParameterElement2 element) =>
+  R? visitSuperFormalParameterElement(SuperFormalParameterElement element) =>
       null;
 
   @override
   R? visitTopLevelFunctionElement(TopLevelFunctionElement element) => null;
 
   @override
-  R? visitTopLevelVariableElement(TopLevelVariableElement2 element) => null;
+  R? visitTopLevelVariableElement(TopLevelVariableElement element) => null;
 
   @override
-  R? visitTypeAliasElement(TypeAliasElement2 element) => null;
+  R? visitTypeAliasElement(TypeAliasElement element) => null;
 
   @override
-  R? visitTypeParameterElement(TypeParameterElement2 element) => null;
+  R? visitTypeParameterElement(TypeParameterElement element) => null;
 }
 
 /// An AST visitor that will throw an exception if any of the visit methods that
@@ -445,26 +444,25 @@ class SimpleElementVisitor2<R> implements ElementVisitor2<R> {
 /// Clients may extend this class.
 class ThrowingElementVisitor2<R> implements ElementVisitor2<R> {
   @override
-  R? visitClassElement(ClassElement2 element) => _throw(element);
+  R? visitClassElement(ClassElement element) => _throw(element);
 
   @override
-  R? visitConstructorElement(ConstructorElement2 element) => _throw(element);
+  R? visitConstructorElement(ConstructorElement element) => _throw(element);
 
   @override
-  R? visitEnumElement(EnumElement2 element) => _throw(element);
+  R? visitEnumElement(EnumElement element) => _throw(element);
 
   @override
-  R? visitExtensionElement(ExtensionElement2 element) => _throw(element);
+  R? visitExtensionElement(ExtensionElement element) => _throw(element);
 
   @override
-  R? visitExtensionTypeElement(ExtensionTypeElement2 element) =>
-      _throw(element);
+  R? visitExtensionTypeElement(ExtensionTypeElement element) => _throw(element);
 
   @override
-  R? visitFieldElement(FieldElement2 element) => _throw(element);
+  R? visitFieldElement(FieldElement element) => _throw(element);
 
   @override
-  R? visitFieldFormalParameterElement(FieldFormalParameterElement2 element) =>
+  R? visitFieldFormalParameterElement(FieldFormalParameterElement element) =>
       _throw(element);
 
   @override
@@ -472,19 +470,19 @@ class ThrowingElementVisitor2<R> implements ElementVisitor2<R> {
       _throw(element);
 
   @override
-  R? visitGenericFunctionTypeElement(GenericFunctionTypeElement2 element) =>
+  R? visitGenericFunctionTypeElement(GenericFunctionTypeElement element) =>
       _throw(element);
 
   @override
   R? visitGetterElement(GetterElement element) => _throw(element);
 
   @override
-  R? visitLabelElement(LabelElement2 element) {
+  R? visitLabelElement(LabelElement element) {
     _throw(element);
   }
 
   @override
-  R? visitLibraryElement(LibraryElement2 element) => _throw(element);
+  R? visitLibraryElement(LibraryElement element) => _throw(element);
 
   @override
   R? visitLocalFunctionElement(LocalFunctionElement element) {
@@ -492,22 +490,22 @@ class ThrowingElementVisitor2<R> implements ElementVisitor2<R> {
   }
 
   @override
-  R? visitLocalVariableElement(LocalVariableElement2 element) {
+  R? visitLocalVariableElement(LocalVariableElement element) {
     _throw(element);
   }
 
   @override
-  R? visitMethodElement(MethodElement2 element) => _throw(element);
+  R? visitMethodElement(MethodElement element) => _throw(element);
 
   @override
-  R? visitMixinElement(MixinElement2 element) => _throw(element);
+  R? visitMixinElement(MixinElement element) => _throw(element);
 
   @override
-  R? visitMultiplyDefinedElement(MultiplyDefinedElement2 element) =>
+  R? visitMultiplyDefinedElement(MultiplyDefinedElement element) =>
       _throw(element);
 
   @override
-  R? visitPrefixElement(PrefixElement2 element) {
+  R? visitPrefixElement(PrefixElement element) {
     _throw(element);
   }
 
@@ -515,7 +513,7 @@ class ThrowingElementVisitor2<R> implements ElementVisitor2<R> {
   R? visitSetterElement(SetterElement element) => _throw(element);
 
   @override
-  R? visitSuperFormalParameterElement(SuperFormalParameterElement2 element) =>
+  R? visitSuperFormalParameterElement(SuperFormalParameterElement element) =>
       _throw(element);
 
   @override
@@ -523,17 +521,16 @@ class ThrowingElementVisitor2<R> implements ElementVisitor2<R> {
       _throw(element);
 
   @override
-  R? visitTopLevelVariableElement(TopLevelVariableElement2 element) =>
+  R? visitTopLevelVariableElement(TopLevelVariableElement element) =>
       _throw(element);
 
   @override
-  R? visitTypeAliasElement(TypeAliasElement2 element) => _throw(element);
+  R? visitTypeAliasElement(TypeAliasElement element) => _throw(element);
 
   @override
-  R? visitTypeParameterElement(TypeParameterElement2 element) =>
-      _throw(element);
+  R? visitTypeParameterElement(TypeParameterElement element) => _throw(element);
 
-  Never _throw(Element2 element) {
+  Never _throw(Element element) {
     throw Exception('Missing implementation of visit${element.runtimeType}');
   }
 }
diff --git a/pkg/analyzer/lib/error/listener.dart b/pkg/analyzer/lib/error/listener.dart
index 970ee50bbb3..775e3e0bc99 100644
--- a/pkg/analyzer/lib/error/listener.dart
+++ b/pkg/analyzer/lib/error/listener.dart
@@ -96,7 +96,7 @@ class ErrorReporter {
   /// The [element] is used to compute the location of the error.
   @experimental
   void atElement2(
-    Element2 element2,
+    Element element2,
     ErrorCode errorCode, {
     List<Object>? arguments,
     List<DiagnosticMessage>? contextMessages,
@@ -170,7 +170,7 @@ class ErrorReporter {
           arguments
               .whereNotType<String>()
               .whereNotType<DartType>()
-              .whereNotType<Element2>()
+              .whereNotType<Element>()
               .whereNotType<int>()
               .whereNotType<Uri>();
       if (invalid.isNotEmpty) {
@@ -256,7 +256,7 @@ class ErrorReporter {
         var displayName = argument.getDisplayString(preferTypeAlias: true);
         var types = typeGroups.putIfAbsent(displayName, () => []);
         types.add(_TypeToConvert(i, argument, displayName));
-      } else if (argument is Element2) {
+      } else if (argument is Element) {
         var displayName = argument.displayString2();
         var types = typeGroups.putIfAbsent(displayName, () => []);
         types.add(_ElementToConvert(i, argument, displayName));
@@ -275,11 +275,11 @@ class ErrorReporter {
 
       const unnamedExtension = '<unnamed extension>';
       const unnamed = '<unnamed>';
-      var nameToElementMap = <String, Set<Element2>>{};
+      var nameToElementMap = <String, Set<Element>>{};
       for (var typeToConvert in typeGroup) {
         for (var element in typeToConvert.allElements) {
           var name = element.name3;
-          name ??= element is ExtensionElement2 ? unnamedExtension : unnamed;
+          name ??= element is ExtensionElement ? unnamedExtension : unnamed;
 
           var elements = nameToElementMap.putIfAbsent(name, () => {});
           elements.add(element);
@@ -292,7 +292,7 @@ class ErrorReporter {
         StringBuffer? buffer;
         for (var element in typeToConvert.allElements) {
           var name = element.name3;
-          name ??= element is ExtensionElement2 ? unnamedExtension : unnamed;
+          name ??= element is ExtensionElement ? unnamedExtension : unnamed;
           var sourcePath =
               element.firstFragment.libraryFragment!.source.fullName;
           if (nameToElementMap[name]!.length > 1) {
@@ -353,7 +353,7 @@ class RecordingErrorListener implements AnalysisErrorListener {
 }
 
 /// Used by [ErrorReporter._convertTypeNames] to keep track of an error argument
-/// that is an [Element2], that is being converted to a display string.
+/// that is an [Element], that is being converted to a display string.
 class _ElementToConvert implements _ToConvert {
   @override
   final int index;
@@ -362,9 +362,9 @@ class _ElementToConvert implements _ToConvert {
   final String displayName;
 
   @override
-  final Iterable<Element2> allElements;
+  final Iterable<Element> allElements;
 
-  _ElementToConvert(this.index, Element2 element, this.displayName)
+  _ElementToConvert(this.index, Element element, this.displayName)
     : allElements = [element];
 }
 
@@ -379,9 +379,9 @@ class _NullErrorListener implements AnalysisErrorListener {
 /// Used by [ErrorReporter._convertTypeNames] to keep track of an argument that
 /// is being converted to a display string.
 abstract class _ToConvert {
-  /// A list of all elements involved in the [DartType] or [Element2]'s display
+  /// A list of all elements involved in the [DartType] or [Element]'s display
   /// string.
-  Iterable<Element2> get allElements;
+  Iterable<Element> get allElements;
 
   /// The argument's display string, to replace the argument in the argument
   /// list.
@@ -403,8 +403,8 @@ class _TypeToConvert implements _ToConvert {
   final String displayName;
 
   @override
-  late final Iterable<Element2> allElements = () {
-    var elements = <Element2>{};
+  late final Iterable<Element> allElements = () {
+    var elements = <Element>{};
 
     void addElementsFrom(DartType type) {
       if (type is FunctionType) {
diff --git a/pkg/analyzer/lib/src/dart/analysis/index.dart b/pkg/analyzer/lib/src/dart/analysis/index.dart
index 7a98ba063aa..99cdcfc6657 100644
--- a/pkg/analyzer/lib/src/dart/analysis/index.dart
+++ b/pkg/analyzer/lib/src/dart/analysis/index.dart
@@ -14,7 +14,7 @@ import 'package:analyzer/src/summary/format.dart';
 import 'package:analyzer/src/summary/idl.dart';
 import 'package:collection/collection.dart';
 
-Element2? declaredParameterElement(SimpleIdentifier node, Element2? element) {
+Element? declaredParameterElement(SimpleIdentifier node, Element? element) {
   if (element == null || element.enclosingElement2 != null) {
     return element;
   }
@@ -23,9 +23,7 @@ Element2? declaredParameterElement(SimpleIdentifier node, Element2? element) {
   /// synthetic [ParameterElement]s, disconnected from the rest of the
   /// element model. But we want to index these parameter references
   /// as references to declared parameters.
-  FormalParameterElement? namedParameterElement(
-    ExecutableElement2? executable,
-  ) {
+  FormalParameterElement? namedParameterElement(ExecutableElement? executable) {
     if (executable == null) {
       return null;
     }
@@ -48,7 +46,7 @@ Element2? declaredParameterElement(SimpleIdentifier node, Element2? element) {
           return namedParameterElement(executable);
         } else if (invocation is MethodInvocation) {
           var executable = invocation.methodName.element;
-          if (executable is ExecutableElement2) {
+          if (executable is ExecutableElement) {
             return namedParameterElement(executable);
           }
         }
@@ -59,7 +57,7 @@ Element2? declaredParameterElement(SimpleIdentifier node, Element2? element) {
   return element;
 }
 
-Element2? declaredParameterElement2(SimpleIdentifier node, Element2? element) {
+Element? declaredParameterElement2(SimpleIdentifier node, Element? element) {
   if (element == null || element.enclosingElement2 != null) {
     return element;
   }
@@ -68,9 +66,7 @@ Element2? declaredParameterElement2(SimpleIdentifier node, Element2? element) {
   /// synthetic [ParameterElement]s, disconnected from the rest of the
   /// element model. But we want to index these parameter references
   /// as references to declared parameters.
-  FormalParameterElement? namedParameterElement(
-    ExecutableElement2? executable,
-  ) {
+  FormalParameterElement? namedParameterElement(ExecutableElement? executable) {
     if (executable == null) {
       return null;
     }
@@ -93,7 +89,7 @@ Element2? declaredParameterElement2(SimpleIdentifier node, Element2? element) {
           return namedParameterElement(executable);
         } else if (invocation is MethodInvocation) {
           var executable = invocation.methodName.element;
-          if (executable is ExecutableElement2) {
+          if (executable is ExecutableElement) {
             return namedParameterElement(executable);
           }
         }
@@ -106,7 +102,7 @@ Element2? declaredParameterElement2(SimpleIdentifier node, Element2? element) {
 
 /// Return the [CompilationUnitElementImpl] that should be used for [element].
 /// Throw [StateError] if the [element] is not linked into a unit.
-CompilationUnitElementImpl getUnitElement(Element2 element) {
+CompilationUnitElementImpl getUnitElement(Element element) {
   var result = element.firstFragment.libraryFragment;
   if (result case CompilationUnitElementImpl result) {
     return result;
@@ -124,7 +120,7 @@ class ElementNameComponents {
   final String? classMemberName;
   final String? unitMemberName;
 
-  factory ElementNameComponents(Element2 element) {
+  factory ElementNameComponents(Element element) {
     String? parameterName;
     if (element.firstFragment case FormalParameterFragment fragment) {
       parameterName = fragment.name2;
@@ -132,8 +128,8 @@ class ElementNameComponents {
     }
 
     String? classMemberName;
-    if (element.enclosingElement2 is InterfaceElement2 ||
-        element.enclosingElement2 is ExtensionElement2) {
+    if (element.enclosingElement2 is InterfaceElement ||
+        element.enclosingElement2 is ExtensionElement) {
       classMemberName = element.lookupName;
       element = element.enclosingElement2!;
     }
@@ -141,7 +137,7 @@ class ElementNameComponents {
     String? unitMemberName;
     if (element.firstFragment.enclosingFragment is CompilationUnitElementImpl) {
       unitMemberName = element.lookupName;
-      if (element is ExtensionElement2 && unitMemberName == null) {
+      if (element is ExtensionElement && unitMemberName == null) {
         var enclosingUnit = element.enclosingElement2;
         var indexOf = enclosingUnit.extensions.indexOf(element);
         unitMemberName = 'extension-$indexOf';
@@ -167,10 +163,10 @@ class ElementNameComponents {
 /// corresponding non-synthetic field and [IndexSyntheticElementKind.getter] as
 /// the [kind].
 class IndexElementInfo {
-  final Element2 element;
+  final Element element;
   final IndexSyntheticElementKind kind;
 
-  factory IndexElementInfo(Element2 element) {
+  factory IndexElementInfo(Element element) {
     IndexSyntheticElementKind kind = IndexSyntheticElementKind.notSynthetic;
     ElementKind elementKind = element.kind;
     if (elementKind == ElementKind.LIBRARY ||
@@ -185,14 +181,14 @@ class IndexElementInfo {
         kind = IndexSyntheticElementKind.loadLibrary;
         element = element.library2;
       } else if (elementKind == ElementKind.FIELD) {
-        var field = element as FieldElement2;
+        var field = element as FieldElement;
         kind = IndexSyntheticElementKind.field;
         element = (field.getter2 ?? field.setter2)!;
       } else if (elementKind == ElementKind.GETTER ||
           elementKind == ElementKind.SETTER) {
-        var accessor = element as PropertyAccessorElement2;
+        var accessor = element as PropertyAccessorElement;
         var enclosing = element.enclosingElement2;
-        bool isEnumGetter = enclosing is EnumElement2;
+        bool isEnumGetter = enclosing is EnumElement;
         if (isEnumGetter && accessor.name3 == 'index') {
           kind = IndexSyntheticElementKind.enumIndex;
           element = enclosing;
@@ -208,14 +204,14 @@ class IndexElementInfo {
             element = variable;
           }
         }
-      } else if (element is MethodElement2) {
+      } else if (element is MethodElement) {
         var enclosing = element.enclosingElement2;
-        bool isEnumMethod = enclosing is EnumElement2;
+        bool isEnumMethod = enclosing is EnumElement;
         if (isEnumMethod && element.name3 == 'toString') {
           kind = IndexSyntheticElementKind.enumToString;
           element = enclosing;
         }
-      } else if (element is TopLevelVariableElement2) {
+      } else if (element is TopLevelVariableElement) {
         kind = IndexSyntheticElementKind.topLevelVariable;
         element = (element.getter2 ?? element.setter2)!;
       } else {
@@ -297,7 +293,7 @@ class _IndexAssembler {
   static const _nullString = '--nullString--';
 
   /// Map associating referenced elements with their [_ElementInfo]s.
-  final Map<Element2, _ElementInfo> elementMap = {};
+  final Map<Element, _ElementInfo> elementMap = {};
 
   /// Map associating [CompilationUnitElementImpl]s with their identifiers,
   /// which are indices into [unitLibraryUris] and [unitUnitUris].
@@ -339,7 +335,7 @@ class _IndexAssembler {
   }
 
   void addElementRelation(
-    Element2 element,
+    Element element,
     IndexRelationKind kind,
     int offset,
     int length,
@@ -377,7 +373,7 @@ class _IndexAssembler {
   }
 
   /// Adds a prefix (or empty string for unprefixed) for an element.
-  void addPrefixForElement(Element2 element, {PrefixElement2? prefix}) {
+  void addPrefixForElement(Element element, {PrefixElement? prefix}) {
     if (element is MultiplyDefinedElementImpl2 ||
         // TODO(brianwilkerson): The last two conditions are here because the
         //  elements for `dynamic` and `Never` are singletons and hence don't have
@@ -528,7 +524,7 @@ class _IndexAssembler {
 
   /// Return the unique [_ElementInfo] corresponding the [element].  The field
   /// [_ElementInfo.id] is filled by [assemble] during final sorting.
-  _ElementInfo _getElementInfo(Element2 element) {
+  _ElementInfo _getElementInfo(Element element) {
     element = element.baseElement;
     return elementMap.putIfAbsent(element, () {
       var unitElement = getUnitElement(element);
@@ -571,7 +567,7 @@ class _IndexAssembler {
 
   /// Return a new [_ElementInfo] for the given [element] in the given [unitId].
   /// This method is static, so it cannot add any information to the index.
-  _ElementInfo _newElementInfo(int unitId, Element2 element) {
+  _ElementInfo _newElementInfo(int unitId, Element element) {
     IndexElementInfo info = IndexElementInfo(element);
     element = info.element;
 
@@ -592,8 +588,8 @@ class _IndexContributor extends GeneralizingAstVisitor {
 
   _IndexContributor(this.assembler);
 
-  void recordIsAncestorOf(InterfaceElement2 descendant) {
-    _recordIsAncestorOf(descendant, descendant, false, <InterfaceElement2>[]);
+  void recordIsAncestorOf(InterfaceElement descendant) {
+    _recordIsAncestorOf(descendant, descendant, false, <InterfaceElement>[]);
   }
 
   /// Record that the name [node] has a relation of the given [kind].
@@ -605,8 +601,8 @@ class _IndexContributor extends GeneralizingAstVisitor {
     assembler.addNameRelation(node.name, kind, node.offset, isQualified);
   }
 
-  /// Record reference to the given operator [Element2].
-  void recordOperatorReference(Token operator, Element2? element) {
+  /// Record reference to the given operator [Element].
+  void recordOperatorReference(Token operator, Element? element) {
     recordRelationToken(element, IndexRelationKind.IS_INVOKED_BY, operator);
   }
 
@@ -615,7 +611,7 @@ class _IndexContributor extends GeneralizingAstVisitor {
   /// explicit or implicit qualifier, so cannot be shadowed by a local
   /// declaration.
   void recordRelation(
-    Element2? element,
+    Element? element,
     IndexRelationKind kind,
     SyntacticEntity node,
     bool isQualified,
@@ -636,7 +632,7 @@ class _IndexContributor extends GeneralizingAstVisitor {
   /// has an explicit or implicit qualifier, so [element] cannot be shadowed by
   /// a local declaration.
   void recordRelationOffset(
-    Element2? element,
+    Element? element,
     IndexRelationKind kind,
     int offset,
     int length,
@@ -671,7 +667,7 @@ class _IndexContributor extends GeneralizingAstVisitor {
     // named parameters. Ignore them.
     if (elementKind == ElementKind.PARAMETER &&
         element is FormalParameterElement &&
-        element.enclosingElement2 is GenericFunctionTypeElement2) {
+        element.enclosingElement2 is GenericFunctionTypeElement) {
       return;
     }
     // Add the relation.
@@ -681,7 +677,7 @@ class _IndexContributor extends GeneralizingAstVisitor {
   /// Record that [element] has a relation of the given [kind] at the location
   /// of the given [token].
   void recordRelationToken(
-    Element2? element,
+    Element? element,
     IndexRelationKind kind,
     Token token, {
     bool isQualified = true,
@@ -695,14 +691,14 @@ class _IndexContributor extends GeneralizingAstVisitor {
     );
   }
 
-  /// Record a relation between a super [namedType] and its [Element2].
+  /// Record a relation between a super [namedType] and its [Element].
   void recordSuperType(NamedType namedType, IndexRelationKind kind) {
     var isQualified = namedType.importPrefix != null;
     var element = namedType.element2;
     recordRelation(element, kind, namedType.name2, isQualified);
   }
 
-  void recordUriReference(Element2? element, StringLiteral uri) {
+  void recordUriReference(Element? element, StringLiteral uri) {
     recordRelation(element, IndexRelationKind.IS_REFERENCED_BY, uri, true);
   }
 
@@ -768,7 +764,7 @@ class _IndexContributor extends GeneralizingAstVisitor {
     var expression = node.expression;
     if (expression is Identifier) {
       var element = expression.element;
-      if (element is ConstructorElement2) {
+      if (element is ConstructorElement) {
         if (expression is PrefixedIdentifier) {
           var offset = expression.prefix.end;
           var length = expression.end - offset;
@@ -1005,7 +1001,7 @@ class _IndexContributor extends GeneralizingAstVisitor {
   @override
   void visitIndexExpression(IndexExpression node) {
     var element = node.writeOrReadElement2;
-    if (element is MethodElement2) {
+    if (element is MethodElement) {
       Token operator = node.leftBracket;
       recordRelationToken(element, IndexRelationKind.IS_INVOKED_BY, operator);
     }
@@ -1026,7 +1022,7 @@ class _IndexContributor extends GeneralizingAstVisitor {
     }
     // element invocation
     IndexRelationKind kind =
-        element is InterfaceElement2
+        element is InterfaceElement
             ? IndexRelationKind.IS_REFERENCED_BY
             : IndexRelationKind.IS_INVOKED_BY;
     recordRelation(element, kind, name, isQualified);
@@ -1111,7 +1107,7 @@ class _IndexContributor extends GeneralizingAstVisitor {
   void visitPrefixedIdentifier(PrefixedIdentifier node) {
     var element = node.element;
     var prefixElement = node.prefix.element;
-    if (element != null && prefixElement is PrefixElement2) {
+    if (element != null && prefixElement is PrefixElement) {
       assembler.addPrefixForElement(element, prefix: prefixElement);
     }
     super.visitPrefixedIdentifier(node);
@@ -1264,7 +1260,7 @@ class _IndexContributor extends GeneralizingAstVisitor {
     List<String> supertypes = [];
     List<String> members = [];
 
-    String getInterfaceElementId(InterfaceElement2 element) {
+    String getInterfaceElementId(InterfaceElement element) {
       var libraryUri = element.library2.uri;
       var libraryFragment = element.firstFragment.libraryFragment;
       var libraryFragmentUri = libraryFragment.source.uri;
@@ -1273,7 +1269,7 @@ class _IndexContributor extends GeneralizingAstVisitor {
 
     void addSupertype(NamedType? type) {
       var element = type?.element2;
-      if (element is InterfaceElement2) {
+      if (element is InterfaceElement) {
         String id = getInterfaceElementId(element);
         supertypes.add(id);
       }
@@ -1342,10 +1338,10 @@ class _IndexContributor extends GeneralizingAstVisitor {
   /// If the given [constructor] is a synthetic constructor created for a
   /// [ClassTypeAlias], return the actual constructor of a [ClassDeclaration]
   /// which is invoked.  Return `null` if a redirection cycle is detected.
-  ConstructorElement2? _getActualConstructorElement(
-    ConstructorElement2? constructor,
+  ConstructorElement? _getActualConstructorElement(
+    ConstructorElement? constructor,
   ) {
-    var seenConstructors = <ConstructorElement2?>{};
+    var seenConstructors = <ConstructorElement?>{};
     while (constructor is ConstructorElementImpl2 && constructor.isSynthetic) {
       var enclosing = constructor.enclosingElement2;
       if (enclosing is ClassElementImpl2 && enclosing.isMixinApplication) {
@@ -1380,7 +1376,7 @@ class _IndexContributor extends GeneralizingAstVisitor {
   void _recordImportPrefixedElement({
     required ImportPrefixReference? importPrefix,
     required Token name,
-    required Element2? element,
+    required Element? element,
   }) {
     if (element == null) {
       return;
@@ -1388,7 +1384,7 @@ class _IndexContributor extends GeneralizingAstVisitor {
 
     if (importPrefix != null) {
       var prefixElement = importPrefix.element2;
-      if (prefixElement is PrefixElement2) {
+      if (prefixElement is PrefixElement) {
         recordRelationToken(
           importPrefix.element2,
           IndexRelationKind.IS_REFERENCED_BY,
@@ -1410,10 +1406,10 @@ class _IndexContributor extends GeneralizingAstVisitor {
   }
 
   void _recordIsAncestorOf(
-    Element2 descendant,
-    InterfaceElement2 ancestor,
+    Element descendant,
+    InterfaceElement ancestor,
     bool includeThis,
-    List<InterfaceElement2> visitedElements,
+    List<InterfaceElement> visitedElements,
   ) {
     if (visitedElements.contains(ancestor)) {
       return;
@@ -1451,7 +1447,7 @@ class _IndexContributor extends GeneralizingAstVisitor {
         visitedElements,
       );
     }
-    if (ancestor is MixinElement2) {
+    if (ancestor is MixinElement) {
       for (InterfaceType type in ancestor.superclassConstraints) {
         _recordIsAncestorOf(descendant, type.element3, true, visitedElements);
       }
diff --git a/pkg/analyzer/lib/src/dart/analysis/search.dart b/pkg/analyzer/lib/src/dart/analysis/search.dart
index 68c31ddb0f3..337ed2b58e5 100644
--- a/pkg/analyzer/lib/src/dart/analysis/search.dart
+++ b/pkg/analyzer/lib/src/dart/analysis/search.dart
@@ -52,35 +52,35 @@ Fragment _getEnclosingFragment(
   return result ?? libraryFragment;
 }
 
-DeclarationKind? _getSearchElementKind(Element2 element) {
-  if (element is EnumElement2) {
+DeclarationKind? _getSearchElementKind(Element element) {
+  if (element is EnumElement) {
     return DeclarationKind.ENUM;
   }
 
-  if (element is ExtensionTypeElement2) {
+  if (element is ExtensionTypeElement) {
     return DeclarationKind.EXTENSION_TYPE;
   }
 
-  if (element is MixinElement2) {
+  if (element is MixinElement) {
     return DeclarationKind.MIXIN;
   }
 
-  if (element is ClassElement2) {
+  if (element is ClassElement) {
     if (element.isMixinApplication) {
       return DeclarationKind.CLASS_TYPE_ALIAS;
     }
     return DeclarationKind.CLASS;
   }
 
-  if (element is ConstructorElement2) {
+  if (element is ConstructorElement) {
     return DeclarationKind.CONSTRUCTOR;
   }
 
-  if (element is ExtensionElement2) {
+  if (element is ExtensionElement) {
     return DeclarationKind.EXTENSION;
   }
 
-  if (element is FieldElement2) {
+  if (element is FieldElement) {
     if (element.isEnumConstant) return DeclarationKind.ENUM_CONSTANT;
     return DeclarationKind.FIELD;
   }
@@ -89,7 +89,7 @@ DeclarationKind? _getSearchElementKind(Element2 element) {
     return DeclarationKind.FUNCTION;
   }
 
-  if (element is MethodElement2) {
+  if (element is MethodElement) {
     return DeclarationKind.METHOD;
   }
 
@@ -101,11 +101,11 @@ DeclarationKind? _getSearchElementKind(Element2 element) {
     return DeclarationKind.SETTER;
   }
 
-  if (element is TypeAliasElement2) {
+  if (element is TypeAliasElement) {
     return DeclarationKind.TYPE_ALIAS;
   }
 
-  if (element is VariableElement2) {
+  if (element is VariableElement) {
     return DeclarationKind.VARIABLE;
   }
 
@@ -224,7 +224,7 @@ class ImportElementReferencesVisitor extends RecursiveAstVisitor<void> {
   final LibraryImport import;
   final CompilationUnitElementImpl enclosingLibraryFragment;
 
-  late final Set<Element2> importedElements;
+  late final Set<Element> importedElements;
 
   ImportElementReferencesVisitor(
     LibraryImport element,
@@ -336,19 +336,19 @@ class Search {
   Search(this._driver);
 
   /// Returns class or mixin members with the given [name].
-  Future<List<Element2>> classMembers(
+  Future<List<Element>> classMembers(
     String name,
     SearchedFiles searchedFiles,
   ) async {
-    var elements = <Element2>[];
+    var elements = <Element>[];
 
-    void addElement(Element2 element) {
+    void addElement(Element element) {
       if (!element.isSynthetic && element.displayName == name) {
         elements.add(element);
       }
     }
 
-    void addElements(InterfaceElement2 element) {
+    void addElements(InterfaceElement element) {
       element.getters2.forEach(addElement);
       element.setters2.forEach(addElement);
       element.fields2.forEach(addElement);
@@ -376,7 +376,7 @@ class Search {
   /// string if the element is referenced without a prefix.
   Future<Set<String>> prefixesUsedInLibrary(
     LibraryElementImpl library,
-    Element2 element,
+    Element element,
   ) async {
     var prefixes = <String>{};
     for (var unit in library.units) {
@@ -395,7 +395,7 @@ class Search {
 
   /// Returns references to the [element].
   Future<List<SearchResult>> references(
-    Element2? element,
+    Element? element,
     SearchedFiles searchedFiles,
   ) async {
     if (element == null) {
@@ -403,20 +403,20 @@ class Search {
     }
 
     ElementKind kind = element.kind;
-    if (element is ExtensionElement2 ||
-        element is InterfaceElement2 ||
+    if (element is ExtensionElement ||
+        element is InterfaceElement ||
         element is SetterElement ||
-        element is TypeAliasElement2) {
+        element is TypeAliasElement) {
       return _searchReferences(element, searchedFiles);
-    } else if (element is ConstructorElement2) {
+    } else if (element is ConstructorElement) {
       return await _searchReferences_Constructor(element, searchedFiles);
     } else if (element is GetterElement) {
       return _searchReferences_Getter(element, searchedFiles);
-    } else if (element is PropertyInducingElement2) {
+    } else if (element is PropertyInducingElement) {
       return _searchReferences_Field(element, searchedFiles);
     } else if (element is LocalFunctionElement) {
       return _searchReferences_Local(element, (n) => n is Block, searchedFiles);
-    } else if (element is ExecutableElement2) {
+    } else if (element is ExecutableElement) {
       return _searchReferences_Function(element, searchedFiles);
     } else if (element is PatternVariableElementImpl2) {
       return _searchReferences_PatternVariable(element, searchedFiles);
@@ -439,7 +439,7 @@ class Search {
       return _searchReferences_Parameter(element, searchedFiles);
     } else if (element is PrefixElementImpl2) {
       return _searchReferences_Prefix(element, searchedFiles);
-    } else if (element is TypeParameterElement2) {
+    } else if (element is TypeParameterElement) {
       return _searchReferences_Local(
         element,
         (n) => n.parent is CompilationUnit,
@@ -487,7 +487,7 @@ class Search {
   /// [Search] object, so should be only searched by it to avoid duplicate
   /// results; and updated to take ownership if the file is not owned yet.
   Future<List<SearchResult>> subTypes(
-    InterfaceElement2? type,
+    InterfaceElement? type,
     SearchedFiles searchedFiles, {
     List<FileState>? filesToCheck,
   }) async {
@@ -510,7 +510,7 @@ class Search {
   /// Return direct [SubtypeResult]s for either the [type] or [subtype].
   Future<List<SubtypeResult>> subtypes(
     SearchedFiles searchedFiles, {
-    InterfaceElement2? type,
+    InterfaceElement? type,
     SubtypeResult? subtype,
   }) async {
     var type1 = type;
@@ -549,10 +549,10 @@ class Search {
   }
 
   /// Returns top-level elements with names matching the given [regExp].
-  Future<List<Element2>> topLevelElements(RegExp regExp) async {
-    var elements = <Element2>[];
+  Future<List<Element>> topLevelElements(RegExp regExp) async {
+    var elements = <Element>[];
 
-    void addElement(Element2 element) {
+    void addElement(Element element) {
       if (!element.isSynthetic && regExp.hasMatch(element.displayName)) {
         elements.add(element);
       }
@@ -617,7 +617,7 @@ class Search {
 
   Future<void> _addResults(
     List<SearchResult> results,
-    Element2 element,
+    Element element,
     SearchedFiles searchedFiles,
     Map<IndexRelationKind, SearchResultKind> relationToResultKind, {
     List<FileState>? filesToCheck,
@@ -628,7 +628,7 @@ class Search {
     if (externalElement case FormalParameterElement(:var enclosingElement2?)) {
       externalElement = enclosingElement2;
     }
-    if (externalElement is ConstructorElement2) {
+    if (externalElement is ConstructorElement) {
       name = externalElement.enclosingElement2.displayName;
     }
 
@@ -691,7 +691,7 @@ class Search {
   /// Add results for [element] usage in the given [file].
   Future<void> _addResultsInFile(
     List<SearchResult> results,
-    Element2 element,
+    Element element,
     Map<IndexRelationKind, SearchResultKind> relationToResultKind,
     String file,
   ) async {
@@ -716,7 +716,7 @@ class Search {
   }
 
   Future<List<SearchResult>> _searchReferences(
-    Element2 element,
+    Element element,
     SearchedFiles searchedFiles,
   ) async {
     List<SearchResult> results = <SearchResult>[];
@@ -766,7 +766,7 @@ class Search {
   }
 
   Future<List<SearchResult>> _searchReferences_Constructor(
-    ConstructorElement2 element,
+    ConstructorElement element,
     SearchedFiles searchedFiles,
   ) async {
     List<SearchResult> results = <SearchResult>[];
@@ -782,7 +782,7 @@ class Search {
   }
 
   Future<List<SearchResult>> _searchReferences_Field(
-    PropertyInducingElement2 field,
+    PropertyInducingElement field,
     SearchedFiles searchedFiles,
   ) async {
     List<SearchResult> results = <SearchResult>[];
@@ -809,7 +809,7 @@ class Search {
   }
 
   Future<List<SearchResult>> _searchReferences_Function(
-    Element2 element,
+    Element element,
     SearchedFiles searchedFiles,
   ) async {
     List<SearchResult> results = <SearchResult>[];
@@ -892,7 +892,7 @@ class Search {
   }
 
   Future<List<SearchResult>> _searchReferences_Local(
-    Element2 element,
+    Element element,
     bool Function(AstNode n) isRootNode,
     SearchedFiles searchedFiles,
   ) async {
@@ -947,7 +947,7 @@ class Search {
     );
     if (parameter.isNamed ||
         parameter.isOptionalPositional ||
-        parameter.enclosingElement2 is ConstructorElement2) {
+        parameter.enclosingElement2 is ConstructorElement) {
       results.addAll(await _searchReferences(parameter, searchedFiles));
     }
     return results;
@@ -1284,7 +1284,7 @@ class _FindLibraryDeclarations {
     _addTypeAliases(library.typeAliases);
   }
 
-  void _addClasses(List<InterfaceElement2> elements) {
+  void _addClasses(List<InterfaceElement> elements) {
     for (var i = 0; i < elements.length; i++) {
       var element = elements[i];
       _addDeclaration(element, element.name3!);
@@ -1296,7 +1296,7 @@ class _FindLibraryDeclarations {
     }
   }
 
-  void _addConstructors(List<ConstructorElement2> elements) {
+  void _addConstructors(List<ConstructorElement> elements) {
     for (var i = 0; i < elements.length; i++) {
       var element = elements[i];
       if (!element.isSynthetic) {
@@ -1305,7 +1305,7 @@ class _FindLibraryDeclarations {
     }
   }
 
-  void _addDeclaration(Element2 element, String name) {
+  void _addDeclaration(Element element, String name) {
     if (result.hasMoreDeclarationsThan(maxResults)) {
       throw const _MaxNumberOfDeclarationsError();
     }
@@ -1318,11 +1318,11 @@ class _FindLibraryDeclarations {
 
     String? className;
     String? mixinName;
-    if (enclosing is EnumElement2) {
+    if (enclosing is EnumElement) {
       // skip
-    } else if (enclosing is MixinElement2) {
+    } else if (enclosing is MixinElement) {
       mixinName = enclosing.name3;
-    } else if (enclosing is InterfaceElement2) {
+    } else if (enclosing is InterfaceElement) {
       className = enclosing.name3;
     }
 
@@ -1332,7 +1332,7 @@ class _FindLibraryDeclarations {
     }
 
     String? parameters;
-    if (element is ExecutableElement2) {
+    if (element is ExecutableElement) {
       var displayString = element.displayString2();
       var parameterIndex = displayString.indexOf('(');
       if (parameterIndex > 0) {
@@ -1382,7 +1382,7 @@ class _FindLibraryDeclarations {
     );
   }
 
-  void _addExtensions(List<ExtensionElement2> elements) {
+  void _addExtensions(List<ExtensionElement> elements) {
     for (var i = 0; i < elements.length; i++) {
       var element = elements[i];
       var name = element.name3;
@@ -1396,7 +1396,7 @@ class _FindLibraryDeclarations {
     }
   }
 
-  void _addFields(List<FieldElement2> elements) {
+  void _addFields(List<FieldElement> elements) {
     for (var i = 0; i < elements.length; i++) {
       var element = elements[i];
       if (!element.isSynthetic) {
@@ -1421,7 +1421,7 @@ class _FindLibraryDeclarations {
     }
   }
 
-  void _addMethods(List<MethodElement2> elements) {
+  void _addMethods(List<MethodElement> elements) {
     for (var i = 0; i < elements.length; i++) {
       var element = elements[i];
       _addDeclaration(element, element.name3!);
@@ -1437,14 +1437,14 @@ class _FindLibraryDeclarations {
     }
   }
 
-  void _addTypeAliases(List<TypeAliasElement2> elements) {
+  void _addTypeAliases(List<TypeAliasElement> elements) {
     for (var i = 0; i < elements.length; i++) {
       var element = elements[i];
       _addDeclaration(element, element.name3!);
     }
   }
 
-  void _addVariables(List<TopLevelVariableElement2> elements) {
+  void _addVariables(List<TopLevelVariableElement> elements) {
     for (var i = 0; i < elements.length; i++) {
       var element = elements[i];
       if (!element.isSynthetic) {
@@ -1501,7 +1501,7 @@ class _IndexRequest {
 
   /// Return the [element]'s identifier in the [index] or `-1` if the
   /// [element] is not referenced in the [index].
-  int findElementId(Element2 element) {
+  int findElementId(Element element) {
     IndexElementInfo info = IndexElementInfo(element);
     element = info.element;
     // Find the id of the element's unit.
@@ -1600,7 +1600,7 @@ class _IndexRequest {
 
   /// Return the identifier of the [CompilationUnitElementIml] containing the
   /// [element] in the [index] or `-1` if not found.
-  int getUnitId(Element2 element) {
+  int getUnitId(Element element) {
     var unitElement = getUnitElement(element);
     return index.getLibraryFragmentId(unitElement);
   }
@@ -1677,7 +1677,7 @@ class _IndexRequest {
 class _LocalReferencesVisitor extends RecursiveAstVisitor<void> {
   final List<SearchResult> results = <SearchResult>[];
 
-  final Set<Element2> elements;
+  final Set<Element> elements;
   final CompilationUnitElementImpl enclosingLibraryFragment;
 
   _LocalReferencesVisitor(this.elements, this.enclosingLibraryFragment);
@@ -1730,7 +1730,7 @@ class _LocalReferencesVisitor extends RecursiveAstVisitor<void> {
         if (parent is MethodInvocation && parent.methodName == node) {
           kind = SearchResultKind.INVOCATION;
         }
-      } else if (element is VariableElement2) {
+      } else if (element is VariableElement) {
         bool isGet = node.inGetterContext();
         bool isSet = node.inSetterContext();
         if (isGet && isSet) {
diff --git a/pkg/analyzer/lib/src/dart/analysis/session.dart b/pkg/analyzer/lib/src/dart/analysis/session.dart
index ce210fc8d53..f0428e3d6a9 100644
--- a/pkg/analyzer/lib/src/dart/analysis/session.dart
+++ b/pkg/analyzer/lib/src/dart/analysis/session.dart
@@ -93,7 +93,7 @@ class AnalysisSessionImpl implements AnalysisSession {
   }
 
   @override
-  SomeParsedLibraryResult getParsedLibraryByElement2(LibraryElement2 element) {
+  SomeParsedLibraryResult getParsedLibraryByElement2(LibraryElement element) {
     checkConsistency();
 
     if (element.session != this) {
@@ -117,7 +117,7 @@ class AnalysisSessionImpl implements AnalysisSession {
 
   @override
   Future<SomeResolvedLibraryResult> getResolvedLibraryByElement2(
-    LibraryElement2 element,
+    LibraryElement element,
   ) async {
     checkConsistency();
 
diff --git a/pkg/analyzer/lib/src/dart/analysis/session_helper.dart b/pkg/analyzer/lib/src/dart/analysis/session_helper.dart
index b984557133b..95599bb98bd 100644
--- a/pkg/analyzer/lib/src/dart/analysis/session_helper.dart
+++ b/pkg/analyzer/lib/src/dart/analysis/session_helper.dart
@@ -18,14 +18,14 @@ class AnalysisSessionHelper {
 
   AnalysisSessionHelper(this.session);
 
-  /// Returns the [ClassElement2] with the given [className] that is exported
+  /// Returns the [ClassElement] with the given [className] that is exported
   /// from the library with the given [libraryUri], or `null` if the library
   /// does not export a class with such name.
-  Future<ClassElement2?> getClass(String libraryUri, String className) async {
+  Future<ClassElement?> getClass(String libraryUri, String className) async {
     var libraryResult = await session.getLibraryByUri(libraryUri);
     if (libraryResult is LibraryElementResult) {
       var element = libraryResult.element2.exportNamespace.get2(className);
-      if (element is ClassElement2) {
+      if (element is ClassElement) {
         return element;
       }
     }
@@ -33,28 +33,28 @@ class AnalysisSessionHelper {
   }
 
   @Deprecated('Use [getClass] instead.')
-  Future<ClassElement2?> getClass2(String libraryUri, String className) async {
+  Future<ClassElement?> getClass2(String libraryUri, String className) async {
     return await getClass(libraryUri, className);
   }
 
-  /// Return the [EnumElement2] with the given [className] that is exported
+  /// Return the [EnumElement] with the given [className] that is exported
   /// from the library with the given [libraryUri], or `null` if the library
   /// does not export a class with such name.
-  Future<EnumElement2?> getEnum(String libraryUri, String className) async {
+  Future<EnumElement?> getEnum(String libraryUri, String className) async {
     var libraryResult = await session.getLibraryByUri(libraryUri);
     if (libraryResult is LibraryElementResult) {
       var element = libraryResult.element2.exportNamespace.get2(className);
-      if (element is EnumElement2) {
+      if (element is EnumElement) {
         return element;
       }
     }
     return null;
   }
 
-  /// Returns the [ClassElement2] with the given [className] that is exported
+  /// Returns the [ClassElement] with the given [className] that is exported
   /// from the Flutter widgets library, or `null` if the library does not export
   /// a class with such name.
-  Future<ClassElement2?> getFlutterClass(String className) =>
+  Future<ClassElement?> getFlutterClass(String className) =>
       getClass('package:flutter/widgets.dart', className);
 
   /// Returns the declaration of the [fragment].
@@ -69,14 +69,14 @@ class AnalysisSessionHelper {
     return resolvedLibrary?.getFragmentDeclaration(fragment);
   }
 
-  /// Return the [MixinElement2] with the given [name] that is exported
+  /// Return the [MixinElement] with the given [name] that is exported
   /// from the library with the given [libraryUri], or `null` if the library
   /// does not export a class with such name.
-  Future<MixinElement2?> getMixin(String libraryUri, String name) async {
+  Future<MixinElement?> getMixin(String libraryUri, String name) async {
     var libraryResult = await session.getLibraryByUri(libraryUri);
     if (libraryResult is LibraryElementResult) {
       var element = libraryResult.element2.exportNamespace.get2(name);
-      if (element is MixinElement2) {
+      if (element is MixinElement) {
         return element;
       }
     }
@@ -84,7 +84,7 @@ class AnalysisSessionHelper {
   }
 
   /// Returns the resolved unit that declares the given [element].
-  Future<ResolvedUnitResult?> getResolvedUnitByElement(Element2 element) async {
+  Future<ResolvedUnitResult?> getResolvedUnitByElement(Element element) async {
     var libraryPath = element.library2!.firstFragment.source.fullName;
     var resolvedLibrary = await _getResolvedLibrary(libraryPath);
     if (resolvedLibrary == null) {
@@ -97,19 +97,19 @@ class AnalysisSessionHelper {
     );
   }
 
-  /// Returns the [PropertyAccessorElement2] with the given [name] that is
+  /// Returns the [PropertyAccessorElement] with the given [name] that is
   /// exported from the library with the given [uri].
   ///
   /// Returns `null` if the library does not export a top-level accessor with
   /// that name.
-  Future<PropertyAccessorElement2?> getTopLevelPropertyAccessor(
+  Future<PropertyAccessorElement?> getTopLevelPropertyAccessor(
     String uri,
     String name,
   ) async {
     var libraryResult = await session.getLibraryByUri(uri);
     if (libraryResult is LibraryElementResult) {
       var element = libraryResult.element2.exportNamespace.get2(name);
-      if (element is PropertyAccessorElement2) {
+      if (element is PropertyAccessorElement) {
         return element;
       }
     }
diff --git a/pkg/analyzer/lib/src/dart/ast/ast.dart b/pkg/analyzer/lib/src/dart/ast/ast.dart
index 71b1eb33eab..aea2a80ea45 100644
--- a/pkg/analyzer/lib/src/dart/ast/ast.dart
+++ b/pkg/analyzer/lib/src/dart/ast/ast.dart
@@ -201,7 +201,7 @@ abstract final class Annotation implements AstNode {
   /// Returns `null` if the AST structure hasn't been resolved or if this
   /// annotation couldn't be resolved.
   @experimental
-  Element2? get element2;
+  Element? get element2;
 
   /// The element annotation representing this annotation in the element model,
   /// or `null` if the AST hasn't been resolved.
@@ -245,7 +245,7 @@ final class AnnotationImpl extends AstNodeImpl implements Annotation {
 
   ArgumentListImpl? _arguments;
 
-  Element2? _element2;
+  Element? _element2;
 
   @override
   ElementAnnotationImpl? elementAnnotation;
@@ -295,7 +295,7 @@ final class AnnotationImpl extends AstNodeImpl implements Annotation {
   }
 
   @override
-  Element2? get element2 {
+  Element? get element2 {
     if (_element2 case var element?) {
       return element;
     } else if (_constructorName == null) {
@@ -304,7 +304,7 @@ final class AnnotationImpl extends AstNodeImpl implements Annotation {
     return null;
   }
 
-  set element2(Element2? value) {
+  set element2(Element? value) {
     _element2 = value;
   }
 
@@ -760,16 +760,16 @@ abstract final class AssignedVariablePattern implements VariablePattern {
   /// Returns `null` if either [name] doesn't resolve to an element or the AST
   /// structure hasn't been resolved.
   ///
-  /// In valid code this is either a [LocalVariableElement2] or a
+  /// In valid code this is either a [LocalVariableElement] or a
   /// [FormalParameterElement].
   @experimental
-  Element2? get element2;
+  Element? get element2;
 }
 
 final class AssignedVariablePatternImpl extends VariablePatternImpl
     implements AssignedVariablePattern {
   @override
-  Element2? element2;
+  Element? element2;
 
   AssignedVariablePatternImpl({required super.name});
 
@@ -897,14 +897,14 @@ final class AssignmentExpressionImpl extends ExpressionImpl
   /// right operand is bound, or `null` if the AST structure is not resolved or
   /// the function being invoked is not known based on static type information.
   FormalParameterElementMixin? get _staticParameterElementForRightHandSide {
-    Element2? executableElement;
+    Element? executableElement;
     if (operator.type != TokenType.EQ) {
       executableElement = element;
     } else {
       executableElement = writeElement2;
     }
 
-    if (executableElement is ExecutableElement2) {
+    if (executableElement is ExecutableElement) {
       var formalParameters = executableElement.formalParameters;
       if (formalParameters.isEmpty) {
         return null;
@@ -1779,7 +1779,7 @@ final class BinaryExpressionImpl extends ExpressionImpl
   ExpressionImpl _rightOperand;
 
   @override
-  MethodElement2? element;
+  MethodElement? element;
 
   @override
   FunctionTypeImpl? staticInvokeType;
@@ -2537,7 +2537,7 @@ abstract final class CatchClauseParameter extends AstNode {
   ///
   /// Returns `null` if the AST hasn't been resolved.
   @experimental
-  LocalVariableElement2? get declaredElement2;
+  LocalVariableElement? get declaredElement2;
 
   /// The declared fragment.
   ///
@@ -3558,14 +3558,14 @@ abstract final class CompoundAssignmentExpression implements Expression {
   /// Returns `null` if this node isn't a compound assignment, if the AST
   /// structure hasn't been resolved, or if the target couldn't be resolved.
   ///
-  /// In valid code this element can be a [LocalVariableElement2], a
+  /// In valid code this element can be a [LocalVariableElement], a
   /// [FormalParameterElement], or a [GetterElement].
   ///
   /// In invalid code this element is `null`. For example, in `int += 2`. In
   /// such cases, for recovery purposes, [writeElement2] is filled, and can be
   /// used for navigation.
   @experimental
-  Element2? get readElement2;
+  Element? get readElement2;
 
   /// The type of the value read with the [readElement2], or `null` if this node
   /// isn't a compound assignment.
@@ -3579,7 +3579,7 @@ abstract final class CompoundAssignmentExpression implements Expression {
   /// Returns `null` if the AST structure hasn't been resolved, or if the target
   /// couldn't be resolved.
   ///
-  /// In valid code this is a [LocalVariableElement2], [FormalParameterElement],
+  /// In valid code this is a [LocalVariableElement], [FormalParameterElement],
   /// or a [SetterElement].
   ///
   /// In invalid code, for recovery, we might use other elements, for example a
@@ -3590,7 +3590,7 @@ abstract final class CompoundAssignmentExpression implements Expression {
   /// If this node is a compound assignment, such as `x += y`, both
   /// [readElement2] and [writeElement2] could be non-`null`.
   @experimental
-  Element2? get writeElement2;
+  Element? get writeElement2;
 
   /// The type of the target of the assignment.
   ///
@@ -3603,10 +3603,10 @@ abstract final class CompoundAssignmentExpression implements Expression {
 base mixin CompoundAssignmentExpressionImpl
     implements CompoundAssignmentExpression {
   @override
-  Element2? readElement2;
+  Element? readElement2;
 
   @override
-  Element2? writeElement2;
+  Element? writeElement2;
 
   @override
   TypeImpl? readType;
@@ -4479,7 +4479,7 @@ abstract final class ConstructorReferenceNode implements AstNode {
   /// Returns `null` if the AST structure hasn't been resolved or if the
   /// constructor couldn't be resolved.
   @experimental
-  ConstructorElement2? get element;
+  ConstructorElement? get element;
 }
 
 /// The name of a constructor being invoked.
@@ -4733,7 +4733,7 @@ abstract final class DeclaredIdentifier implements Declaration {
   /// Returns `null` if either this node corresponds to a list of declarations
   /// or if the AST structure hasn't been resolved.
   @experimental
-  LocalVariableElement2? get declaredElement2;
+  LocalVariableElement? get declaredElement2;
 
   @override
   LocalVariableFragment? get declaredFragment;
@@ -4844,7 +4844,7 @@ sealed class DeclaredVariablePattern implements VariablePattern {
   ///
   /// Returns `null` if the AST structure hasn't been resolved.
   @experimental
-  BindPatternVariableElement2? get declaredElement2;
+  BindPatternVariableElement? get declaredElement2;
 
   /// The fragment declared by this declaration.
   ///
@@ -5702,7 +5702,7 @@ abstract final class EnumConstantDeclaration implements Declaration {
   /// Returns `null` if the AST structure hasn't been resolved, or if the
   /// constructor couldn't be resolved.
   @experimental
-  ConstructorElement2? get constructorElement2;
+  ConstructorElement? get constructorElement2;
 
   @experimental
   @override
@@ -6667,7 +6667,7 @@ abstract final class ExtensionOverride implements Expression {
 
   /// The extension that resolution will use to resolve member references.
   @experimental
-  ExtensionElement2 get element2;
+  ExtensionElement get element2;
 
   /// The actual type extended by this override, produced by applying
   /// [typeArgumentTypes] to the generic type extended by the extension, or
@@ -8223,7 +8223,7 @@ sealed class FunctionBody implements AstNode {
   ///
   /// Throws an exception if resolution hasn't been performed.
   @experimental
-  bool isPotentiallyMutatedInScope2(VariableElement2 variable);
+  bool isPotentiallyMutatedInScope2(VariableElement variable);
 }
 
 sealed class FunctionBodyImpl extends AstNodeImpl implements FunctionBody {
@@ -8252,7 +8252,7 @@ sealed class FunctionBodyImpl extends AstNodeImpl implements FunctionBody {
   Token? get star => null;
 
   @override
-  bool isPotentiallyMutatedInScope2(VariableElement2 variable) {
+  bool isPotentiallyMutatedInScope2(VariableElement variable) {
     if (localVariableInfo == null) {
       throw StateError('Resolution has not been performed');
     }
@@ -8596,7 +8596,7 @@ abstract final class FunctionExpressionInvocation
   /// Returns `null` if the AST structure hasn't been resolved or the function
   /// couldn't be resolved.
   @experimental
-  ExecutableElement2? get element;
+  ExecutableElement? get element;
 
   /// The expression producing the function being invoked.
   @override
@@ -8609,7 +8609,7 @@ final class FunctionExpressionInvocationImpl extends InvocationExpressionImpl
   ExpressionImpl _function;
 
   @override
-  ExecutableElement2? element;
+  ExecutableElement? element;
 
   /// Initializes a newly created function expression invocation.
   FunctionExpressionInvocationImpl({
@@ -9342,7 +9342,7 @@ sealed class Identifier implements Expression, CommentReferableExpression {
   /// identifier couldn't be resolved. One example of the latter case is an
   /// identifier that isn't defined within the scope in which it appears.
   @experimental
-  Element2? get element;
+  Element? get element;
 
   /// The lexical representation of the identifier.
   String get name;
@@ -9744,7 +9744,7 @@ final class ImplicitCallReferenceImpl extends ExpressionImpl
   List<DartType> typeArgumentTypes;
 
   @override
-  MethodElement2 element;
+  MethodElement element;
 
   ImplicitCallReferenceImpl({
     required ExpressionImpl expression,
@@ -9975,9 +9975,9 @@ final class ImportDirectiveImpl extends NamespaceDirectiveImpl
 abstract final class ImportPrefixReference implements AstNode {
   /// The element to which [name] is resolved.
   ///
-  /// Usually a [PrefixElement2], but can be anything in invalid code.
+  /// Usually a [PrefixElement], but can be anything in invalid code.
   @experimental
-  Element2? get element2;
+  Element? get element2;
 
   /// The name of the referenced import prefix.
   Token get name;
@@ -9995,7 +9995,7 @@ final class ImportPrefixReferenceImpl extends AstNodeImpl
   final Token period;
 
   @override
-  Element2? element2;
+  Element? element2;
 
   ImportPrefixReferenceImpl({required this.name, required this.period});
 
@@ -10112,7 +10112,7 @@ final class IndexExpressionImpl extends ExpressionImpl
   /// target, or `null` if the AST structure hasn't been resolved or if the
   /// operator couldn't be resolved.
   @override
-  MethodElement2? element;
+  MethodElement? element;
 
   /// Initializes a newly created index expression that is a child of a cascade
   /// expression.
@@ -10222,7 +10222,7 @@ final class IndexExpressionImpl extends ExpressionImpl
   /// or the function being invoked is not known based on static type
   /// information.
   FormalParameterElementMixin? get _staticParameterElementForIndex {
-    Element2? element = this.element;
+    Element? element = this.element;
 
     var parent = this.parent;
     if (parent is CompoundAssignmentExpression) {
@@ -10998,7 +10998,7 @@ abstract final class LibraryDirective implements Directive {
   /// Returns `null` if the AST structure hasn't been resolved or if this
   /// directive couldn't be resolved.
   @experimental
-  LibraryElement2? get element2;
+  LibraryElement? get element2;
 
   /// The token representing the `library` keyword.
   Token get libraryKeyword;
@@ -11094,7 +11094,7 @@ final class LibraryIdentifierImpl extends IdentifierImpl
   NodeListImpl<SimpleIdentifierImpl> get components => _components;
 
   @override
-  Element2? get element => null;
+  Element? get element => null;
 
   @override
   Token get endToken => _components.endToken!;
@@ -11361,7 +11361,7 @@ sealed class LiteralImpl extends ExpressionImpl implements Literal {
 class LocalVariableInfo {
   /// The set of local variables and parameters that are potentially mutated
   /// within the scope of their declarations.
-  final Set<VariableElement2> potentiallyMutatedInScope = {};
+  final Set<VariableElement> potentiallyMutatedInScope = {};
 }
 
 /// A logical-and pattern.
@@ -12119,11 +12119,11 @@ final class MethodInvocationImpl extends InvocationExpressionImpl
 
   /// The invoke type of the [methodName].
   ///
-  /// If the target element is a [MethodElement2], this is the same as the
+  /// If the target element is a [MethodElement], this is the same as the
   /// [staticInvokeType].
   ///
   /// If the target element is a getter, presumably returning an
-  /// [ExecutableElement2] so that it can be invoked in this [MethodInvocation],
+  /// [ExecutableElement] so that it can be invoked in this [MethodInvocation],
   /// then this type is the type of the getter, and the [staticInvokeType] is
   /// the invoked type of the returned element.
   DartType? get methodNameType => _methodNameType ?? staticInvokeType;
@@ -12205,7 +12205,7 @@ abstract final class MethodReferenceExpression implements Expression {
   /// this is a non-compound assignment expression, or when the method referred
   /// to couldn't be resolved.
   @experimental
-  MethodElement2? get element;
+  MethodElement? get element;
 }
 
 /// The declaration of a mixin.
@@ -12510,13 +12510,13 @@ final class NamedExpressionImpl extends ExpressionImpl
 abstract final class NamedType implements TypeAnnotation {
   /// The element of [name2] considering [importPrefix].
   ///
-  /// This could be a [ClassElement2], [TypeAliasElement2], or other type defining
+  /// This could be a [ClassElement], [TypeAliasElement], or other type defining
   /// element.
   ///
   /// Returns `null` if [name2] can't be resolved, or there's no element for the
   /// type name, such as for `void`.
   @experimental
-  Element2? get element2;
+  Element? get element2;
 
   /// The optional import prefix before [name2].
   ImportPrefixReference? get importPrefix;
@@ -12550,7 +12550,7 @@ final class NamedTypeImpl extends TypeAnnotationImpl implements NamedType {
 
   @experimental
   @override
-  Element2? element2;
+  Element? element2;
 
   @override
   TypeArgumentListImpl? typeArguments;
@@ -12593,7 +12593,7 @@ final class NamedTypeImpl extends TypeAnnotationImpl implements NamedType {
   @override
   bool get isDeferred {
     var importPrefixElement = importPrefix?.element2;
-    if (importPrefixElement is PrefixElement2) {
+    if (importPrefixElement is PrefixElement) {
       return importPrefixElement.fragments.any(
         (fragment) => fragment.isDeferred,
       );
@@ -13875,7 +13875,7 @@ abstract final class PatternField implements AstNode {
   /// Returns non-`null` inside valid [ObjectPattern]s; always returns `null`
   /// inside [RecordPattern]s.
   @experimental
-  Element2? get element2;
+  Element? get element2;
 
   /// The name of the field, or `null` if the field is a positional field.
   PatternFieldName? get name;
@@ -13886,7 +13886,7 @@ abstract final class PatternField implements AstNode {
 
 final class PatternFieldImpl extends AstNodeImpl implements PatternField {
   @override
-  Element2? element2;
+  Element? element2;
 
   @override
   final PatternFieldNameImpl? name;
@@ -14132,7 +14132,7 @@ abstract final class PostfixExpression
   /// operand, or `null` if the AST structure hasn't been resolved, if the
   /// operator isn't user definable, or if the operator couldn't be resolved.
   @override
-  MethodElement2? get element;
+  MethodElement? get element;
 
   /// The expression computing the operand for the operator.
   Expression get operand;
@@ -14150,7 +14150,7 @@ final class PostfixExpressionImpl extends ExpressionImpl
   final Token operator;
 
   @override
-  MethodElement2? element;
+  MethodElement? element;
 
   /// Initializes a newly created postfix expression.
   PostfixExpressionImpl({
@@ -14268,7 +14268,7 @@ final class PrefixedIdentifierImpl extends IdentifierImpl
   Token get beginToken => _prefix.beginToken;
 
   @override
-  Element2? get element {
+  Element? get element {
     return _identifier.element;
   }
 
@@ -14285,7 +14285,7 @@ final class PrefixedIdentifierImpl extends IdentifierImpl
   @override
   bool get isDeferred {
     var element = _prefix.element;
-    if (element is PrefixElement2) {
+    if (element is PrefixElement) {
       return element.fragments.any((fragment) => fragment.isDeferred);
     }
     return false;
@@ -14341,7 +14341,7 @@ abstract final class PrefixExpression
   /// operand, or `null` if the AST structure hasn't been resolved, if the
   /// operator isn't user definable, or if the operator couldn't be resolved.
   @override
-  MethodElement2? get element;
+  MethodElement? get element;
 
   /// The expression computing the operand for the operator.
   Expression get operand;
@@ -14359,7 +14359,7 @@ final class PrefixExpressionImpl extends ExpressionImpl
   ExpressionImpl _operand;
 
   @override
-  MethodElement2? element;
+  MethodElement? element;
 
   /// Initializes a newly created prefix expression.
   PrefixExpressionImpl({
@@ -15122,7 +15122,7 @@ abstract final class RelationalPattern implements DartPattern {
   /// Returns `null` if the AST structure hasn't been resolved or if the
   /// operator couldn't be resolved.
   @experimental
-  MethodElement2? get element2;
+  MethodElement? get element2;
 
   /// The expression used to compute the operand.
   Expression get operand;
@@ -15139,7 +15139,7 @@ final class RelationalPatternImpl extends DartPatternImpl
   final Token operator;
 
   @override
-  MethodElement2? element2;
+  MethodElement? element2;
 
   RelationalPatternImpl({
     required this.operator,
@@ -15906,7 +15906,7 @@ final class SimpleIdentifierImpl extends IdentifierImpl
   /// information, or `null` if the AST structure hasn't been resolved or if
   /// this identifier couldn't be resolved.
   @override
-  Element2? element;
+  Element? element;
 
   @override
   List<TypeImpl>? tearOffTypeArgumentTypes;
@@ -18274,7 +18274,7 @@ abstract final class VariableDeclaration implements Declaration {
   /// Returns `null` if the AST structure hasn't been resolved or if this node
   /// represents the declaration of a top-level variable or a field.
   @experimental
-  LocalVariableElement2? get declaredElement2;
+  LocalVariableElement? get declaredElement2;
 
   /// The fragment declared by this declaration.
   ///
diff --git a/pkg/analyzer/lib/src/dart/ast/constant_evaluator.dart b/pkg/analyzer/lib/src/dart/ast/constant_evaluator.dart
index 01af364d86d..6083bf5f8bd 100644
--- a/pkg/analyzer/lib/src/dart/ast/constant_evaluator.dart
+++ b/pkg/analyzer/lib/src/dart/ast/constant_evaluator.dart
@@ -391,7 +391,7 @@ class ConstantEvaluator extends GeneralizingAstVisitor<Object> {
 
   /// Return the constant value of the static constant represented by the given
   /// [element].
-  Object _getConstantValue(Element2? element) {
+  Object _getConstantValue(Element? element) {
     // TODO(brianwilkerson): Implement this
     //    if (element is FieldElement) {
     //      FieldElement field = element;
diff --git a/pkg/analyzer/lib/src/dart/ast/element_locator.dart b/pkg/analyzer/lib/src/dart/ast/element_locator.dart
index 3e6bfa215e1..266348f0f2f 100644
--- a/pkg/analyzer/lib/src/dart/ast/element_locator.dart
+++ b/pkg/analyzer/lib/src/dart/ast/element_locator.dart
@@ -7,11 +7,11 @@ import 'package:analyzer/dart/ast/visitor.dart';
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/src/dart/ast/extensions.dart';
 
-/// An object used to locate the [Element2] associated with a given [AstNode].
+/// An object used to locate the [Element] associated with a given [AstNode].
 class ElementLocator {
   /// Return the element associated with the given [node], or `null` if there
   /// is no element associated with the node.
-  static Element2? locate2(AstNode? node) {
+  static Element? locate2(AstNode? node) {
     if (node == null) return null;
 
     var mapper = _ElementMapper2();
@@ -20,54 +20,54 @@ class ElementLocator {
 }
 
 /// Visitor that maps nodes to elements.
-class _ElementMapper2 extends GeneralizingAstVisitor<Element2> {
+class _ElementMapper2 extends GeneralizingAstVisitor<Element> {
   @override
-  Element2? visitAnnotation(Annotation node) {
+  Element? visitAnnotation(Annotation node) {
     return node.element2;
   }
 
   @override
-  Element2? visitAssignedVariablePattern(AssignedVariablePattern node) {
+  Element? visitAssignedVariablePattern(AssignedVariablePattern node) {
     return node.element2;
   }
 
   @override
-  Element2? visitAssignmentExpression(AssignmentExpression node) {
+  Element? visitAssignmentExpression(AssignmentExpression node) {
     return node.element;
   }
 
   @override
-  Element2? visitBinaryExpression(BinaryExpression node) {
+  Element? visitBinaryExpression(BinaryExpression node) {
     return node.element;
   }
 
   @override
-  Element2? visitCatchClauseParameter(CatchClauseParameter node) {
+  Element? visitCatchClauseParameter(CatchClauseParameter node) {
     return node.declaredElement2;
   }
 
   @override
-  Element2? visitClassDeclaration(ClassDeclaration node) {
+  Element? visitClassDeclaration(ClassDeclaration node) {
     return node.declaredFragment?.element;
   }
 
   @override
-  Element2? visitClassTypeAlias(ClassTypeAlias node) {
+  Element? visitClassTypeAlias(ClassTypeAlias node) {
     return node.declaredFragment?.element;
   }
 
   @override
-  Element2? visitCompilationUnit(CompilationUnit node) {
+  Element? visitCompilationUnit(CompilationUnit node) {
     return node.declaredFragment?.element;
   }
 
   @override
-  Element2? visitConstructorDeclaration(ConstructorDeclaration node) {
+  Element? visitConstructorDeclaration(ConstructorDeclaration node) {
     return node.declaredFragment?.element;
   }
 
   @override
-  Element2? visitConstructorSelector(ConstructorSelector node) {
+  Element? visitConstructorSelector(ConstructorSelector node) {
     var parent = node.parent;
     if (parent is EnumConstantArguments) {
       var parent2 = parent.parent;
@@ -79,67 +79,67 @@ class _ElementMapper2 extends GeneralizingAstVisitor<Element2> {
   }
 
   @override
-  Element2? visitDeclaredIdentifier(DeclaredIdentifier node) {
+  Element? visitDeclaredIdentifier(DeclaredIdentifier node) {
     return node.declaredElement2;
   }
 
   @override
-  Element2? visitDeclaredVariablePattern(DeclaredVariablePattern node) {
+  Element? visitDeclaredVariablePattern(DeclaredVariablePattern node) {
     return node.declaredElement2;
   }
 
   @override
-  Element2? visitEnumConstantDeclaration(EnumConstantDeclaration node) {
+  Element? visitEnumConstantDeclaration(EnumConstantDeclaration node) {
     return node.declaredFragment?.element;
   }
 
   @override
-  Element2? visitEnumDeclaration(EnumDeclaration node) {
+  Element? visitEnumDeclaration(EnumDeclaration node) {
     return node.declaredFragment?.element;
   }
 
   @override
-  Element2? visitExportDirective(ExportDirective node) {
+  Element? visitExportDirective(ExportDirective node) {
     return node.libraryExport?.exportedLibrary2;
   }
 
   @override
-  Element2? visitExtensionDeclaration(ExtensionDeclaration node) {
+  Element? visitExtensionDeclaration(ExtensionDeclaration node) {
     return node.declaredFragment?.element;
   }
 
   @override
-  Element2? visitExtensionOverride(ExtensionOverride node) {
+  Element? visitExtensionOverride(ExtensionOverride node) {
     return node.element2;
   }
 
   @override
-  Element2? visitExtensionTypeDeclaration(ExtensionTypeDeclaration node) {
+  Element? visitExtensionTypeDeclaration(ExtensionTypeDeclaration node) {
     return node.declaredFragment?.element;
   }
 
   @override
-  Element2? visitFormalParameter(FormalParameter node) {
+  Element? visitFormalParameter(FormalParameter node) {
     return node.declaredFragment?.element;
   }
 
   @override
-  Element2? visitFunctionDeclaration(FunctionDeclaration node) {
+  Element? visitFunctionDeclaration(FunctionDeclaration node) {
     return node.declaredFragment?.element;
   }
 
   @override
-  Element2? visitFunctionTypeAlias(FunctionTypeAlias node) {
+  Element? visitFunctionTypeAlias(FunctionTypeAlias node) {
     return node.declaredFragment?.element;
   }
 
   @override
-  Element2? visitGenericTypeAlias(GenericTypeAlias node) {
+  Element? visitGenericTypeAlias(GenericTypeAlias node) {
     return node.declaredFragment?.element;
   }
 
   @override
-  Element2? visitIdentifier(Identifier node) {
+  Element? visitIdentifier(Identifier node) {
     var parent = node.parent;
     if (parent is Annotation) {
       // Map the type name in an annotation.
@@ -155,7 +155,7 @@ class _ElementMapper2 extends GeneralizingAstVisitor<Element2> {
           return parent.declaredFragment?.element;
         }
         var element = node.element;
-        if (element is InterfaceElement2) {
+        if (element is InterfaceElement) {
           return element.unnamedConstructor2;
         }
       } else if (parent.name == node.endToken) {
@@ -180,62 +180,62 @@ class _ElementMapper2 extends GeneralizingAstVisitor<Element2> {
   }
 
   @override
-  Element2? visitImportDirective(ImportDirective node) {
+  Element? visitImportDirective(ImportDirective node) {
     return node.libraryImport?.importedLibrary2;
   }
 
   @override
-  Element2? visitImportPrefixReference(ImportPrefixReference node) {
+  Element? visitImportPrefixReference(ImportPrefixReference node) {
     return node.element2;
   }
 
   @override
-  Element2? visitIndexExpression(IndexExpression node) {
+  Element? visitIndexExpression(IndexExpression node) {
     return node.element;
   }
 
   @override
-  Element2? visitInstanceCreationExpression(InstanceCreationExpression node) {
+  Element? visitInstanceCreationExpression(InstanceCreationExpression node) {
     return node.constructorName.element;
   }
 
   @override
-  Element2? visitLibraryDirective(LibraryDirective node) {
+  Element? visitLibraryDirective(LibraryDirective node) {
     return node.element2;
   }
 
   @override
-  Element2? visitMethodDeclaration(MethodDeclaration node) {
+  Element? visitMethodDeclaration(MethodDeclaration node) {
     return node.declaredFragment?.element;
   }
 
   @override
-  Element2? visitMethodInvocation(MethodInvocation node) {
+  Element? visitMethodInvocation(MethodInvocation node) {
     return node.methodName.element;
   }
 
   @override
-  Element2? visitMixinDeclaration(MixinDeclaration node) {
+  Element? visitMixinDeclaration(MixinDeclaration node) {
     return node.declaredFragment?.element;
   }
 
   @override
-  Element2? visitNamedType(NamedType node) {
+  Element? visitNamedType(NamedType node) {
     return node.element2;
   }
 
   @override
-  Element2? visitPartOfDirective(PartOfDirective node) {
+  Element? visitPartOfDirective(PartOfDirective node) {
     return node.libraryName?.element;
   }
 
   @override
-  Element2? visitPatternField(PatternField node) {
+  Element? visitPatternField(PatternField node) {
     return node.element2;
   }
 
   @override
-  Element2? visitPatternFieldName(PatternFieldName node) {
+  Element? visitPatternFieldName(PatternFieldName node) {
     var parent = node.parent;
     if (parent is PatternField) {
       return parent.element2;
@@ -245,22 +245,22 @@ class _ElementMapper2 extends GeneralizingAstVisitor<Element2> {
   }
 
   @override
-  Element2? visitPostfixExpression(PostfixExpression node) {
+  Element? visitPostfixExpression(PostfixExpression node) {
     return node.element;
   }
 
   @override
-  Element2? visitPrefixedIdentifier(PrefixedIdentifier node) {
+  Element? visitPrefixedIdentifier(PrefixedIdentifier node) {
     return node.element;
   }
 
   @override
-  Element2? visitPrefixExpression(PrefixExpression node) {
+  Element? visitPrefixExpression(PrefixExpression node) {
     return node.element;
   }
 
   @override
-  Element2? visitRepresentationConstructorName(
+  Element? visitRepresentationConstructorName(
     RepresentationConstructorName node,
   ) {
     var representation = node.parent as RepresentationDeclaration;
@@ -268,12 +268,12 @@ class _ElementMapper2 extends GeneralizingAstVisitor<Element2> {
   }
 
   @override
-  Element2? visitRepresentationDeclaration(RepresentationDeclaration node) {
+  Element? visitRepresentationDeclaration(RepresentationDeclaration node) {
     return node.fieldFragment?.element;
   }
 
   @override
-  Element2? visitStringLiteral(StringLiteral node) {
+  Element? visitStringLiteral(StringLiteral node) {
     var parent = node.parent;
     if (parent is ExportDirective) {
       return parent.libraryExport?.exportedLibrary2;
@@ -286,12 +286,12 @@ class _ElementMapper2 extends GeneralizingAstVisitor<Element2> {
   }
 
   @override
-  Element2? visitTypeParameter(TypeParameter node) {
+  Element? visitTypeParameter(TypeParameter node) {
     return node.declaredFragment?.element;
   }
 
   @override
-  Element2? visitVariableDeclaration(VariableDeclaration node) {
+  Element? visitVariableDeclaration(VariableDeclaration node) {
     return node.declaredFragment?.element ?? node.declaredElement2;
   }
 }
diff --git a/pkg/analyzer/lib/src/dart/ast/extensions.dart b/pkg/analyzer/lib/src/dart/ast/extensions.dart
index b79dd13374b..550631086c0 100644
--- a/pkg/analyzer/lib/src/dart/ast/extensions.dart
+++ b/pkg/analyzer/lib/src/dart/ast/extensions.dart
@@ -11,7 +11,7 @@ import 'package:analyzer/src/dart/element/type.dart';
 import 'package:collection/collection.dart';
 
 // TODO(scheglov): https://github.com/dart-lang/sdk/issues/43608
-Element2? _readElement2(AstNode node) {
+Element? _readElement2(AstNode node) {
   var parent = node.parent;
 
   if (parent is AssignmentExpression && parent.leftHandSide == node) {
@@ -34,7 +34,7 @@ Element2? _readElement2(AstNode node) {
 }
 
 // TODO(scheglov): https://github.com/dart-lang/sdk/issues/43608
-Element2? _writeElement2(AstNode node) {
+Element? _writeElement2(AstNode node) {
   var parent = node.parent;
 
   if (parent is AssignmentExpression && parent.leftHandSide == node) {
@@ -199,7 +199,7 @@ extension FormalParameterExtension on FormalParameter {
 
 // TODO(scheglov): https://github.com/dart-lang/sdk/issues/43608
 extension IdentifierExtension on Identifier {
-  Element2? get readElement2 {
+  Element? get readElement2 {
     return _readElement2(this);
   }
 
@@ -212,11 +212,11 @@ extension IdentifierExtension on Identifier {
     }
   }
 
-  Element2? get writeElement2 {
+  Element? get writeElement2 {
     return _writeElement2(this);
   }
 
-  Element2? get writeOrReadElement2 {
+  Element? get writeOrReadElement2 {
     return _writeElement2(this) ?? element;
   }
 
@@ -256,7 +256,7 @@ extension IdentifierImplExtension on IdentifierImpl {
 
 // TODO(scheglov): https://github.com/dart-lang/sdk/issues/43608
 extension IndexExpressionExtension on IndexExpression {
-  Element2? get writeOrReadElement2 {
+  Element? get writeOrReadElement2 {
     return _writeElement2(this) ?? element;
   }
 }
diff --git a/pkg/analyzer/lib/src/dart/constant/constant_verifier.dart b/pkg/analyzer/lib/src/dart/constant/constant_verifier.dart
index b86aad94e52..61ec2347ee3 100644
--- a/pkg/analyzer/lib/src/dart/constant/constant_verifier.dart
+++ b/pkg/analyzer/lib/src/dart/constant/constant_verifier.dart
@@ -107,7 +107,7 @@ class ConstantVerifier extends RecursiveAstVisitor<void> {
     super.visitAnnotation(node);
     // check annotation creation
     var element = node.element2;
-    if (element is ConstructorElement2) {
+    if (element is ConstructorElement) {
       // should be 'const' constructor
       if (!element.isConst) {
         _errorReporter.atNode(
@@ -581,12 +581,12 @@ class ConstantVerifier extends RecursiveAstVisitor<void> {
   void _checkForConstWithTypeParameters(
     TypeAnnotation type,
     ErrorCode errorCode, {
-    Set<TypeParameterElement2>? allowedTypeParameters,
+    Set<TypeParameterElement>? allowedTypeParameters,
   }) {
     allowedTypeParameters = {...?allowedTypeParameters};
     if (type is NamedType) {
       // Should not be a type parameter.
-      if (type.element2 is TypeParameterElement2 &&
+      if (type.element2 is TypeParameterElement &&
           !allowedTypeParameters.contains(type.element2)) {
         _errorReporter.atNode(type, errorCode);
         return;
diff --git a/pkg/analyzer/lib/src/dart/constant/evaluation.dart b/pkg/analyzer/lib/src/dart/constant/evaluation.dart
index 263e8679cfc..6c1c408b24b 100644
--- a/pkg/analyzer/lib/src/dart/constant/evaluation.dart
+++ b/pkg/analyzer/lib/src/dart/constant/evaluation.dart
@@ -165,7 +165,7 @@ class ConstantEvaluationEngine {
     } else if (constant is ElementAnnotationImpl) {
       var constNode = constant.annotationAst;
       var element = constant.element2;
-      if (element is PropertyAccessorElement2) {
+      if (element is PropertyAccessorElement) {
         // The annotation is a reference to a compile-time constant variable.
         // Just copy the evaluation result.
         var variableElement = element.variable3?.baseElement;
@@ -202,7 +202,7 @@ class ConstantEvaluationEngine {
         // is detected elsewhere, so just silently ignore it here.
         constant.evaluationResult = null;
       }
-    } else if (constant is VariableElement2) {
+    } else if (constant is VariableElement) {
       // `constant` is a VariableElement but not a VariableElementImpl.  This
       // can happen sometimes in the case of invalid user code (for example, a
       // constant expression that refers to a non-static field inside a generic
@@ -303,14 +303,14 @@ class ConstantEvaluationEngine {
     } else if (constant is ElementAnnotationImpl) {
       Annotation constNode = constant.annotationAst;
       var element = constant.element2;
-      if (element is PropertyAccessorElement2) {
+      if (element is PropertyAccessorElement) {
         // The annotation is a reference to a compile-time constant variable,
         // so it depends on the variable.
         if (element.variable3 case var variable?) {
           var baseElement = variable.baseElement as VariableElementImpl2;
           callback(baseElement.firstFragment as VariableElementImpl);
         }
-      } else if (element is ConstructorElement2) {
+      } else if (element is ConstructorElement) {
         // The annotation is a constructor invocation, so it depends on the
         // constructor.
         var baseElement = element.baseElement;
@@ -534,7 +534,7 @@ abstract class ConstantEvaluationTarget {
   bool get isConstantEvaluated;
 
   /// The library with this constant.
-  LibraryElement2? get library2;
+  LibraryElement? get library2;
 
   /// The library containing this constant.
   Source? get librarySource;
@@ -557,7 +557,7 @@ class ConstantVisitor extends UnifyingAstVisitor<Constant> {
   final Map<String, DartObjectImpl>? _lexicalEnvironment;
 
   /// A mapping of type parameter names to runtime values (types).
-  final Map<TypeParameterElement2, TypeImpl>? _lexicalTypeEnvironment;
+  final Map<TypeParameterElement, TypeImpl>? _lexicalTypeEnvironment;
 
   final Substitution? _substitution;
 
@@ -580,7 +580,7 @@ class ConstantVisitor extends UnifyingAstVisitor<Constant> {
     this._library,
     this._errorReporter, {
     Map<String, DartObjectImpl>? lexicalEnvironment,
-    Map<TypeParameterElement2, TypeImpl>? lexicalTypeEnvironment,
+    Map<TypeParameterElement, TypeImpl>? lexicalTypeEnvironment,
     Substitution? substitution,
   }) : _lexicalEnvironment = lexicalEnvironment,
        _lexicalTypeEnvironment = lexicalTypeEnvironment,
@@ -655,12 +655,12 @@ class ConstantVisitor extends UnifyingAstVisitor<Constant> {
     var operatorElement = node.element;
     var operatorContainer = operatorElement?.enclosingElement2;
     switch (operatorContainer) {
-      case ExtensionElement2():
+      case ExtensionElement():
         return InvalidConstant.forEntity(
           entity: node,
           errorCode: CompileTimeErrorCode.CONST_EVAL_EXTENSION_METHOD,
         );
-      case ExtensionTypeElement2():
+      case ExtensionTypeElement():
         return InvalidConstant.forEntity(
           entity: node,
           errorCode: CompileTimeErrorCode.CONST_EVAL_EXTENSION_TYPE_METHOD,
@@ -843,7 +843,7 @@ class ConstantVisitor extends UnifyingAstVisitor<Constant> {
     // [_dartObjectComputer.typeInstantiate] is unnecessary.
     var typeElement = node.constructorName.type.element2;
 
-    TypeAliasElement2? viaTypeAlias;
+    TypeAliasElement? viaTypeAlias;
     if (typeElement is TypeAliasElementImpl2) {
       if (constructorFunctionType.typeFormals.isNotEmpty &&
           !typeElement.isProperRename) {
@@ -1174,18 +1174,18 @@ class ConstantVisitor extends UnifyingAstVisitor<Constant> {
     var prefixElement = prefixNode.element;
 
     // A top-level constant, imported with a prefix.
-    if (prefixElement is PrefixElement2) {
+    if (prefixElement is PrefixElement) {
       if (node.isDeferred) {
         return _getDeferredLibraryError(node, node.identifier);
       }
-    } else if (prefixElement is! ExtensionElement2) {
+    } else if (prefixElement is! ExtensionElement) {
       var prefixResult = evaluateConstant(prefixNode);
       if (prefixResult is! DartObjectImpl) {
         return prefixResult;
       }
 
       // For example, `String.length`.
-      if (prefixElement is! InterfaceElement2) {
+      if (prefixElement is! InterfaceElement) {
         var propertyAccessResult = _evaluatePropertyAccess(
           prefixResult,
           node.identifier,
@@ -1211,12 +1211,12 @@ class ConstantVisitor extends UnifyingAstVisitor<Constant> {
     var operatorElement = node.element;
     var operatorContainer = operatorElement?.enclosingElement2;
     switch (operatorContainer) {
-      case ExtensionElement2():
+      case ExtensionElement():
         return InvalidConstant.forEntity(
           entity: node,
           errorCode: CompileTimeErrorCode.CONST_EVAL_EXTENSION_METHOD,
         );
-      case ExtensionTypeElement2():
+      case ExtensionTypeElement():
         return InvalidConstant.forEntity(
           entity: node,
           errorCode: CompileTimeErrorCode.CONST_EVAL_EXTENSION_TYPE_METHOD,
@@ -1245,10 +1245,10 @@ class ConstantVisitor extends UnifyingAstVisitor<Constant> {
     var target = node.target;
     if (target != null) {
       if (target is PrefixedIdentifierImpl &&
-          (target.element is ExtensionElement2 ||
-              target.element is ExtensionTypeElement2)) {
+          (target.element is ExtensionElement ||
+              target.element is ExtensionTypeElement)) {
         var prefix = target.prefix;
-        if (prefix.element is PrefixElement2 && target.isDeferred) {
+        if (prefix.element is PrefixElement && target.isDeferred) {
           return _getDeferredLibraryError(node, target.identifier);
         }
 
@@ -1838,12 +1838,12 @@ class ConstantVisitor extends UnifyingAstVisitor<Constant> {
 
     var propertyContainer = propertyElement?.enclosingElement2;
     switch (propertyContainer) {
-      case ExtensionElement2():
+      case ExtensionElement():
         return InvalidConstant.forEntity(
           entity: errorNode,
           errorCode: CompileTimeErrorCode.CONST_EVAL_EXTENSION_METHOD,
         );
-      case ExtensionTypeElement2():
+      case ExtensionTypeElement():
         return InvalidConstant.forEntity(
           entity: errorNode,
           errorCode: CompileTimeErrorCode.CONST_EVAL_EXTENSION_TYPE_METHOD,
@@ -1860,7 +1860,7 @@ class ConstantVisitor extends UnifyingAstVisitor<Constant> {
     }
 
     var element = identifier.element;
-    if (element != null && element is ExecutableElement2 && element.isStatic) {
+    if (element != null && element is ExecutableElement && element.isStatic) {
       return null;
     }
 
@@ -1876,21 +1876,21 @@ class ConstantVisitor extends UnifyingAstVisitor<Constant> {
   ///
   /// The [errorNode] is the node to be used if an error needs to be reported,
   /// the [expression] is used to identify type parameter errors, and
-  /// [identifier] to determine the constant of any [ExecutableElement2]s.
+  /// [identifier] to determine the constant of any [ExecutableElement]s.
   ///
   // TODO(kallentu): Revisit this method and clean it up a bit.
   Constant _getConstantValue({
     required AstNode errorNode,
     required Expression? expression,
     required SimpleIdentifierImpl? identifier,
-    required Element2? element,
+    required Element? element,
     TypeImpl? givenType,
   }) {
     var errorNode2 = _evaluationEngine.configuration.errorNode(errorNode);
     element = element?.baseElement;
 
     var variableElement =
-        element is PropertyAccessorElement2 ? element.variable3 : element;
+        element is PropertyAccessorElement ? element.variable3 : element;
 
     // TODO(srawlins): Remove this check when [FunctionReference]s are inserted
     // for generic function instantiation for pre-constructor-references code.
@@ -2007,7 +2007,7 @@ class ConstantVisitor extends UnifyingAstVisitor<Constant> {
         _typeProvider.typeType,
         TypeState(_typeProvider.neverType),
       );
-    } else if (variableElement is TypeParameterElement2) {
+    } else if (variableElement is TypeParameterElement) {
       // Constants may refer to type parameters only if the constructor-tearoffs
       // feature is enabled.
       if (_library.featureSet.isEnabled(Feature.constructor_tearoffs)) {
@@ -2806,7 +2806,7 @@ class _InstanceCreationEvaluator {
 
   final List<DartObjectImpl> _argumentValues;
 
-  final Map<TypeParameterElement2, TypeImpl> _typeParameterMap = HashMap();
+  final Map<TypeParameterElement, TypeImpl> _typeParameterMap = HashMap();
 
   final Map<String, DartObjectImpl> _parameterMap = HashMap();
 
@@ -2941,7 +2941,7 @@ class _InstanceCreationEvaluator {
     }
 
     var definingType = this.definingType;
-    if (definingType.element3 case ExtensionTypeElement2 element) {
+    if (definingType.element3 case ExtensionTypeElement element) {
       var representation = _fieldMap[element.representation2.name3];
       if (representation != null) {
         return representation;
diff --git a/pkg/analyzer/lib/src/dart/constant/from_environment_evaluator.dart b/pkg/analyzer/lib/src/dart/constant/from_environment_evaluator.dart
index caa850e679b..5f9e6bb7f1c 100644
--- a/pkg/analyzer/lib/src/dart/constant/from_environment_evaluator.dart
+++ b/pkg/analyzer/lib/src/dart/constant/from_environment_evaluator.dart
@@ -25,7 +25,7 @@ class FromEnvironmentEvaluator {
   DartObjectImpl getBool2(
     String? name,
     Map<String, DartObjectImpl> namedValues,
-    ConstructorElement2 constructor,
+    ConstructorElement constructor,
   ) {
     var str = name != null ? _declaredVariables.get(name) : null;
     if (str == 'true') {
@@ -55,7 +55,7 @@ class FromEnvironmentEvaluator {
   DartObjectImpl getInt2(
     String? name,
     Map<String, DartObjectImpl> namedValues,
-    ConstructorElement2 constructor,
+    ConstructorElement constructor,
   ) {
     var str = name != null ? _declaredVariables.get(name) : null;
     if (str != null) {
@@ -98,7 +98,7 @@ class FromEnvironmentEvaluator {
   DartObjectImpl getString2(
     String? name,
     Map<String, DartObjectImpl> namedValues,
-    ConstructorElement2 constructor,
+    ConstructorElement constructor,
   ) {
     var str = name != null ? _declaredVariables.get(name) : null;
     if (str != null) {
@@ -138,7 +138,7 @@ class FromEnvironmentEvaluator {
   }
 
   static DartObjectImpl _defaultValueDefaultValue(
-    ConstructorElement2 constructor,
+    ConstructorElement constructor,
   ) {
     return constructor.formalParameters
             .singleWhere((parameter) => parameter.name3 == _defaultValue)
diff --git a/pkg/analyzer/lib/src/dart/constant/potentially_constant.dart b/pkg/analyzer/lib/src/dart/constant/potentially_constant.dart
index 9a81e1f5d56..a21edbfde59 100644
--- a/pkg/analyzer/lib/src/dart/constant/potentially_constant.dart
+++ b/pkg/analyzer/lib/src/dart/constant/potentially_constant.dart
@@ -10,7 +10,7 @@ import 'package:analyzer/dart/element/type.dart';
 import 'package:analyzer/src/dart/ast/extensions.dart';
 import 'package:analyzer/src/dart/element/type.dart';
 
-/// Some [ConstructorElement2]s can be temporary marked as "const" to check
+/// Some [ConstructorElement]s can be temporary marked as "const" to check
 /// if doing this is valid.
 final temporaryConstConstructorElements = Expando<bool>();
 
@@ -38,7 +38,7 @@ bool isPotentiallyConstantTypeExpression(TypeAnnotation node) {
 
 bool _isConstantTypeName(Identifier name) {
   var element = name.element;
-  if (element is InterfaceElement2 || element is TypeAliasElement2) {
+  if (element is InterfaceElement || element is TypeAliasElement) {
     if (name is PrefixedIdentifier) {
       if (name.isDeferred) {
         return false;
@@ -221,7 +221,7 @@ class _Collector {
         collect(node.prefix);
         return;
       }
-      if (element is MethodElement2 && element.isStatic) {
+      if (element is MethodElement && element.isStatic) {
         if (!_isConstantTypeName(node.prefix)) {
           nodes.add(node);
         }
@@ -231,7 +231,7 @@ class _Collector {
 
     if (element is FormalParameterElement) {
       var enclosing = element.enclosingElement2;
-      if (enclosing is ConstructorElement2 &&
+      if (enclosing is ConstructorElement &&
           isConstConstructorElement(enclosing)) {
         if (node.thisOrAncestorOfType<ConstructorInitializer>() != null) {
           return;
@@ -241,7 +241,7 @@ class _Collector {
       return;
     }
 
-    if (element is VariableElement2) {
+    if (element is VariableElement) {
       if (!element.isConst) {
         nodes.add(node);
       }
@@ -263,10 +263,10 @@ class _Collector {
     if (element is TopLevelFunctionElement) {
       return;
     }
-    if (element is MethodElement2 && element.isStatic) {
+    if (element is MethodElement && element.isStatic) {
       return;
     }
-    if (element is TypeParameterElement2 &&
+    if (element is TypeParameterElement &&
         featureSet.isEnabled(Feature.constructor_tearoffs)) {
       return;
     }
@@ -382,7 +382,7 @@ class _Collector {
     }
   }
 
-  static bool isConstConstructorElement(ConstructorElement2 element) {
+  static bool isConstConstructorElement(ConstructorElement element) {
     if (element.isConst) return true;
     return temporaryConstConstructorElements[element] ?? false;
   }
@@ -400,7 +400,7 @@ class _ConstantTypeChecker {
     }
     if (potentially &&
         node is NamedType &&
-        node.element2 is TypeParameterElement2) {
+        node.element2 is TypeParameterElement) {
       return true;
     }
 
@@ -466,7 +466,7 @@ class _ConstantTypeChecker {
 extension on NamedType {
   bool get isConstantNamedType {
     var element2 = this.element2;
-    if (element2 is InterfaceElement2 || element2 is TypeAliasElement2) {
+    if (element2 is InterfaceElement || element2 is TypeAliasElement) {
       return !isDeferred;
     }
     return false;
diff --git a/pkg/analyzer/lib/src/dart/constant/value.dart b/pkg/analyzer/lib/src/dart/constant/value.dart
index 805fb531bcd..80f50747988 100644
--- a/pkg/analyzer/lib/src/dart/constant/value.dart
+++ b/pkg/analyzer/lib/src/dart/constant/value.dart
@@ -144,7 +144,7 @@ sealed class Constant {}
 /// Information about a const constructor invocation.
 class ConstructorInvocation {
   /// The constructor that was called.
-  final ConstructorElement2 constructor2;
+  final ConstructorElement constructor2;
 
   /// Values of specified arguments, actual values for positional, and `null`
   /// for named (which are provided as [namedArguments]).
@@ -291,7 +291,7 @@ class DartObjectImpl implements DartObject, Constant {
   List<DartType>? get typeArguments => (state as FunctionState).typeArguments;
 
   @override
-  VariableElement2? get variable2 => variable.asElement2 as VariableElement2?;
+  VariableElement? get variable2 => variable.asElement2 as VariableElement?;
 
   @override
   bool operator ==(Object other) {
@@ -1415,14 +1415,14 @@ class FunctionState extends InstanceState {
   /// aliased class.
   ///
   /// Otherwise null.
-  final TypeDefiningElement2? _viaTypeAlias;
+  final TypeDefiningElement? _viaTypeAlias;
 
   /// Initialize a newly created state to represent the function with the given
   /// [element].
   FunctionState(
     this.element, {
     this.typeArguments,
-    TypeDefiningElement2? viaTypeAlias,
+    TypeDefiningElement? viaTypeAlias,
   }) : _viaTypeAlias = viaTypeAlias;
 
   @override
@@ -1575,9 +1575,9 @@ class GenericState extends InstanceState {
   bool hasPrimitiveEquality(FeatureSet featureSet) {
     var type = _object.type;
     if (type is InterfaceTypeImpl) {
-      bool isFromDartCoreObject(ExecutableElement2? element) {
+      bool isFromDartCoreObject(ExecutableElement? element) {
         var enclosing = element?.enclosingElement2;
-        return enclosing is ClassElement2 && enclosing.isDartCoreObject;
+        return enclosing is ClassElement && enclosing.isDartCoreObject;
       }
 
       var element = type.element3;
@@ -2518,7 +2518,7 @@ class InvalidConstant implements Constant {
 
   /// Creates a constant evaluation error associated with an [element].
   InvalidConstant.forElement({
-    required Element2 element,
+    required Element element,
     required ErrorCode errorCode,
     List<Object>? arguments,
     List<DiagnosticMessage>? contextMessages,
diff --git a/pkg/analyzer/lib/src/dart/element/display_string_builder.dart b/pkg/analyzer/lib/src/dart/element/display_string_builder.dart
index 63349b627ac..4cc09afb0e5 100644
--- a/pkg/analyzer/lib/src/dart/element/display_string_builder.dart
+++ b/pkg/analyzer/lib/src/dart/element/display_string_builder.dart
@@ -533,7 +533,7 @@ class ElementDisplayStringBuilder {
     _write('>');
   }
 
-  void _writeTypeParameters2(List<TypeParameterElement2> elements) {
+  void _writeTypeParameters2(List<TypeParameterElement> elements) {
     if (elements.isEmpty) return;
 
     _write('<');
@@ -591,7 +591,7 @@ class ElementDisplayStringBuilder {
       return type;
     }
 
-    var referencedTypeParameters = <TypeParameterElement2>{};
+    var referencedTypeParameters = <TypeParameterElement>{};
 
     void collectTypeParameters(DartType? type) {
       if (type is TypeParameterType) {
diff --git a/pkg/analyzer/lib/src/dart/element/element.dart b/pkg/analyzer/lib/src/dart/element/element.dart
index 529eb495982..3ec37c2fc86 100644
--- a/pkg/analyzer/lib/src/dart/element/element.dart
+++ b/pkg/analyzer/lib/src/dart/element/element.dart
@@ -64,7 +64,7 @@ This is part of the old analyzer element model. Please see
 https://github.com/dart-lang/sdk/blob/main/pkg/analyzer/doc/element_model_migration_guide.md
 for information about how to migrate to the new element model.''';
 
-abstract class AnnotatableElement implements Element2, Annotatable {
+abstract class AnnotatableElement implements Element, Annotatable {
   @override
   MetadataImpl get metadata2;
 }
@@ -109,7 +109,7 @@ class BindPatternVariableElementImpl extends PatternVariableElementImpl
 }
 
 class BindPatternVariableElementImpl2 extends PatternVariableElementImpl2
-    implements BindPatternVariableElement2 {
+    implements BindPatternVariableElement {
   BindPatternVariableElementImpl2(super._wrappedElement);
 
   @override
@@ -472,7 +472,7 @@ class ClassElementImpl extends ClassOrMixinElementImpl
   }
 }
 
-class ClassElementImpl2 extends InterfaceElementImpl2 implements ClassElement2 {
+class ClassElementImpl2 extends InterfaceElementImpl2 implements ClassElement {
   @override
   final Reference reference;
 
@@ -523,9 +523,9 @@ class ClassElementImpl2 extends InterfaceElementImpl2 implements ClassElement2 {
             } else {
               return null;
             }
-          case EnumElement2 _:
+          case EnumElement _:
             result.add(elementThis);
-          case MixinElement2 _:
+          case MixinElement _:
             return null;
         }
       }
@@ -660,7 +660,7 @@ class ClassElementImpl2 extends InterfaceElementImpl2 implements ClassElement2 {
   }
 
   @override
-  bool isExtendableIn2(LibraryElement2 library) {
+  bool isExtendableIn2(LibraryElement library) {
     if (library == library2) {
       return true;
     }
@@ -668,7 +668,7 @@ class ClassElementImpl2 extends InterfaceElementImpl2 implements ClassElement2 {
   }
 
   @override
-  bool isImplementableIn2(LibraryElement2 library) {
+  bool isImplementableIn2(LibraryElement library) {
     if (library == library2) {
       return true;
     }
@@ -676,7 +676,7 @@ class ClassElementImpl2 extends InterfaceElementImpl2 implements ClassElement2 {
   }
 
   @override
-  bool isMixableIn2(LibraryElement2 library) {
+  bool isMixableIn2(LibraryElement library) {
     if (library == library2) {
       return true;
     } else if (library2.featureSet.isEnabled(Feature.class_modifiers)) {
@@ -769,7 +769,7 @@ class CompilationUnitElementImpl extends _ExistingElementImpl
   }) : super(null, -1);
 
   @override
-  List<ExtensionElement2> get accessibleExtensions2 {
+  List<ExtensionElement> get accessibleExtensions2 {
     return scope.accessibleExtensions;
   }
 
@@ -912,7 +912,7 @@ class CompilationUnitElementImpl extends _ExistingElementImpl
   String get identifier => '${source.uri}';
 
   @override
-  List<LibraryElement2> get importedLibraries2 {
+  List<LibraryElement> get importedLibraries2 {
     return libraryImports2
         .map((import) => import.importedLibrary2)
         .nonNulls
@@ -1458,7 +1458,7 @@ class ConstructorElementImpl2 extends ExecutableElementImpl2
         FragmentedElementMixin<ConstructorElementImpl>,
         ConstructorElementMixin2,
         _HasSinceSdkVersionMixin
-    implements ConstructorElement2 {
+    implements ConstructorElement {
   @override
   final String? name3;
 
@@ -1525,7 +1525,7 @@ class ConstructorElementImpl2 extends ExecutableElementImpl2
   }
 
   @override
-  Element2 get nonSynthetic2 {
+  Element get nonSynthetic2 {
     if (isSynthetic) {
       return enclosingElement2;
     } else {
@@ -1616,9 +1616,9 @@ mixin ConstructorElementMixin
   InterfaceTypeImpl get returnType;
 }
 
-/// Common implementation for methods defined in [ConstructorElement2].
+/// Common implementation for methods defined in [ConstructorElement].
 mixin ConstructorElementMixin2
-    implements ExecutableElement2OrMember, ConstructorElement2 {
+    implements ExecutableElement2OrMember, ConstructorElement {
   @override
   ConstructorElementImpl2 get baseElement;
 
@@ -1945,7 +1945,7 @@ class DynamicElementImpl2 extends TypeDefiningElementImpl2 {
   Null get documentationComment => null;
 
   @override
-  Element2? get enclosingElement2 => null;
+  Element? get enclosingElement2 => null;
 
   @override
   DynamicElementImpl get firstFragment => DynamicElementImpl.instance;
@@ -2133,7 +2133,7 @@ class ElementAnnotationImpl implements ElementAnnotation {
       'visibleOutsideTemplate';
 
   @override
-  Element2? element2;
+  Element? element2;
 
   /// The compilation unit in which this annotation appears.
   CompilationUnitElementImpl compilationUnit;
@@ -2196,7 +2196,7 @@ class ElementAnnotationImpl implements ElementAnnotation {
 
   bool get isDartInternalSince {
     var element2 = this.element2;
-    if (element2 is ConstructorElement2) {
+    if (element2 is ConstructorElement) {
       return element2.enclosingElement2.name3 == 'Since' &&
           element2.library2.uri.toString() == 'dart:_internal';
     }
@@ -2206,10 +2206,10 @@ class ElementAnnotationImpl implements ElementAnnotation {
   @override
   bool get isDeprecated {
     var element2 = this.element2;
-    if (element2 is ConstructorElement2) {
+    if (element2 is ConstructorElement) {
       return element2.library2.isDartCore &&
           element2.enclosingElement2.name3 == _deprecatedClassName;
-    } else if (element2 is PropertyAccessorElement2) {
+    } else if (element2 is PropertyAccessorElement) {
       return element2.library2.isDartCore &&
           element2.name3 == _deprecatedVariableName;
     }
@@ -2374,7 +2374,7 @@ class ElementAnnotationImpl implements ElementAnnotation {
     required String className,
   }) {
     var element2 = this.element2;
-    return element2 is ConstructorElement2 &&
+    return element2 is ConstructorElement &&
         element2.enclosingElement2.name3 == className &&
         element2.library2.name3 == libraryName;
   }
@@ -2397,7 +2397,7 @@ class ElementAnnotationImpl implements ElementAnnotation {
       'Exactly one of libraryName/libraryUri should be provided',
     );
     var element2 = this.element2;
-    return element2 is PropertyAccessorElement2 &&
+    return element2 is PropertyAccessorElement &&
         element2.name3 == name &&
         (libraryName == null || element2.library2.name3 == libraryName) &&
         (libraryUri == null || element2.library2.uri == libraryUri);
@@ -2686,7 +2686,7 @@ abstract class ElementImpl implements ElementOrMember {
   }
 }
 
-abstract class ElementImpl2 implements Element2 {
+abstract class ElementImpl2 implements Element {
   @override
   final int id = ElementImpl._NEXT_ID++;
 
@@ -2694,17 +2694,17 @@ abstract class ElementImpl2 implements Element2 {
   EnumSet<Modifier> _modifiers = EnumSet.empty();
 
   @override
-  Element2 get baseElement => this;
+  Element get baseElement => this;
 
   @override
-  List<Element2> get children2 => const [];
+  List<Element> get children2 => const [];
 
   @override
   String get displayName => name3 ?? '<unnamed>';
 
   @override
   // TODO(augmentations): implement enclosingElement2
-  Element2? get enclosingElement2 => throw UnimplementedError();
+  Element? get enclosingElement2 => throw UnimplementedError();
 
   @override
   List<Fragment> get fragments {
@@ -2747,12 +2747,12 @@ abstract class ElementImpl2 implements Element2 {
   }
 
   @override
-  Element2 get nonSynthetic2 => this;
+  Element get nonSynthetic2 => this;
 
   /// The reference of this element, used during reading summaries.
   ///
   /// Can be `null` if this element cannot be referenced from outside,
-  /// for example a [LocalFunctionElement], a [TypeParameterElement2],
+  /// for example a [LocalFunctionElement], a [TypeParameterElement],
   /// a positional [FormalParameterElement], etc.
   Reference? get reference => null;
 
@@ -2795,7 +2795,7 @@ abstract class ElementImpl2 implements Element2 {
   bool hasModifier(Modifier modifier) => _modifiers[modifier];
 
   @override
-  bool isAccessibleIn2(LibraryElement2 library) {
+  bool isAccessibleIn2(LibraryElement library) {
     var name3 = this.name3;
     if (name3 == null || Identifier.isPrivateName(name3)) {
       return library == library2;
@@ -2809,8 +2809,8 @@ abstract class ElementImpl2 implements Element2 {
   }
 
   @override
-  Element2? thisOrAncestorMatching2(bool Function(Element2 p1) predicate) {
-    Element2? element = this;
+  Element? thisOrAncestorMatching2(bool Function(Element p1) predicate) {
+    Element? element = this;
     while (element != null && !predicate(element)) {
       element = element.enclosingElement2;
     }
@@ -2818,8 +2818,8 @@ abstract class ElementImpl2 implements Element2 {
   }
 
   @override
-  E? thisOrAncestorOfType2<E extends Element2>() {
-    Element2 element = this;
+  E? thisOrAncestorOfType2<E extends Element>() {
+    Element element = this;
     while (element is! E) {
       var ancestor = element.enclosingElement2;
       if (ancestor == null) return null;
@@ -2977,7 +2977,7 @@ class EnumElementImpl extends InterfaceElementImpl implements EnumFragment {
   }
 
   @override
-  List<FieldElement2> get constants2 =>
+  List<FieldElement> get constants2 =>
       constants.map((e) => e.asElement2).toList();
 
   @override
@@ -3013,7 +3013,7 @@ class EnumElementImpl extends InterfaceElementImpl implements EnumFragment {
   }
 }
 
-class EnumElementImpl2 extends InterfaceElementImpl2 implements EnumElement2 {
+class EnumElementImpl2 extends InterfaceElementImpl2 implements EnumElement {
   @override
   final Reference reference;
 
@@ -3051,7 +3051,7 @@ class EnumElementImpl2 extends InterfaceElementImpl2 implements EnumElement2 {
 /// Common base class for all analyzer-internal classes that implement
 /// `ExecutableElement2`.
 abstract class ExecutableElement2OrMember
-    implements ExecutableElement2, AnnotatableElement {
+    implements ExecutableElement, AnnotatableElement {
   @override
   ExecutableElementImpl2 get baseElement;
 
@@ -3275,7 +3275,7 @@ abstract class ExecutableElementImpl2 extends FunctionTypedElementImpl2
   ExecutableElementImpl2 get baseElement => this;
 
   @override
-  List<Element2> get children2 => [
+  List<Element> get children2 => [
     ...super.children2,
     ...typeParameters2,
     ...formalParameters,
@@ -3309,7 +3309,7 @@ abstract class ExecutableElementImpl2 extends FunctionTypedElementImpl2
   }
 
   @override
-  LibraryElement2 get library2 {
+  LibraryElement get library2 {
     var firstFragment = this.firstFragment as ExecutableElementImpl;
     return firstFragment.library;
   }
@@ -3461,7 +3461,7 @@ class ExtensionElementImpl extends InstanceElementImpl
 
 class ExtensionElementImpl2 extends InstanceElementImpl2
     with _HasSinceSdkVersionMixin
-    implements ExtensionElement2 {
+    implements ExtensionElement {
   @override
   final Reference reference;
 
@@ -3554,7 +3554,7 @@ class ExtensionTypeElementImpl extends InterfaceElementImpl
 }
 
 class ExtensionTypeElementImpl2 extends InterfaceElementImpl2
-    implements ExtensionTypeElement2 {
+    implements ExtensionTypeElement {
   @override
   final Reference reference;
 
@@ -3603,7 +3603,7 @@ class ExtensionTypeElementImpl2 extends InterfaceElementImpl2
   }
 
   @override
-  ConstructorElement2 get primaryConstructor2 {
+  ConstructorElement get primaryConstructor2 {
     return firstFragment.primaryConstructor.element;
   }
 
@@ -3624,7 +3624,7 @@ class ExtensionTypeElementImpl2 extends InterfaceElementImpl2
 /// Common base class for all analyzer-internal classes that implement
 /// `FieldElement2`.
 abstract class FieldElement2OrMember
-    implements PropertyInducingElement2OrMember, FieldElement2 {}
+    implements PropertyInducingElement2OrMember, FieldElement {}
 
 class FieldElementImpl extends PropertyInducingElementImpl
     implements FieldElementOrMember, FieldFragment {
@@ -3761,10 +3761,10 @@ class FieldElementImpl2 extends PropertyInducingElementImpl2
   }
 
   @override
-  FieldElement2 get baseElement => this;
+  FieldElement get baseElement => this;
 
   @override
-  InstanceElement2 get enclosingElement2 =>
+  InstanceElement get enclosingElement2 =>
       (firstFragment.enclosingElement3 as InstanceFragment).element;
 
   @override
@@ -3907,7 +3907,7 @@ class FieldFormalParameterElementImpl extends ParameterElementImpl
 }
 
 class FieldFormalParameterElementImpl2 extends FormalParameterElementImpl
-    implements FieldFormalParameterElement2 {
+    implements FieldFormalParameterElement {
   FieldFormalParameterElementImpl2(super.firstFragment);
 
   @override
@@ -4080,7 +4080,7 @@ class FormalParameterElementImpl extends PromotableElementImpl2
 
   @override
   // TODO(augmentations): Implement the merge of formal parameters.
-  List<TypeParameterElement2> get typeParameters2 => const [];
+  List<TypeParameterElement> get typeParameters2 => const [];
 
   @override
   TypeImpl get typeShared => type;
@@ -4464,8 +4464,8 @@ mixin FragmentedAnnotatableElementMixin<E extends Fragment>
       MetadataImpl(-1, metadata.cast<ElementAnnotationImpl>());
 
   Version? get sinceSdkVersion {
-    if (this is Element2) {
-      return SinceSdkVersionComputer().compute(this as Element2);
+    if (this is Element) {
+      return SinceSdkVersionComputer().compute(this as Element);
     }
     return null;
   }
@@ -4596,7 +4596,7 @@ mixin FragmentedTypeParameterizedElementMixin<
     return true;
   }
 
-  List<TypeParameterElement2> get typeParameters2 {
+  List<TypeParameterElement> get typeParameters2 {
     var fragment = firstFragment;
     if (fragment is TypeParameterizedElementMixin) {
       return fragment.typeParameters
@@ -4671,7 +4671,7 @@ abstract class FunctionTypedElementImpl implements _ExistingElementImpl {
 }
 
 abstract class FunctionTypedElementImpl2 extends TypeParameterizedElementImpl2
-    implements FunctionTypedElement2 {
+    implements FunctionTypedElement {
   @override
   void visitChildren2<T>(ElementVisitor2<T> visitor) {
     for (var child in children2) {
@@ -4799,7 +4799,7 @@ class GenericFunctionTypeElementImpl extends _ExistingElementImpl
 ///
 /// Clients may not extend, implement or mix-in this class.
 class GenericFunctionTypeElementImpl2 extends FunctionTypedElementImpl2
-    implements GenericFunctionTypeElement2 {
+    implements GenericFunctionTypeElement {
   final GenericFunctionTypeElementImpl _wrappedElement;
 
   GenericFunctionTypeElementImpl2(this._wrappedElement);
@@ -4853,7 +4853,7 @@ class GenericFunctionTypeElementImpl2 extends FunctionTypedElementImpl2
   FunctionType get type => _wrappedElement.type;
 
   @override
-  List<TypeParameterElement2> get typeParameters2 =>
+  List<TypeParameterElement> get typeParameters2 =>
       _wrappedElement.typeParameters2
           .map((fragment) => fragment.element)
           .toList();
@@ -4915,7 +4915,7 @@ class GetterElementImpl extends PropertyAccessorElementImpl2
   ElementKind get kind => ElementKind.GETTER;
 
   @override
-  Element2 get nonSynthetic2 {
+  Element get nonSynthetic2 {
     if (!isSynthetic) {
       return this;
     } else if (variable3 case var variable?) {
@@ -5133,14 +5133,14 @@ abstract class InstanceElementImpl extends _ExistingElementImpl
 
 abstract class InstanceElementImpl2 extends ElementImpl2
     implements
-        InstanceElement2,
-        TypeParameterizedElement2,
+        InstanceElement,
+        TypeParameterizedElement,
         AnnotatableElementImpl {
   @override
-  InstanceElement2 get baseElement => this;
+  InstanceElement get baseElement => this;
 
   @override
-  List<Element2> get children2 {
+  List<Element> get children2 {
     return [...fields2, ...getters2, ...setters2, ...methods2];
   }
 
@@ -5151,7 +5151,7 @@ abstract class InstanceElementImpl2 extends ElementImpl2
   String? get documentationComment => firstFragment.documentationComment;
 
   @override
-  LibraryElement2 get enclosingElement2 => firstFragment.library;
+  LibraryElement get enclosingElement2 => firstFragment.library;
 
   @override
   List<FieldElementImpl2> get fields2 {
@@ -5205,8 +5205,8 @@ abstract class InstanceElementImpl2 extends ElementImpl2
   String? get name3 => firstFragment.name;
 
   @override
-  Element2 get nonSynthetic2 =>
-      isSynthetic ? enclosingElement2 : this as Element2;
+  Element get nonSynthetic2 =>
+      isSynthetic ? enclosingElement2 : this as Element;
 
   @override
   AnalysisSession? get session => firstFragment.session;
@@ -5255,7 +5255,7 @@ abstract class InstanceElementImpl2 extends ElementImpl2
   }
 
   @override
-  bool isAccessibleIn2(LibraryElement2 library) {
+  bool isAccessibleIn2(LibraryElement library) {
     var name = name3;
     if (name != null && Identifier.isPrivateName(name)) {
       return library == library2;
@@ -5266,7 +5266,7 @@ abstract class InstanceElementImpl2 extends ElementImpl2
   @override
   GetterElement? lookUpGetter2({
     required String name,
-    required LibraryElement2 library,
+    required LibraryElement library,
   }) {
     return _implementationsOfGetter2(
           name,
@@ -5275,9 +5275,9 @@ abstract class InstanceElementImpl2 extends ElementImpl2
   }
 
   @override
-  MethodElement2? lookUpMethod2({
+  MethodElement? lookUpMethod2({
     required String name,
-    required LibraryElement2 library,
+    required LibraryElement library,
   }) {
     return _implementationsOfMethod2(
       name,
@@ -5287,7 +5287,7 @@ abstract class InstanceElementImpl2 extends ElementImpl2
   @override
   SetterElement? lookUpSetter2({
     required String name,
-    required LibraryElement2 library,
+    required LibraryElement library,
   }) {
     return _implementationsOfSetter2(
           name,
@@ -5296,7 +5296,7 @@ abstract class InstanceElementImpl2 extends ElementImpl2
   }
 
   @override
-  Element2? thisOrAncestorMatching2(bool Function(Element2) predicate) {
+  Element? thisOrAncestorMatching2(bool Function(Element) predicate) {
     if (predicate(this)) {
       return this;
     }
@@ -5304,7 +5304,7 @@ abstract class InstanceElementImpl2 extends ElementImpl2
   }
 
   @override
-  E? thisOrAncestorOfType2<E extends Element2>() {
+  E? thisOrAncestorOfType2<E extends Element>() {
     if (this case E result) {
       return result;
     }
@@ -5321,14 +5321,14 @@ abstract class InstanceElementImpl2 extends ElementImpl2
   Iterable<PropertyAccessorElement2OrMember> _implementationsOfGetter2(
     String name,
   ) sync* {
-    var visitedElements = <InstanceElement2>{};
-    InstanceElement2? element = this;
+    var visitedElements = <InstanceElement>{};
+    InstanceElement? element = this;
     while (element != null && visitedElements.add(element)) {
       var getter = element.getGetter2(name);
       if (getter != null) {
         yield getter as PropertyAccessorElement2OrMember;
       }
-      if (element is! InterfaceElement2) {
+      if (element is! InterfaceElement) {
         return;
       }
       for (var mixin in element.mixins.reversed) {
@@ -5347,14 +5347,14 @@ abstract class InstanceElementImpl2 extends ElementImpl2
   Iterable<MethodElement2OrMember> _implementationsOfMethod2(
     String name,
   ) sync* {
-    var visitedElements = <InstanceElement2>{};
-    InstanceElement2? element = this;
+    var visitedElements = <InstanceElement>{};
+    InstanceElement? element = this;
     while (element != null && visitedElements.add(element)) {
       var method = element.getMethod2(name);
       if (method != null) {
         yield method as MethodElement2OrMember;
       }
-      if (element is! InterfaceElement2) {
+      if (element is! InterfaceElement) {
         return;
       }
       for (var mixin in element.mixins.reversed) {
@@ -5373,14 +5373,14 @@ abstract class InstanceElementImpl2 extends ElementImpl2
   Iterable<PropertyAccessorElement2OrMember> _implementationsOfSetter2(
     String name,
   ) sync* {
-    var visitedElements = <InstanceElement2>{};
-    InstanceElement2? element = this;
+    var visitedElements = <InstanceElement>{};
+    InstanceElement? element = this;
     while (element != null && visitedElements.add(element)) {
       var setter = element.getSetter2(name);
       if (setter != null) {
         yield setter as PropertyAccessorElement2OrMember;
       }
-      if (element is! InterfaceElement2) {
+      if (element is! InterfaceElement) {
         return;
       }
       for (var mixin in element.mixins.reversed) {
@@ -5573,7 +5573,7 @@ abstract class InterfaceElementImpl extends InstanceElementImpl
 
 abstract class InterfaceElementImpl2 extends InstanceElementImpl2
     with _HasSinceSdkVersionMixin
-    implements InterfaceElement2 {
+    implements InterfaceElement {
   /// The non-nullable instance of this element, without alias.
   /// Should be used only when the element has no type parameters.
   InterfaceTypeImpl? _nonNullableInstance;
@@ -5594,7 +5594,7 @@ abstract class InterfaceElementImpl2 extends InstanceElementImpl2
   }
 
   @override
-  List<Element2> get children2 {
+  List<Element> get children2 {
     return [...super.children2, ...constructors2];
   }
 
@@ -5626,16 +5626,16 @@ abstract class InterfaceElementImpl2 extends InstanceElementImpl2
   }
 
   @override
-  Map<Name, ExecutableElement2> get inheritedConcreteMembers =>
+  Map<Name, ExecutableElement> get inheritedConcreteMembers =>
       (session as AnalysisSessionImpl).inheritanceManager
           .getInheritedConcreteMap(this);
 
   @override
-  Map<Name, ExecutableElement2> get inheritedMembers =>
+  Map<Name, ExecutableElement> get inheritedMembers =>
       (session as AnalysisSessionImpl).inheritanceManager.getInheritedMap(this);
 
   @override
-  Map<Name, ExecutableElement2> get interfaceMembers =>
+  Map<Name, ExecutableElement> get interfaceMembers =>
       (session as AnalysisSessionImpl).inheritanceManager
           .getInterface2(this)
           .map2;
@@ -5686,18 +5686,18 @@ abstract class InterfaceElementImpl2 extends InstanceElementImpl2
   }
 
   @override
-  ExecutableElement2? getInheritedConcreteMember(Name name) =>
+  ExecutableElement? getInheritedConcreteMember(Name name) =>
       inheritedConcreteMembers[name];
 
   @override
-  ExecutableElement2? getInheritedMember(Name name) =>
+  ExecutableElement? getInheritedMember(Name name) =>
       (session as AnalysisSessionImpl).inheritanceManager.getInherited4(
         this,
         name,
       );
 
   @override
-  ExecutableElement2? getInterfaceMember(Name name) =>
+  ExecutableElement? getInterfaceMember(Name name) =>
       (session as AnalysisSessionImpl).inheritanceManager.getMember4(
         this,
         name,
@@ -5713,7 +5713,7 @@ abstract class InterfaceElementImpl2 extends InstanceElementImpl2
   }
 
   @override
-  List<ExecutableElement2>? getOverridden(Name name) =>
+  List<ExecutableElement>? getOverridden(Name name) =>
       (session as AnalysisSessionImpl).inheritanceManager.getOverridden4(
         this,
         name,
@@ -5774,18 +5774,18 @@ abstract class InterfaceElementImpl2 extends InstanceElementImpl2
   }
 
   @override
-  MethodElement2? lookUpConcreteMethod(
+  MethodElement? lookUpConcreteMethod(
     String methodName,
-    LibraryElement2 library,
+    LibraryElement library,
   ) {
     return _implementationsOfMethod2(methodName).firstWhereOrNull(
       (method) => !method.isAbstract && method.isAccessibleIn2(library),
     );
   }
 
-  PropertyAccessorElement2? lookUpInheritedConcreteGetter(
+  PropertyAccessorElement? lookUpInheritedConcreteGetter(
     String getterName,
-    LibraryElement2 library,
+    LibraryElement library,
   ) {
     return _implementationsOfGetter2(getterName).firstWhereOrNull(
       (getter) =>
@@ -5796,9 +5796,9 @@ abstract class InterfaceElementImpl2 extends InstanceElementImpl2
     );
   }
 
-  MethodElement2? lookUpInheritedConcreteMethod(
+  MethodElement? lookUpInheritedConcreteMethod(
     String methodName,
-    LibraryElement2 library,
+    LibraryElement library,
   ) {
     return _implementationsOfMethod2(methodName).firstWhereOrNull(
       (method) =>
@@ -5809,9 +5809,9 @@ abstract class InterfaceElementImpl2 extends InstanceElementImpl2
     );
   }
 
-  PropertyAccessorElement2? lookUpInheritedConcreteSetter(
+  PropertyAccessorElement? lookUpInheritedConcreteSetter(
     String setterName,
-    LibraryElement2 library,
+    LibraryElement library,
   ) {
     return _implementationsOfSetter2(setterName).firstWhereOrNull(
       (setter) =>
@@ -5822,9 +5822,9 @@ abstract class InterfaceElementImpl2 extends InstanceElementImpl2
     );
   }
 
-  MethodElement2? lookUpInheritedMethod(
+  MethodElement? lookUpInheritedMethod(
     String methodName,
-    LibraryElement2 library,
+    LibraryElement library,
   ) {
     return _implementationsOfMethod2(methodName).firstWhereOrNull(
       (method) =>
@@ -5835,9 +5835,9 @@ abstract class InterfaceElementImpl2 extends InstanceElementImpl2
   }
 
   @override
-  MethodElement2? lookUpInheritedMethod2({
+  MethodElement? lookUpInheritedMethod2({
     required String methodName,
-    required LibraryElement2 library,
+    required LibraryElement library,
   }) {
     return inheritanceManager
         .getInherited4(this, Name.forLibrary(library, methodName))
@@ -5851,7 +5851,7 @@ abstract class InterfaceElementImpl2 extends InstanceElementImpl2
   /// or a superclass.
   GetterElement2OrMember? lookupStaticGetter(
     String name,
-    LibraryElement2 library,
+    LibraryElement library,
   ) {
     return _implementationsOfGetter2(name)
         .firstWhereOrNull(
@@ -5867,7 +5867,7 @@ abstract class InterfaceElementImpl2 extends InstanceElementImpl2
   /// or a superclass.
   MethodElement2OrMember? lookupStaticMethod(
     String name,
-    LibraryElement2 library,
+    LibraryElement library,
   ) {
     return _implementationsOfMethod2(name).firstWhereOrNull(
       (element) => element.isStatic && element.isAccessibleIn2(library),
@@ -5881,7 +5881,7 @@ abstract class InterfaceElementImpl2 extends InstanceElementImpl2
   /// or a superclass.
   SetterElement2OrMember? lookupStaticSetter(
     String name,
-    LibraryElement2 library,
+    LibraryElement library,
   ) {
     return _implementationsOfSetter2(name)
         .firstWhereOrNull(
@@ -5959,7 +5959,7 @@ class JoinPatternVariableElementImpl extends PatternVariableElementImpl
 }
 
 class JoinPatternVariableElementImpl2 extends PatternVariableElementImpl2
-    implements JoinPatternVariableElement2 {
+    implements JoinPatternVariableElement {
   JoinPatternVariableElementImpl2(super._wrappedElement);
 
   @override
@@ -6041,7 +6041,7 @@ class LabelElementImpl extends ElementImpl implements LabelFragment {
   String get displayName => name;
 
   @override
-  LabelElement2 get element => element2;
+  LabelElement get element => element2;
 
   @override
   ExecutableElementImpl get enclosingElement3 =>
@@ -6089,17 +6089,17 @@ class LabelElementImpl extends ElementImpl implements LabelFragment {
 
 class LabelElementImpl2 extends ElementImpl2
     with WrappedElementMixin
-    implements LabelElement2 {
+    implements LabelElement {
   @override
   final LabelElementImpl _wrappedElement;
 
   LabelElementImpl2(this._wrappedElement);
 
   @override
-  LabelElement2 get baseElement => this;
+  LabelElement get baseElement => this;
 
   @override
-  ExecutableElement2? get enclosingElement2 => null;
+  ExecutableElement? get enclosingElement2 => null;
 
   @override
   LabelElementImpl get firstFragment => _wrappedElement;
@@ -6114,7 +6114,7 @@ class LabelElementImpl2 extends ElementImpl2
   bool get isOnSwitchMember => _wrappedElement.isOnSwitchMember;
 
   @override
-  LibraryElement2 get library2 {
+  LibraryElement get library2 {
     return _wrappedElement.library;
   }
 
@@ -6127,10 +6127,10 @@ class LabelElementImpl2 extends ElementImpl2
   void visitChildren2<T>(ElementVisitor2<T> visitor) {}
 }
 
-/// A concrete implementation of [LibraryElement2].
+/// A concrete implementation of [LibraryElement].
 class LibraryElementImpl extends ElementImpl
     with _HasLibraryMixin
-    implements LibraryElement2 {
+    implements LibraryElement {
   /// The analysis context in which this library is defined.
   @override
   final AnalysisContext context;
@@ -6233,7 +6233,7 @@ class LibraryElementImpl extends ElementImpl
   LibraryElementImpl get baseElement => this;
 
   @override
-  List<Element2> get children2 {
+  List<Element> get children2 {
     return [
       ...classes,
       ...enums,
@@ -6518,7 +6518,7 @@ class LibraryElementImpl extends ElementImpl
   }
 
   @override
-  EnumElement2? getEnum2(String name) {
+  EnumElement? getEnum2(String name) {
     return _getElementByName(enums, name);
   }
 
@@ -6530,12 +6530,12 @@ class LibraryElementImpl extends ElementImpl
   }
 
   @override
-  ExtensionElement2? getExtension(String name) {
+  ExtensionElement? getExtension(String name) {
     return _getElementByName(extensions, name);
   }
 
   @override
-  ExtensionTypeElement2? getExtensionType(String name) {
+  ExtensionTypeElement? getExtensionType(String name) {
     return _getElementByName(extensionTypes, name);
   }
 
@@ -6545,7 +6545,7 @@ class LibraryElementImpl extends ElementImpl
   }
 
   @override
-  MixinElement2? getMixin2(String name) {
+  MixinElement? getMixin2(String name) {
     return _getElementByName(mixins, name);
   }
 
@@ -6560,17 +6560,17 @@ class LibraryElementImpl extends ElementImpl
   }
 
   @override
-  TopLevelVariableElement2? getTopLevelVariable(String name) {
+  TopLevelVariableElement? getTopLevelVariable(String name) {
     return _getElementByName(topLevelVariables, name);
   }
 
   @override
-  TypeAliasElement2? getTypeAlias(String name) {
+  TypeAliasElement? getTypeAlias(String name) {
     return _getElementByName(typeAliases, name);
   }
 
   @override
-  bool isAccessibleIn2(LibraryElement2 library) {
+  bool isAccessibleIn2(LibraryElement library) {
     return true;
   }
 
@@ -6597,14 +6597,14 @@ class LibraryElementImpl extends ElementImpl
 
   @override
   LibraryElementImpl? thisOrAncestorMatching2(
-    bool Function(Element2) predicate,
+    bool Function(Element) predicate,
   ) {
     return predicate(this) ? this : null;
   }
 
   @override
-  E? thisOrAncestorOfType2<E extends Element2>() {
-    return E is LibraryElement2 ? this as E : null;
+  E? thisOrAncestorOfType2<E extends Element>() {
+    return E is LibraryElement ? this as E : null;
   }
 
   @override
@@ -6614,7 +6614,7 @@ class LibraryElementImpl extends ElementImpl
     }
   }
 
-  static T? _getElementByName<T extends Element2>(
+  static T? _getElementByName<T extends Element>(
     List<T> elements,
     String name,
   ) {
@@ -6789,7 +6789,7 @@ class LocalFunctionElementImpl extends ExecutableElementImpl2
 
   @override
   // Local functions belong to Fragments, not Elements.
-  Element2? get enclosingElement2 => null;
+  Element? get enclosingElement2 => null;
 
   @override
   LocalFunctionFragmentImpl get firstFragment => _wrappedElement;
@@ -6840,7 +6840,7 @@ class LocalFunctionElementImpl extends ExecutableElementImpl2
   FunctionTypeImpl get type => _wrappedElement.type;
 
   @override
-  List<TypeParameterElement2> get typeParameters2 =>
+  List<TypeParameterElement> get typeParameters2 =>
       _wrappedElement.typeParameters
           .map((fragment) => (fragment as TypeParameterFragment).element)
           .toList();
@@ -6945,14 +6945,14 @@ class LocalVariableElementImpl extends NonParameterVariableElementImpl
 
 class LocalVariableElementImpl2 extends PromotableElementImpl2
     with WrappedElementMixin, _NonTopLevelVariableOrParameter
-    implements LocalVariableElement2 {
+    implements LocalVariableElement {
   @override
   final LocalVariableElementImpl _wrappedElement;
 
   LocalVariableElementImpl2(this._wrappedElement);
 
   @override
-  LocalVariableElement2 get baseElement => this;
+  LocalVariableElement get baseElement => this;
 
   @override
   String? get documentationComment => null;
@@ -7393,7 +7393,7 @@ final class MetadataImpl implements Metadata {
 /// Common base class for all analyzer-internal classes that implement
 /// `MethodElement2`.
 abstract class MethodElement2OrMember
-    implements MethodElement2, ExecutableElement2OrMember {
+    implements MethodElement, ExecutableElement2OrMember {
   @override
   MethodElementImpl2 get baseElement;
 }
@@ -7509,7 +7509,7 @@ class MethodElementImpl2 extends ExecutableElementImpl2
   MethodElementImpl2 get baseElement => this;
 
   @override
-  Element2? get enclosingElement2 =>
+  Element? get enclosingElement2 =>
       (firstFragment.enclosingElement3 as InstanceFragment).element;
 
   @override
@@ -7633,7 +7633,7 @@ class MixinElementImpl extends ClassOrMixinElementImpl
   }
 }
 
-class MixinElementImpl2 extends InterfaceElementImpl2 implements MixinElement2 {
+class MixinElementImpl2 extends InterfaceElementImpl2 implements MixinElement {
   @override
   final Reference reference;
 
@@ -7674,7 +7674,7 @@ class MixinElementImpl2 extends InterfaceElementImpl2 implements MixinElement2 {
   }
 
   @override
-  bool isImplementableIn2(LibraryElement2 library) {
+  bool isImplementableIn2(LibraryElement library) {
     if (library == library2) {
       return true;
     }
@@ -7761,7 +7761,7 @@ enum Modifier {
   HAS_SINCE_SDK_VERSION_VALUE,
 
   /// Indicates that the associated element did not have an explicit type
-  /// associated with it. If the element is an [ExecutableElement2], then the
+  /// associated with it. If the element is an [ExecutableElement], then the
   /// type being referred to is the return type.
   IMPLICIT_TYPE,
 
@@ -7793,7 +7793,7 @@ enum Modifier {
   /// Indicates that the pseudo-modifier 'set' was applied to the element.
   SETTER,
 
-  /// See [TypeParameterizedElement2.isSimplyBounded].
+  /// See [TypeParameterizedElement.isSimplyBounded].
   SIMPLY_BOUNDED,
 
   /// Indicates that the modifier 'static' was applied to the element.
@@ -7807,14 +7807,14 @@ enum Modifier {
 }
 
 class MultiplyDefinedElementImpl2 extends ElementImpl2
-    implements MultiplyDefinedElement2 {
+    implements MultiplyDefinedElement {
   final CompilationUnitElementImpl libraryFragment;
 
   @override
   final String name3;
 
   @override
-  final List<Element2> conflictingElements2;
+  final List<Element> conflictingElements2;
 
   @override
   late final MultiplyDefinedFragmentImpl firstFragment =
@@ -7830,7 +7830,7 @@ class MultiplyDefinedElementImpl2 extends ElementImpl2
   MultiplyDefinedElementImpl2 get baseElement => this;
 
   @override
-  List<Element2> get children2 => const [];
+  List<Element> get children2 => const [];
 
   @override
   String get displayName => name3;
@@ -7860,10 +7860,10 @@ class MultiplyDefinedElementImpl2 extends ElementImpl2
   ElementKind get kind => ElementKind.ERROR;
 
   @override
-  LibraryElement2 get library2 => libraryFragment.element;
+  LibraryElement get library2 => libraryFragment.element;
 
   @override
-  Element2 get nonSynthetic2 => this;
+  Element get nonSynthetic2 => this;
 
   @override
   AnalysisSession get session => libraryFragment.session;
@@ -7887,7 +7887,7 @@ class MultiplyDefinedElementImpl2 extends ElementImpl2
   }
 
   @override
-  bool isAccessibleIn2(LibraryElement2 library) {
+  bool isAccessibleIn2(LibraryElement library) {
     for (var element in conflictingElements2) {
       if (element.isAccessibleIn2(library)) {
         return true;
@@ -7897,12 +7897,12 @@ class MultiplyDefinedElementImpl2 extends ElementImpl2
   }
 
   @override
-  Element2? thisOrAncestorMatching2(bool Function(Element2 p1) predicate) {
+  Element? thisOrAncestorMatching2(bool Function(Element p1) predicate) {
     return null;
   }
 
   @override
-  E? thisOrAncestorOfType2<E extends Element2>() {
+  E? thisOrAncestorOfType2<E extends Element>() {
     return null;
   }
 
@@ -7910,7 +7910,7 @@ class MultiplyDefinedElementImpl2 extends ElementImpl2
   String toString() {
     StringBuffer buffer = StringBuffer();
     bool needsSeparator = false;
-    void writeList(List<Element2> elements) {
+    void writeList(List<Element> elements) {
       for (var element in elements) {
         if (needsSeparator) {
           buffer.write(", ");
@@ -8036,7 +8036,7 @@ class NeverElementImpl2 extends TypeDefiningElementImpl2 {
   Null get documentationComment => null;
 
   @override
-  Element2? get enclosingElement2 => null;
+  Element? get enclosingElement2 => null;
 
   @override
   NeverElementImpl get firstFragment => NeverElementImpl.instance;
@@ -8537,7 +8537,7 @@ class PatternVariableElementImpl extends LocalVariableElementImpl
 }
 
 class PatternVariableElementImpl2 extends LocalVariableElementImpl2
-    implements PatternVariableElement2 {
+    implements PatternVariableElement {
   PatternVariableElementImpl2(super._wrappedElement);
 
   @override
@@ -8579,7 +8579,7 @@ class PatternVariableElementImpl2 extends LocalVariableElementImpl2
   PatternVariableElementImpl get _wrappedElement =>
       super._wrappedElement as PatternVariableElementImpl;
 
-  static PatternVariableElement2 fromElement(
+  static PatternVariableElement fromElement(
     PatternVariableElementImpl element,
   ) {
     if (element is JoinPatternVariableElementImpl) {
@@ -8591,7 +8591,7 @@ class PatternVariableElementImpl2 extends LocalVariableElementImpl2
   }
 }
 
-/// Currently we write [Element2] using the first fragment.
+/// Currently we write [Element] using the first fragment.
 /// Usually this works (as good as a hack can), but [PrefixElementImpl2]
 /// does not have [ElementImpl] fragments. So, we use this fake element.
 // TODO(scheglov): resonsider how we write Element2.
@@ -8608,7 +8608,7 @@ class PrefixElementImpl extends ElementImpl {
   Null get library => null;
 }
 
-class PrefixElementImpl2 extends ElementImpl2 implements PrefixElement2 {
+class PrefixElementImpl2 extends ElementImpl2 implements PrefixElement {
   @override
   final Reference reference;
 
@@ -8746,12 +8746,12 @@ class PrefixFragmentImpl implements PrefixFragment {
 }
 
 abstract class PromotableElementImpl2 extends VariableElementImpl2
-    implements PromotableElement2 {}
+    implements PromotableElement {}
 
 /// Common base class for all analyzer-internal classes that implement
 /// `PropertyAccessorElement2`.
 abstract class PropertyAccessorElement2OrMember
-    implements PropertyAccessorElement2, ExecutableElement2OrMember {
+    implements PropertyAccessorElement, ExecutableElement2OrMember {
   @override
   PropertyAccessorElementImpl2 get baseElement;
 
@@ -8870,7 +8870,7 @@ abstract class PropertyAccessorElementImpl2 extends ExecutableElementImpl2
   PropertyAccessorElementImpl2 get baseElement => this;
 
   @override
-  Element2 get enclosingElement2 => firstFragment.enclosingFragment.element;
+  Element get enclosingElement2 => firstFragment.enclosingFragment.element;
 
   @override
   PropertyAccessorElementImpl get firstFragment;
@@ -9067,9 +9067,9 @@ abstract class PropertyAccessorElementOrMember
 }
 
 /// Common base class for all analyzer-internal classes that implement
-/// [PropertyInducingElement2].
+/// [PropertyInducingElement].
 abstract class PropertyInducingElement2OrMember
-    implements VariableElement2OrMember, PropertyInducingElement2 {
+    implements VariableElement2OrMember, PropertyInducingElement {
   @override
   GetterElement2OrMember? get getter2;
 
@@ -9288,7 +9288,7 @@ abstract class PropertyInducingElementImpl2 extends VariableElementImpl2
   }
 
   @override
-  Element2 get nonSynthetic2 {
+  Element get nonSynthetic2 {
     if (isSynthetic) {
       if (enclosingElement2 case EnumElementImpl2 enclosingElement2) {
         // TODO(scheglov): remove 'index'?
@@ -9359,7 +9359,7 @@ class SetterElementImpl extends PropertyAccessorElementImpl2
       firstFragment.variable2?.getter?.element;
 
   @override
-  Element2 get enclosingElement2 => firstFragment.enclosingFragment.element;
+  Element get enclosingElement2 => firstFragment.enclosingFragment.element;
 
   @override
   List<SetterFragmentImpl> get fragments {
@@ -9385,7 +9385,7 @@ class SetterElementImpl extends PropertyAccessorElementImpl2
   }
 
   @override
-  Element2 get nonSynthetic2 {
+  Element get nonSynthetic2 {
     if (!isSynthetic) {
       return this;
     } else if (variable3 case var variable?) {
@@ -9554,7 +9554,7 @@ class SuperFormalParameterElementImpl extends ParameterElementImpl
 }
 
 class SuperFormalParameterElementImpl2 extends FormalParameterElementImpl
-    implements SuperFormalParameterElement2 {
+    implements SuperFormalParameterElement {
   SuperFormalParameterElementImpl2(super.firstFragment);
 
   @override
@@ -9738,7 +9738,7 @@ class TopLevelVariableElementImpl2 extends PropertyInducingElementImpl2
         FragmentedAnnotatableElementMixin<TopLevelVariableElementImpl>,
         FragmentedElementMixin<TopLevelVariableElementImpl>,
         _HasSinceSdkVersionMixin
-    implements TopLevelVariableElement2 {
+    implements TopLevelVariableElement {
   @override
   final Reference reference;
 
@@ -9751,11 +9751,11 @@ class TopLevelVariableElementImpl2 extends PropertyInducingElementImpl2
   }
 
   @override
-  TopLevelVariableElement2 get baseElement => this;
+  TopLevelVariableElement get baseElement => this;
 
   @override
-  LibraryElement2 get enclosingElement2 =>
-      firstFragment.library as LibraryElement2;
+  LibraryElement get enclosingElement2 =>
+      firstFragment.library as LibraryElement;
 
   @override
   List<TopLevelVariableElementImpl> get fragments {
@@ -9795,7 +9795,7 @@ class TopLevelVariableElementImpl2 extends PropertyInducingElementImpl2
   ElementKind get kind => ElementKind.TOP_LEVEL_VARIABLE;
 
   @override
-  LibraryElement2 get library2 {
+  LibraryElement get library2 {
     return firstFragment.libraryFragment.element;
   }
 
@@ -9854,7 +9854,7 @@ class TypeAliasElementImpl extends _ExistingElementImpl
   TypeAliasElementImpl(String super.name, super.nameOffset);
 
   /// If the aliased type has structure, return the corresponding element.
-  /// For example it could be [GenericFunctionTypeElement2].
+  /// For example it could be [GenericFunctionTypeElement].
   ///
   /// If there is no structure, return `null`.
   ElementImpl? get aliasedElement {
@@ -9950,7 +9950,7 @@ class TypeAliasElementImpl2 extends TypeDefiningElementImpl2
         FragmentedAnnotatableElementMixin<TypeAliasFragment>,
         FragmentedElementMixin<TypeAliasFragment>,
         _HasSinceSdkVersionMixin
-    implements TypeAliasElement2 {
+    implements TypeAliasElement {
   @override
   final Reference reference;
 
@@ -9963,7 +9963,7 @@ class TypeAliasElementImpl2 extends TypeDefiningElementImpl2
   }
 
   @override
-  Element2? get aliasedElement2 {
+  Element? get aliasedElement2 {
     switch (firstFragment.aliasedElement) {
       case InstanceFragment instance:
         return instance.element;
@@ -9987,8 +9987,8 @@ class TypeAliasElementImpl2 extends TypeDefiningElementImpl2
   TypeAliasElementImpl2 get baseElement => this;
 
   @override
-  LibraryElement2 get enclosingElement2 =>
-      firstFragment.library as LibraryElement2;
+  LibraryElement get enclosingElement2 =>
+      firstFragment.library as LibraryElement;
 
   @override
   List<TypeAliasElementImpl> get fragments {
@@ -10152,7 +10152,7 @@ class TypeAliasElementImpl2 extends TypeDefiningElementImpl2
 }
 
 abstract class TypeDefiningElementImpl2 extends ElementImpl2
-    implements TypeDefiningElement2 {}
+    implements TypeDefiningElement {}
 
 class TypeParameterElementImpl extends ElementImpl
     implements TypeParameterFragment {
@@ -10347,7 +10347,7 @@ class TypeParameterElementImpl2 extends TypeDefiningElementImpl2
         FragmentedAnnotatableElementMixin<TypeParameterFragment>,
         FragmentedElementMixin<TypeParameterFragment>,
         _NonTopLevelVariableOrParameter
-    implements TypeParameterElement2, SharedTypeParameter {
+    implements TypeParameterElement, SharedTypeParameter {
   @override
   final TypeParameterElementImpl firstFragment;
 
@@ -10366,7 +10366,7 @@ class TypeParameterElementImpl2 extends TypeDefiningElementImpl2
   }
 
   @override
-  TypeParameterElement2 get baseElement => this;
+  TypeParameterElement get baseElement => this;
 
   @override
   TypeImpl? get bound => firstFragment.bound;
@@ -10441,7 +10441,7 @@ class TypeParameterElementImpl2 extends TypeDefiningElementImpl2
 }
 
 abstract class TypeParameterizedElementImpl2 extends ElementImpl2
-    implements TypeParameterizedElement2 {}
+    implements TypeParameterizedElement {}
 
 /// Mixin representing an element which can have type parameters.
 mixin TypeParameterizedElementMixin on ElementImpl
@@ -10487,7 +10487,7 @@ mixin TypeParameterizedElementMixin on ElementImpl
 
 /// Common base class for all analyzer-internal classes that implement
 /// `VariableElement2`.
-abstract class VariableElement2OrMember implements VariableElement2 {
+abstract class VariableElement2OrMember implements VariableElement {
   @override
   TypeImpl get type;
 }
@@ -10772,9 +10772,9 @@ mixin _HasSinceSdkVersionMixin on ElementImpl2, Annotatable
   }
 }
 
-mixin _NonTopLevelVariableOrParameter on Element2 {
+mixin _NonTopLevelVariableOrParameter on Element {
   @override
-  Element2? get enclosingElement2 {
+  Element? get enclosingElement2 {
     // TODO(dantup): Can we simplify this code and inline it into each class?
 
     var enclosingFunction = _enclosingFunction;
diff --git a/pkg/analyzer/lib/src/dart/element/extensions.dart b/pkg/analyzer/lib/src/dart/element/extensions.dart
index 42be706ec5b..89c9adfb45f 100644
--- a/pkg/analyzer/lib/src/dart/element/extensions.dart
+++ b/pkg/analyzer/lib/src/dart/element/extensions.dart
@@ -15,11 +15,11 @@ import 'package:meta/meta_meta.dart';
 
 extension DartTypeExtension on DartType {
   bool get isExtensionType {
-    return element3 is ExtensionTypeElement2;
+    return element3 is ExtensionTypeElement;
   }
 }
 
-extension Element2Extension on Element2 {
+extension Element2Extension on Element {
   TypeImpl? get firstParameterType {
     var self = this;
     if (self is MethodElement2OrMember) {
@@ -39,39 +39,39 @@ extension Element2Extension on Element2 {
     }
 
     var ancestor = enclosingElement2;
-    if (ancestor is InterfaceElement2) {
+    if (ancestor is InterfaceElement) {
       if (ancestor.metadata2.hasDoNotStore) {
         return true;
       }
       ancestor = ancestor.enclosingElement2;
-    } else if (ancestor is ExtensionElement2) {
+    } else if (ancestor is ExtensionElement) {
       if (ancestor.metadata2.hasDoNotStore) {
         return true;
       }
       ancestor = ancestor.enclosingElement2;
     }
 
-    return ancestor is LibraryElement2 && ancestor.metadata2.hasDoNotStore;
+    return ancestor is LibraryElement && ancestor.metadata2.hasDoNotStore;
   }
 
   /// Return `true` if this element is an instance member of a class or mixin.
   ///
-  /// Only [MethodElement2]s, [GetterElement]s, and  [SetterElement]s are
+  /// Only [MethodElement]s, [GetterElement]s, and  [SetterElement]s are
   /// supported.
   ///
-  /// We intentionally exclude [ConstructorElement2]s - they can only be
-  /// invoked in instance creation expressions, and [FieldElement2]s - they
+  /// We intentionally exclude [ConstructorElement]s - they can only be
+  /// invoked in instance creation expressions, and [FieldElement]s - they
   /// cannot be invoked directly and are always accessed using corresponding
   /// [GetterElement]s or [SetterElement]s.
   bool get isInstanceMember {
     assert(
-      this is! PropertyInducingElement2,
+      this is! PropertyInducingElement,
       'Check the GetterElement or SetterElement instead',
     );
     var this_ = this;
     var enclosing = this_.enclosingElement2;
-    if (enclosing is InterfaceElement2) {
-      return this_ is MethodElement2 && !this_.isStatic ||
+    if (enclosing is InterfaceElement) {
+      return this_ is MethodElement && !this_.isStatic ||
           this_ is GetterElement && !this_.isStatic ||
           this_ is SetterElement && !this_.isStatic;
     }
@@ -82,17 +82,17 @@ extension Element2Extension on Element2 {
   bool get isWildcardVariable {
     return name3 == '_' &&
         (this is LocalFunctionElement ||
-            this is LocalVariableElement2 ||
-            this is PrefixElement2 ||
-            this is TypeParameterElement2 ||
+            this is LocalVariableElement ||
+            this is PrefixElement ||
+            this is TypeParameterElement ||
             (this is FormalParameterElement &&
-                this is! FieldFormalParameterElement2 &&
-                this is! SuperFormalParameterElement2)) &&
+                this is! FieldFormalParameterElement &&
+                this is! SuperFormalParameterElement)) &&
         library2.hasWildcardVariablesFeatureEnabled;
   }
 }
 
-extension Element2OrNullExtension on Element2? {
+extension Element2OrNullExtension on Element? {
   /// Return true if this element is a wildcard variable.
   bool get isWildcardVariable {
     return this?.isWildcardVariable ?? false;
@@ -107,14 +107,14 @@ extension ElementAnnotationExtensions on ElementAnnotation {
   /// Return the target kinds defined for this [ElementAnnotation].
   Set<TargetKind> get targetKinds {
     var element = element2;
-    InterfaceElement2? interfaceElement;
+    InterfaceElement? interfaceElement;
 
     if (element is GetterElement) {
       var type = element.returnType;
       if (type is InterfaceType) {
         interfaceElement = type.element3;
       }
-    } else if (element is ConstructorElement2) {
+    } else if (element is ConstructorElement) {
       interfaceElement = element.enclosingElement2;
     }
     if (interfaceElement == null) {
@@ -147,11 +147,11 @@ extension ElementAnnotationExtensions on ElementAnnotation {
   }
 }
 
-extension ExecutableElement2Extension on ExecutableElement2 {
+extension ExecutableElement2Extension on ExecutableElement {
   /// Whether the enclosing element is the class `Object`.
   bool get isObjectMember {
     var enclosing = enclosingElement2;
-    return enclosing is ClassElement2 && enclosing.isDartCoreObject;
+    return enclosing is ClassElement && enclosing.isDartCoreObject;
   }
 }
 
@@ -176,7 +176,7 @@ extension InterfaceTypeExtension on InterfaceType {
   }
 }
 
-extension LibraryExtension2 on LibraryElement2? {
+extension LibraryExtension2 on LibraryElement? {
   bool get hasWildcardVariablesFeatureEnabled =>
       this?.featureSet.isEnabled(Feature.wildcard_variables) ?? false;
 }
diff --git a/pkg/analyzer/lib/src/dart/element/field_name_non_promotability_info.dart b/pkg/analyzer/lib/src/dart/element/field_name_non_promotability_info.dart
index 4999bed31a4..c6263dbe23d 100644
--- a/pkg/analyzer/lib/src/dart/element/field_name_non_promotability_info.dart
+++ b/pkg/analyzer/lib/src/dart/element/field_name_non_promotability_info.dart
@@ -15,19 +15,19 @@ class FieldNameNonPromotabilityInfo {
   /// The set of fields in the library with the given private name that are
   /// inherently non-promotable. These fields conflict with promotability of the
   /// given private name.
-  final List<FieldElement2> conflictingFields;
+  final List<FieldElement> conflictingFields;
 
   /// The set of getters in the library with the given private name that are
   /// concrete. These getters conflict with promotability of the given private
   /// name.
-  final List<PropertyAccessorElement2> conflictingGetters;
+  final List<PropertyAccessorElement> conflictingGetters;
 
   /// The set of concrete classes in the library that contain a getter with the
   /// given private name in their interface but not explicitly in their
   /// implementation (and hence implicitly contain a `noSuchMethod` forwarder
   /// for the getter). These implicit `noSuchMethod` forwarders conflict with
   /// promotability of the given private name.
-  final List<InterfaceElement2> conflictingNsmClasses;
+  final List<InterfaceElement> conflictingNsmClasses;
 
   FieldNameNonPromotabilityInfo({
     required this.conflictingFields,
diff --git a/pkg/analyzer/lib/src/dart/element/generic_inferrer.dart b/pkg/analyzer/lib/src/dart/element/generic_inferrer.dart
index d4a6b75b75e..fa0ff6dc207 100644
--- a/pkg/analyzer/lib/src/dart/element/generic_inferrer.dart
+++ b/pkg/analyzer/lib/src/dart/element/generic_inferrer.dart
@@ -107,7 +107,7 @@ class GenericInferrer {
 
   GenericInferrer(
     this._typeSystem,
-    List<TypeParameterElement2> typeFormals, {
+    List<TypeParameterElement> typeFormals, {
     this.errorReporter,
     this.errorEntity,
     required this.genericMetadataIsEnabled,
@@ -284,7 +284,7 @@ class GenericInferrer {
   List<TypeImpl>? tryChooseFinalTypes({bool failAtError = true}) {
     var inferredTypes = _chooseTypes(preliminary: false);
     // Check the inferred types against all of the constraints.
-    var knownTypes = <TypeParameterElement2, TypeImpl>{};
+    var knownTypes = <TypeParameterElement, TypeImpl>{};
     var hasErrorReported = false;
     for (int i = 0; i < _typeFormals.length; i++) {
       TypeParameterElementImpl2 parameter = _typeFormals[i];
@@ -824,7 +824,7 @@ class GenericInferrer {
     } else if (errorEntity is SimpleIdentifier) {
       var element = errorEntity.element;
       if (element != null) {
-        if (element is VariableElement2) {
+        if (element is VariableElement) {
           // For variable elements, we check their type and possible alias type.
           var type = element.type;
           var typeElement = type is InterfaceType ? type.element3 : null;
@@ -972,7 +972,7 @@ class GenericInferrer {
   }
 }
 
-extension on Element2 {
+extension on Element {
   bool get hasOptionalTypeArgs {
     if (this case Annotatable annotatable) {
       return annotatable.metadata2.hasOptionalTypeArgs;
diff --git a/pkg/analyzer/lib/src/dart/element/inheritance_manager3.dart b/pkg/analyzer/lib/src/dart/element/inheritance_manager3.dart
index e9e4d8802a8..1d2eff114c8 100644
--- a/pkg/analyzer/lib/src/dart/element/inheritance_manager3.dart
+++ b/pkg/analyzer/lib/src/dart/element/inheritance_manager3.dart
@@ -23,7 +23,7 @@ class CandidatesConflict extends Conflict {
 
   CandidatesConflict({required super.name, required this.candidates});
 
-  List<ExecutableElement2> get candidates2 =>
+  List<ExecutableElement> get candidates2 =>
       candidates.map((e) => e.asElement2).toList();
 }
 
@@ -46,9 +46,9 @@ class GetterMethodConflict extends Conflict {
     required this.method,
   });
 
-  ExecutableElement2 get getter2 => getter.asElement2;
+  ExecutableElement get getter2 => getter.asElement2;
 
-  ExecutableElement2 get method2 => method.asElement2;
+  ExecutableElement get method2 => method.asElement2;
 }
 
 /// The extension type has both an extension and non-extension member
@@ -63,10 +63,10 @@ class HasNonExtensionAndExtensionMemberConflict extends Conflict {
     required this.extension,
   });
 
-  List<ExecutableElement2> get extension2 =>
+  List<ExecutableElement> get extension2 =>
       extension.map((e) => e.asElement2).toList();
 
-  List<ExecutableElement2> get nonExtension2 =>
+  List<ExecutableElement> get nonExtension2 =>
       nonExtension.map((e) => e.asElement2).toList();
 }
 
@@ -74,7 +74,7 @@ class HasNonExtensionAndExtensionMemberConflict extends Conflict {
 class InheritanceManager3 {
   static final _noSuchMethodName = Name(
     null,
-    MethodElement2.NO_SUCH_METHOD_METHOD_NAME,
+    MethodElement.NO_SUCH_METHOD_METHOD_NAME,
   );
 
   /// Cached instance interfaces for [InterfaceElementImpl].
@@ -162,7 +162,7 @@ class InheritanceManager3 {
   /// Returns the result of [getInherited2] with [type] substitution.
   // This is a replacement for `getInherited`.
   @experimental
-  ExecutableElement2? getInherited3(InterfaceType type, Name name) {
+  ExecutableElement? getInherited3(InterfaceType type, Name name) {
     var element = getInherited(type, name);
     return element?.asElement2;
   }
@@ -177,7 +177,7 @@ class InheritanceManager3 {
   // This is a replacement for `getInherited2`.
   @experimental
   ExecutableElement2OrMember? getInherited4(
-    InterfaceElement2 element,
+    InterfaceElement element,
     Name name,
   ) {
     element as InterfaceElementImpl2; // TODO(scheglov): remove cast
@@ -188,8 +188,8 @@ class InheritanceManager3 {
   /// Returns signatures of all concrete members that the given [element]
   /// inherits from the superclasses and mixins.
   @experimental
-  Map<Name, ExecutableElement2> getInheritedConcreteMap(
-    InterfaceElement2 element,
+  Map<Name, ExecutableElement> getInheritedConcreteMap(
+    InterfaceElement element,
   ) {
     element as InterfaceElementImpl2; // TODO(scheglov): remove cast
     var map = getInheritedConcreteMap2(element.asElement);
@@ -216,7 +216,7 @@ class InheritanceManager3 {
   /// If there is no most specific signature for a name, the corresponding name
   /// will not be included.
   @experimental
-  Map<Name, ExecutableElement2> getInheritedMap(InterfaceElement2 element) {
+  Map<Name, ExecutableElement> getInheritedMap(InterfaceElement element) {
     element as InterfaceElementImpl2; // TODO(scheglov): remove cast
     var map = getInheritedMap2(element.asElement);
     return map.mapValue((element) => element.asElement2);
@@ -279,7 +279,7 @@ class InheritanceManager3 {
   /// The interface might include private members, not necessary accessible in
   /// all libraries.
   @experimental
-  Interface getInterface2(InterfaceElement2 element) {
+  Interface getInterface2(InterfaceElement element) {
     element as InterfaceElementImpl2; // TODO(scheglov): remove cast
     return getInterface(element.asElement);
   }
@@ -355,7 +355,7 @@ class InheritanceManager3 {
   /// Returns the result of [getMember4] with [type] substitution.
   // This is a replacement for `getMember`.
   @experimental
-  ExecutableElement2? getMember3(
+  ExecutableElement? getMember3(
     InterfaceType type,
     Name name, {
     bool concrete = false,
@@ -386,7 +386,7 @@ class InheritanceManager3 {
   // This is a replacement for `getMember2`.
   @experimental
   ExecutableElement2OrMember? getMember4(
-    InterfaceElement2 element,
+    InterfaceElement element,
     Name name, {
     bool concrete = false,
     int forMixinIndex = -1,
@@ -408,10 +408,7 @@ class InheritanceManager3 {
   ///
   /// Returns `null` if no members would be overridden.
   @experimental
-  List<ExecutableElement2>? getOverridden(
-    InterfaceElement2 element,
-    Name name,
-  ) {
+  List<ExecutableElement>? getOverridden(InterfaceElement element, Name name) {
     element as InterfaceElementImpl2; // TODO(scheglov): remove cast
     var elements = getOverridden2(element.asElement, name);
     if (elements == null) {
@@ -434,10 +431,7 @@ class InheritanceManager3 {
   /// Return all members of mixins, superclasses, and interfaces that a member
   /// with the given [name], defined in the [element], would override; or `null`
   /// if no members would be overridden.
-  List<ExecutableElement2>? getOverridden4(
-    InterfaceElement2 element,
-    Name name,
-  ) {
+  List<ExecutableElement>? getOverridden4(InterfaceElement element, Name name) {
     var interface = getInterface2(element);
     var fragments = interface.overridden[name];
     return fragments?.map((fragment) => fragment.asElement2).toList();
@@ -503,7 +497,7 @@ class InheritanceManager3 {
       }
 
       var class_ = executable.asElement2.enclosingElement2;
-      if (class_ is ClassElement2 && class_.isDartCoreObject) {
+      if (class_ is ClassElement && class_.isDartCoreObject) {
         continue;
       }
 
@@ -763,14 +757,14 @@ class InheritanceManager3 {
 
     var implemented2 = implemented.mapValue((value) => value.asElement2);
 
-    var namedCandidates2 = namedCandidates.map<Name, List<ExecutableElement2>>(
+    var namedCandidates2 = namedCandidates.map<Name, List<ExecutableElement>>(
       (key, value) => MapEntry(key, value.map((e) => e.asElement2).toList()),
     );
 
     var superImplemented2 =
         superImplemented
             .map(
-              (e) => e.map<Name, ExecutableElement2>(
+              (e) => e.map<Name, ExecutableElement>(
                 (key, value) => MapEntry(key, value.asElement2),
               ),
             )
@@ -958,14 +952,14 @@ class InheritanceManager3 {
       }
     }
 
-    var uniqueRedeclared2 = <Name, List<ExecutableElement2>>{};
+    var uniqueRedeclared2 = <Name, List<ExecutableElement>>{};
     for (var entry in redeclared.entries) {
       var name = entry.key;
       var fragments = entry.value.map((fragment) => fragment.asElement2);
       if (fragments.length == 1) {
         uniqueRedeclared2[name] = fragments.toFixedList();
       } else {
-        var uniqueElements = <ExecutableElement2>{};
+        var uniqueElements = <ExecutableElement>{};
         for (var fragment in fragments) {
           uniqueElements.add(fragment);
         }
@@ -1041,7 +1035,7 @@ class InheritanceManager3 {
 
     var interfaceCandidates2 = interfaceCandidates.map<
       Name,
-      List<ExecutableElement2>
+      List<ExecutableElement>
     >((key, value) => MapEntry(key, value.map((e) => e.asElement2).toList()));
 
     var superInterface2 = superInterface.mapValue((value) => value.asElement2);
@@ -1261,7 +1255,7 @@ class InheritanceManager3 {
 
   static bool _isDeclaredInObject(ExecutableElementOrMember element) {
     var enclosing = element.asElement2.enclosingElement2;
-    return enclosing is ClassElement2 && enclosing.isDartCoreObject;
+    return enclosing is ClassElement && enclosing.isDartCoreObject;
   }
 }
 
@@ -1303,7 +1297,7 @@ class Interface {
 
   /// The map of names to their signatures from the mixins, superclasses,
   /// or interfaces.
-  final Map<Name, List<ExecutableElement2>> overridden2;
+  final Map<Name, List<ExecutableElement>> overridden2;
 
   /// The map of names to the signatures from superinterfaces that a member
   /// declaration in this extension type redeclares.
@@ -1311,7 +1305,7 @@ class Interface {
 
   /// The map of names to the signatures from superinterfaces that a member
   /// declaration in this extension type redeclares.
-  final Map<Name, List<ExecutableElement2>> redeclared2;
+  final Map<Name, List<ExecutableElement>> redeclared2;
 
   /// Each item of this list maps names to their concrete implementations.
   /// The first item of the list is the nominal superclass, next the nominal
@@ -1323,7 +1317,7 @@ class Interface {
   /// The first item of the list is the nominal superclass, next the nominal
   /// superclass plus the first mixin, etc. So, for the class like
   /// `class C extends S with M1, M2`, we get `[S, S&M1, S&M1&M2]`.
-  final List<Map<Name, ExecutableElement2>> superImplemented2;
+  final List<Map<Name, ExecutableElement>> superImplemented2;
 
   /// The list of conflicts between superinterfaces - the nominal superclass,
   /// mixins, and interfaces.  Does not include conflicts with the declared
@@ -1351,17 +1345,17 @@ class Interface {
 
   /// The map of declared names to their signatures.
   @experimental
-  Map<Name, ExecutableElement2> get declared2 {
+  Map<Name, ExecutableElement> get declared2 {
     return declared.mapValue((element) => element.asElement2);
   }
 
   /// The map of names to the most specific signatures from the mixins,
   /// superclasses, or interfaces.
-  Map<Name, ExecutableElement2>? get inheritedMap2 {
+  Map<Name, ExecutableElement>? get inheritedMap2 {
     if (inheritedMap == null) {
       return null;
     }
-    var inheritedMap2 = <Name, ExecutableElement2>{};
+    var inheritedMap2 = <Name, ExecutableElement>{};
     for (var entry in inheritedMap!.entries) {
       inheritedMap2[entry.key] = entry.value.asElement2;
     }
@@ -1408,7 +1402,7 @@ class Name {
     }
   }
 
-  factory Name.forLibrary(LibraryElement2? library, String name) {
+  factory Name.forLibrary(LibraryElement? library, String name) {
     return Name(library?.uri, name);
   }
 
@@ -1450,7 +1444,7 @@ class Name {
   /// If the element is private, the name includes the library URI.
   ///
   /// If the name is a setter, the name ends with `=`.
-  static Name? forElement(Element2 element) {
+  static Name? forElement(Element element) {
     var name = element.lookupName;
     if (name == null) {
       return null;
@@ -1474,7 +1468,7 @@ class NotUniqueExtensionMemberConflict extends Conflict {
     required this.candidates,
   });
 
-  List<ExecutableElement2> get candidates2 =>
+  List<ExecutableElement> get candidates2 =>
       candidates.map((e) => e.asElement2).toList();
 }
 
diff --git a/pkg/analyzer/lib/src/dart/element/least_upper_bound.dart b/pkg/analyzer/lib/src/dart/element/least_upper_bound.dart
index 24e5b9d8147..740ac624380 100644
--- a/pkg/analyzer/lib/src/dart/element/least_upper_bound.dart
+++ b/pkg/analyzer/lib/src/dart/element/least_upper_bound.dart
@@ -125,7 +125,7 @@ class InterfaceLeastUpperBoundHelper {
       return;
     }
 
-    if (type.element3 is ExtensionTypeElement2) {
+    if (type.element3 is ExtensionTypeElement) {
       set.add(typeSystem.objectQuestion);
     }
 
@@ -181,7 +181,7 @@ class InterfaceLeastUpperBoundHelper {
   /// Object.
   @visibleForTesting
   static int computeLongestInheritancePathToObject(InterfaceType type) {
-    return _computeLongestInheritancePathToObject(type, <InterfaceElement2>{});
+    return _computeLongestInheritancePathToObject(type, <InterfaceElement>{});
   }
 
   static NullabilitySuffix _chooseNullability(
@@ -204,7 +204,7 @@ class InterfaceLeastUpperBoundHelper {
   /// case of a cyclic type structure.
   static int _computeLongestInheritancePathToObject(
     InterfaceType type,
-    Set<InterfaceElement2> visitedElements,
+    Set<InterfaceElement> visitedElements,
   ) {
     var element = type.element3;
     // recursion
@@ -216,14 +216,14 @@ class InterfaceLeastUpperBoundHelper {
       return 1;
     }
     // Object case
-    if (element is ClassElement2) {
+    if (element is ClassElement) {
       if (element.isDartCoreObject) {
         return type.nullabilitySuffix == NullabilitySuffix.none ? 1 : 0;
       }
     }
 
     // Extension type without interfaces, implicit `Object?`
-    if (element is ExtensionTypeElement2) {
+    if (element is ExtensionTypeElement) {
       if (element.interfaces.isEmpty) {
         return 1;
       }
@@ -235,7 +235,7 @@ class InterfaceLeastUpperBoundHelper {
 
       // loop through each of the superinterfaces recursively calling this
       // method and keeping track of the longest path to return
-      if (element is MixinElement2) {
+      if (element is MixinElement) {
         for (InterfaceType interface in element.superclassConstraints) {
           var pathLength = _computeLongestInheritancePathToObject(
             interface,
@@ -255,7 +255,7 @@ class InterfaceLeastUpperBoundHelper {
         longestPath = max(longestPath, 1 + pathLength);
       }
 
-      if (element is! ClassElement2) {
+      if (element is! ClassElement) {
         return longestPath;
       }
 
diff --git a/pkg/analyzer/lib/src/dart/element/member.dart b/pkg/analyzer/lib/src/dart/element/member.dart
index 7db8cc87c65..216ba4f955e 100644
--- a/pkg/analyzer/lib/src/dart/element/member.dart
+++ b/pkg/analyzer/lib/src/dart/element/member.dart
@@ -21,7 +21,7 @@ import 'package:pub_semver/pub_semver.dart';
 /// the type parameters are known.
 class ConstructorMember extends ExecutableMember
     with ConstructorElementMixin, ConstructorElementMixin2
-    implements ConstructorElement2 {
+    implements ConstructorElement {
   /// Initialize a newly created element to represent a constructor, based on
   /// the [declaration], and applied [substitution].
   ConstructorMember({
@@ -131,7 +131,7 @@ class ConstructorMember extends ExecutableMember
         return element;
       case ConstructorMember():
         var memberMap = element.substitution.map;
-        var map = <TypeParameterElement2, DartType>{
+        var map = <TypeParameterElement, DartType>{
           for (var MapEntry(:key, :value) in memberMap.entries)
             key: substitution.substituteType(value),
         };
@@ -206,7 +206,7 @@ abstract class ExecutableMember extends Member
   });
 
   @override
-  List<Element2> get children2 {
+  List<Element> get children2 {
     return [...typeParameters2, ...formalParameters];
   }
 
@@ -218,7 +218,7 @@ abstract class ExecutableMember extends Member
   String get displayName => declaration.displayName;
 
   @override
-  Element2? get enclosingElement2 => _element2.enclosingElement2;
+  Element? get enclosingElement2 => _element2.enclosingElement2;
 
   @override
   List<FormalParameterElementMixin> get formalParameters =>
@@ -270,7 +270,7 @@ abstract class ExecutableMember extends Member
   bool get isSynchronous => declaration.isSynchronous;
 
   @override
-  LibraryElement2 get library2 => _element2.library2;
+  LibraryElement get library2 => _element2.library2;
 
   @override
   Source get librarySource => _declaration.librarySource!;
@@ -279,7 +279,7 @@ abstract class ExecutableMember extends Member
   int get nameOffset => declaration.nameOffset;
 
   @override
-  Element2 get nonSynthetic2 => _element2;
+  Element get nonSynthetic2 => _element2;
 
   @override
   List<ParameterElementMixin> get parameters {
@@ -321,7 +321,7 @@ abstract class ExecutableMember extends Member
       typeParameters.map((fragment) => fragment.asElement2).toList();
 
   @override
-  ExecutableElement2 get _element2 => declaration.asElement2;
+  ExecutableElement get _element2 => declaration.asElement2;
 
   @override
   void appendTo(ElementDisplayStringBuilder builder) {
@@ -342,15 +342,15 @@ abstract class ExecutableMember extends Member
   }
 
   @override
-  bool isAccessibleIn2(LibraryElement2 library) =>
+  bool isAccessibleIn2(LibraryElement library) =>
       _element2.isAccessibleIn2(library);
 
   @override
-  Element2? thisOrAncestorMatching2(bool Function(Element2 p1) predicate) =>
+  Element? thisOrAncestorMatching2(bool Function(Element p1) predicate) =>
       _element2.thisOrAncestorMatching2(predicate);
 
   @override
-  E? thisOrAncestorOfType2<E extends Element2>() =>
+  E? thisOrAncestorOfType2<E extends Element>() =>
       _element2.thisOrAncestorOfType2();
 
   @override
@@ -361,7 +361,7 @@ abstract class ExecutableMember extends Member
   }
 
   static ExecutableElement2OrMember from(
-    ExecutableElement2 element,
+    ExecutableElement element,
     MapSubstitution substitution,
   ) {
     return from2(element.asElement, substitution).asElement2;
@@ -380,7 +380,7 @@ abstract class ExecutableMember extends Member
     if (element is ExecutableMember) {
       declaration = element.declaration;
 
-      var map = <TypeParameterElement2, DartType>{
+      var map = <TypeParameterElement, DartType>{
         for (var MapEntry(:key, :value) in element.substitution.map.entries)
           key: substitution.substituteType(value),
       };
@@ -470,10 +470,10 @@ class FieldMember extends VariableMember
   });
 
   @override
-  FieldElement2 get baseElement => _element2;
+  FieldElement get baseElement => _element2;
 
   @override
-  List<Element2> get children2 => const [];
+  List<Element> get children2 => const [];
 
   @override
   ConstantInitializer? get constantInitializer2 {
@@ -487,7 +487,7 @@ class FieldMember extends VariableMember
   String get displayName => declaration.displayName;
 
   @override
-  InstanceElement2 get enclosingElement2 => _element2.enclosingElement2;
+  InstanceElement get enclosingElement2 => _element2.enclosingElement2;
 
   @override
   FieldFragment get firstFragment => _element2.firstFragment;
@@ -536,7 +536,7 @@ class FieldMember extends VariableMember
   bool get isPromotable => declaration.isPromotable;
 
   @override
-  LibraryElement2 get library2 => _element2.library2;
+  LibraryElement get library2 => _element2.library2;
 
   @override
   String? get lookupName => _element2.lookupName;
@@ -548,7 +548,7 @@ class FieldMember extends VariableMember
   String? get name3 => _element2.name3;
 
   @override
-  Element2 get nonSynthetic2 => _element2.nonSynthetic2;
+  Element get nonSynthetic2 => _element2.nonSynthetic2;
 
   @override
   SetterElement2OrMember? get setter2 {
@@ -567,7 +567,7 @@ class FieldMember extends VariableMember
   Source? get source => _declaration.source;
 
   @override
-  FieldElement2 get _element2 => declaration.asElement2;
+  FieldElement get _element2 => declaration.asElement2;
 
   @override
   T? accept2<T>(ElementVisitor2<T> visitor) {
@@ -586,17 +586,17 @@ class FieldMember extends VariableMember
   }
 
   @override
-  bool isAccessibleIn2(LibraryElement2 library) {
+  bool isAccessibleIn2(LibraryElement library) {
     return _element2.isAccessibleIn2(library);
   }
 
   @override
-  Element2? thisOrAncestorMatching2(bool Function(Element2 e) predicate) {
+  Element? thisOrAncestorMatching2(bool Function(Element e) predicate) {
     return _element2.thisOrAncestorMatching2(predicate);
   }
 
   @override
-  E? thisOrAncestorOfType2<E extends Element2>() {
+  E? thisOrAncestorOfType2<E extends Element>() {
     return _element2.thisOrAncestorOfType2<E>();
   }
 
@@ -673,7 +673,7 @@ class GetterMember extends PropertyAccessorMember
   String? get lookupName => _element2.lookupName;
 
   @override
-  Element2 get nonSynthetic2 {
+  Element get nonSynthetic2 {
     if (!isSynthetic) {
       return this;
     } else if (variable3 case var variable?) {
@@ -732,7 +732,7 @@ abstract class Member implements ElementOrMember {
     }
   }
 
-  Element2 get baseElement;
+  Element get baseElement;
 
   @override
   AnalysisContext get context => _declaration.context;
@@ -784,7 +784,7 @@ abstract class Member implements ElementOrMember {
   @override
   Version? get sinceSdkVersion => _declaration.sinceSdkVersion;
 
-  Element2 get _element2;
+  Element get _element2;
 
   /// Append a textual representation of this element to the given [builder].
   void appendTo(ElementDisplayStringBuilder builder);
@@ -861,7 +861,7 @@ class MethodMember extends ExecutableMember
   }
 
   @override
-  LibraryElement2 get library2 => _element2.library2;
+  LibraryElement get library2 => _element2.library2;
 
   @override
   String? get lookupName => name3;
@@ -934,7 +934,7 @@ class ParameterMember extends VariableMember
   FormalParameterElement get baseElement => _element2;
 
   @override
-  List<Element2> get children2 {
+  List<Element> get children2 {
     return [...typeParameters2, ...formalParameters];
   }
 
@@ -953,7 +953,7 @@ class ParameterMember extends VariableMember
   FormalParameterElementImpl get element => declaration.element;
 
   @override
-  Element2? get enclosingElement2 => _element2.enclosingElement2;
+  Element? get enclosingElement2 => _element2.enclosingElement2;
 
   @override
   FormalParameterFragment get firstFragment => _element2.firstFragment;
@@ -987,7 +987,7 @@ class ParameterMember extends VariableMember
   bool get isSuperFormal => declaration.isSuperFormal;
 
   @override
-  LibraryElement2? get library2 => _element2.library2;
+  LibraryElement? get library2 => _element2.library2;
 
   @override
   String? get lookupName => _element2.lookupName;
@@ -1002,7 +1002,7 @@ class ParameterMember extends VariableMember
   String get nameShared => name;
 
   @override
-  Element2 get nonSynthetic2 => _element2;
+  Element get nonSynthetic2 => _element2;
 
   @deprecated
   @override
@@ -1023,7 +1023,7 @@ class ParameterMember extends VariableMember
   Source? get source => _declaration.source;
 
   @override
-  List<TypeParameterElement2> get typeParameters2 => _element2.typeParameters2;
+  List<TypeParameterElement> get typeParameters2 => _element2.typeParameters2;
 
   @override
   TypeImpl get typeShared => type;
@@ -1053,16 +1053,16 @@ class ParameterMember extends VariableMember
   }
 
   @override
-  bool isAccessibleIn2(LibraryElement2 library) =>
+  bool isAccessibleIn2(LibraryElement library) =>
       _element2.isAccessibleIn2(library);
 
   @override
-  Element2? thisOrAncestorMatching2(bool Function(Element2 p1) predicate) {
+  Element? thisOrAncestorMatching2(bool Function(Element p1) predicate) {
     return _element2.thisOrAncestorMatching2(predicate);
   }
 
   @override
-  E? thisOrAncestorOfType2<E extends Element2>() {
+  E? thisOrAncestorOfType2<E extends Element>() {
     return _element2.thisOrAncestorOfType2();
   }
 
@@ -1081,7 +1081,7 @@ class ParameterMember extends VariableMember
       var member = element;
       declaration = member.declaration;
 
-      var map = <TypeParameterElement2, DartType>{
+      var map = <TypeParameterElement, DartType>{
         for (var MapEntry(:key, :value) in member.substitution.map.entries)
           key: substitution.substituteType(value),
       };
@@ -1162,7 +1162,7 @@ abstract class PropertyAccessorMember extends ExecutableMember
       _declaration as PropertyAccessorElementImpl;
 
   @override
-  Element2 get enclosingElement2 {
+  Element get enclosingElement2 {
     return super.enclosingElement2!;
   }
 
@@ -1261,7 +1261,7 @@ class SetterMember extends PropertyAccessorMember
   String? get lookupName => _element2.lookupName;
 
   @override
-  Element2 get nonSynthetic2 {
+  Element get nonSynthetic2 {
     if (!isSynthetic) {
       return this;
     } else if (variable3 case var variable?) {
diff --git a/pkg/analyzer/lib/src/dart/element/name_union.dart b/pkg/analyzer/lib/src/dart/element/name_union.dart
index 247a0b7c3fa..e82a5681dbe 100644
--- a/pkg/analyzer/lib/src/dart/element/name_union.dart
+++ b/pkg/analyzer/lib/src/dart/element/name_union.dart
@@ -90,24 +90,24 @@ class ElementNameUnion {
     return true;
   }
 
-  static ElementNameUnion forLibrary(LibraryElement2 libraryElement) {
+  static ElementNameUnion forLibrary(LibraryElement libraryElement) {
     var result = ElementNameUnion.empty();
     libraryElement.accept2(_ElementVisitor2(result));
     return result;
   }
 
-  static bool _hasInterestingElements(Element2 element) {
-    if (element is ExecutableElement2) {
+  static bool _hasInterestingElements(Element element) {
+    if (element is ExecutableElement) {
       return false;
     }
     return true;
   }
 
-  static bool _isInterestingElement(Element2 element) {
-    return element.enclosingElement2 is LibraryElement2 ||
-        element is FieldElement2 ||
-        element is MethodElement2 ||
-        element is PropertyAccessorElement2;
+  static bool _isInterestingElement(Element element) {
+    return element.enclosingElement2 is LibraryElement ||
+        element is FieldElement ||
+        element is MethodElement ||
+        element is PropertyAccessorElement;
   }
 }
 
@@ -117,7 +117,7 @@ class _ElementVisitor2 extends GeneralizingElementVisitor2<void> {
   _ElementVisitor2(this.union);
 
   @override
-  void visitElement(Element2 element) {
+  void visitElement(Element element) {
     if (ElementNameUnion._isInterestingElement(element)) {
       var name = element.name3;
       if (name != null) {
diff --git a/pkg/analyzer/lib/src/dart/element/non_covariant_type_parameter_position.dart b/pkg/analyzer/lib/src/dart/element/non_covariant_type_parameter_position.dart
index b6a755fb282..e326689a6c2 100644
--- a/pkg/analyzer/lib/src/dart/element/non_covariant_type_parameter_position.dart
+++ b/pkg/analyzer/lib/src/dart/element/non_covariant_type_parameter_position.dart
@@ -10,7 +10,7 @@ import 'package:analyzer/dart/element/type_visitor.dart';
 import 'package:analyzer/src/dart/element/extensions.dart';
 
 class NonCovariantTypeParameterPositionVisitor implements TypeVisitor<bool> {
-  final List<TypeParameterElement2> _typeParameters;
+  final List<TypeParameterElement> _typeParameters;
   Variance _variance;
 
   NonCovariantTypeParameterPositionVisitor(
diff --git a/pkg/analyzer/lib/src/dart/element/normalize.dart b/pkg/analyzer/lib/src/dart/element/normalize.dart
index 9f03d66c0cc..08b9c631974 100644
--- a/pkg/analyzer/lib/src/dart/element/normalize.dart
+++ b/pkg/analyzer/lib/src/dart/element/normalize.dart
@@ -21,7 +21,7 @@ class NormalizeHelper {
   final TypeSystemImpl typeSystem;
   final TypeProviderImpl typeProvider;
 
-  final Set<TypeParameterElement2> _typeParameters = {};
+  final Set<TypeParameterElement> _typeParameters = {};
 
   NormalizeHelper(this.typeSystem) : typeProvider = typeSystem.typeProvider;
 
diff --git a/pkg/analyzer/lib/src/dart/element/replacement_visitor.dart b/pkg/analyzer/lib/src/dart/element/replacement_visitor.dart
index acdc950f0cf..71fc5c114e1 100644
--- a/pkg/analyzer/lib/src/dart/element/replacement_visitor.dart
+++ b/pkg/analyzer/lib/src/dart/element/replacement_visitor.dart
@@ -187,7 +187,7 @@ class ReplacementVisitor
 
     Substitution? substitution;
     if (newTypeParameters != null) {
-      var map = <TypeParameterElement2, DartType>{};
+      var map = <TypeParameterElement, DartType>{};
       for (var i = 0; i < newTypeParameters.length; ++i) {
         var typeParameter = node.typeParameters[i];
         var newTypeParameter = newTypeParameters[i];
@@ -293,7 +293,7 @@ class ReplacementVisitor
 
     Substitution? substitution;
     if (newTypeParameters != null) {
-      var map = <TypeParameterElement2, DartType>{};
+      var map = <TypeParameterElement, DartType>{};
       for (var i = 0; i < newTypeParameters.length; ++i) {
         var typeParameter = node.typeParameters[i];
         var newTypeParameter = newTypeParameters[i];
diff --git a/pkg/analyzer/lib/src/dart/element/runtime_type_equality.dart b/pkg/analyzer/lib/src/dart/element/runtime_type_equality.dart
index 09915f1d1bd..16af39b40e0 100644
--- a/pkg/analyzer/lib/src/dart/element/runtime_type_equality.dart
+++ b/pkg/analyzer/lib/src/dart/element/runtime_type_equality.dart
@@ -193,8 +193,8 @@ class RuntimeTypeEqualityVisitor
   /// returns a [_TypeParametersResult] indicating the substitutions necessary
   /// to demonstrate their equality.  If they aren't, returns `null`.
   _TypeParametersResult? _typeParameters(
-    List<TypeParameterElement2> T1_parameters,
-    List<TypeParameterElement2> T2_parameters,
+    List<TypeParameterElement> T1_parameters,
+    List<TypeParameterElement> T2_parameters,
   ) {
     if (T1_parameters.length != T2_parameters.length) {
       return null;
diff --git a/pkg/analyzer/lib/src/dart/element/scope.dart b/pkg/analyzer/lib/src/dart/element/scope.dart
index b08504ee436..4930ffed4fe 100644
--- a/pkg/analyzer/lib/src/dart/element/scope.dart
+++ b/pkg/analyzer/lib/src/dart/element/scope.dart
@@ -14,7 +14,7 @@ import 'package:analyzer/src/utilities/extensions/collection.dart';
 
 /// The scope for the initializers in a constructor.
 class ConstructorInitializerScope extends EnclosedScope {
-  ConstructorInitializerScope(super.parent, ConstructorElement2 element) {
+  ConstructorInitializerScope(super.parent, ConstructorElement element) {
     var hasWildcardVariables = element.library2.featureSet.isEnabled(
       Feature.wildcard_variables,
     );
@@ -41,7 +41,7 @@ class DocumentationCommentScope with _GettersAndSetters implements Scope {
 
   DocumentationCommentScope(
     this.innerScope,
-    List<LibraryElement2> docImportLibraries,
+    List<LibraryElement> docImportLibraries,
   ) {
     for (var importedLibrary in docImportLibraries) {
       if (importedLibrary is LibraryElementImpl) {
@@ -92,7 +92,7 @@ class EnclosedScope with _GettersAndSetters implements Scope {
 
 /// The scope defined by an extension.
 class ExtensionScope extends EnclosedScope {
-  ExtensionScope(super.parent, ExtensionElement2 element) {
+  ExtensionScope(super.parent, ExtensionElement element) {
     element.getters2.forEach(_addGetter);
     element.setters2.forEach(_addSetter);
     element.methods2.forEach(_addGetter);
@@ -102,8 +102,8 @@ class ExtensionScope extends EnclosedScope {
 class FormalParameterScope extends EnclosedScope {
   FormalParameterScope(super.parent, List<FormalParameterElement> elements) {
     for (var parameter in elements) {
-      if (parameter is! FieldFormalParameterElement2 &&
-          parameter is! SuperFormalParameterElement2) {
+      if (parameter is! FieldFormalParameterElement &&
+          parameter is! SuperFormalParameterElement) {
         if (!parameter.isWildcardVariable) {
           _addGetter(parameter);
         }
@@ -120,11 +120,11 @@ class ImportsTracking {
   ImportsTracking({required this.map});
 
   /// The elements that are used from [import].
-  Set<Element2> elementsOf(LibraryImportElementImpl import) {
+  Set<Element> elementsOf(LibraryImportElementImpl import) {
     return trackerOf(import)?.importToUsedElements[import] ?? {};
   }
 
-  void notifyExtensionUsed(ExtensionElement2 element) {
+  void notifyExtensionUsed(ExtensionElement element) {
     for (var tracking in map.values) {
       tracking.notifyExtensionUsed(element);
     }
@@ -141,16 +141,16 @@ class ImportsTrackingOfPrefix {
 
   /// Key: an element.
   /// Value: the imports that provide the element.
-  final Map<Element2, List<LibraryImportElementImpl>> _elementImports = {};
+  final Map<Element, List<LibraryImportElementImpl>> _elementImports = {};
 
   /// Key: an import.
   /// Value: used elements imported from the import.
-  final Map<LibraryImportElementImpl, Set<Element2>> importToUsedElements = {};
+  final Map<LibraryImportElementImpl, Set<Element>> importToUsedElements = {};
 
   /// Key: an import.
   /// Value: used elements imported from the import.
   /// Excludes elements from deprecated exports.
-  final Map<LibraryImportElementImpl, Set<Element2>> importToAccessedElements2 =
+  final Map<LibraryImportElementImpl, Set<Element>> importToAccessedElements2 =
       {};
 
   /// Usually it is an error to use an import prefix without `.identifier`
@@ -166,13 +166,13 @@ class ImportsTrackingOfPrefix {
   }
 
   /// The elements that are used from [import].
-  Set<Element2> elementsOf(LibraryImportElementImpl import) {
+  Set<Element> elementsOf(LibraryImportElementImpl import) {
     return importToUsedElements[import] ?? {};
   }
 
   /// The subset of [elementsOf], excludes elements that are from deprecated
   /// exports inside the imported library.
-  Set<Element2> elementsOf2(LibraryImportElementImpl import) {
+  Set<Element> elementsOf2(LibraryImportElementImpl import) {
     var result = importToAccessedElements2[import];
     if (result != null) {
       return result;
@@ -207,7 +207,7 @@ class ImportsTrackingOfPrefix {
     return importToAccessedElements2[import] = result;
   }
 
-  void lookupResult(Element2? element) {
+  void lookupResult(Element? element) {
     if (!active) {
       return;
     }
@@ -216,7 +216,7 @@ class ImportsTrackingOfPrefix {
       return;
     }
 
-    if (element is MultiplyDefinedElement2) {
+    if (element is MultiplyDefinedElement) {
       return;
     }
 
@@ -227,7 +227,7 @@ class ImportsTrackingOfPrefix {
     }
   }
 
-  void notifyExtensionUsed(ExtensionElement2 element) {
+  void notifyExtensionUsed(ExtensionElement element) {
     var imports = _elementImports[element];
     if (imports != null) {
       for (var import in imports) {
@@ -264,7 +264,7 @@ class ImportsTrackingOfPrefix {
 
 /// The scope defined by an instance element.
 class InstanceScope extends EnclosedScope {
-  InstanceScope(super.parent, InstanceElement2 element) {
+  InstanceScope(super.parent, InstanceElement element) {
     element.getters2.forEach(_addGetter);
     element.setters2.forEach(_addSetter);
     element.methods2.forEach(_addGetter);
@@ -273,7 +273,7 @@ class InstanceScope extends EnclosedScope {
 
 /// The top-level declarations of the library.
 class LibraryDeclarations with _GettersAndSetters {
-  List<ExtensionElement2> extensions = [];
+  List<ExtensionElement> extensions = [];
 
   LibraryDeclarations(LibraryElementImpl library) {
     library.getters.forEach(_addGetter);
@@ -296,11 +296,11 @@ class LibraryDeclarations with _GettersAndSetters {
   }
 
   /// Returns a getter or setter with the [name].
-  Element2? withName(String name) {
+  Element? withName(String name) {
     return _getters[name] ?? _setters[name];
   }
 
-  void _addExtension(ExtensionElement2 element) {
+  void _addExtension(ExtensionElement element) {
     _addGetter(element);
     if (!extensions.contains(element)) {
       extensions.add(element);
@@ -316,7 +316,7 @@ class LibraryFragmentScope implements Scope {
   final Map<String, PrefixElementImpl2> _prefixElements = {};
 
   /// The cached result for [accessibleExtensions].
-  List<ExtensionElement2>? _extensions;
+  List<ExtensionElement>? _extensions;
 
   /// This field is set temporarily while resolving all files of a library.
   /// So, we can track which elements were actually returned, and which imports
@@ -359,7 +359,7 @@ class LibraryFragmentScope implements Scope {
   }
 
   /// The extensions accessible within [fragment].
-  List<ExtensionElement2> get accessibleExtensions {
+  List<ExtensionElement> get accessibleExtensions {
     var libraryDeclarations = fragment.library.libraryDeclarations;
     return _extensions ??=
         {
@@ -417,7 +417,7 @@ class LibraryFragmentScope implements Scope {
     return ScopeLookupResultImpl(getter2: null, setter2: null);
   }
 
-  void notifyExtensionUsed(ExtensionElement2 element) {
+  void notifyExtensionUsed(ExtensionElement element) {
     _importsTracking?.notifyExtensionUsed(element);
   }
 
@@ -481,7 +481,7 @@ class LibraryFragmentScope implements Scope {
 class LocalScope extends EnclosedScope {
   LocalScope(super.parent);
 
-  void add(Element2 element) {
+  void add(Element element) {
     if (!element.isWildcardVariable) {
       _addGetter(element);
     }
@@ -495,12 +495,12 @@ class PrefixScope implements Scope {
   final List<LibraryImportElementImpl> _importElements = [];
   final List<LibraryElementImpl> _importedLibraries = [];
 
-  final Map<String, Element2> _getters = {};
-  final Map<String, Element2> _setters = {};
+  final Map<String, Element> _getters = {};
+  final Map<String, Element> _setters = {};
   Set<String>? _settersFromDeprecatedExport;
   Set<String>? _gettersFromDeprecatedExport;
-  final Set<ExtensionElement2> _extensions = {};
-  LibraryElement2? _deferredLibrary;
+  final Set<ExtensionElement> _extensions = {};
+  LibraryElement? _deferredLibrary;
 
   ImportsTrackingOfPrefix? _importsTracking;
 
@@ -508,7 +508,7 @@ class PrefixScope implements Scope {
     required this.libraryFragment,
     required this.parent,
     required List<LibraryImportElementImpl> libraryImports,
-    required PrefixElement2? prefix,
+    required PrefixElement? prefix,
   }) {
     var elementFactory = libraryElement.session.elementFactory;
     for (var import in libraryImports) {
@@ -599,7 +599,7 @@ class PrefixScope implements Scope {
     _importsTracking?.notifyPrefixUsedInCommentReference();
   }
 
-  void _add(Element2 element, bool isFromDeprecatedExport) {
+  void _add(Element element, bool isFromDeprecatedExport) {
     if (element is SetterElement) {
       _addTo(
         element,
@@ -612,14 +612,14 @@ class PrefixScope implements Scope {
         isFromDeprecatedExport: isFromDeprecatedExport,
         isSetter: false,
       );
-      if (element is ExtensionElement2) {
+      if (element is ExtensionElement) {
         _extensions.add(element);
       }
     }
   }
 
   void _addTo(
-    Element2 element, {
+    Element element, {
     required bool isFromDeprecatedExport,
     required bool isSetter,
   }) {
@@ -655,7 +655,7 @@ class PrefixScope implements Scope {
     }
   }
 
-  Element2 _merge(Element2 existing, Element2 other) {
+  Element _merge(Element existing, Element other) {
     if (_isSdkElement(existing)) {
       if (!_isSdkElement(other)) {
         return other;
@@ -666,7 +666,7 @@ class PrefixScope implements Scope {
       }
     }
 
-    var conflictingElements = <Element2>{};
+    var conflictingElements = <Element>{};
     _addElement(conflictingElements, existing);
     _addElement(conflictingElements, other);
 
@@ -677,7 +677,7 @@ class PrefixScope implements Scope {
     );
   }
 
-  bool _shouldAdd(LibraryElementImpl importedLibrary, Element2 element) {
+  bool _shouldAdd(LibraryElementImpl importedLibrary, Element element) {
     // It is an error for the identifier `Record`, denoting the `Record` class
     // from `dart:core`, where that import scope name is only imported from
     // platform libraries, to appear in a library whose language version is
@@ -693,7 +693,7 @@ class PrefixScope implements Scope {
     return true;
   }
 
-  static void _addElement(Set<Element2> conflictingElements, Element2 element) {
+  static void _addElement(Set<Element> conflictingElements, Element element) {
     if (element is MultiplyDefinedElementImpl2) {
       conflictingElements.addAll(element.conflictingElements2);
     } else {
@@ -701,11 +701,11 @@ class PrefixScope implements Scope {
     }
   }
 
-  static bool _isSdkElement(Element2 element) {
+  static bool _isSdkElement(Element element) {
     if (element is DynamicElementImpl2 || element is NeverElementImpl2) {
       return true;
     }
-    if (element is MultiplyDefinedElement2) {
+    if (element is MultiplyDefinedElement) {
       return false;
     }
     return element.library2!.isInSdk;
@@ -744,16 +744,16 @@ class PrefixScopeLookupResult extends ScopeLookupResultImpl {
 
 class ScopeLookupResultImpl extends ScopeLookupResult {
   @override
-  final Element2? getter2;
+  final Element? getter2;
 
   @override
-  final Element2? setter2;
+  final Element? setter2;
 
   ScopeLookupResultImpl({required this.getter2, required this.setter2});
 }
 
 class TypeParameterScope extends EnclosedScope {
-  TypeParameterScope(super.parent, List<TypeParameterElement2> elements) {
+  TypeParameterScope(super.parent, List<TypeParameterElement> elements) {
     for (var element in elements) {
       if (!element.isWildcardVariable) {
         _addGetter(element);
@@ -763,17 +763,17 @@ class TypeParameterScope extends EnclosedScope {
 }
 
 mixin _GettersAndSetters {
-  final Map<String, Element2> _getters = {};
-  final Map<String, Element2> _setters = {};
+  final Map<String, Element> _getters = {};
+  final Map<String, Element> _setters = {};
 
-  void _addGetter(Element2 element) {
+  void _addGetter(Element element) {
     var id = element.lookupName;
     if (id != null) {
       _getters[id] ??= element;
     }
   }
 
-  void _addSetter(Element2 element) {
+  void _addSetter(Element element) {
     var name = element.lookupName;
     if (name != null && name.endsWith('=')) {
       var id = considerCanonicalizeString(name.substring(0, name.length - 1));
diff --git a/pkg/analyzer/lib/src/dart/element/since_sdk_version.dart b/pkg/analyzer/lib/src/dart/element/since_sdk_version.dart
index 879f288d7f6..1d90d11defa 100644
--- a/pkg/analyzer/lib/src/dart/element/since_sdk_version.dart
+++ b/pkg/analyzer/lib/src/dart/element/since_sdk_version.dart
@@ -12,7 +12,7 @@ class SinceSdkVersionComputer {
 
   /// The [element] is a `dart:xyz` library, so it can have `@Since` annotations.
   /// Evaluates its annotations and returns the version.
-  Version? compute(Element2 element) {
+  Version? compute(Element element) {
     // Must be in a `dart:` library.
     var libraryUri = element.library2?.uri;
     if (libraryUri == null || !libraryUri.isScheme('dart')) {
@@ -29,7 +29,7 @@ class SinceSdkVersionComputer {
       specified = _specifiedVersion(element as Annotatable);
     }
 
-    if (element is LibraryElement2) {
+    if (element is LibraryElement) {
       return specified;
     } else if (element.enclosingElement2 case HasSinceSdkVersion hasSince?) {
       var enclosing = hasSince.sinceSdkVersion;
diff --git a/pkg/analyzer/lib/src/dart/element/subtype.dart b/pkg/analyzer/lib/src/dart/element/subtype.dart
index 65daae3447b..ea8d3181d04 100644
--- a/pkg/analyzer/lib/src/dart/element/subtype.dart
+++ b/pkg/analyzer/lib/src/dart/element/subtype.dart
@@ -109,7 +109,7 @@ class SubtypeHelper {
         return false;
       }
       // Extension types require explicit `Object` implementation.
-      if (T0 is InterfaceTypeImpl && T0.element3 is ExtensionTypeElement2) {
+      if (T0 is InterfaceTypeImpl && T0.element3 is ExtensionTypeElement) {
         for (var interface in T0.interfaces) {
           if (isSubtypeOf(interface, T1)) {
             return true;
diff --git a/pkg/analyzer/lib/src/dart/element/type.dart b/pkg/analyzer/lib/src/dart/element/type.dart
index 3af913b6937..3e7659a9ab2 100644
--- a/pkg/analyzer/lib/src/dart/element/type.dart
+++ b/pkg/analyzer/lib/src/dart/element/type.dart
@@ -449,8 +449,8 @@ class FunctionTypeImpl extends TypeImpl
     FunctionType f2,
     bool Function(DartType bound2, DartType bound1) relation,
   ) {
-    List<TypeParameterElement2> params1 = f1.typeParameters;
-    List<TypeParameterElement2> params2 = f2.typeParameters;
+    List<TypeParameterElement> params1 = f1.typeParameters;
+    List<TypeParameterElement> params2 = f2.typeParameters;
 
     int count = params1.length;
     if (params2.length != count) {
@@ -459,12 +459,12 @@ class FunctionTypeImpl extends TypeImpl
     // We build up a substitution matching up the type parameters
     // from the two types, {variablesFresh/variables1} and
     // {variablesFresh/variables2}
-    List<TypeParameterElement2> variables1 = <TypeParameterElement2>[];
-    List<TypeParameterElement2> variables2 = <TypeParameterElement2>[];
+    List<TypeParameterElement> variables1 = <TypeParameterElement>[];
+    List<TypeParameterElement> variables2 = <TypeParameterElement>[];
     List<TypeParameterType> variablesFresh = <TypeParameterType>[];
     for (int i = 0; i < count; i++) {
-      TypeParameterElement2 p1 = params1[i];
-      TypeParameterElement2 p2 = params2[i];
+      TypeParameterElement p1 = params1[i];
+      TypeParameterElement p2 = params2[i];
       TypeParameterElementImpl pFresh = TypeParameterElementImpl.synthetic(
         p2.name3!,
       );
@@ -787,7 +787,7 @@ class InterfaceTypeImpl extends TypeImpl implements InterfaceType {
 
   /// The instantiated representation type, if [element3] is an extension type.
   TypeImpl? get representationType {
-    if (element3 case ExtensionTypeElement2 element) {
+    if (element3 case ExtensionTypeElement element) {
       var substitution = Substitution.fromInterfaceType(this);
       var representationType = element.representation2.type;
       return substitution.substituteType(representationType);
@@ -865,7 +865,7 @@ class InterfaceTypeImpl extends TypeImpl implements InterfaceType {
   }
 
   @override
-  InterfaceTypeImpl? asInstanceOf2(InterfaceElement2 targetElement) {
+  InterfaceTypeImpl? asInstanceOf2(InterfaceElement targetElement) {
     if (element3 == targetElement) {
       return this;
     }
@@ -901,7 +901,7 @@ class InterfaceTypeImpl extends TypeImpl implements InterfaceType {
   @override
   ConstructorElementMixin2? lookUpConstructor2(
     String? constructorName,
-    LibraryElement2 library,
+    LibraryElement library,
   ) {
     // prepare base ConstructorElement
     ConstructorElementImpl2? constructorElement;
@@ -922,7 +922,7 @@ class InterfaceTypeImpl extends TypeImpl implements InterfaceType {
   @override
   GetterElement2OrMember? lookUpGetter3(
     String name,
-    LibraryElement2 library, {
+    LibraryElement library, {
     bool concrete = false,
     bool inherited = false,
     bool recoveryStatic = false,
@@ -960,7 +960,7 @@ class InterfaceTypeImpl extends TypeImpl implements InterfaceType {
   @override
   MethodElement2OrMember? lookUpMethod3(
     String name,
-    LibraryElement2 library, {
+    LibraryElement library, {
     bool concrete = false,
     bool inherited = false,
     bool recoveryStatic = false,
@@ -998,7 +998,7 @@ class InterfaceTypeImpl extends TypeImpl implements InterfaceType {
   @override
   SetterElement2OrMember? lookUpSetter3(
     String name,
-    LibraryElement2 library, {
+    LibraryElement library, {
     bool concrete = false,
     bool inherited = false,
     bool recoveryStatic = false,
@@ -1478,7 +1478,7 @@ abstract class TypeImpl implements DartType, SharedType {
   void appendTo(ElementDisplayStringBuilder builder);
 
   @override
-  InterfaceTypeImpl? asInstanceOf2(InterfaceElement2 targetElement) => null;
+  InterfaceTypeImpl? asInstanceOf2(InterfaceElement targetElement) => null;
 
   @override
   TypeImpl asQuestionType(bool isQuestionType) => withNullability(
@@ -1582,7 +1582,7 @@ class TypeParameterTypeImpl extends TypeImpl implements TypeParameterType {
     // In principle we ought to be able to do `return bound.isBottom;`, but that
     // goes into an infinite loop with illegal code in which type parameter
     // bounds form a loop.  So we have to be more careful.
-    Set<TypeParameterElement2> seenTypes = {};
+    Set<TypeParameterElement> seenTypes = {};
     TypeParameterType type = this;
     while (seenTypes.add(type.element3)) {
       if (type.nullabilitySuffix == NullabilitySuffix.question) {
@@ -1645,7 +1645,7 @@ class TypeParameterTypeImpl extends TypeImpl implements TypeParameterType {
   }
 
   @override
-  InterfaceTypeImpl? asInstanceOf2(InterfaceElement2 targetElement) {
+  InterfaceTypeImpl? asInstanceOf2(InterfaceElement targetElement) {
     return bound.asInstanceOf2(targetElement);
   }
 
diff --git a/pkg/analyzer/lib/src/dart/element/type_algebra.dart b/pkg/analyzer/lib/src/dart/element/type_algebra.dart
index bf8ee677fba..861540498b7 100644
--- a/pkg/analyzer/lib/src/dart/element/type_algebra.dart
+++ b/pkg/analyzer/lib/src/dart/element/type_algebra.dart
@@ -23,7 +23,7 @@ import 'package:analyzer/src/utilities/extensions/element.dart';
 /// The returned object contains the fresh type parameter list as well as a
 /// mapping to be used for replacing other types to use the new type parameters.
 FreshTypeParameters getFreshTypeParameters2(
-  List<TypeParameterElement2> typeParameters,
+  List<TypeParameterElement> typeParameters,
 ) {
   var freshParameters = List<TypeParameterElementImpl2>.generate(
     typeParameters.length,
@@ -31,7 +31,7 @@ FreshTypeParameters getFreshTypeParameters2(
     growable: false,
   );
 
-  var map = <TypeParameterElement2, DartType>{};
+  var map = <TypeParameterElement, DartType>{};
   for (int i = 0; i < typeParameters.length; ++i) {
     map[typeParameters[i]] = TypeParameterTypeImpl(
       element3: freshParameters[i],
@@ -103,7 +103,7 @@ FunctionTypeImpl replaceTypeParameters(
 /// [identical] to efficiently check if a distinct type was created.
 DartType substitute2(
   DartType type,
-  Map<TypeParameterElement2, DartType> substitution,
+  Map<TypeParameterElement, DartType> substitution,
 ) {
   if (substitution.isEmpty) {
     return type;
@@ -148,7 +148,7 @@ class FreshTypeParameters {
 abstract class MapSubstitution extends Substitution {
   const MapSubstitution();
 
-  Map<TypeParameterElement2, DartType> get map;
+  Map<TypeParameterElement, DartType> get map;
 }
 
 abstract class Substitution {
@@ -156,7 +156,7 @@ abstract class Substitution {
 
   const Substitution();
 
-  DartType? getSubstitute(TypeParameterElement2 parameter, bool upperBound);
+  DartType? getSubstitute(TypeParameterElement parameter, bool upperBound);
 
   FunctionTypeImpl mapFunctionType(FunctionType type) {
     return substituteType(type) as FunctionTypeImpl;
@@ -199,7 +199,7 @@ abstract class Substitution {
   }
 
   /// Substitutes each parameter to the type it maps to in [map].
-  static MapSubstitution fromMap2(Map<TypeParameterElement2, DartType> map) {
+  static MapSubstitution fromMap2(Map<TypeParameterElement, DartType> map) {
     if (map.isEmpty) {
       return _NullSubstitution.instance;
     }
@@ -218,7 +218,7 @@ abstract class Substitution {
   /// Substitutes the Nth parameter in [parameters] with the Nth type in
   /// [types].
   static MapSubstitution fromPairs2(
-    List<TypeParameterElement2> parameters,
+    List<TypeParameterElement> parameters,
     List<DartType> types,
   ) {
     assert(parameters.length == types.length);
@@ -226,7 +226,7 @@ abstract class Substitution {
       return _NullSubstitution.instance;
     }
     return fromMap2(
-      Map<TypeParameterElement2, DartType>.fromIterables(parameters, types),
+      Map<TypeParameterElement, DartType>.fromIterables(parameters, types),
     );
   }
 }
@@ -238,14 +238,14 @@ class _CombinedSubstitution extends Substitution {
   _CombinedSubstitution(this.first, this.second);
 
   @override
-  DartType? getSubstitute(TypeParameterElement2 parameter, bool upperBound) {
+  DartType? getSubstitute(TypeParameterElement parameter, bool upperBound) {
     return first.getSubstitute(parameter, upperBound) ??
         second.getSubstitute(parameter, upperBound);
   }
 }
 
 class _FreshTypeParametersSubstitutor extends _TypeSubstitutor {
-  final Map<TypeParameterElement2, DartType> substitution = {};
+  final Map<TypeParameterElement, DartType> substitution = {};
 
   _FreshTypeParametersSubstitutor(_TypeSubstitutor super.outer);
 
@@ -283,19 +283,19 @@ class _FreshTypeParametersSubstitutor extends _TypeSubstitutor {
   }
 
   @override
-  DartType? lookup(TypeParameterElement2 parameter, bool upperBound) {
+  DartType? lookup(TypeParameterElement parameter, bool upperBound) {
     return substitution[parameter];
   }
 }
 
 class _MapSubstitution extends MapSubstitution {
   @override
-  final Map<TypeParameterElement2, DartType> map;
+  final Map<TypeParameterElement, DartType> map;
 
   _MapSubstitution(this.map);
 
   @override
-  DartType? getSubstitute(TypeParameterElement2 parameter, bool upperBound) {
+  DartType? getSubstitute(TypeParameterElement parameter, bool upperBound) {
     return map[parameter];
   }
 
@@ -309,10 +309,10 @@ class _NullSubstitution extends MapSubstitution {
   const _NullSubstitution();
 
   @override
-  Map<TypeParameterElement2, DartType> get map => const {};
+  Map<TypeParameterElement, DartType> get map => const {};
 
   @override
-  DartType getSubstitute(TypeParameterElement2 parameter, bool upperBound) {
+  DartType getSubstitute(TypeParameterElement parameter, bool upperBound) {
     return TypeParameterTypeImpl(
       element3: parameter as TypeParameterElementImpl2,
       nullabilitySuffix: NullabilitySuffix.none,
@@ -344,7 +344,7 @@ class _TopSubstitutor extends _TypeSubstitutor {
   }
 
   @override
-  DartType? lookup(TypeParameterElement2 parameter, bool upperBound) {
+  DartType? lookup(TypeParameterElement parameter, bool upperBound) {
     return substitution.getSubstitute(parameter, upperBound);
   }
 }
@@ -382,7 +382,7 @@ abstract class _TypeSubstitutor
     List<TypeParameterElementImpl2> elements,
   );
 
-  DartType? getSubstitute(TypeParameterElement2 parameter) {
+  DartType? getSubstitute(TypeParameterElement parameter) {
     _TypeSubstitutor? environment = this;
     while (environment != null) {
       var replacement = environment.lookup(parameter, covariantContext);
@@ -399,7 +399,7 @@ abstract class _TypeSubstitutor
     covariantContext = !covariantContext;
   }
 
-  DartType? lookup(TypeParameterElement2 parameter, bool upperBound);
+  DartType? lookup(TypeParameterElement parameter, bool upperBound);
 
   _FreshTypeParametersSubstitutor newInnerEnvironment() {
     return _FreshTypeParametersSubstitutor(this);
diff --git a/pkg/analyzer/lib/src/dart/element/type_provider.dart b/pkg/analyzer/lib/src/dart/element/type_provider.dart
index 090ffa7a901..608d69a490f 100644
--- a/pkg/analyzer/lib/src/dart/element/type_provider.dart
+++ b/pkg/analyzer/lib/src/dart/element/type_provider.dart
@@ -487,7 +487,7 @@ class TypeProviderImpl extends TypeProviderBase {
   }
 
   @override
-  bool isNonSubtypableClass2(InterfaceElement2 element) {
+  bool isNonSubtypableClass2(InterfaceElement element) {
     var name = element.name3;
     if (_nonSubtypableClassNames.contains(name)) {
       var libraryUriStr = element.library2.uri.toString();
diff --git a/pkg/analyzer/lib/src/dart/element/type_schema.dart b/pkg/analyzer/lib/src/dart/element/type_schema.dart
index 330aa6d9c6e..6bdbe703324 100644
--- a/pkg/analyzer/lib/src/dart/element/type_schema.dart
+++ b/pkg/analyzer/lib/src/dart/element/type_schema.dart
@@ -24,7 +24,7 @@ class UnknownInferredType extends TypeImpl implements SharedUnknownType {
   const UnknownInferredType._();
 
   @override
-  Element2? get element3 => null;
+  Element? get element3 => null;
 
   @override
   int get hashCode => 1;
diff --git a/pkg/analyzer/lib/src/dart/element/type_system.dart b/pkg/analyzer/lib/src/dart/element/type_system.dart
index d6d827589ff..b13e6841851 100644
--- a/pkg/analyzer/lib/src/dart/element/type_system.dart
+++ b/pkg/analyzer/lib/src/dart/element/type_system.dart
@@ -539,7 +539,7 @@ class TypeSystemImpl implements TypeSystem {
   FunctionTypeImpl? getCallMethodType(DartType t) {
     if (t is InterfaceTypeImpl) {
       return t
-          .lookUpMethod3(MethodElement2.CALL_METHOD_NAME, t.element3.library2)
+          .lookUpMethod3(MethodElement.CALL_METHOD_NAME, t.element3.library2)
           ?.type;
     }
     return null;
@@ -550,14 +550,14 @@ class TypeSystemImpl implements TypeSystem {
   /// If a non-null [candidates] set is given, then only type parameters
   /// appearing in it are considered; otherwise all type parameters are
   /// considered.
-  List<TypeParameterElement2>? getFreeParameters2(
+  List<TypeParameterElement>? getFreeParameters2(
     DartType rootType, {
-    Set<TypeParameterElement2>? candidates,
+    Set<TypeParameterElement>? candidates,
   }) {
-    List<TypeParameterElement2>? parameters;
+    List<TypeParameterElement>? parameters;
     Set<DartType> visitedTypes = HashSet<DartType>();
-    Set<TypeParameterElement2> boundTypeParameters =
-        HashSet<TypeParameterElement2>();
+    Set<TypeParameterElement> boundTypeParameters =
+        HashSet<TypeParameterElement>();
 
     void appendParameters(DartType? type) {
       if (type == null) {
@@ -571,7 +571,7 @@ class TypeSystemImpl implements TypeSystem {
         var element = type.element3;
         if ((candidates == null || candidates.contains(element)) &&
             !boundTypeParameters.contains(element)) {
-          parameters ??= <TypeParameterElement2>[];
+          parameters ??= <TypeParameterElement>[];
           parameters!.add(element);
         }
       } else if (type is FunctionType) {
@@ -745,18 +745,18 @@ class TypeSystemImpl implements TypeSystem {
   List<TypeImpl> instantiateTypeFormalsToBounds2(
     List<TypeParameterElementImpl2> typeParameters, {
     List<bool>? hasError,
-    Map<TypeParameterElement2, TypeImpl>? knownTypes,
+    Map<TypeParameterElement, TypeImpl>? knownTypes,
   }) {
     int count = typeParameters.length;
     if (count == 0) {
       return const <TypeImpl>[];
     }
 
-    Set<TypeParameterElement2> all = <TypeParameterElement2>{};
+    Set<TypeParameterElement> all = <TypeParameterElement>{};
     // all ground
-    Map<TypeParameterElement2, TypeImpl> defaults = knownTypes ?? {};
+    Map<TypeParameterElement, TypeImpl> defaults = knownTypes ?? {};
     // not ground
-    Map<TypeParameterElement2, TypeImpl> partials = {};
+    Map<TypeParameterElement, TypeImpl> partials = {};
 
     for (var typeParameter in typeParameters) {
       all.add(typeParameter);
@@ -769,7 +769,7 @@ class TypeSystemImpl implements TypeSystem {
     bool hasProgress = true;
     while (hasProgress) {
       hasProgress = false;
-      for (TypeParameterElement2 parameter in partials.keys) {
+      for (TypeParameterElement parameter in partials.keys) {
         var value = partials[parameter]!;
         var freeParameters = getFreeParameters2(value, candidates: all);
         if (freeParameters == null) {
@@ -800,13 +800,13 @@ class TypeSystemImpl implements TypeSystem {
       var range = defaults.values.toList();
       // Build a substitution Phi mapping each uncompleted type variable to
       // dynamic, and each completed type variable to its default.
-      for (TypeParameterElement2 parameter in partials.keys) {
+      for (TypeParameterElement parameter in partials.keys) {
         domain.add(parameter);
         range.add(DynamicTypeImpl.instance);
       }
       // Set the default for an uncompleted type variable (T extends B)
       // to be Phi(B)
-      for (TypeParameterElement2 parameter in partials.keys) {
+      for (TypeParameterElement parameter in partials.keys) {
         defaults[parameter] = Substitution.fromPairs2(
           domain,
           range,
@@ -830,13 +830,13 @@ class TypeSystemImpl implements TypeSystem {
         return true;
       }
       var element = type.element3;
-      if (element is EnumElement2) {
+      if (element is EnumElement) {
         return true;
       }
-      if (element is ClassElement2 && element.isSealed) {
+      if (element is ClassElement && element.isSealed) {
         return true;
       }
-      if (element is ExtensionTypeElement2) {
+      if (element is ExtensionTypeElement) {
         return isAlwaysExhaustive(type.extensionTypeErasure);
       }
       if (type.isDartAsyncFutureOr) {
@@ -971,7 +971,7 @@ class TypeSystemImpl implements TypeSystem {
     }
 
     // `T` is an extension type that does not implement `Future`.
-    if (T.element3 is ExtensionTypeElement2) {
+    if (T.element3 is ExtensionTypeElement) {
       var anyFuture = typeProvider.futureType(objectQuestion);
       if (!isSubtypeOf(T, anyFuture)) {
         return true;
@@ -1184,7 +1184,7 @@ class TypeSystemImpl implements TypeSystem {
       if (type.isDartAsyncFutureOr) {
         return isNonNullable(type.typeArguments[0]);
       }
-      if (type.element3 is ExtensionTypeElement2) {
+      if (type.element3 is ExtensionTypeElement) {
         return type.interfaces.isNotEmpty;
       }
     } else if (type is TypeParameterType) {
@@ -1276,7 +1276,7 @@ class TypeSystemImpl implements TypeSystem {
       if (type.isDartAsyncFutureOr) {
         return isStrictlyNonNullable(type.typeArguments[0]);
       }
-      if (type.element3 is ExtensionTypeElement2) {
+      if (type.element3 is ExtensionTypeElement) {
         return type.interfaces.isNotEmpty;
       }
     } else if (type is TypeParameterType) {
@@ -1522,7 +1522,7 @@ class TypeSystemImpl implements TypeSystem {
     TokenType operator,
     TypeImpl rightType,
     TypeImpl currentType,
-    MethodElement2? operatorElement,
+    MethodElement? operatorElement,
   ) {
     if (operatorElement == null) return currentType;
     return _refineNumericInvocationTypeNullSafe(leftType, operatorElement, [
@@ -1537,11 +1537,11 @@ class TypeSystemImpl implements TypeSystem {
   /// [currentType].
   TypeImpl refineNumericInvocationContext2(
     TypeImpl? targetType,
-    Element2? methodElement,
+    Element? methodElement,
     TypeImpl invocationContext,
     TypeImpl currentType,
   ) {
-    if (targetType != null && methodElement is MethodElement2) {
+    if (targetType != null && methodElement is MethodElement) {
       return _refineNumericInvocationContextNullSafe(
         targetType,
         methodElement,
@@ -1562,11 +1562,11 @@ class TypeSystemImpl implements TypeSystem {
   // TODO(scheglov): I expected that [methodElement] is [MethodElement].
   TypeImpl refineNumericInvocationType(
     TypeImpl targetType,
-    Element2? methodElement,
+    Element? methodElement,
     List<TypeImpl> argumentTypes,
     TypeImpl currentType,
   ) {
-    if (methodElement is MethodElement2) {
+    if (methodElement is MethodElement) {
       return _refineNumericInvocationTypeNullSafe(
         targetType,
         methodElement,
@@ -1690,7 +1690,7 @@ class TypeSystemImpl implements TypeSystem {
   /// context type.
   GenericInferrer setupGenericTypeInference({
     // TODO(paulberry): change this to a list of `TypeParameterElementImpl`.
-    required List<TypeParameterElement2> typeParameters,
+    required List<TypeParameterElement> typeParameters,
     required TypeImpl declaredReturnType,
     required TypeImpl contextReturnType,
     ErrorReporter? errorReporter,
@@ -1806,7 +1806,7 @@ class TypeSystemImpl implements TypeSystem {
   }
 
   List<TypeImpl> _defaultTypeArguments(
-    List<TypeParameterElement2> typeParameters,
+    List<TypeParameterElement> typeParameters,
   ) {
     return typeParameters.map((typeParameter) {
       var typeParameterImpl = typeParameter as TypeParameterElementImpl2;
@@ -1860,15 +1860,15 @@ class TypeSystemImpl implements TypeSystem {
 
   TypeImpl _refineNumericInvocationContextNullSafe(
     TypeImpl targetType,
-    MethodElement2 methodElement,
+    MethodElement methodElement,
     TypeImpl invocationContext,
     TypeImpl currentType,
   ) {
     // If the method being invoked comes from an extension, don't refine the
     // type because we can only make guarantees about methods defined in the
     // SDK, and the numeric methods we refine are all instance methods.
-    if (methodElement.enclosingElement2 is ExtensionElement2 ||
-        methodElement.enclosingElement2 is ExtensionTypeElement2) {
+    if (methodElement.enclosingElement2 is ExtensionElement ||
+        methodElement.enclosingElement2 is ExtensionTypeElement) {
       return currentType;
     }
 
@@ -1963,15 +1963,15 @@ class TypeSystemImpl implements TypeSystem {
 
   TypeImpl _refineNumericInvocationTypeNullSafe(
     TypeImpl targetType,
-    MethodElement2 methodElement,
+    MethodElement methodElement,
     List<TypeImpl> argumentTypes,
     TypeImpl currentType,
   ) {
     // If the method being invoked comes from an extension, don't refine the
     // type because we can only make guarantees about methods defined in the
     // SDK, and the numeric methods we refine are all instance methods.
-    if (methodElement.enclosingElement2 is ExtensionElement2 ||
-        methodElement.enclosingElement2 is ExtensionTypeElement2) {
+    if (methodElement.enclosingElement2 is ExtensionElement ||
+        methodElement.enclosingElement2 is ExtensionTypeElement) {
       return currentType;
     }
 
@@ -2129,7 +2129,7 @@ class _TypeVariableEliminator extends Substitution {
   _TypeVariableEliminator(this._topType, this._bottomType);
 
   @override
-  DartType getSubstitute(TypeParameterElement2 parameter, bool upperBound) {
+  DartType getSubstitute(TypeParameterElement parameter, bool upperBound) {
     return upperBound ? _bottomType : _topType;
   }
 }
diff --git a/pkg/analyzer/lib/src/dart/element/well_bounded.dart b/pkg/analyzer/lib/src/dart/element/well_bounded.dart
index 95764899db3..2ce91385ec0 100644
--- a/pkg/analyzer/lib/src/dart/element/well_bounded.dart
+++ b/pkg/analyzer/lib/src/dart/element/well_bounded.dart
@@ -29,7 +29,7 @@ class TypeArgumentIssue {
   final int index;
 
   /// The type parameter with the bound that was violated.
-  final TypeParameterElement2 parameter;
+  final TypeParameterElement parameter;
 
   /// The substituted bound of the [parameter].
   final DartType parameterBound;
diff --git a/pkg/analyzer/lib/src/dart/micro/resolve_file.dart b/pkg/analyzer/lib/src/dart/micro/resolve_file.dart
index 087347dd691..8b93289b90f 100644
--- a/pkg/analyzer/lib/src/dart/micro/resolve_file.dart
+++ b/pkg/analyzer/lib/src/dart/micro/resolve_file.dart
@@ -252,7 +252,7 @@ class FileResolver {
   /// Looks for references to the given Element. All the files currently
   ///  cached by the resolver are searched, generated files are ignored.
   Future<List<CiderSearchMatch>> findReferences(
-    Element2 element, {
+    Element element, {
     OperationPerformanceImpl? performance,
   }) {
     return logger.runAsync('findReferences for ${element.name3}', () async {
@@ -289,7 +289,7 @@ class FileResolver {
 
       performance ??= OperationPerformanceImpl('<default>');
       // TODO(keertip): check if element is named constructor.
-      if (element is LocalVariableElement2 ||
+      if (element is LocalVariableElement ||
           (element is FormalParameterElement && !element.isNamed)) {
         await collectReferences2(
           element.firstFragment.libraryFragment!.source.fullName,
diff --git a/pkg/analyzer/lib/src/dart/micro/utils.dart b/pkg/analyzer/lib/src/dart/micro/utils.dart
index 9cb748015ff..7d9a12c1d60 100644
--- a/pkg/analyzer/lib/src/dart/micro/utils.dart
+++ b/pkg/analyzer/lib/src/dart/micro/utils.dart
@@ -9,9 +9,9 @@ import 'package:analyzer/src/dart/ast/element_locator.dart';
 import 'package:analyzer/src/dart/element/element.dart';
 import 'package:analyzer/src/utilities/extensions/element.dart';
 
-/// Return the [Element2] of the given [node], or `null` if [node] is `null` or
+/// Return the [Element] of the given [node], or `null` if [node] is `null` or
 /// does not have an element.
-Element2? getElementOfNode2(AstNode? node) {
+Element? getElementOfNode2(AstNode? node) {
   if (node == null) {
     return null;
   }
@@ -25,7 +25,7 @@ Element2? getElementOfNode2(AstNode? node) {
     return null;
   }
 
-  Element2? element;
+  Element? element;
   switch (node) {
     case ImportDirective():
       return MockLibraryImportElement(node.libraryImport!);
@@ -35,14 +35,14 @@ Element2? getElementOfNode2(AstNode? node) {
       element = ElementLocator.locate2(node);
   }
 
-  if (node is SimpleIdentifier && element is PrefixElement2) {
+  if (node is SimpleIdentifier && element is PrefixElement) {
     var parent = node.parent;
     if (parent is ImportDirective) {
       element = MockLibraryImportElement(parent.libraryImport!);
     } else {
       element = _getImportElementInfo2(node);
     }
-  } else if (node is ImportPrefixReference && element is PrefixElement2) {
+  } else if (node is ImportPrefixReference && element is PrefixElement) {
     element = _getImportElementInfoFromReference(node);
   }
 
@@ -52,10 +52,10 @@ Element2? getElementOfNode2(AstNode? node) {
 /// If the given [constructor] is a synthetic constructor created for a
 /// [ClassTypeAlias], return the actual constructor of a [ClassDeclaration]
 /// which is invoked.  Return `null` if a redirection cycle is detected.
-ConstructorElement2? _getActualConstructorElement(
-  ConstructorElement2? constructor,
+ConstructorElement? _getActualConstructorElement(
+  ConstructorElement? constructor,
 ) {
-  var seenConstructors = <ConstructorElement2?>{};
+  var seenConstructors = <ConstructorElement?>{};
   while (constructor is ConstructorElementImpl2 && constructor.isSynthetic) {
     var enclosing = constructor.enclosingElement2;
     if (enclosing is ClassElementImpl2 && enclosing.isMixinApplication) {
@@ -88,7 +88,7 @@ MockLibraryImportElement? _getImportElementInfo2(SimpleIdentifier prefixNode) {
     return null;
   }
   // prepare used element
-  Element2? usedElement;
+  Element? usedElement;
   if (parent is PrefixedIdentifier) {
     var prefixed = parent;
     if (prefixed.prefix == prefixNode) {
@@ -106,7 +106,7 @@ MockLibraryImportElement? _getImportElementInfo2(SimpleIdentifier prefixNode) {
   }
   // find ImportElement
   var prefix = prefixNode.name;
-  var importElementsMap = <LibraryImport, Set<Element2>>{};
+  var importElementsMap = <LibraryImport, Set<Element>>{};
   return _getMockImportElement(
     libraryFragment,
     prefix,
@@ -128,7 +128,7 @@ MockLibraryImportElement? _getImportElementInfoFromReference(
   }
 
   // prepare used element
-  Element2? usedElement;
+  Element? usedElement;
   var parent = prefixNode.parent;
   if (parent is ExtensionOverride) {
     usedElement = parent.element2;
@@ -141,7 +141,7 @@ MockLibraryImportElement? _getImportElementInfoFromReference(
 
   // find ImportElement
   var prefix = prefixNode.name.lexeme;
-  var importElementsMap = <LibraryImport, Set<Element2>>{};
+  var importElementsMap = <LibraryImport, Set<Element>>{};
   return _getMockImportElement(
     libraryFragment,
     prefix,
@@ -159,10 +159,10 @@ MockLibraryImportElement? _getImportElementInfoFromReference(
 MockLibraryImportElement? _getMockImportElement(
   CompilationUnitElementImpl libraryFragment,
   String prefix,
-  Element2 element,
-  Map<LibraryImport, Set<Element2>> importElementsMap,
+  Element element,
+  Map<LibraryImport, Set<Element>> importElementsMap,
 ) {
-  if (element.enclosingElement2 is! LibraryElement2) {
+  if (element.enclosingElement2 is! LibraryElement) {
     return null;
   }
   var usedLibrary = element.library2;
@@ -270,7 +270,7 @@ class MatchKind {
 }
 
 class ReferencesCollector extends GeneralizingAstVisitor<void> {
-  final Element2 element;
+  final Element element;
   final List<MatchInfo> references = [];
 
   ReferencesCollector(this.element);
@@ -278,7 +278,7 @@ class ReferencesCollector extends GeneralizingAstVisitor<void> {
   @override
   void visitAssignmentExpression(AssignmentExpression node) {
     var writeElement = node.writeElement2;
-    if (writeElement is PropertyAccessorElement2) {
+    if (writeElement is PropertyAccessorElement) {
       var kind = MatchKind.WRITE;
       if (writeElement.variable3 == element || writeElement == element) {
         if (node.leftHandSide is SimpleIdentifier) {
@@ -304,7 +304,7 @@ class ReferencesCollector extends GeneralizingAstVisitor<void> {
     }
 
     var readElement = node.readElement2;
-    if (readElement is PropertyAccessorElement2) {
+    if (readElement is PropertyAccessorElement) {
       if (readElement.variable3 == element) {
         references.add(
           MatchInfo(
@@ -322,7 +322,7 @@ class ReferencesCollector extends GeneralizingAstVisitor<void> {
     var expression = node.expression;
     if (expression is Identifier) {
       var element = expression.element;
-      if (element is ConstructorElement2) {
+      if (element is ConstructorElement) {
         if (expression is PrefixedIdentifier) {
           var offset = expression.prefix.end;
           var length = expression.end - offset;
diff --git a/pkg/analyzer/lib/src/dart/resolver/annotation_resolver.dart b/pkg/analyzer/lib/src/dart/resolver/annotation_resolver.dart
index d385c04ecf0..8319d08ca36 100644
--- a/pkg/analyzer/lib/src/dart/resolver/annotation_resolver.dart
+++ b/pkg/analyzer/lib/src/dart/resolver/annotation_resolver.dart
@@ -68,11 +68,11 @@ class AnnotationResolver {
 
   void _classGetter(
     AnnotationImpl node,
-    InterfaceElement2 classElement,
+    InterfaceElement classElement,
     SimpleIdentifierImpl? getterName,
     List<WhyNotPromotedGetter> whyNotPromotedArguments,
   ) {
-    ExecutableElement2? getter;
+    ExecutableElement? getter;
     if (getterName != null) {
       getter = classElement.getGetter2(getterName.name);
       // Recovery, try to find a constructor.
@@ -84,7 +84,7 @@ class AnnotationResolver {
     getterName?.element = getter;
     node.element2 = getter;
 
-    if (getterName != null && getter is PropertyAccessorElement2) {
+    if (getterName != null && getter is PropertyAccessorElement) {
       _propertyAccessorElement(
         node,
         getterName,
@@ -92,7 +92,7 @@ class AnnotationResolver {
         whyNotPromotedArguments,
       );
       _resolveAnnotationElementGetter(node, getter);
-    } else if (getter is! ConstructorElement2) {
+    } else if (getter is! ConstructorElement) {
       _errorReporter.atNode(node, CompileTimeErrorCode.INVALID_ANNOTATION);
     }
 
@@ -151,11 +151,11 @@ class AnnotationResolver {
 
   void _extensionGetter(
     AnnotationImpl node,
-    ExtensionElement2 extensionElement,
+    ExtensionElement extensionElement,
     SimpleIdentifierImpl? getterName,
     List<WhyNotPromotedGetter> whyNotPromotedArguments,
   ) {
-    ExecutableElement2? getter;
+    ExecutableElement? getter;
     if (getterName != null) {
       getter = extensionElement.getGetter2(getterName.name);
     }
@@ -163,7 +163,7 @@ class AnnotationResolver {
     getterName?.element = getter;
     node.element2 = getter;
 
-    if (getterName != null && getter is PropertyAccessorElement2) {
+    if (getterName != null && getter is PropertyAccessorElement) {
       _propertyAccessorElement(
         node,
         getterName,
@@ -184,7 +184,7 @@ class AnnotationResolver {
 
   void _localVariable(
     AnnotationImpl node,
-    VariableElement2 element,
+    VariableElement element,
     List<WhyNotPromotedGetter> whyNotPromotedArguments,
   ) {
     if (!element.isConst || node.arguments != null) {
@@ -201,7 +201,7 @@ class AnnotationResolver {
   void _propertyAccessorElement(
     AnnotationImpl node,
     SimpleIdentifierImpl name,
-    PropertyAccessorElement2 element,
+    PropertyAccessorElement element,
     List<WhyNotPromotedGetter> whyNotPromotedArguments,
   ) {
     name.element = element;
@@ -267,19 +267,19 @@ class AnnotationResolver {
     }
 
     // Extension.CONST
-    if (element1 is ExtensionElement2) {
+    if (element1 is ExtensionElement) {
       _extensionGetter(node, element1, name2, whyNotPromotedArguments);
       return;
     }
 
     // prefix.*
-    if (element1 is PrefixElement2) {
+    if (element1 is PrefixElement) {
       if (name2 != null) {
         var element = element1.scope.lookup(name2.name).getter2;
         name2.element = element;
         // prefix.Class(args) or prefix.Class.CONST
         if (element is InterfaceElementImpl2) {
-          if (element is ClassElement2 && argumentList != null) {
+          if (element is ClassElement && argumentList != null) {
             _classConstructorInvocation(
               node,
               element,
@@ -293,12 +293,12 @@ class AnnotationResolver {
           return;
         }
         // prefix.Extension.CONST
-        if (element is ExtensionElement2) {
+        if (element is ExtensionElement) {
           _extensionGetter(node, element, name3, whyNotPromotedArguments);
           return;
         }
         // prefix.CONST
-        if (element is PropertyAccessorElement2) {
+        if (element is PropertyAccessorElement) {
           _propertyAccessorElement(
             node,
             name2,
@@ -345,7 +345,7 @@ class AnnotationResolver {
     }
 
     // CONST
-    if (element1 is PropertyAccessorElement2) {
+    if (element1 is PropertyAccessorElement) {
       _propertyAccessorElement(node, name1, element1, whyNotPromotedArguments);
       return;
     }
@@ -370,7 +370,7 @@ class AnnotationResolver {
       return;
     }
 
-    if (element1 is VariableElement2) {
+    if (element1 is VariableElement) {
       _localVariable(node, element1, whyNotPromotedArguments);
       return;
     }
@@ -386,7 +386,7 @@ class AnnotationResolver {
 
   void _resolveAnnotationElementGetter(
     Annotation annotation,
-    PropertyAccessorElement2 accessorElement,
+    PropertyAccessorElement accessorElement,
   ) {
     // The accessor should be synthetic, the variable should be constant, and
     // there should be no arguments.
@@ -439,11 +439,11 @@ class AnnotationResolver {
 
   void _typeAliasGetter(
     AnnotationImpl node,
-    TypeAliasElement2 typeAliasElement,
+    TypeAliasElement typeAliasElement,
     SimpleIdentifierImpl? getterName,
     List<WhyNotPromotedGetter> whyNotPromotedArguments,
   ) {
-    ExecutableElement2? getter;
+    ExecutableElement? getter;
     var aliasedType = typeAliasElement.aliasedType;
     if (aliasedType is InterfaceType) {
       var classElement = aliasedType.element3;
@@ -455,7 +455,7 @@ class AnnotationResolver {
     getterName?.element = getter;
     node.element2 = getter;
 
-    if (getterName != null && getter is PropertyAccessorElement2) {
+    if (getterName != null && getter is PropertyAccessorElement) {
       _propertyAccessorElement(
         node,
         getterName,
@@ -463,7 +463,7 @@ class AnnotationResolver {
         whyNotPromotedArguments,
       );
       _resolveAnnotationElementGetter(node, getter);
-    } else if (getter is! ConstructorElement2) {
+    } else if (getter is! ConstructorElement) {
       _errorReporter.atNode(node, CompileTimeErrorCode.INVALID_ANNOTATION);
     }
 
diff --git a/pkg/analyzer/lib/src/dart/resolver/applicable_extensions.dart b/pkg/analyzer/lib/src/dart/resolver/applicable_extensions.dart
index c0c0bde2a14..430563e4fcd 100644
--- a/pkg/analyzer/lib/src/dart/resolver/applicable_extensions.dart
+++ b/pkg/analyzer/lib/src/dart/resolver/applicable_extensions.dart
@@ -29,7 +29,7 @@ class InstantiatedExtensionWithMember {
     return SingleExtensionResolutionResult(getter2: getter, setter2: setter);
   }
 
-  ExtensionElement2 get extension => candidate.extension;
+  ExtensionElement get extension => candidate.extension;
 
   ExecutableElement2OrMember? get getter {
     var getter = candidate.getter;
@@ -49,7 +49,7 @@ class InstantiatedExtensionWithMember {
 }
 
 class InstantiatedExtensionWithoutMember {
-  final ExtensionElement2 extension;
+  final ExtensionElement extension;
   final MapSubstitution substitution;
   final DartType extendedType;
 
@@ -73,8 +73,8 @@ abstract class _NotInstantiatedExtension<R> {
 
 class _NotInstantiatedExtensionWithMember
     extends _NotInstantiatedExtension<InstantiatedExtensionWithMember> {
-  final ExecutableElement2? getter;
-  final ExecutableElement2? setter;
+  final ExecutableElement? getter;
+  final ExecutableElement? setter;
 
   _NotInstantiatedExtensionWithMember(
     super.extension, {
@@ -91,7 +91,7 @@ class _NotInstantiatedExtensionWithMember
   }
 }
 
-/// [_NotInstantiatedExtension] for any [ExtensionElement2].
+/// [_NotInstantiatedExtension] for any [ExtensionElement].
 class _NotInstantiatedExtensionWithoutMember
     extends _NotInstantiatedExtension<InstantiatedExtensionWithoutMember> {
   _NotInstantiatedExtensionWithoutMember(super.extension);
@@ -109,10 +109,10 @@ class _NotInstantiatedExtensionWithoutMember
   }
 }
 
-extension ExtensionsExtensions on Iterable<ExtensionElement2> {
+extension ExtensionsExtensions on Iterable<ExtensionElement> {
   /// Extensions that can be applied, within [targetLibrary], to [targetType].
   List<InstantiatedExtensionWithoutMember> applicableTo({
-    required LibraryElement2 targetLibrary,
+    required LibraryElement targetLibrary,
     required TypeImpl targetType,
     required bool strictCasts,
   }) {
@@ -126,7 +126,7 @@ extension ExtensionsExtensions on Iterable<ExtensionElement2> {
     ).applicableTo(targetLibrary: targetLibrary, targetType: targetType);
   }
 
-  /// Returns the sublist of [ExtensionElement2]s that have an instance member
+  /// Returns the sublist of [ExtensionElement]s that have an instance member
   /// named [baseName].
   List<_NotInstantiatedExtensionWithMember> havingMemberWithBaseName(
     Name baseName,
@@ -134,8 +134,8 @@ extension ExtensionsExtensions on Iterable<ExtensionElement2> {
     var result = <_NotInstantiatedExtensionWithMember>[];
     for (var extension in this) {
       if (baseName.name == '[]') {
-        ExecutableElement2? getter;
-        ExecutableElement2? setter;
+        ExecutableElement? getter;
+        ExecutableElement? setter;
         for (var method in extension.methods2) {
           if (method.name3 == '[]') {
             getter = method;
@@ -200,7 +200,7 @@ extension NotInstantiatedExtensionsExtensions<R>
     on Iterable<_NotInstantiatedExtension<R>> {
   /// Extensions that can be applied, within [targetLibrary], to [targetType].
   List<R> applicableTo({
-    required LibraryElement2 targetLibrary,
+    required LibraryElement targetLibrary,
     required TypeImpl targetType,
   }) {
     if (identical(targetType, NeverTypeImpl.instance)) {
diff --git a/pkg/analyzer/lib/src/dart/resolver/assignment_expression_resolver.dart b/pkg/analyzer/lib/src/dart/resolver/assignment_expression_resolver.dart
index fa7a39b5aff..3aeabe4498c 100644
--- a/pkg/analyzer/lib/src/dart/resolver/assignment_expression_resolver.dart
+++ b/pkg/analyzer/lib/src/dart/resolver/assignment_expression_resolver.dart
@@ -80,7 +80,7 @@ class AssignmentExpressionResolver {
     TypeImpl rhsContext;
     {
       var leftType = node.writeType;
-      if (writeElement is VariableElement2) {
+      if (writeElement is VariableElement) {
         leftType = _resolver.localVariableTypeProvider.getType(
           left as SimpleIdentifierImpl,
           isRead: false,
diff --git a/pkg/analyzer/lib/src/dart/resolver/ast_rewrite.dart b/pkg/analyzer/lib/src/dart/resolver/ast_rewrite.dart
index 1dc105b4134..4840a402fa8 100644
--- a/pkg/analyzer/lib/src/dart/resolver/ast_rewrite.dart
+++ b/pkg/analyzer/lib/src/dart/resolver/ast_rewrite.dart
@@ -48,13 +48,13 @@ class AstRewriter {
     var importPrefix = typeNode.importPrefix;
     if (importPrefix == null) {
       var element = nameScope.lookup(typeNode.name2.lexeme).getter2;
-      if (element is ExecutableElement2) {
+      if (element is ExecutableElement) {
         return _toMethodInvocationOfFunctionReference(
           node: node,
           function: SimpleIdentifierImpl(typeNode.name2),
         );
       } else if (element is TypeAliasElementImpl2 &&
-          element.aliasedElement2 is GenericFunctionTypeElement2) {
+          element.aliasedElement2 is GenericFunctionTypeElement) {
         return _toMethodInvocationOfAliasedTypeLiteral(
           node: node,
           function: SimpleIdentifierImpl(typeNode.name2),
@@ -64,7 +64,7 @@ class AstRewriter {
     } else {
       var prefixName = importPrefix.name.lexeme;
       var prefixElement = nameScope.lookup(prefixName).getter2;
-      if (prefixElement is PrefixElement2) {
+      if (prefixElement is PrefixElement) {
         var prefixedName = typeNode.name2.lexeme;
         var element = prefixElement.scope.lookup(prefixedName).getter2;
         if (element is TopLevelFunctionElement) {
@@ -77,7 +77,7 @@ class AstRewriter {
             ),
           );
         } else if (element is TypeAliasElementImpl2 &&
-            element.aliasedElement2 is GenericFunctionTypeElement2) {
+            element.aliasedElement2 is GenericFunctionTypeElement) {
           return _toMethodInvocationOfAliasedTypeLiteral(
             node: node,
             function: PrefixedIdentifierImpl(
@@ -137,7 +137,7 @@ class AstRewriter {
         return node;
       }
       var element = nameScope.lookup(methodName.name).getter2;
-      if (element is InterfaceElement2) {
+      if (element is InterfaceElement) {
         return _toInstanceCreation_type(node: node, typeIdentifier: methodName);
       } else if (element is ExtensionElementImpl2) {
         var extensionOverride = ExtensionOverrideImpl(
@@ -149,7 +149,7 @@ class AstRewriter {
         );
         NodeReplacer.replace(node, extensionOverride);
         return extensionOverride;
-      } else if (element is TypeAliasElement2 &&
+      } else if (element is TypeAliasElement &&
           element.aliasedType is InterfaceType) {
         return _toInstanceCreation_type(node: node, typeIdentifier: methodName);
       }
@@ -160,7 +160,7 @@ class AstRewriter {
         // being used.
       }
       var element = nameScope.lookup(target.name).getter2;
-      if (element is InterfaceElement2) {
+      if (element is InterfaceElement) {
         // class C { C.named(); }
         // C.named()
         return _toInstanceCreation_type_constructor(
@@ -169,10 +169,10 @@ class AstRewriter {
           constructorIdentifier: methodName,
           classElement: element,
         );
-      } else if (element is PrefixElement2) {
+      } else if (element is PrefixElement) {
         // Possible cases: p.C() or p.C<>()
         var prefixedElement = element.scope.lookup(methodName.name).getter2;
-        if (prefixedElement is InterfaceElement2) {
+        if (prefixedElement is InterfaceElement) {
           return _toInstanceCreation_prefix_type(
             node: node,
             prefixIdentifier: target,
@@ -191,7 +191,7 @@ class AstRewriter {
           );
           NodeReplacer.replace(node, extensionOverride);
           return extensionOverride;
-        } else if (prefixedElement is TypeAliasElement2 &&
+        } else if (prefixedElement is TypeAliasElement &&
             prefixedElement.aliasedType is InterfaceType) {
           return _toInstanceCreation_prefix_type(
             node: node,
@@ -199,7 +199,7 @@ class AstRewriter {
             typeIdentifier: methodName,
           );
         }
-      } else if (element is TypeAliasElement2) {
+      } else if (element is TypeAliasElement) {
         var aliasedType = element.aliasedType;
         if (aliasedType is InterfaceType) {
           // class C { C.named(); }
@@ -217,17 +217,17 @@ class AstRewriter {
       // Possible case: p.C.n()
       var prefixElement = nameScope.lookup(target.prefix.name).getter2;
       target.prefix.element = prefixElement;
-      if (prefixElement is PrefixElement2) {
+      if (prefixElement is PrefixElement) {
         var prefixedName = target.identifier.name;
         var element = prefixElement.scope.lookup(prefixedName).getter2;
-        if (element is InterfaceElement2) {
+        if (element is InterfaceElement) {
           return _instanceCreation_prefix_type_name(
             node: node,
             typeNameIdentifier: target,
             constructorIdentifier: methodName,
             classElement: element,
           );
-        } else if (element is TypeAliasElement2) {
+        } else if (element is TypeAliasElement) {
           var aliasedType = element.aliasedType;
           if (aliasedType is InterfaceType) {
             return _instanceCreation_prefix_type_name(
@@ -273,13 +273,13 @@ class AstRewriter {
     }
     var prefix = node.prefix;
     var prefixElement = nameScope.lookup(prefix.name).getter2;
-    if (parent is ConstantPattern && prefixElement is PrefixElement2) {
+    if (parent is ConstantPattern && prefixElement is PrefixElement) {
       var element = prefixElement.scope.lookup(node.identifier.name).getter2;
-      if (element is TypeDefiningElement2) {
+      if (element is TypeDefiningElement) {
         return _toPatternTypeLiteral(parent, node);
       }
     }
-    if (prefixElement is InterfaceElement2) {
+    if (prefixElement is InterfaceElement) {
       // Example:
       //     class C { C.named(); }
       //     C.named
@@ -287,7 +287,7 @@ class AstRewriter {
         node: node,
         classElement: prefixElement,
       );
-    } else if (prefixElement is TypeAliasElement2) {
+    } else if (prefixElement is TypeAliasElement) {
       var aliasedType = prefixElement.aliasedType;
       if (aliasedType is InterfaceType) {
         // Example:
@@ -345,13 +345,13 @@ class AstRewriter {
       return node;
     }
 
-    Element2? element;
+    Element? element;
     if (receiverIdentifier is SimpleIdentifierImpl) {
       element = nameScope.lookup(receiverIdentifier.name).getter2;
     } else if (receiverIdentifier is PrefixedIdentifierImpl) {
       var prefixElement =
           nameScope.lookup(receiverIdentifier.prefix.name).getter2;
-      if (prefixElement is PrefixElement2) {
+      if (prefixElement is PrefixElement) {
         element =
             prefixElement.scope
                 .lookup(receiverIdentifier.identifier.name)
@@ -365,7 +365,7 @@ class AstRewriter {
       }
     }
 
-    if (element is InterfaceElement2) {
+    if (element is InterfaceElement) {
       // Example:
       //     class C<T> { C.named(); }
       //     C<int>.named
@@ -375,7 +375,7 @@ class AstRewriter {
         typeArguments: typeArguments,
         classElement: element,
       );
-    } else if (element is TypeAliasElement2) {
+    } else if (element is TypeAliasElement) {
       var aliasedType = element.aliasedType;
       if (aliasedType is InterfaceType) {
         // Example:
@@ -410,7 +410,7 @@ class AstRewriter {
     var parent = node.parent;
     if (parent is ConstantPattern) {
       var element = nameScope.lookup(node.name).getter2;
-      if (element is TypeDefiningElement2) {
+      if (element is TypeDefiningElement) {
         return _toPatternTypeLiteral(parent, node);
       }
     }
@@ -422,7 +422,7 @@ class AstRewriter {
     required MethodInvocationImpl node,
     required PrefixedIdentifierImpl typeNameIdentifier,
     required SimpleIdentifierImpl constructorIdentifier,
-    required InterfaceElement2 classElement,
+    required InterfaceElement classElement,
   }) {
     var constructorElement = classElement.getNamedConstructor2(
       constructorIdentifier.name,
@@ -466,7 +466,7 @@ class AstRewriter {
 
   AstNode _toConstructorReference_prefixed({
     required PrefixedIdentifierImpl node,
-    required InterfaceElement2 classElement,
+    required InterfaceElement classElement,
   }) {
     var name = node.identifier.name;
     var constructorElement =
@@ -499,7 +499,7 @@ class AstRewriter {
     required PropertyAccessImpl node,
     required IdentifierImpl receiver,
     required TypeArgumentListImpl? typeArguments,
-    required InterfaceElement2 classElement,
+    required InterfaceElement classElement,
   }) {
     var name = node.propertyName.name;
     var constructorElement =
@@ -590,7 +590,7 @@ class AstRewriter {
     required MethodInvocationImpl node,
     required SimpleIdentifierImpl typeIdentifier,
     required SimpleIdentifierImpl constructorIdentifier,
-    required InterfaceElement2 classElement,
+    required InterfaceElement classElement,
   }) {
     var name = constructorIdentifier.name;
     var constructorElement = classElement.getNamedConstructor2(name);
diff --git a/pkg/analyzer/lib/src/dart/resolver/binary_expression_resolver.dart b/pkg/analyzer/lib/src/dart/resolver/binary_expression_resolver.dart
index 40c09a72c74..c821ceb4e00 100644
--- a/pkg/analyzer/lib/src/dart/resolver/binary_expression_resolver.dart
+++ b/pkg/analyzer/lib/src/dart/resolver/binary_expression_resolver.dart
@@ -435,7 +435,7 @@ class BinaryExpressionResolver {
       nameErrorEntity: node,
     );
 
-    node.element = result.getter2 as MethodElement2?;
+    node.element = result.getter2 as MethodElement?;
     node.staticInvokeType = result.getter2?.type;
     if (result.needsGetterError) {
       if (leftOperand is SuperExpression) {
diff --git a/pkg/analyzer/lib/src/dart/resolver/body_inference_context.dart b/pkg/analyzer/lib/src/dart/resolver/body_inference_context.dart
index 8af29faf32d..9f02afe801e 100644
--- a/pkg/analyzer/lib/src/dart/resolver/body_inference_context.dart
+++ b/pkg/analyzer/lib/src/dart/resolver/body_inference_context.dart
@@ -170,7 +170,7 @@ class BodyInferenceContext {
     );
   }
 
-  static TypeImpl? _argumentOf(TypeImpl type, InterfaceElement2 element) {
+  static TypeImpl? _argumentOf(TypeImpl type, InterfaceElement element) {
     var elementType = type.asInstanceOf2(element);
     return elementType?.typeArguments[0];
   }
diff --git a/pkg/analyzer/lib/src/dart/resolver/comment_reference_resolver.dart b/pkg/analyzer/lib/src/dart/resolver/comment_reference_resolver.dart
index f77a7973b00..bb9e66c6a30 100644
--- a/pkg/analyzer/lib/src/dart/resolver/comment_reference_resolver.dart
+++ b/pkg/analyzer/lib/src/dart/resolver/comment_reference_resolver.dart
@@ -65,7 +65,7 @@ class CommentReferenceResolver {
 
     var name = expression.identifier;
 
-    if (prefixElement is PrefixElement2) {
+    if (prefixElement is PrefixElement) {
       var prefixScope = prefixElement.scope;
       var lookupResult = prefixScope.lookup(name.name);
       var element = lookupResult.getter2 ?? lookupResult.setter2;
@@ -74,7 +74,7 @@ class CommentReferenceResolver {
     }
 
     if (!hasNewKeyword) {
-      if (prefixElement is InterfaceElement2) {
+      if (prefixElement is InterfaceElement) {
         name.element =
             _resolver.inheritance.getMember4(
               prefixElement,
@@ -84,7 +84,7 @@ class CommentReferenceResolver {
             prefixElement.getGetter2(name.name) ??
             prefixElement.getSetter2(name.name) ??
             prefixElement.getNamedConstructor2(name.name);
-      } else if (prefixElement is ExtensionElement2) {
+      } else if (prefixElement is ExtensionElement) {
         name.element =
             prefixElement.getMethod2(name.name) ??
             prefixElement.getGetter2(name.name) ??
@@ -92,7 +92,7 @@ class CommentReferenceResolver {
       } else {
         // TODO(brianwilkerson): Report this error.
       }
-    } else if (prefixElement is InterfaceElement2) {
+    } else if (prefixElement is InterfaceElement) {
       var constructor = prefixElement.getNamedConstructor2(name.name);
       if (constructor == null) {
         // TODO(brianwilkerson): Report this error.
@@ -119,7 +119,7 @@ class CommentReferenceResolver {
     var prefixElement = _resolveSimpleIdentifier(prefix);
     prefix.element = prefixElement;
 
-    if (prefixElement is! PrefixElement2) {
+    if (prefixElement is! PrefixElement) {
       // The only valid prefixElement is a PrefixElement; otherwise, this is
       // not a comment reference.
       return;
@@ -132,13 +132,13 @@ class CommentReferenceResolver {
     name.element = element;
 
     var propertyName = expression.propertyName;
-    if (element is InterfaceElement2) {
+    if (element is InterfaceElement) {
       propertyName.element =
           element.getMethod2(propertyName.name) ??
           element.getGetter2(propertyName.name) ??
           element.getSetter2(propertyName.name) ??
           element.getNamedConstructor2(propertyName.name);
-    } else if (element is ExtensionElement2) {
+    } else if (element is ExtensionElement) {
       propertyName.element =
           element.getMethod2(propertyName.name) ??
           element.getGetter2(propertyName.name) ??
@@ -150,7 +150,7 @@ class CommentReferenceResolver {
   ///
   /// Returns the resolved element, or `null` if the identifier could not be
   /// resolved. This does not record the results of the resolution.
-  Element2? _resolveSimpleIdentifier(SimpleIdentifierImpl identifier) {
+  Element? _resolveSimpleIdentifier(SimpleIdentifierImpl identifier) {
     var lookupResult = identifier.scopeLookupResult!;
     var element = lookupResult.getter2 ?? lookupResult.setter2;
 
@@ -203,7 +203,7 @@ class CommentReferenceResolver {
     }
     expression.element = element;
     if (hasNewKeyword) {
-      if (element is InterfaceElement2) {
+      if (element is InterfaceElement) {
         var constructor = element.unnamedConstructor2;
         if (constructor == null) {
           // TODO(brianwilkerson): Report this error.
diff --git a/pkg/analyzer/lib/src/dart/resolver/constructor_reference_resolver.dart b/pkg/analyzer/lib/src/dart/resolver/constructor_reference_resolver.dart
index c88e8194266..97097a173b7 100644
--- a/pkg/analyzer/lib/src/dart/resolver/constructor_reference_resolver.dart
+++ b/pkg/analyzer/lib/src/dart/resolver/constructor_reference_resolver.dart
@@ -53,7 +53,7 @@ class ConstructorReferenceResolver {
       // Only report errors when the constructor tearoff feature is enabled,
       // to avoid reporting redundant errors.
       var enclosingElement = node.constructorName.type.element2;
-      if (enclosingElement is TypeAliasElement2) {
+      if (enclosingElement is TypeAliasElement) {
         var aliasedType = enclosingElement.aliasedType;
         enclosingElement =
             aliasedType is InterfaceType ? aliasedType.element3 : null;
@@ -61,7 +61,7 @@ class ConstructorReferenceResolver {
       // TODO(srawlins): Handle `enclosingElement` being a function typedef:
       // typedef F<T> = void Function(); var a = F<int>.extensionOnType;`.
       // This is illegal.
-      if (enclosingElement is InterfaceElement2) {
+      if (enclosingElement is InterfaceElement) {
         var method =
             enclosingElement.getMethod2(name.name) ??
             enclosingElement.getGetter2(name.name) ??
diff --git a/pkg/analyzer/lib/src/dart/resolver/exit_detector.dart b/pkg/analyzer/lib/src/dart/resolver/exit_detector.dart
index 36773d1c2bd..49f39644abe 100644
--- a/pkg/analyzer/lib/src/dart/resolver/exit_detector.dart
+++ b/pkg/analyzer/lib/src/dart/resolver/exit_detector.dart
@@ -712,8 +712,8 @@ class ExitDetector extends GeneralizingAstVisitor<bool> {
     return ExitDetector()._nodeExits(node);
   }
 
-  static bool _elementExits(Element2? element) {
-    if (element is ExecutableElement2) {
+  static bool _elementExits(Element? element) {
+    if (element is ExecutableElement) {
       var declaration = element.baseElement;
       return declaration.metadata2.hasAlwaysThrows ||
           identical(declaration.returnType, NeverTypeImpl.instance);
diff --git a/pkg/analyzer/lib/src/dart/resolver/extension_member_resolver.dart b/pkg/analyzer/lib/src/dart/resolver/extension_member_resolver.dart
index 6c9219d8d6e..1d267f63ddb 100644
--- a/pkg/analyzer/lib/src/dart/resolver/extension_member_resolver.dart
+++ b/pkg/analyzer/lib/src/dart/resolver/extension_member_resolver.dart
@@ -407,7 +407,7 @@ class ExtensionMemberResolver {
 
   /// Instantiate the extended type of the [extension] to the bounds of the
   /// type formals of the extension.
-  TypeImpl _instantiateToBounds(ExtensionElement2 extension) {
+  TypeImpl _instantiateToBounds(ExtensionElement extension) {
     extension as ExtensionElementImpl2;
     var typeParameters = extension.typeParameters2;
     return Substitution.fromPairs2(
diff --git a/pkg/analyzer/lib/src/dart/resolver/flow_analysis_visitor.dart b/pkg/analyzer/lib/src/dart/resolver/flow_analysis_visitor.dart
index 978ebce1450..17299911e64 100644
--- a/pkg/analyzer/lib/src/dart/resolver/flow_analysis_visitor.dart
+++ b/pkg/analyzer/lib/src/dart/resolver/flow_analysis_visitor.dart
@@ -390,7 +390,7 @@ class FlowAnalysisHelper {
   /// [isBreak] is `true` for `break`, and `false` for `continue`.
   static StatementImpl? getLabelTarget(
     AstNode? node,
-    Element2? element, {
+    Element? element, {
     required bool isBreak,
   }) {
     for (; node != null; node = node.parent) {
@@ -434,7 +434,7 @@ class FlowAnalysisHelper {
     return null;
   }
 
-  static bool _hasLabel(List<Label> labels, Element2 element) {
+  static bool _hasLabel(List<Label> labels, Element element) {
     for (var nodeLabel in labels) {
       if (identical(nodeLabel.label.element, element)) {
         return true;
@@ -651,11 +651,11 @@ class TypeSystemOperations
 
   @override
   bool isExtensionTypeInternal(TypeImpl type) {
-    return type is InterfaceType && type.element3 is ExtensionTypeElement2;
+    return type is InterfaceType && type.element3 is ExtensionTypeElement;
   }
 
   @override
-  bool isFinal(PromotableElement2 variable) {
+  bool isFinal(PromotableElement variable) {
     return variable.isFinal;
   }
 
@@ -664,7 +664,7 @@ class TypeSystemOperations
     return type is InterfaceType &&
         !type.isDartCoreNull &&
         !type.isDartAsyncFutureOr &&
-        type.element3 is! ExtensionTypeElement2;
+        type.element3 is! ExtensionTypeElement;
   }
 
   @override
@@ -685,9 +685,9 @@ class TypeSystemOperations
 
   @override
   bool isPropertyPromotable(Object property) {
-    if (property is! PropertyAccessorElement2) return false;
+    if (property is! PropertyAccessorElement) return false;
     var field = property.variable3;
-    if (field is! FieldElement2) return false;
+    if (field is! FieldElement) return false;
     return field.isPromotable;
   }
 
@@ -713,7 +713,7 @@ class TypeSystemOperations
   }
 
   @override
-  bool isVariableFinal(PromotableElement2 element) {
+  bool isVariableFinal(PromotableElement element) {
     return element.isFinal;
   }
 
@@ -915,14 +915,14 @@ class TypeSystemOperations
 
   @override
   PropertyNonPromotabilityReason? whyPropertyIsNotPromotable(
-    covariant ExecutableElement2 property,
+    covariant ExecutableElement property,
   ) {
     if (property.isPublic) return PropertyNonPromotabilityReason.isNotPrivate;
-    if (property is! PropertyAccessorElement2) {
+    if (property is! PropertyAccessorElement) {
       return PropertyNonPromotabilityReason.isNotField;
     }
     var field = property.variable3;
-    if (field is! FieldElement2) {
+    if (field is! FieldElement) {
       return PropertyNonPromotabilityReason.isNotField;
     }
     if (field.isSynthetic && !property.isSynthetic) {
@@ -942,14 +942,14 @@ class TypeSystemOperations
 /// The visitor that gathers local variables that are potentially assigned
 /// in corresponding statements, such as loops, `switch` and `try`.
 class _AssignedVariablesVisitor extends RecursiveAstVisitor<void> {
-  final AssignedVariables<AstNode, PromotableElement2> assignedVariables;
+  final AssignedVariables<AstNode, PromotableElement> assignedVariables;
 
   _AssignedVariablesVisitor(this.assignedVariables);
 
   @override
   void visitAssignedVariablePattern(AssignedVariablePattern node) {
     var element = node.element2;
-    if (element is PromotableElement2) {
+    if (element is PromotableElement) {
       assignedVariables.write(element);
     }
   }
@@ -962,7 +962,7 @@ class _AssignedVariablesVisitor extends RecursiveAstVisitor<void> {
 
     if (left is SimpleIdentifier) {
       var element = left.element;
-      if (element is PromotableElement2) {
+      if (element is PromotableElement) {
         assignedVariables.write(element);
       }
     }
@@ -1081,7 +1081,7 @@ class _AssignedVariablesVisitor extends RecursiveAstVisitor<void> {
       var operand = node.operand;
       if (operand is SimpleIdentifier) {
         var element = operand.element;
-        if (element is PromotableElement2) {
+        if (element is PromotableElement) {
           assignedVariables.write(element);
         }
       }
@@ -1095,7 +1095,7 @@ class _AssignedVariablesVisitor extends RecursiveAstVisitor<void> {
       var operand = node.operand;
       if (operand is SimpleIdentifier) {
         var element = operand.element;
-        if (element is PromotableElement2) {
+        if (element is PromotableElement) {
           assignedVariables.write(element);
         }
       }
@@ -1105,7 +1105,7 @@ class _AssignedVariablesVisitor extends RecursiveAstVisitor<void> {
   @override
   void visitSimpleIdentifier(SimpleIdentifier node) {
     var element = node.element;
-    if (element is PromotableElement2 &&
+    if (element is PromotableElement &&
         node.inGetterContext() &&
         node.parent is! FormalParameter &&
         node.parent is! CatchClause &&
@@ -1178,7 +1178,7 @@ class _AssignedVariablesVisitor extends RecursiveAstVisitor<void> {
         grandParent is FieldDeclaration) {
       throw StateError('Should not visit top level declarations');
     }
-    var declaredElement = node.declaredElement2 as PromotableElement2;
+    var declaredElement = node.declaredElement2 as PromotableElement;
     assignedVariables.declare(declaredElement);
     if (declaredElement.isLate && node.initializer != null) {
       assignedVariables.beginNode();
@@ -1227,7 +1227,7 @@ class _AssignedVariablesVisitor extends RecursiveAstVisitor<void> {
 
       if (forLoopParts is ForEachPartsWithIdentifier) {
         var element = forLoopParts.identifier.element;
-        if (element is PromotableElement2) {
+        if (element is PromotableElement) {
           assignedVariables.write(element);
         }
       } else if (forLoopParts is ForEachPartsWithDeclaration) {
diff --git a/pkg/analyzer/lib/src/dart/resolver/for_resolver.dart b/pkg/analyzer/lib/src/dart/resolver/for_resolver.dart
index 3c782516d69..21288bece21 100644
--- a/pkg/analyzer/lib/src/dart/resolver/for_resolver.dart
+++ b/pkg/analyzer/lib/src/dart/resolver/for_resolver.dart
@@ -105,7 +105,7 @@ class ForResolver {
       return DynamicTypeImpl.instance;
     }
 
-    ClassElement2 iteratedElement =
+    ClassElement iteratedElement =
         isAsync
             ? _resolver.typeProvider.streamElement2
             : _resolver.typeProvider.iterableElement2;
@@ -127,7 +127,7 @@ class ForResolver {
     ExpressionImpl iterable = forEachParts.iterable;
     DeclaredIdentifierImpl? loopVariable;
     SimpleIdentifierImpl? identifier;
-    Element2? identifierElement;
+    Element? identifierElement;
     if (forEachParts is ForEachPartsWithDeclarationImpl) {
       loopVariable = forEachParts.loopVariable;
     } else if (forEachParts is ForEachPartsWithIdentifierImpl) {
@@ -150,7 +150,7 @@ class ForResolver {
     }
     if (identifier != null) {
       identifierElement = identifier.element;
-      if (identifierElement is VariableElement2) {
+      if (identifierElement is VariableElement) {
         valueType = _resolver.localVariableTypeProvider.getType(
           identifier,
           isRead: false,
diff --git a/pkg/analyzer/lib/src/dart/resolver/function_expression_invocation_resolver.dart b/pkg/analyzer/lib/src/dart/resolver/function_expression_invocation_resolver.dart
index ab6a62141ca..be677b58583 100644
--- a/pkg/analyzer/lib/src/dart/resolver/function_expression_invocation_resolver.dart
+++ b/pkg/analyzer/lib/src/dart/resolver/function_expression_invocation_resolver.dart
@@ -91,7 +91,7 @@ class FunctionExpressionInvocationResolver {
     var result = _typePropertyResolver.resolve(
       receiver: function,
       receiverType: receiverType,
-      name: MethodElement2.CALL_METHOD_NAME,
+      name: MethodElement.CALL_METHOD_NAME,
       propertyErrorEntity: function,
       nameErrorEntity: function,
     );
@@ -193,7 +193,7 @@ class FunctionExpressionInvocationResolver {
   }) {
     var result = _extensionResolver.getOverrideMember(
       function,
-      MethodElement2.CALL_METHOD_NAME,
+      MethodElement.CALL_METHOD_NAME,
     );
     var callElement = result.getter2;
     node.element = callElement;
diff --git a/pkg/analyzer/lib/src/dart/resolver/function_reference_resolver.dart b/pkg/analyzer/lib/src/dart/resolver/function_reference_resolver.dart
index 964a87fb7c9..5c7c3e5d9dd 100644
--- a/pkg/analyzer/lib/src/dart/resolver/function_reference_resolver.dart
+++ b/pkg/analyzer/lib/src/dart/resolver/function_reference_resolver.dart
@@ -77,7 +77,7 @@ class FunctionReferenceResolver {
         _resolve(node: node, rawType: functionType);
       } else {
         var callMethod = _getCallMethod(node, function.staticType);
-        if (callMethod is MethodElement2) {
+        if (callMethod is MethodElement) {
           _resolveAsImplicitCallReference(node, callMethod);
           return;
         } else {
@@ -93,12 +93,12 @@ class FunctionReferenceResolver {
   bool _checkDynamicTypeInstantiation(
     FunctionReferenceImpl node,
     PrefixedIdentifierImpl function,
-    Element2 prefixElement,
+    Element prefixElement,
   ) {
     DartType? prefixType;
-    if (prefixElement is VariableElement2) {
+    if (prefixElement is VariableElement) {
       prefixType = prefixElement.type;
-    } else if (prefixElement is PropertyAccessorElement2) {
+    } else if (prefixElement is PropertyAccessorElement) {
       var variable = prefixElement.variable3;
       if (variable == null) {
         return false;
@@ -120,7 +120,7 @@ class FunctionReferenceResolver {
   List<TypeImpl> _checkTypeArguments(
     TypeArgumentList typeArgumentList,
     String? name,
-    List<TypeParameterElement2> typeParameters,
+    List<TypeParameterElement> typeParameters,
     CompileTimeErrorCode errorCode,
   ) {
     if (typeArgumentList.arguments.length != typeParameters.length) {
@@ -155,7 +155,7 @@ class FunctionReferenceResolver {
     }
   }
 
-  ExecutableElement2? _getCallMethod(
+  ExecutableElement? _getCallMethod(
     FunctionReferenceImpl node,
     DartType? type,
   ) {
@@ -164,7 +164,7 @@ class FunctionReferenceResolver {
     }
     var callMethodName = Name(
       _resolver.definingLibrary.source.uri,
-      MethodElement2.CALL_METHOD_NAME,
+      MethodElement.CALL_METHOD_NAME,
     );
     if (type.nullabilitySuffix == NullabilitySuffix.question) {
       // If the interface type is nullable, only an applicable extension method
@@ -176,7 +176,7 @@ class FunctionReferenceResolver {
     // Otherwise, a 'call' method on the interface, or on an applicable
     // extension method applies.
     return type.lookUpMethod3(
-          MethodElement2.CALL_METHOD_NAME,
+          MethodElement.CALL_METHOD_NAME,
           type.element3.library2,
         ) ??
         _extensionResolver.findExtension(type, node, callMethodName).getter2;
@@ -184,7 +184,7 @@ class FunctionReferenceResolver {
 
   void _reportInvalidAccessToStaticMember(
     SimpleIdentifier nameNode,
-    ExecutableElement2 element, {
+    ExecutableElement element, {
     required bool implicitReceiver,
   }) {
     var enclosingElement = element.enclosingElement2!;
@@ -203,7 +203,7 @@ class FunctionReferenceResolver {
           arguments: [enclosingElement.displayName],
         );
       }
-    } else if (enclosingElement is ExtensionElement2 &&
+    } else if (enclosingElement is ExtensionElement &&
         enclosingElement.name3 == null) {
       _resolver.errorReporter.atNode(
         nameNode,
@@ -221,7 +221,7 @@ class FunctionReferenceResolver {
           nameNode.name,
           element.kind.displayName,
           enclosingElement.name3!,
-          enclosingElement is MixinElement2
+          enclosingElement is MixinElement
               ? 'mixin'
               : enclosingElement.kind.displayName,
         ],
@@ -295,14 +295,14 @@ class FunctionReferenceResolver {
 
   void _resolveAsImplicitCallReference(
     FunctionReferenceImpl node,
-    MethodElement2 callMethod,
+    MethodElement callMethod,
   ) {
     // `node<...>` is to be treated as `node.call<...>`.
     var callMethodType = callMethod.type;
     var typeArgumentTypes = _checkTypeArguments(
       // `node.typeArguments`, coming from the parser, is never null.
       node.typeArguments!,
-      MethodElement2.CALL_METHOD_NAME,
+      MethodElement.CALL_METHOD_NAME,
       callMethodType.typeParameters,
       CompileTimeErrorCode.WRONG_NUMBER_OF_TYPE_ARGUMENTS_FUNCTION,
     );
@@ -396,7 +396,7 @@ class FunctionReferenceResolver {
       // Continue to resolve type.
     }
 
-    if (member is PropertyAccessorElement2) {
+    if (member is PropertyAccessorElement) {
       _resolve(node: node, rawType: member.returnType);
       return;
     }
@@ -404,12 +404,12 @@ class FunctionReferenceResolver {
     _resolve(node: node, rawType: member.type, name: propertyName.name);
   }
 
-  /// Resolve a possible function tearoff of a [FunctionTypedElement2] receiver.
+  /// Resolve a possible function tearoff of a [FunctionTypedElement] receiver.
   ///
   /// There are three possible valid cases: tearing off the `call` method of a
   /// function element, tearing off an extension element declared on [Function],
   /// and tearing off an extension element declared on a function type.
-  Element2? _resolveFunctionTypeFunction(
+  Element? _resolveFunctionTypeFunction(
     ExpressionImpl receiver,
     SimpleIdentifier methodName,
     FunctionTypeImpl receiverType,
@@ -453,7 +453,7 @@ class FunctionReferenceResolver {
 
     function.prefix.element = prefixElement;
     function.prefix.setPseudoExpressionStaticType(
-      prefixElement is PromotableElement2
+      prefixElement is PromotableElement
           ? _resolver.localVariableTypeProvider.getType(
             function.prefix,
             isRead: true,
@@ -462,7 +462,7 @@ class FunctionReferenceResolver {
     );
     var functionName = function.identifier.name;
 
-    if (prefixElement is PrefixElement2) {
+    if (prefixElement is PrefixElement) {
       var functionElement = prefixElement.scope.lookup(functionName).getter2;
       if (functionElement == null) {
         _errorReporter.atNode(
@@ -484,7 +484,7 @@ class FunctionReferenceResolver {
     }
 
     if (prefixElement is TopLevelFunctionElement &&
-        functionName == MethodElement2.CALL_METHOD_NAME) {
+        functionName == MethodElement.CALL_METHOD_NAME) {
       _resolve(node: node, rawType: prefixElement.type, name: functionName);
       return;
     }
@@ -496,7 +496,7 @@ class FunctionReferenceResolver {
     );
 
     var callMethod = _getCallMethod(node, propertyType);
-    if (callMethod is MethodElement2) {
+    if (callMethod is MethodElement) {
       _resolveAsImplicitCallReference(node, callMethod);
       return;
     }
@@ -527,7 +527,7 @@ class FunctionReferenceResolver {
     _resolver.analyzeExpression(function, _resolver.operations.unknownType);
     _resolver.popRewrite();
     var callMethod = _getCallMethod(node, function.staticType);
-    if (callMethod is MethodElement2) {
+    if (callMethod is MethodElement) {
       _resolveAsImplicitCallReference(node, callMethod);
       return;
     }
@@ -608,7 +608,7 @@ class FunctionReferenceResolver {
             )
             .getter2;
 
-    if (propertyElement is TypeParameterElement2) {
+    if (propertyElement is TypeParameterElement) {
       _resolve(node: node, rawType: propertyElement!.type);
       return;
     }
@@ -622,12 +622,12 @@ class FunctionReferenceResolver {
 
   void _resolveReceiverPrefix(
     FunctionReferenceImpl node,
-    PrefixElement2 prefixElement,
+    PrefixElement prefixElement,
     PrefixedIdentifierImpl prefix,
-    Element2 element,
+    Element element,
   ) {
-    if (element is MultiplyDefinedElement2) {
-      MultiplyDefinedElement2 multiply = element;
+    if (element is MultiplyDefinedElement) {
+      MultiplyDefinedElement multiply = element;
       element = multiply.conflictingElements2[0];
 
       // TODO(srawlins): Add a resolution test for this case.
@@ -636,7 +636,7 @@ class FunctionReferenceResolver {
     // Classes and type aliases are checked first so as to include a
     // PropertyAccess parent check, which does not need to be done for
     // functions.
-    if (element is InterfaceElement2 || element is TypeAliasElement2) {
+    if (element is InterfaceElement || element is TypeAliasElement) {
       // A type-instantiated constructor tearoff like `prefix.C<int>.name` is
       // initially represented as a [PropertyAccess] with a
       // [FunctionReference] 'target'.
@@ -657,14 +657,14 @@ class FunctionReferenceResolver {
         _resolveTypeAlias(node: node, element: element, typeAlias: prefix);
         return;
       }
-    } else if (element is ExecutableElement2) {
+    } else if (element is ExecutableElement) {
       _resolver.analyzeExpression(
         node.function,
         _resolver.operations.unknownType,
       );
       _resolver.popRewrite();
       var callMethod = _getCallMethod(node, node.function.staticType);
-      if (callMethod is MethodElement2) {
+      if (callMethod is MethodElement) {
         _resolveAsImplicitCallReference(node, callMethod);
         return;
       }
@@ -674,7 +674,7 @@ class FunctionReferenceResolver {
         name: element.name3,
       );
       return;
-    } else if (element is ExtensionElement2) {
+    } else if (element is ExtensionElement) {
       prefix.identifier.element = element;
       prefix.identifier.setPseudoExpressionStaticType(InvalidTypeImpl.instance);
       prefix.setPseudoExpressionStaticType(InvalidTypeImpl.instance);
@@ -768,7 +768,7 @@ class FunctionReferenceResolver {
     // Classes and type aliases are checked first so as to include a
     // PropertyAccess parent check, which does not need to be done for
     // functions.
-    if (element is InterfaceElement2 || element is TypeAliasElement2) {
+    if (element is InterfaceElement || element is TypeAliasElement) {
       // A type-instantiated constructor tearoff like `C<int>.name` or
       // `prefix.C<int>.name` is initially represented as a [PropertyAccess]
       // with a [FunctionReference] target.
@@ -790,7 +790,7 @@ class FunctionReferenceResolver {
         _resolveTypeAlias(node: node, element: element, typeAlias: function);
         return;
       }
-    } else if (element is MethodElement2) {
+    } else if (element is MethodElement) {
       function.element = element;
       function.setPseudoExpressionStaticType(element.type);
       _resolve(node: node, rawType: element.type, name: element.name3);
@@ -805,7 +805,7 @@ class FunctionReferenceResolver {
       function.setPseudoExpressionStaticType(element.type);
       _resolve(node: node, rawType: element.type, name: element.name3);
       return;
-    } else if (element is PropertyAccessorElement2) {
+    } else if (element is PropertyAccessorElement) {
       function.element = element;
       var variable = element.variable3;
       if (variable == null) {
@@ -814,28 +814,28 @@ class FunctionReferenceResolver {
       }
       function.setPseudoExpressionStaticType(variable.type);
       var callMethod = _getCallMethod(node, variable.type);
-      if (callMethod is MethodElement2) {
+      if (callMethod is MethodElement) {
         _resolveAsImplicitCallReference(node, callMethod);
         return;
       }
       _resolve(node: node, rawType: element.returnType);
       return;
-    } else if (element is ExecutableElement2) {
+    } else if (element is ExecutableElement) {
       function.element = element;
       function.setPseudoExpressionStaticType(element.type);
       _resolve(node: node, rawType: element.type);
       return;
-    } else if (element is VariableElement2) {
+    } else if (element is VariableElement) {
       function.element = element;
       function.setPseudoExpressionStaticType(element.type);
       var callMethod = _getCallMethod(node, element.type);
-      if (callMethod is MethodElement2) {
+      if (callMethod is MethodElement) {
         _resolveAsImplicitCallReference(node, callMethod);
         return;
       }
       _resolve(node: node, rawType: element.type);
       return;
-    } else if (element is ExtensionElement2) {
+    } else if (element is ExtensionElement) {
       function.element = element;
       function.setPseudoExpressionStaticType(InvalidTypeImpl.instance);
       _resolveDisallowedExpression(node, InvalidTypeImpl.instance);
@@ -848,12 +848,12 @@ class FunctionReferenceResolver {
 
   /// Returns the element that represents the property named [propertyName] on
   /// [classElement].
-  ExecutableElement2? _resolveStaticElement(
-    InterfaceElement2 classElement,
+  ExecutableElement? _resolveStaticElement(
+    InterfaceElement classElement,
     SimpleIdentifier propertyName,
   ) {
     String name = propertyName.name;
-    ExecutableElement2? element;
+    ExecutableElement? element;
     if (propertyName.inSetterContext()) {
       element = classElement.getSetter2(name);
     }
@@ -914,11 +914,11 @@ class FunctionReferenceResolver {
   }) {
     if (receiver is IdentifierImpl) {
       var receiverElement = receiver.element;
-      if (receiverElement is InterfaceElement2) {
+      if (receiverElement is InterfaceElement) {
         var element = _resolveStaticElement(receiverElement, name);
         name.element = element;
         return element?.referenceType;
-      } else if (receiverElement is TypeAliasElement2) {
+      } else if (receiverElement is TypeAliasElement) {
         var aliasedType = receiverElement.aliasedType;
         if (aliasedType is InterfaceType) {
           var element = _resolveStaticElement(aliasedType.element3, name);
@@ -936,7 +936,7 @@ class FunctionReferenceResolver {
     } else if (receiverType is TypeParameterTypeImpl) {
       return null;
     } else if (receiverType is FunctionTypeImpl) {
-      if (name.name == MethodElement2.CALL_METHOD_NAME) {
+      if (name.name == MethodElement.CALL_METHOD_NAME) {
         return receiverType;
       }
       var element = _resolveFunctionTypeFunction(receiver, name, receiverType);
@@ -966,24 +966,24 @@ class FunctionReferenceResolver {
   }
 }
 
-extension on Element2 {
+extension on Element {
   /// Returns the 'type' of `this`, when accessed as a "reference", not
   /// immediately followed by parentheses and arguments.
   ///
-  /// For all elements that don't have a type (for example, [LibraryElement2]),
-  /// `null` is returned. For [PropertyAccessorElement2], the return value is
+  /// For all elements that don't have a type (for example, [LibraryElement]),
+  /// `null` is returned. For [PropertyAccessorElement], the return value is
   /// returned. For all other elements, their `type` property is returned.
   DartType? get referenceType {
-    if (this is ConstructorElement2) {
-      return (this as ConstructorElement2).type;
+    if (this is ConstructorElement) {
+      return (this as ConstructorElement).type;
     } else if (this is TopLevelFunctionElement) {
       return (this as TopLevelFunctionElement).type;
-    } else if (this is PropertyAccessorElement2) {
-      return (this as PropertyAccessorElement2).returnType;
-    } else if (this is MethodElement2) {
-      return (this as MethodElement2).type;
-    } else if (this is VariableElement2) {
-      return (this as VariableElement2).type;
+    } else if (this is PropertyAccessorElement) {
+      return (this as PropertyAccessorElement).returnType;
+    } else if (this is MethodElement) {
+      return (this as MethodElement).type;
+    } else if (this is VariableElement) {
+      return (this as VariableElement).type;
     } else {
       return null;
     }
diff --git a/pkg/analyzer/lib/src/dart/resolver/invocation_inference_helper.dart b/pkg/analyzer/lib/src/dart/resolver/invocation_inference_helper.dart
index a32f06a29d2..b1b67cb2075 100644
--- a/pkg/analyzer/lib/src/dart/resolver/invocation_inference_helper.dart
+++ b/pkg/analyzer/lib/src/dart/resolver/invocation_inference_helper.dart
@@ -19,13 +19,13 @@ import 'package:analyzer/src/utilities/extensions/element.dart';
 
 /// Information about a constructor element to instantiate.
 ///
-/// If the target is a [ClassElement2], the [element] is a raw
-/// [ConstructorElement2] from the class, and [typeParameters] are the
+/// If the target is a [ClassElement], the [element] is a raw
+/// [ConstructorElement] from the class, and [typeParameters] are the
 /// type parameters of the class.
 ///
-/// If the target is a [TypeAliasElement2] with an [InterfaceType] as the
+/// If the target is a [TypeAliasElement] with an [InterfaceType] as the
 /// aliased type, the [element] is a [ConstructorMember] created from the
-/// [ConstructorElement2] of the corresponding class, and substituting
+/// [ConstructorElement] of the corresponding class, and substituting
 /// the class type parameters with the type arguments specified in the alias,
 /// explicit types or the type parameters of the alias. The [typeParameters]
 /// are the type parameters of the alias.
@@ -84,7 +84,7 @@ class InvocationInferenceHelper {
   /// and the [constructorName] does not have explicit type arguments,
   /// return the element and type parameters to infer. Otherwise return `null`.
   ConstructorElementToInfer? constructorElementToInfer({
-    required Element2? typeElement,
+    required Element? typeElement,
     required SimpleIdentifierImpl? constructorName,
     required LibraryElementImpl definingLibrary,
   }) {
@@ -157,7 +157,7 @@ class InvocationInferenceHelper {
 
   /// Finish resolution of the [DotShorthandInvocation].
   ///
-  /// We have already found the invoked [ExecutableElement2], and the [rawType]
+  /// We have already found the invoked [ExecutableElement], and the [rawType]
   /// is its not yet instantiated type. Here we perform downwards inference,
   /// resolution of arguments, and upwards inference.
   void resolveDotShorthandInvocation({
@@ -178,7 +178,7 @@ class InvocationInferenceHelper {
 
   /// Finish resolution of the [MethodInvocation].
   ///
-  /// We have already found the invoked [ExecutableElement2], and the [rawType]
+  /// We have already found the invoked [ExecutableElement], and the [rawType]
   /// is its not yet instantiated type. Here we perform downwards inference,
   /// resolution of arguments, and upwards inference.
   void resolveMethodInvocation({
diff --git a/pkg/analyzer/lib/src/dart/resolver/invocation_inferrer.dart b/pkg/analyzer/lib/src/dart/resolver/invocation_inferrer.dart
index fc6d82fc714..df6304bdc58 100644
--- a/pkg/analyzer/lib/src/dart/resolver/invocation_inferrer.dart
+++ b/pkg/analyzer/lib/src/dart/resolver/invocation_inferrer.dart
@@ -407,7 +407,7 @@ abstract class FullInvocationInferrer<Node extends AstNodeImpl>
   void _reportWrongNumberOfTypeArguments(
     TypeArgumentList typeArgumentList,
     FunctionType rawType,
-    List<TypeParameterElement2> typeParameters,
+    List<TypeParameterElement> typeParameters,
   ) {
     resolver.errorReporter.atNode(
       typeArgumentList,
@@ -476,7 +476,7 @@ class InstanceCreationInferrer
   void _reportWrongNumberOfTypeArguments(
     TypeArgumentList typeArgumentList,
     FunctionType rawType,
-    List<TypeParameterElement2> typeParameters,
+    List<TypeParameterElement> typeParameters,
   ) {
     // Error reporting for instance creations is done elsewhere.
   }
@@ -804,13 +804,13 @@ class _DeferredParamInfo extends _ParamInfo {
 class _FunctionLiteralDependencies
     extends
         FunctionLiteralDependencies<
-          TypeParameterElement2,
+          TypeParameterElement,
           _ParamInfo,
           _DeferredParamInfo
         > {
   final TypeSystemImpl _typeSystem;
 
-  final Set<TypeParameterElement2> _typeVariables;
+  final Set<TypeParameterElement> _typeVariables;
 
   _FunctionLiteralDependencies(
     this._typeSystem,
@@ -820,7 +820,7 @@ class _FunctionLiteralDependencies
   ) : super(deferredParamInfo, _typeVariables, undeferredParamInfo);
 
   @override
-  Iterable<TypeParameterElement2> typeVarsFreeInParamParams(
+  Iterable<TypeParameterElement> typeVarsFreeInParamParams(
     _DeferredParamInfo paramInfo,
   ) {
     var type = paramInfo.parameter?.type;
@@ -829,7 +829,7 @@ class _FunctionLiteralDependencies
       var explicitlyTypedParameters = _computeExplicitlyTypedParameterSet(
         paramInfo.value,
       );
-      Set<TypeParameterElement2> result = {};
+      Set<TypeParameterElement> result = {};
       for (var entry in parameterMap.entries) {
         if (explicitlyTypedParameters.contains(entry.key)) continue;
         result.addAll(
@@ -847,7 +847,7 @@ class _FunctionLiteralDependencies
   }
 
   @override
-  Iterable<TypeParameterElement2> typeVarsFreeInParamReturns(
+  Iterable<TypeParameterElement> typeVarsFreeInParamReturns(
     _ParamInfo paramInfo,
   ) {
     var type = paramInfo.parameter?.type;
diff --git a/pkg/analyzer/lib/src/dart/resolver/lexical_lookup.dart b/pkg/analyzer/lib/src/dart/resolver/lexical_lookup.dart
index f89c1d11bfd..ff1c3642dc6 100644
--- a/pkg/analyzer/lib/src/dart/resolver/lexical_lookup.dart
+++ b/pkg/analyzer/lib/src/dart/resolver/lexical_lookup.dart
@@ -41,7 +41,7 @@ class LexicalLookup {
     var scopeGetter = scopeResult.getter2;
     var scopeSetter = scopeResult.setter2;
     if (scopeGetter != null || scopeSetter != null) {
-      if (scopeGetter is VariableElement2) {
+      if (scopeGetter is VariableElement) {
         return LexicalLookupResult(requested: scopeGetter);
       }
       if (scopeSetter != null) {
@@ -57,8 +57,8 @@ class LexicalLookup {
 }
 
 class LexicalLookupResult {
-  final Element2? requested;
-  final Element2? recovery;
+  final Element? requested;
+  final Element? recovery;
 
   /// The type, usually [FunctionType] referenced with `call`.
   final DartType? callFunctionType;
diff --git a/pkg/analyzer/lib/src/dart/resolver/method_invocation_resolver.dart b/pkg/analyzer/lib/src/dart/resolver/method_invocation_resolver.dart
index 8e1e877f669..a01375b411c 100644
--- a/pkg/analyzer/lib/src/dart/resolver/method_invocation_resolver.dart
+++ b/pkg/analyzer/lib/src/dart/resolver/method_invocation_resolver.dart
@@ -158,7 +158,7 @@ class MethodInvocationResolver with ScopeHelpers {
 
     if (receiver is IdentifierImpl) {
       var element = receiver.element;
-      if (element is InterfaceElement2) {
+      if (element is InterfaceElement) {
         return _resolveReceiverTypeLiteral(
           node,
           element,
@@ -167,7 +167,7 @@ class MethodInvocationResolver with ScopeHelpers {
           whyNotPromotedArguments,
           contextType: contextType,
         );
-      } else if (element is TypeAliasElement2) {
+      } else if (element is TypeAliasElement) {
         var aliasedType = element.aliasedType;
         if (aliasedType is InterfaceType) {
           return _resolveReceiverTypeLiteral(
@@ -285,7 +285,7 @@ class MethodInvocationResolver with ScopeHelpers {
   }
 
   bool _hasMatchingObjectMethod(
-    MethodElement2 target,
+    MethodElement target,
     NodeListImpl<ExpressionImpl> arguments,
   ) {
     return arguments.length == target.formalParameters.length &&
@@ -299,7 +299,7 @@ class MethodInvocationResolver with ScopeHelpers {
 
   void _reportInstanceAccessToStaticMember(
     SimpleIdentifier nameNode,
-    ExecutableElement2 element,
+    ExecutableElement element,
     bool nullReceiver,
   ) {
     var enclosingElement = element.enclosingElement2!;
@@ -318,7 +318,7 @@ class MethodInvocationResolver with ScopeHelpers {
           arguments: [enclosingElement.displayString2()],
         );
       }
-    } else if (enclosingElement is ExtensionElement2 &&
+    } else if (enclosingElement is ExtensionElement &&
         enclosingElement.name3 == null) {
       _resolver.errorReporter.atNode(
         nameNode,
@@ -336,7 +336,7 @@ class MethodInvocationResolver with ScopeHelpers {
           nameNode.name,
           element.kind.displayName,
           enclosingElement.name3!,
-          enclosingElement is MixinElement2
+          enclosingElement is MixinElement
               ? 'mixin'
               : enclosingElement.kind.displayName,
         ],
@@ -361,7 +361,7 @@ class MethodInvocationResolver with ScopeHelpers {
   }
 
   void _reportStaticAccessToInstanceMember(
-    ExecutableElement2 element,
+    ExecutableElement element,
     SimpleIdentifier nameNode,
   ) {
     if (!element.isStatic) {
@@ -398,7 +398,7 @@ class MethodInvocationResolver with ScopeHelpers {
   }
 
   void _reportUndefinedMethodOrNew(
-    InterfaceElement2 receiver,
+    InterfaceElement receiver,
     SimpleIdentifierImpl methodName,
   ) {
     if (methodName.name == 'new') {
@@ -463,13 +463,13 @@ class MethodInvocationResolver with ScopeHelpers {
 
   /// Given that we are accessing a property of the given [classElement] with the
   /// given [propertyName], return the element that represents the property.
-  Element2? _resolveElement(
-    InterfaceElement2 classElement,
+  Element? _resolveElement(
+    InterfaceElement classElement,
     SimpleIdentifier propertyName,
   ) {
     // TODO(scheglov): Replace with class hierarchy.
     String name = propertyName.name;
-    Element2? element;
+    Element? element;
     if (propertyName.inSetterContext()) {
       element = classElement.getSetter2(name);
     }
@@ -741,7 +741,7 @@ class MethodInvocationResolver with ScopeHelpers {
     var element = scopeLookupResult.getter2;
     if (element != null) {
       nameNode.element = element;
-      if (element is MultiplyDefinedElement2) {
+      if (element is MultiplyDefinedElement) {
         element = element.conflictingElements2[0];
       }
       if (element is PropertyAccessorElement2OrMember) {
@@ -765,7 +765,7 @@ class MethodInvocationResolver with ScopeHelpers {
         );
         return null;
       }
-      if (element is VariableElement2) {
+      if (element is VariableElement) {
         _resolver.checkReadOfNotAssignedLocalVariable(nameNode, element);
         var targetType = _localVariableTypeProvider.getType(
           nameNode,
@@ -783,7 +783,7 @@ class MethodInvocationResolver with ScopeHelpers {
         );
       }
       // TODO(scheglov): This is a questionable distinction.
-      if (element is PrefixElement2) {
+      if (element is PrefixElement) {
         _setInvalidTypeResolution(
           node,
           whyNotPromotedArguments: whyNotPromotedArguments,
@@ -823,9 +823,9 @@ class MethodInvocationResolver with ScopeHelpers {
       // or is static, then we do not keep searching for the getter; this
       // setter represents the property being accessed (erroneously).
       var noGetterIsPossible =
-          element.enclosingElement2 is LibraryElement2 ||
-          element.enclosingElement2 is ExtensionElement2 ||
-          (element is ExecutableElement2 && element.isStatic);
+          element.enclosingElement2 is LibraryElement ||
+          element.enclosingElement2 is ExtensionElement ||
+          (element is ExecutableElement && element.isStatic);
       if (noGetterIsPossible) {
         nameNode.element = element;
 
@@ -906,7 +906,7 @@ class MethodInvocationResolver with ScopeHelpers {
     var element = scopeLookupResult.getter2;
     nameNode.element = element;
 
-    if (element is MultiplyDefinedElement2) {
+    if (element is MultiplyDefinedElement) {
       element = element.conflictingElements2[0];
     }
 
@@ -1060,7 +1060,7 @@ class MethodInvocationResolver with ScopeHelpers {
 
     var callFunctionType = result.callFunctionType;
     if (callFunctionType != null) {
-      assert(name == MethodElement2.CALL_METHOD_NAME);
+      assert(name == MethodElement.CALL_METHOD_NAME);
       _setResolution(
         node,
         callFunctionType,
@@ -1075,7 +1075,7 @@ class MethodInvocationResolver with ScopeHelpers {
     }
 
     if (receiverType.isDartCoreFunction &&
-        name == MethodElement2.CALL_METHOD_NAME) {
+        name == MethodElement.CALL_METHOD_NAME) {
       _setResolution(
         node,
         DynamicTypeImpl.instance,
@@ -1111,7 +1111,7 @@ class MethodInvocationResolver with ScopeHelpers {
         _reportInstanceAccessToStaticMember(nameNode, target, receiver == null);
       }
 
-      if (target is PropertyAccessorElement2) {
+      if (target is PropertyAccessorElement) {
         return _rewriteAsFunctionExpressionInvocation(
           node,
           node.target,
@@ -1166,7 +1166,7 @@ class MethodInvocationResolver with ScopeHelpers {
   /// process, then returns that new node. Otherwise, returns `null`.
   FunctionExpressionInvocationImpl? _resolveReceiverTypeLiteral(
     MethodInvocationImpl node,
-    InterfaceElement2 receiver,
+    InterfaceElement receiver,
     SimpleIdentifierImpl nameNode,
     String name,
     List<WhyNotPromotedGetter> whyNotPromotedArguments, {
@@ -1227,7 +1227,7 @@ class MethodInvocationResolver with ScopeHelpers {
   /// node. Otherwise, returns `null`.
   RewrittenMethodInvocationImpl? _resolveReceiverTypeLiteralForDotShorthand(
     DotShorthandInvocationImpl node,
-    InterfaceElement2 receiver,
+    InterfaceElement receiver,
     SimpleIdentifierImpl nameNode,
     String name,
     List<WhyNotPromotedGetter> whyNotPromotedArguments, {
@@ -1326,8 +1326,8 @@ class MethodInvocationResolver with ScopeHelpers {
       }
 
       var element = methodName.element;
-      if (element is ExecutableElement2 &&
-          element.enclosingElement2 is InstanceElement2 &&
+      if (element is ExecutableElement &&
+          element.enclosingElement2 is InstanceElement &&
           !element.isStatic) {
         targetType =
             _resolver.flowAnalysis.flow
@@ -1344,7 +1344,7 @@ class MethodInvocationResolver with ScopeHelpers {
             targetType;
       }
     } else {
-      if (target is SimpleIdentifierImpl && target.element is PrefixElement2) {
+      if (target is SimpleIdentifierImpl && target.element is PrefixElement) {
         functionExpression = PrefixedIdentifierImpl(
           prefix: target,
           period: operator!,
@@ -1601,10 +1601,10 @@ class MethodInvocationResolver with ScopeHelpers {
   /// Checks whether the given [expression] is a reference to a class. If it is
   /// then the element representing the class is returned, otherwise `null` is
   /// returned.
-  static InterfaceElement2? getTypeReference(Expression expression) {
+  static InterfaceElement? getTypeReference(Expression expression) {
     if (expression is Identifier) {
       var staticElement = expression.element;
-      if (staticElement is InterfaceElement2) {
+      if (staticElement is InterfaceElement) {
         return staticElement;
       }
     }
diff --git a/pkg/analyzer/lib/src/dart/resolver/named_type_resolver.dart b/pkg/analyzer/lib/src/dart/resolver/named_type_resolver.dart
index 3a0a002820f..13a4a489a5e 100644
--- a/pkg/analyzer/lib/src/dart/resolver/named_type_resolver.dart
+++ b/pkg/analyzer/lib/src/dart/resolver/named_type_resolver.dart
@@ -99,8 +99,8 @@ class NamedTypeResolver with ScopeHelpers {
         return;
       }
 
-      if (prefixElement is InterfaceElement2 ||
-          prefixElement is TypeAliasElement2) {
+      if (prefixElement is InterfaceElement ||
+          prefixElement is TypeAliasElement) {
         _rewriteToConstructorName(
           node: node,
           importPrefix: importPrefix,
@@ -110,7 +110,7 @@ class NamedTypeResolver with ScopeHelpers {
         return;
       }
 
-      if (prefixElement is PrefixElement2) {
+      if (prefixElement is PrefixElement) {
         var nameToken = node.name2;
         var element = _lookupGetter(prefixElement.scope, nameToken);
         _resolveToElement(node, element, dataForTesting: dataForTesting);
@@ -208,7 +208,7 @@ class NamedTypeResolver with ScopeHelpers {
 
   TypeImpl _instantiateElement(
     NamedTypeImpl node,
-    Element2 element, {
+    Element element, {
     required TypeConstraintGenerationDataForTesting? dataForTesting,
   }) {
     var nullability = _getNullability(node);
@@ -300,7 +300,7 @@ class NamedTypeResolver with ScopeHelpers {
     return NeverTypeImpl.instance.withNullability(nullability);
   }
 
-  Element2? _lookupGetter(Scope scope, Token nameToken) {
+  Element? _lookupGetter(Scope scope, Token nameToken) {
     var scopeLookupResult = scope.lookup(nameToken.lexeme);
     reportDeprecatedExportUseGetter(
       scopeLookupResult: scopeLookupResult,
@@ -311,7 +311,7 @@ class NamedTypeResolver with ScopeHelpers {
 
   void _resolveToElement(
     NamedTypeImpl node,
-    Element2? element, {
+    Element? element, {
     required TypeConstraintGenerationDataForTesting? dataForTesting,
   }) {
     node.element2 = element;
@@ -324,7 +324,7 @@ class NamedTypeResolver with ScopeHelpers {
       return;
     }
 
-    if (element is MultiplyDefinedElement2) {
+    if (element is MultiplyDefinedElement) {
       node.type = InvalidTypeImpl.instance;
       return;
     }
@@ -339,12 +339,12 @@ class NamedTypeResolver with ScopeHelpers {
   }
 
   /// We parse `foo.bar` as `prefix.Name` with the expectation that `prefix`
-  /// will be a [PrefixElement2]. But when we resolved the `prefix` it turned
-  /// out to be a [ClassElement2], so it is probably a `Class.constructor`.
+  /// will be a [PrefixElement]. But when we resolved the `prefix` it turned
+  /// out to be a [ClassElement], so it is probably a `Class.constructor`.
   void _rewriteToConstructorName({
     required NamedTypeImpl node,
     required ImportPrefixReferenceImpl importPrefix,
-    required Element2 importPrefixElement,
+    required Element importPrefixElement,
     required Token nameToken,
   }) {
     var constructorName = node.parent;
@@ -433,7 +433,7 @@ class NamedTypeResolver with ScopeHelpers {
 
   TypeImpl _verifyTypeAliasForContext(
     NamedType node,
-    TypeAliasElement2 element,
+    TypeAliasElement element,
     TypeImpl type,
   ) {
     // If a type alias that expands to a type parameter.
@@ -533,7 +533,7 @@ class _ErrorHelper {
     return false;
   }
 
-  void reportNullOrNonTypeElement(NamedType node, Element2? element) {
+  void reportNullOrNonTypeElement(NamedType node, Element? element) {
     if (node.name2.isSynthetic) {
       return;
     }
@@ -626,7 +626,7 @@ class _ErrorHelper {
       return;
     }
 
-    if (element is LocalVariableElement2 || element is LocalFunctionElement) {
+    if (element is LocalVariableElement || element is LocalFunctionElement) {
       errorReporter.reportError(
         DiagnosticFactory().referencedBeforeDeclaration(
           errorReporter.source,
@@ -673,7 +673,7 @@ class _ErrorHelper {
     var firstToken = node.name2;
     var importPrefix = node.importPrefix;
     if (importPrefix != null) {
-      if (!skipImportPrefix || importPrefix.element2 is! PrefixElement2) {
+      if (!skipImportPrefix || importPrefix.element2 is! PrefixElement) {
         firstToken = importPrefix.name;
       }
     }
diff --git a/pkg/analyzer/lib/src/dart/resolver/postfix_expression_resolver.dart b/pkg/analyzer/lib/src/dart/resolver/postfix_expression_resolver.dart
index 041d6dcb99a..ec7a9ec91c3 100644
--- a/pkg/analyzer/lib/src/dart/resolver/postfix_expression_resolver.dart
+++ b/pkg/analyzer/lib/src/dart/resolver/postfix_expression_resolver.dart
@@ -98,8 +98,8 @@ class PostfixExpressionResolver {
   /// @return the static return type that was computed
   ///
   // TODO(scheglov): this is duplicate
-  TypeImpl _computeStaticReturnType(Element2? element) {
-    if (element is PropertyAccessorElement2) {
+  TypeImpl _computeStaticReturnType(Element? element) {
+    if (element is PropertyAccessorElement) {
       //
       // This is a function invocation expression disguised as something else.
       // We are invoking a getter and then invoking the returned function.
@@ -108,7 +108,7 @@ class PostfixExpressionResolver {
       return InvocationInferrer.computeInvokeReturnType(
         propertyType.returnType,
       );
-    } else if (element is ExecutableElement2) {
+    } else if (element is ExecutableElement) {
       return InvocationInferrer.computeInvokeReturnType(element.type);
     }
     return DynamicTypeImpl.instance;
@@ -146,7 +146,7 @@ class PostfixExpressionResolver {
       propertyErrorEntity: node.operator,
       nameErrorEntity: operand,
     );
-    node.element = result.getter2 as MethodElement2?;
+    node.element = result.getter2 as MethodElement?;
     if (result.needsGetterError) {
       if (operand is SuperExpression) {
         _errorReporter.atToken(
diff --git a/pkg/analyzer/lib/src/dart/resolver/prefix_expression_resolver.dart b/pkg/analyzer/lib/src/dart/resolver/prefix_expression_resolver.dart
index 095b41f0341..8f04d91caf2 100644
--- a/pkg/analyzer/lib/src/dart/resolver/prefix_expression_resolver.dart
+++ b/pkg/analyzer/lib/src/dart/resolver/prefix_expression_resolver.dart
@@ -116,8 +116,8 @@ class PrefixExpressionResolver {
   /// @return the static return type that was computed
   ///
   // TODO(scheglov): this is duplicate
-  TypeImpl _computeStaticReturnType(Element2? element) {
-    if (element is PropertyAccessorElement2) {
+  TypeImpl _computeStaticReturnType(Element? element) {
+    if (element is PropertyAccessorElement) {
       //
       // This is a function invocation expression disguised as something else.
       // We are invoking a getter and then invoking the returned function.
@@ -126,7 +126,7 @@ class PrefixExpressionResolver {
       return InvocationInferrer.computeInvokeReturnType(
         propertyType.returnType,
       );
-    } else if (element is ExecutableElement2) {
+    } else if (element is ExecutableElement) {
       return InvocationInferrer.computeInvokeReturnType(element.type);
     }
     return InvalidTypeImpl.instance;
@@ -189,7 +189,7 @@ class PrefixExpressionResolver {
         propertyErrorEntity: node.operator,
         nameErrorEntity: operand,
       );
-      node.element = result.getter2 as MethodElement2?;
+      node.element = result.getter2 as MethodElement?;
       if (result.needsGetterError) {
         if (operand is SuperExpression) {
           _errorReporter.atToken(
diff --git a/pkg/analyzer/lib/src/dart/resolver/prefixed_identifier_resolver.dart b/pkg/analyzer/lib/src/dart/resolver/prefixed_identifier_resolver.dart
index 8108d94bf07..f1636da268f 100644
--- a/pkg/analyzer/lib/src/dart/resolver/prefixed_identifier_resolver.dart
+++ b/pkg/analyzer/lib/src/dart/resolver/prefixed_identifier_resolver.dart
@@ -32,7 +32,7 @@ class PrefixedIdentifierResolver {
     _resolver.checkUnreachableNode(node.identifier);
 
     var prefixElement = node.prefix.element;
-    if (prefixElement is! PrefixElement2) {
+    if (prefixElement is! PrefixElement) {
       var prefixType = node.prefix.staticType;
       // TODO(scheglov): It would be nice to rewrite all such cases.
       if (prefixType != null) {
@@ -63,7 +63,7 @@ class PrefixedIdentifierResolver {
     var identifier = node.identifier;
     identifier.element = element;
 
-    if (element is ExtensionElement2) {
+    if (element is ExtensionElement) {
       _setExtensionIdentifierType(node);
       return null;
     }
@@ -79,7 +79,7 @@ class PrefixedIdentifierResolver {
         result.readElementRecovery2 != null) {
       // Since the element came from error recovery logic, its type isn't
       // trustworthy; leave it as `dynamic`.
-    } else if (element is InterfaceElement2) {
+    } else if (element is InterfaceElement) {
       if (_isExpressionIdentifier(node)) {
         var type = _typeProvider.typeType;
         node.recordStaticType(type, resolver: _resolver);
@@ -93,7 +93,7 @@ class PrefixedIdentifierResolver {
       node.recordStaticType(type, resolver: _resolver);
       identifier.setPseudoExpressionStaticType(type);
       return null;
-    } else if (element is TypeAliasElement2) {
+    } else if (element is TypeAliasElement) {
       if (node.parent is NamedType) {
         // no type
       } else {
@@ -102,13 +102,13 @@ class PrefixedIdentifierResolver {
         identifier.setPseudoExpressionStaticType(type);
       }
       return null;
-    } else if (element is MethodElement2) {
+    } else if (element is MethodElement) {
       type = element.type;
-    } else if (element is PropertyAccessorElement2) {
+    } else if (element is PropertyAccessorElement) {
       type = result.getType!;
-    } else if (element is ExecutableElement2) {
+    } else if (element is ExecutableElement) {
       type = element.type;
-    } else if (element is VariableElement2) {
+    } else if (element is VariableElement) {
       type = element.type;
     } else if (result.functionTypeCallType != null) {
       type = result.functionTypeCallType!;
diff --git a/pkg/analyzer/lib/src/dart/resolver/property_element_resolver.dart b/pkg/analyzer/lib/src/dart/resolver/property_element_resolver.dart
index 36ca1950a3c..dbe721915e3 100644
--- a/pkg/analyzer/lib/src/dart/resolver/property_element_resolver.dart
+++ b/pkg/analyzer/lib/src/dart/resolver/property_element_resolver.dart
@@ -196,7 +196,7 @@ class PropertyElementResolver with ScopeHelpers {
     var identifier = node.identifier;
 
     var prefixElement = prefix.element;
-    if (prefixElement is PrefixElement2) {
+    if (prefixElement is PrefixElement) {
       return _resolveTargetPrefixElement(
         target: prefixElement,
         identifier: identifier,
@@ -281,8 +281,8 @@ class PropertyElementResolver with ScopeHelpers {
       hasWrite: hasWrite,
     );
 
-    Element2? readElementRequested;
-    Element2? readElementRecovery;
+    Element? readElementRequested;
+    Element? readElementRecovery;
     TypeImpl? getType;
     if (hasRead) {
       var readLookup =
@@ -320,8 +320,8 @@ class PropertyElementResolver with ScopeHelpers {
       _resolver.checkReadOfNotAssignedLocalVariable(node, readElementRequested);
     }
 
-    Element2? writeElementRequested;
-    Element2? writeElementRecovery;
+    Element? writeElementRequested;
+    Element? writeElementRecovery;
     if (hasWrite) {
       var writeLookup =
           LexicalLookup.resolveSetter(scopeLookupResult) ??
@@ -351,7 +351,7 @@ class PropertyElementResolver with ScopeHelpers {
   /// Returns `true` if an error was reported.
   bool _checkForStaticAccessToInstanceMember(
     SimpleIdentifier identifier,
-    ExecutableElement2 element,
+    ExecutableElement element,
   ) {
     if (element.isStatic) return false;
 
@@ -366,7 +366,7 @@ class PropertyElementResolver with ScopeHelpers {
   void _checkForStaticMember(
     Expression target,
     SimpleIdentifier propertyName,
-    ExecutableElement2? element,
+    ExecutableElement? element,
   ) {
     if (element != null && element.isStatic) {
       if (target is ExtensionOverride) {
@@ -376,7 +376,7 @@ class PropertyElementResolver with ScopeHelpers {
         );
       } else {
         var enclosingElement = element.enclosingElement2;
-        if (enclosingElement is ExtensionElement2 &&
+        if (enclosingElement is ExtensionElement &&
             enclosingElement.name3 == null) {
           _resolver.errorReporter.atNode(
             propertyName,
@@ -395,7 +395,7 @@ class PropertyElementResolver with ScopeHelpers {
               propertyName.name,
               element.kind.displayName,
               enclosingElement!.name3!,
-              enclosingElement is MixinElement2
+              enclosingElement is MixinElement
                   ? 'mixin'
                   : enclosingElement.kind.displayName,
             ],
@@ -405,7 +405,7 @@ class PropertyElementResolver with ScopeHelpers {
     }
   }
 
-  bool _isAccessible(ExecutableElement2 element) {
+  bool _isAccessible(ExecutableElement element) {
     return element.isAccessibleIn2(_definingLibrary);
   }
 
@@ -444,7 +444,7 @@ class PropertyElementResolver with ScopeHelpers {
     //
     if (target is IdentifierImpl) {
       var targetElement = target.element;
-      if (targetElement is InterfaceElement2) {
+      if (targetElement is InterfaceElement) {
         return _resolveTargetInterfaceElement(
           typeReference: targetElement,
           isCascaded: isCascaded,
@@ -452,7 +452,7 @@ class PropertyElementResolver with ScopeHelpers {
           hasRead: hasRead,
           hasWrite: hasWrite,
         );
-      } else if (targetElement is TypeAliasElement2) {
+      } else if (targetElement is TypeAliasElement) {
         var aliasedType = targetElement.aliasedType;
         if (aliasedType is InterfaceType) {
           return _resolveTargetInterfaceElement(
@@ -473,7 +473,7 @@ class PropertyElementResolver with ScopeHelpers {
     //
     if (target is IdentifierImpl) {
       var targetElement = target.element;
-      if (targetElement is ExtensionElement2) {
+      if (targetElement is ExtensionElement) {
         return _resolveTargetExtensionElement(
           extension: targetElement,
           propertyName: propertyName,
@@ -485,7 +485,7 @@ class PropertyElementResolver with ScopeHelpers {
 
     var targetType = target.typeOrThrow;
 
-    if (propertyName.name == MethodElement2.CALL_METHOD_NAME) {
+    if (propertyName.name == MethodElement.CALL_METHOD_NAME) {
       if (targetType is FunctionType || targetType.isDartCoreFunction) {
         return PropertyElementResolverResult(functionTypeCallType: targetType);
       }
@@ -587,15 +587,15 @@ class PropertyElementResolver with ScopeHelpers {
   }
 
   PropertyElementResolverResult _resolveTargetExtensionElement({
-    required ExtensionElement2 extension,
+    required ExtensionElement extension,
     required SimpleIdentifier propertyName,
     required bool hasRead,
     required bool hasWrite,
   }) {
     var memberName = propertyName.name;
 
-    ExecutableElement2? readElement;
-    ExecutableElement2? readElementRecovery;
+    ExecutableElement? readElement;
+    ExecutableElement? readElementRecovery;
     DartType? getType;
     if (hasRead) {
       readElement ??= extension.getGetter2(memberName);
@@ -619,8 +619,8 @@ class PropertyElementResolver with ScopeHelpers {
       }
     }
 
-    ExecutableElement2? writeElement;
-    ExecutableElement2? writeElementRecovery;
+    ExecutableElement? writeElement;
+    ExecutableElement? writeElementRecovery;
     if (hasWrite) {
       writeElement = extension.getSetter2(memberName);
 
@@ -666,7 +666,7 @@ class PropertyElementResolver with ScopeHelpers {
 
     var result = _extensionResolver.getOverrideMember(target, memberName);
 
-    ExecutableElement2? readElement;
+    ExecutableElement? readElement;
     DartType? getType;
     if (hasRead) {
       readElement = result.getter2;
@@ -685,7 +685,7 @@ class PropertyElementResolver with ScopeHelpers {
       _checkForStaticMember(target, propertyName, readElement);
     }
 
-    ExecutableElement2? writeElement;
+    ExecutableElement? writeElement;
     if (hasWrite) {
       writeElement = result.setter2;
       if (writeElement == null) {
@@ -709,7 +709,7 @@ class PropertyElementResolver with ScopeHelpers {
   }
 
   PropertyElementResolverResult _resolveTargetInterfaceElement({
-    required InterfaceElement2 typeReference,
+    required InterfaceElement typeReference,
     required bool isCascaded,
     required SimpleIdentifier propertyName,
     required bool hasRead,
@@ -719,8 +719,8 @@ class PropertyElementResolver with ScopeHelpers {
       typeReference = _resolver.typeProvider.typeType.element3;
     }
 
-    ExecutableElement2? readElement;
-    ExecutableElement2? readElementRecovery;
+    ExecutableElement? readElement;
+    ExecutableElement? readElementRecovery;
     DartType? getType;
     if (hasRead) {
       readElement = typeReference.getGetter2(propertyName.name);
@@ -743,7 +743,7 @@ class PropertyElementResolver with ScopeHelpers {
         }
       } else {
         var code =
-            typeReference is EnumElement2
+            typeReference is EnumElement
                 ? CompileTimeErrorCode.UNDEFINED_ENUM_CONSTANT
                 : CompileTimeErrorCode.UNDEFINED_GETTER;
         errorReporter.atNode(
@@ -754,8 +754,8 @@ class PropertyElementResolver with ScopeHelpers {
       }
     }
 
-    ExecutableElement2? writeElement;
-    ExecutableElement2? writeElementRecovery;
+    ExecutableElement? writeElement;
+    ExecutableElement? writeElementRecovery;
     if (hasWrite) {
       writeElement = typeReference.getSetter2(propertyName.name);
       if (writeElement != null) {
@@ -792,7 +792,7 @@ class PropertyElementResolver with ScopeHelpers {
   }
 
   PropertyElementResolverResult _resolveTargetPrefixElement({
-    required PrefixElement2 target,
+    required PrefixElement target,
     required SimpleIdentifier identifier,
     required bool hasRead,
     required bool hasWrite,
@@ -809,7 +809,7 @@ class PropertyElementResolver with ScopeHelpers {
     var readElement = lookupResult.getter2;
     var writeElement = lookupResult.setter2;
     DartType? getType;
-    if (hasRead && readElement is PropertyAccessorElement2) {
+    if (hasRead && readElement is PropertyAccessorElement) {
       getType = readElement.returnType;
     }
 
@@ -965,10 +965,10 @@ class PropertyElementResolver with ScopeHelpers {
 }
 
 class PropertyElementResolverResult {
-  final Element2? readElementRequested2;
-  final Element2? readElementRecovery2;
-  final Element2? writeElementRequested2;
-  final Element2? writeElementRecovery2;
+  final Element? readElementRequested2;
+  final Element? readElementRecovery2;
+  final Element? writeElementRequested2;
+  final Element? writeElementRecovery2;
   final bool atDynamicTarget;
   final DartType? functionTypeCallType;
   final RecordTypeFieldImpl? recordField;
@@ -990,11 +990,11 @@ class PropertyElementResolverResult {
     this.getType,
   });
 
-  Element2? get readElement2 {
+  Element? get readElement2 {
     return readElementRequested2 ?? readElementRecovery2;
   }
 
-  Element2? get writeElement2 {
+  Element? get writeElement2 {
     return writeElementRequested2 ?? writeElementRecovery2;
   }
 }
diff --git a/pkg/analyzer/lib/src/dart/resolver/record_type_annotation_resolver.dart b/pkg/analyzer/lib/src/dart/resolver/record_type_annotation_resolver.dart
index ff0b21cb261..d20561e48cd 100644
--- a/pkg/analyzer/lib/src/dart/resolver/record_type_annotation_resolver.dart
+++ b/pkg/analyzer/lib/src/dart/resolver/record_type_annotation_resolver.dart
@@ -19,7 +19,7 @@ import 'package:analyzer/src/error/codes.g.dart';
 class RecordTypeAnnotationResolver {
   final TypeProviderImpl typeProvider;
   final ErrorReporter errorReporter;
-  final LibraryElement2 libraryElement;
+  final LibraryElement libraryElement;
 
   RecordTypeAnnotationResolver({
     required this.typeProvider,
diff --git a/pkg/analyzer/lib/src/dart/resolver/resolution_visitor.dart b/pkg/analyzer/lib/src/dart/resolver/resolution_visitor.dart
index 1af303571c2..61762626034 100644
--- a/pkg/analyzer/lib/src/dart/resolver/resolution_visitor.dart
+++ b/pkg/analyzer/lib/src/dart/resolver/resolution_visitor.dart
@@ -79,7 +79,7 @@ class ResolutionVisitor extends RecursiveAstVisitor<void> {
   final RecordTypeAnnotationResolver _recordTypeResolver;
 
   /// This index is incremented every time we visit a [LibraryDirective].
-  /// There is just one [LibraryElement2], so we can support only one node.
+  /// There is just one [LibraryElement], so we can support only one node.
   int _libraryDirectiveIndex = 0;
 
   /// The provider of pre-built children elements from the element being
@@ -201,7 +201,7 @@ class ResolutionVisitor extends RecursiveAstVisitor<void> {
         CompileTimeErrorCode.UNDEFINED_IDENTIFIER,
         arguments: [name],
       );
-    } else if (!(element is LocalVariableElement2 ||
+    } else if (!(element is LocalVariableElement ||
         element is FormalParameterElement)) {
       _errorReporter.atToken(
         node.name,
@@ -999,7 +999,7 @@ class ResolutionVisitor extends RecursiveAstVisitor<void> {
           _labelScope,
           labelNameNode.name,
           unlabeled,
-          labelNameNode.element as LabelElement2,
+          labelNameNode.element as LabelElement,
         );
       }
       unlabeled.accept(this);
@@ -1570,14 +1570,14 @@ class ResolutionVisitor extends RecursiveAstVisitor<void> {
     node.elementAnnotation = element;
   }
 
-  void _define(Element2 element) {
+  void _define(Element element) {
     if (_nameScope case LocalScope nameScope) {
       nameScope.add(element);
     }
   }
 
   /// Define given [elements] in the [_nameScope].
-  void _defineElements(List<Element2> elements) {
+  void _defineElements(List<Element> elements) {
     int length = elements.length;
     for (int i = 0; i < length; i++) {
       var element = elements[i];
@@ -1698,9 +1698,9 @@ class ResolutionVisitor extends RecursiveAstVisitor<void> {
 
     var element = type.element3;
     switch (element) {
-      case ClassElement2():
+      case ClassElement():
         return;
-      case MixinElement2():
+      case MixinElement():
         if (clause is ImplementsClause ||
             clause is MixinOnClause ||
             clause is WithClause) {
@@ -2024,7 +2024,7 @@ class _VariableBinderErrors
     required covariant LogicalOrPatternImpl node,
     required bool hasInLeft,
     required String name,
-    required PromotableElement2 variable,
+    required PromotableElement variable,
   }) {
     visitor._errorReporter.atNode(
       hasInLeft ? node.rightOperand : node.leftOperand,
diff --git a/pkg/analyzer/lib/src/dart/resolver/scope.dart b/pkg/analyzer/lib/src/dart/resolver/scope.dart
index 84263db8882..2a02ec13d30 100644
--- a/pkg/analyzer/lib/src/dart/resolver/scope.dart
+++ b/pkg/analyzer/lib/src/dart/resolver/scope.dart
@@ -13,7 +13,7 @@ import 'package:analyzer/src/generated/engine.dart';
 class BlockScope {
   /// Return the elements that are declared directly in the given [statements].
   /// This does not include elements declared in nested blocks.
-  static Iterable<Element2> elementsInStatements(
+  static Iterable<Element> elementsInStatements(
     List<Statement> statements,
   ) sync* {
     int statementCount = statements.length;
@@ -86,7 +86,7 @@ class LabelScope {
   final String _label;
 
   /// The element to which the label resolves.
-  final LabelElement2 element;
+  final LabelElement element;
 
   /// The AST node to which the label resolves.
   final AstNode node;
@@ -115,23 +115,23 @@ class Namespace {
 
   /// A table mapping names that are defined in this namespace to the element
   /// representing the thing declared with that name.
-  final Map<String, Element2> _definedNames;
+  final Map<String, Element> _definedNames;
 
   /// Initialize a newly created namespace to have the [_definedNames].
   Namespace(this._definedNames);
 
   /// Return a table containing the same mappings as those defined by this
   /// namespace.
-  Map<String, Element2> get definedNames2 => _definedNames;
+  Map<String, Element> get definedNames2 => _definedNames;
 
   /// Return the element in this namespace that is available to the containing
   /// scope using the given name, or `null` if there is no such element.
-  Element2? get2(String name) => _definedNames[name];
+  Element? get2(String name) => _definedNames[name];
 
   /// Return the element in this namespace whose name is the result of combining
   /// the [prefix] and the [name], separated by a period, or `null` if there is
   /// no such element.
-  Element2? getPrefixed2(String prefix, String name) => null;
+  Element? getPrefixed2(String prefix, String name) => null;
 }
 
 /// The builder used to build a namespace. Namespace builders are thread-safe
@@ -180,7 +180,7 @@ class NamespaceBuilder {
   /// Create a namespace representing the public namespace of the given
   /// [library].
   Namespace createPublicNamespaceForLibrary(LibraryElementImpl library) {
-    var definedNames = <String, Element2>{};
+    var definedNames = <String, Element>{};
     for (var element in library.classes) {
       _addIfPublic(definedNames, element);
     }
@@ -223,7 +223,7 @@ class NamespaceBuilder {
 
   /// Add the given [element] to the table of [definedNames] if it has a
   /// publicly visible name.
-  void _addIfPublic(Map<String, Element2> definedNames, Element2 element) {
+  void _addIfPublic(Map<String, Element> definedNames, Element element) {
     var name = element.name3;
     if (name != null && name.isNotEmpty && !Identifier.isPrivateName(name)) {
       definedNames[name] = element;
@@ -232,8 +232,8 @@ class NamespaceBuilder {
 
   /// Apply the given [combinators] to all of the names in the given table of
   /// [definedNames].
-  Map<String, Element2> _applyCombinators(
-    Map<String, Element2> definedNames,
+  Map<String, Element> _applyCombinators(
+    Map<String, Element> definedNames,
     List<NamespaceCombinator> combinators,
   ) {
     for (NamespaceCombinator combinator in combinators) {
@@ -251,14 +251,14 @@ class NamespaceBuilder {
     return definedNames;
   }
 
-  Map<String, Element2> _getExportMapping(LibraryElementImpl library) {
+  Map<String, Element> _getExportMapping(LibraryElementImpl library) {
     return library.exportNamespace.definedNames2;
   }
 
   /// Return a new map of names which has all the names from [definedNames]
   /// with exception of [hiddenNames].
-  Map<String, Element2> _hide(
-    Map<String, Element2> definedNames,
+  Map<String, Element> _hide(
+    Map<String, Element> definedNames,
     List<String> hiddenNames,
   ) {
     var newNames = {...definedNames};
@@ -270,11 +270,11 @@ class NamespaceBuilder {
   }
 
   /// Return a new map of names which has only [shownNames] from [definedNames].
-  Map<String, Element2> _show(
-    Map<String, Element2> definedNames,
+  Map<String, Element> _show(
+    Map<String, Element> definedNames,
     List<String> shownNames,
   ) {
-    var newNames = <String, Element2>{};
+    var newNames = <String, Element>{};
     for (String name in shownNames) {
       var element = definedNames[name];
       if (element != null) {
@@ -302,7 +302,7 @@ class PrefixedNamespace implements Namespace {
   /// A table mapping names that are defined in this namespace to the element
   /// representing the thing declared with that name.
   @override
-  final Map<String, Element2> _definedNames;
+  final Map<String, Element> _definedNames;
 
   /// Initialize a newly created namespace to have the names resulting from
   /// prefixing each of the [_definedNames] with the given [_prefix] (and a
@@ -312,12 +312,12 @@ class PrefixedNamespace implements Namespace {
       _length = prefix.length;
 
   @override
-  Map<String, Element2> get definedNames2 {
+  Map<String, Element> get definedNames2 {
     return _definedNames;
   }
 
   @override
-  Element2? get2(String name) {
+  Element? get2(String name) {
     if (name.length > _length && name.startsWith(_prefix)) {
       if (name.codeUnitAt(_length) == '.'.codeUnitAt(0)) {
         return _definedNames[name.substring(_length + 1)];
@@ -327,7 +327,7 @@ class PrefixedNamespace implements Namespace {
   }
 
   @override
-  Element2? getPrefixed2(String prefix, String name) {
+  Element? getPrefixed2(String prefix, String name) {
     if (prefix == _prefix) {
       return _definedNames[name];
     }
diff --git a/pkg/analyzer/lib/src/dart/resolver/shared_type_analyzer.dart b/pkg/analyzer/lib/src/dart/resolver/shared_type_analyzer.dart
index 5f979bbfc1d..60904b73f56 100644
--- a/pkg/analyzer/lib/src/dart/resolver/shared_type_analyzer.dart
+++ b/pkg/analyzer/lib/src/dart/resolver/shared_type_analyzer.dart
@@ -53,7 +53,7 @@ class SharedTypeAnalyzerErrors
 
   @override
   void duplicateAssignmentPatternVariable({
-    required covariant PromotableElement2 variable,
+    required covariant PromotableElement variable,
     required covariant AssignedVariablePatternImpl original,
     required covariant AssignedVariablePatternImpl duplicate,
   }) {
@@ -109,8 +109,8 @@ class SharedTypeAnalyzerErrors
 
   @override
   void inconsistentJoinedPatternVariable({
-    required PromotableElement2 variable,
-    required PromotableElement2 component,
+    required PromotableElement variable,
+    required PromotableElement component,
   }) {
     _errorReporter.atElement2(
       component,
diff --git a/pkg/analyzer/lib/src/dart/resolver/simple_identifier_resolver.dart b/pkg/analyzer/lib/src/dart/resolver/simple_identifier_resolver.dart
index 6e506901577..dcbb15ff23b 100644
--- a/pkg/analyzer/lib/src/dart/resolver/simple_identifier_resolver.dart
+++ b/pkg/analyzer/lib/src/dart/resolver/simple_identifier_resolver.dart
@@ -50,7 +50,7 @@ class SimpleIdentifierResolver with ScopeHelpers {
   /// @return the type that should be recorded for a node that resolved to the given accessor
   ///
   // TODO(scheglov): this is duplicate
-  DartType _getTypeOfProperty(PropertyAccessorElement2 accessor) {
+  DartType _getTypeOfProperty(PropertyAccessorElement accessor) {
     FunctionType functionType = accessor.type;
     if (accessor is SetterElement) {
       var parameterTypes = functionType.normalParameterTypes;
@@ -135,7 +135,7 @@ class SimpleIdentifierResolver with ScopeHelpers {
     if (node.inDeclarationContext()) {
       return null;
     }
-    if (node.element is LocalVariableElement2 ||
+    if (node.element is LocalVariableElement ||
         node.element is FormalParameterElement) {
       return null;
     }
@@ -204,7 +204,7 @@ class SimpleIdentifierResolver with ScopeHelpers {
         !identical(element, enclosingClass)) {
       // This error is now reported by the parser.
       element = null;
-    } else if (element is PrefixElement2 && !_isValidAsPrefix(node)) {
+    } else if (element is PrefixElement && !_isValidAsPrefix(node)) {
       if (element.name3 case var name?) {
         errorReporter.atNode(
           node,
@@ -244,21 +244,21 @@ class SimpleIdentifierResolver with ScopeHelpers {
 
     var element = node.element;
 
-    if (element is ExtensionElement2) {
+    if (element is ExtensionElement) {
       _setExtensionIdentifierType(node);
       inferenceLogWriter?.recordExpressionWithNoType(node);
       return;
     }
 
     DartType staticType = InvalidTypeImpl.instance;
-    if (element is InterfaceElement2) {
+    if (element is InterfaceElement) {
       if (_isExpressionIdentifier(node)) {
         node.recordStaticType(_typeProvider.typeType, resolver: _resolver);
       } else {
         inferenceLogWriter?.recordExpressionWithNoType(node);
       }
       return;
-    } else if (element is TypeAliasElement2) {
+    } else if (element is TypeAliasElement) {
       if (_isExpressionIdentifier(node) ||
           element.aliasedType is! InterfaceType) {
         node.recordStaticType(_typeProvider.typeType, resolver: _resolver);
@@ -266,20 +266,20 @@ class SimpleIdentifierResolver with ScopeHelpers {
         inferenceLogWriter?.recordExpressionWithNoType(node);
       }
       return;
-    } else if (element is MethodElement2) {
+    } else if (element is MethodElement) {
       staticType = element.type;
-    } else if (element is PropertyAccessorElement2) {
+    } else if (element is PropertyAccessorElement) {
       staticType = propertyResult?.getType ?? _getTypeOfProperty(element);
-    } else if (element is ExecutableElement2) {
+    } else if (element is ExecutableElement) {
       staticType = element.type;
-    } else if (element is TypeParameterElement2) {
+    } else if (element is TypeParameterElement) {
       staticType = _typeProvider.typeType;
-    } else if (element is VariableElement2) {
+    } else if (element is VariableElement) {
       staticType = _resolver.localVariableTypeProvider.getType(
         node,
         isRead: node.inGetterContext(),
       );
-    } else if (element is PrefixElement2) {
+    } else if (element is PrefixElement) {
       var parent = node.parent;
       if (parent is PrefixedIdentifier && parent.prefix == node ||
           parent is MethodInvocation && parent.target == node) {
diff --git a/pkg/analyzer/lib/src/dart/resolver/type_property_resolver.dart b/pkg/analyzer/lib/src/dart/resolver/type_property_resolver.dart
index 8acab577b8f..3f61b9b9317 100644
--- a/pkg/analyzer/lib/src/dart/resolver/type_property_resolver.dart
+++ b/pkg/analyzer/lib/src/dart/resolver/type_property_resolver.dart
@@ -194,7 +194,7 @@ class TypePropertyResolver {
           return _toResult();
         }
         if (receiverTypeResolved.isDartCoreFunction &&
-            _name == MethodElement2.CALL_METHOD_NAME) {
+            _name == MethodElement.CALL_METHOD_NAME) {
           _needsGetterError = false;
           _needsSetterError = false;
           return _toResult();
@@ -202,7 +202,7 @@ class TypePropertyResolver {
       }
 
       if (receiverTypeResolved is FunctionTypeImpl &&
-          _name == MethodElement2.CALL_METHOD_NAME) {
+          _name == MethodElement.CALL_METHOD_NAME) {
         return ResolutionResult(
           needsGetterError: false,
           needsSetterError: false,
diff --git a/pkg/analyzer/lib/src/dart/resolver/variable_declaration_resolver.dart b/pkg/analyzer/lib/src/dart/resolver/variable_declaration_resolver.dart
index a4a6f6637d9..78646245905 100644
--- a/pkg/analyzer/lib/src/dart/resolver/variable_declaration_resolver.dart
+++ b/pkg/analyzer/lib/src/dart/resolver/variable_declaration_resolver.dart
@@ -40,7 +40,7 @@ class VariableDeclarationResolver {
 
     var element = node.declaredFragment!.element;
     var isTopLevel =
-        element is FieldElement2 || element is TopLevelVariableElement2;
+        element is FieldElement || element is TopLevelVariableElement;
 
     if (isTopLevel) {
       _resolver.flowAnalysis.bodyOrInitializer_enter(node, null);
diff --git a/pkg/analyzer/lib/src/diagnostic/diagnostic_factory.dart b/pkg/analyzer/lib/src/diagnostic/diagnostic_factory.dart
index 2cdbc6da661..06e9b9e28b5 100644
--- a/pkg/analyzer/lib/src/diagnostic/diagnostic_factory.dart
+++ b/pkg/analyzer/lib/src/diagnostic/diagnostic_factory.dart
@@ -21,7 +21,7 @@ class DiagnosticFactory {
   /// as a previous [original] node in a pattern assignment.
   AnalysisError duplicateAssignmentPatternVariable({
     required Source source,
-    required PromotableElement2 variable,
+    required PromotableElement variable,
     required AssignedVariablePatternImpl original,
     required AssignedVariablePatternImpl duplicate,
   }) {
@@ -47,8 +47,8 @@ class DiagnosticFactory {
   /// already used by [originalElement].
   AnalysisError duplicateDefinition(
     ErrorCode code,
-    Element2 duplicateElement,
-    Element2 originalElement,
+    Element duplicateElement,
+    Element originalElement,
     List<Object> arguments,
   ) {
     var duplicate = duplicateElement.nonSynthetic2;
@@ -316,8 +316,8 @@ class DiagnosticFactory {
     Source source,
     ErrorCode errorCode,
     SyntacticEntity errorNode,
-    ExecutableElement2 member,
-    ExecutableElement2 superMember,
+    ExecutableElement member,
+    ExecutableElement superMember,
     String memberName,
   ) {
     // Elements enclosing members that can participate in overrides are always
@@ -367,7 +367,7 @@ class DiagnosticFactory {
   AnalysisError referencedBeforeDeclaration(
     Source source, {
     required Token nameToken,
-    required Element2 element2,
+    required Element element2,
   }) {
     String name = nameToken.lexeme;
     List<DiagnosticMessage>? contextMessages;
diff --git a/pkg/analyzer/lib/src/error/annotation_verifier.dart b/pkg/analyzer/lib/src/error/annotation_verifier.dart
index 06aba99e682..7796b4455e9 100644
--- a/pkg/analyzer/lib/src/error/annotation_verifier.dart
+++ b/pkg/analyzer/lib/src/error/annotation_verifier.dart
@@ -19,7 +19,7 @@ class AnnotationVerifier {
   final ErrorReporter _errorReporter;
 
   /// The current library.
-  final LibraryElement2 _currentLibrary;
+  final LibraryElement _currentLibrary;
 
   /// The [WorkspacePackage] in which [_currentLibrary] is declared.
   final WorkspacePackage? _workspacePackage;
@@ -78,7 +78,7 @@ class AnnotationVerifier {
       }
 
       var element = type.element3;
-      if (element is InterfaceElement2 &&
+      if (element is InterfaceElement &&
           element.allSupertypes.any((t) => t.isDartAsyncFuture)) {
         return;
       }
@@ -209,7 +209,7 @@ class AnnotationVerifier {
       if (!_isValidTarget(parent, kinds)) {
         var invokedElement = element.element2!;
         var name = invokedElement.name3;
-        if (invokedElement is ConstructorElement2) {
+        if (invokedElement is ConstructorElement) {
           var className = invokedElement.enclosingElement2.name3;
           if (name!.isEmpty) {
             name = className;
@@ -285,8 +285,8 @@ class AnnotationVerifier {
   /// Reports a warning at [node] if its parent is not a valid target for a
   /// `@reopen` annotation.
   void _checkReopen(Annotation node) {
-    ClassElement2? classElement;
-    InterfaceElement2? superElement;
+    ClassElement? classElement;
+    InterfaceElement? superElement;
 
     var parent = node.parent;
     if (parent is ClassDeclaration) {
@@ -304,7 +304,7 @@ class AnnotationVerifier {
     if (classElement == null) {
       return;
     }
-    if (superElement is! ClassElement2) {
+    if (superElement is! ClassElement) {
       return;
     }
     if (classElement.isFinal ||
@@ -415,7 +415,7 @@ class AnnotationVerifier {
       } else if (parent.declaredFragment?.element case var declaredElement?) {
         if (element.isVisibleForOverriding &&
             (!declaredElement.isInstanceMember ||
-                declaredElement.enclosingElement2 is ExtensionTypeElement2)) {
+                declaredElement.enclosingElement2 is ExtensionTypeElement)) {
           reportInvalidVisibleForOverriding();
         }
 
@@ -457,7 +457,7 @@ class AnnotationVerifier {
         return;
     }
 
-    InterfaceElement2? declaredElement;
+    InterfaceElement? declaredElement;
     switch (containedDeclaration.parent) {
       case ClassDeclaration classDeclaration:
         declaredElement = classDeclaration.declaredFragment?.element;
diff --git a/pkg/analyzer/lib/src/error/assignment_verifier.dart b/pkg/analyzer/lib/src/error/assignment_verifier.dart
index 61149342dd5..0d38dea3b53 100644
--- a/pkg/analyzer/lib/src/error/assignment_verifier.dart
+++ b/pkg/analyzer/lib/src/error/assignment_verifier.dart
@@ -29,12 +29,12 @@ class AssignmentVerifier {
   /// [CompileTimeErrorCode.UNDEFINED_IDENTIFIER].
   void verify({
     required SimpleIdentifier node,
-    required Element2? requested,
-    required Element2? recovery,
+    required Element? requested,
+    required Element? recovery,
     required DartType? receiverType,
   }) {
     if (requested != null) {
-      if (requested is VariableElement2) {
+      if (requested is VariableElement) {
         if (requested.isConst) {
           _errorReporter.atNode(node, CompileTimeErrorCode.ASSIGNMENT_TO_CONST);
         }
@@ -43,16 +43,16 @@ class AssignmentVerifier {
     }
 
     if (recovery is DynamicElementImpl2 ||
-        recovery is InterfaceElement2 ||
-        recovery is TypeAliasElement2 ||
-        recovery is TypeParameterElement2) {
+        recovery is InterfaceElement ||
+        recovery is TypeAliasElement ||
+        recovery is TypeParameterElement) {
       _errorReporter.atNode(node, CompileTimeErrorCode.ASSIGNMENT_TO_TYPE);
     } else if (recovery is LocalFunctionElement ||
         recovery is TopLevelFunctionElement) {
       _errorReporter.atNode(node, CompileTimeErrorCode.ASSIGNMENT_TO_FUNCTION);
-    } else if (recovery is MethodElement2) {
+    } else if (recovery is MethodElement) {
       _errorReporter.atNode(node, CompileTimeErrorCode.ASSIGNMENT_TO_METHOD);
-    } else if (recovery is PrefixElement2) {
+    } else if (recovery is PrefixElement) {
       if (recovery.name3 case var prefixName?) {
         _errorReporter.atNode(
           node,
@@ -73,7 +73,7 @@ class AssignmentVerifier {
 
       if (variable.isConst) {
         _errorReporter.atNode(node, CompileTimeErrorCode.ASSIGNMENT_TO_CONST);
-      } else if (variable is FieldElement2 && variable.isSynthetic) {
+      } else if (variable is FieldElement && variable.isSynthetic) {
         _errorReporter.atNode(
           node,
           CompileTimeErrorCode.ASSIGNMENT_TO_FINAL_NO_SETTER,
diff --git a/pkg/analyzer/lib/src/error/base_or_final_type_verifier.dart b/pkg/analyzer/lib/src/error/base_or_final_type_verifier.dart
index b4f59dca837..2dbe645c7e7 100644
--- a/pkg/analyzer/lib/src/error/base_or_final_type_verifier.dart
+++ b/pkg/analyzer/lib/src/error/base_or_final_type_verifier.dart
@@ -15,11 +15,11 @@ import 'package:analyzer/src/error/codes.dart';
 /// Helper for verifying that subelements of a base or final element must be
 /// base, final, or sealed.
 class BaseOrFinalTypeVerifier {
-  final LibraryElement2 _definingLibrary;
+  final LibraryElement _definingLibrary;
   final ErrorReporter _errorReporter;
 
   BaseOrFinalTypeVerifier({
-    required LibraryElement2 definingLibrary,
+    required LibraryElement definingLibrary,
     required ErrorReporter errorReporter,
   }) : _definingLibrary = definingLibrary,
        _errorReporter = errorReporter;
@@ -161,7 +161,7 @@ class BaseOrFinalTypeVerifier {
   /// either the current library is also a platform library,
   /// or the current library has a language version which predates
   /// class modifiers.
-  bool _mayIgnoreClassModifiers(LibraryElement2 superLibrary) {
+  bool _mayIgnoreClassModifiers(LibraryElement superLibrary) {
     // Only modifiers in platform libraries can be ignored.
     if (!superLibrary.isInSdk) return false;
 
@@ -238,7 +238,7 @@ class BaseOrFinalTypeVerifier {
         baseOrFinalSuperElement.library2 != element.library2) {
       if (baseOrFinalSuperElement.isBase) {
         var errorCode =
-            baseOrFinalSuperElement is MixinElement2
+            baseOrFinalSuperElement is MixinElement
                 ? CompileTimeErrorCode.BASE_MIXIN_IMPLEMENTED_OUTSIDE_OF_LIBRARY
                 : CompileTimeErrorCode
                     .BASE_CLASS_IMPLEMENTED_OUTSIDE_OF_LIBRARY;
@@ -275,7 +275,7 @@ class BaseOrFinalTypeVerifier {
           }
         }
         var errorCode =
-            element is MixinElement2
+            element is MixinElement
                 ? CompileTimeErrorCode.MIXIN_SUBTYPE_OF_FINAL_IS_NOT_BASE
                 : CompileTimeErrorCode
                     .SUBTYPE_OF_FINAL_IS_NOT_BASE_FINAL_OR_SEALED;
@@ -288,7 +288,7 @@ class BaseOrFinalTypeVerifier {
         return true;
       } else if (baseOrFinalSuperElement.isBase) {
         var errorCode =
-            element is MixinElement2
+            element is MixinElement
                 ? CompileTimeErrorCode.MIXIN_SUBTYPE_OF_BASE_IS_NOT_BASE
                 : CompileTimeErrorCode
                     .SUBTYPE_OF_BASE_IS_NOT_BASE_FINAL_OR_SEALED;
diff --git a/pkg/analyzer/lib/src/error/best_practices_verifier.dart b/pkg/analyzer/lib/src/error/best_practices_verifier.dart
index ca65047c984..71cc548b20d 100644
--- a/pkg/analyzer/lib/src/error/best_practices_verifier.dart
+++ b/pkg/analyzer/lib/src/error/best_practices_verifier.dart
@@ -45,7 +45,7 @@ import 'package:meta/meta.dart';
 class BestPracticesVerifier extends RecursiveAstVisitor<void> {
   /// The class containing the AST nodes being visited, or `null` if we are not
   /// in the scope of a class.
-  InterfaceElement2? _enclosingClass;
+  InterfaceElement? _enclosingClass;
 
   /// A flag indicating whether a surrounding member is annotated as
   /// `@doNotStore`.
@@ -391,9 +391,9 @@ class BestPracticesVerifier extends RecursiveAstVisitor<void> {
     try {
       super.visitFieldDeclaration(node);
       for (var field in node.fields.variables) {
-        ExecutableElement2? getOverriddenPropertyAccessor() {
+        ExecutableElement? getOverriddenPropertyAccessor() {
           var element = field.declaredFragment!.element;
-          if (element is PropertyAccessorElement2 || element is FieldElement2) {
+          if (element is PropertyAccessorElement || element is FieldElement) {
             var name = element.name3;
             if (name == null) {
               return null;
@@ -401,7 +401,7 @@ class BestPracticesVerifier extends RecursiveAstVisitor<void> {
             var nameObj = Name(_currentLibrary.source.uri, name);
             var enclosingElement = element.enclosingElement2!;
             var enclosingDeclaration = enclosingElement;
-            if (enclosingDeclaration is InterfaceElement2) {
+            if (enclosingDeclaration is InterfaceElement) {
               var overridden = _inheritanceManager.getMember4(
                 enclosingDeclaration,
                 nameObj,
@@ -615,8 +615,8 @@ class BestPracticesVerifier extends RecursiveAstVisitor<void> {
       }
 
       var elementIsOverride = false;
-      if (enclosingElement is InterfaceElement2) {
-        if (element is MethodElement2 || element is PropertyAccessorElement2) {
+      if (enclosingElement is InterfaceElement) {
+        if (element is MethodElement || element is PropertyAccessorElement) {
           elementIsOverride =
               _inheritanceManager.getOverridden4(enclosingElement, name) !=
               null;
@@ -635,7 +635,7 @@ class BestPracticesVerifier extends RecursiveAstVisitor<void> {
       }
 
       var overriddenElement =
-          enclosingElement is InterfaceElement2
+          enclosingElement is InterfaceElement
               ? _inheritanceManager.getMember4(
                 enclosingElement,
                 name,
@@ -921,8 +921,8 @@ class BestPracticesVerifier extends RecursiveAstVisitor<void> {
     /// Return `true` if the given class [element] or any superclass of it is
     /// annotated with the `@immutable` annotation.
     bool isOrInheritsImmutable(
-      InterfaceElement2 element,
-      Set<InterfaceElement2> visited,
+      InterfaceElement element,
+      Set<InterfaceElement> visited,
     ) {
       if (visited.add(element)) {
         if (element.metadata2.hasImmutable) {
@@ -945,18 +945,18 @@ class BestPracticesVerifier extends RecursiveAstVisitor<void> {
       return false;
     }
 
-    Iterable<String> nonFinalInstanceFields(InterfaceElement2 element) {
+    Iterable<String> nonFinalInstanceFields(InterfaceElement element) {
       return element.fields2
           .where(
-            (FieldElement2 field) =>
+            (FieldElement field) =>
                 !field.isSynthetic && !field.isFinal && !field.isStatic,
           )
-          .map((FieldElement2 field) => '${element.name3}.${field.name3}');
+          .map((FieldElement field) => '${element.name3}.${field.name3}');
     }
 
     Iterable<String> definedOrInheritedNonFinalInstanceFields(
-      InterfaceElement2 element,
-      Set<InterfaceElement2> visited,
+      InterfaceElement element,
+      Set<InterfaceElement> visited,
     ) {
       Iterable<String> nonFinalFields = [];
       if (visited.add(element)) {
@@ -978,12 +978,12 @@ class BestPracticesVerifier extends RecursiveAstVisitor<void> {
       return nonFinalFields;
     }
 
-    var element = node.declaredFragment!.element as InterfaceElement2;
-    if (isOrInheritsImmutable(element, HashSet<InterfaceElement2>())) {
+    var element = node.declaredFragment!.element as InterfaceElement;
+    if (isOrInheritsImmutable(element, HashSet<InterfaceElement>())) {
       Iterable<String> nonFinalFields =
           definedOrInheritedNonFinalInstanceFields(
             element,
-            HashSet<InterfaceElement2>(),
+            HashSet<InterfaceElement>(),
           );
       if (nonFinalFields.isNotEmpty) {
         _errorReporter.atToken(
@@ -1016,7 +1016,7 @@ class BestPracticesVerifier extends RecursiveAstVisitor<void> {
     var exportNamespace = NamespaceBuilder().createExportNamespaceForDirective2(
       libraryExport,
     );
-    exportNamespace.definedNames2.forEach((String name, Element2 element) {
+    exportNamespace.definedNames2.forEach((String name, Element element) {
       if (element case Annotatable annotatable) {
         if (annotatable.metadata2.hasInternal) {
           _errorReporter.atNode(
@@ -1027,7 +1027,7 @@ class BestPracticesVerifier extends RecursiveAstVisitor<void> {
           return;
         }
       }
-      if (element is ExecutableElement2) {
+      if (element is ExecutableElement) {
         var signatureTypes = [
           ...element.formalParameters.map((p) => p.type),
           element.returnType,
@@ -1048,7 +1048,7 @@ class BestPracticesVerifier extends RecursiveAstVisitor<void> {
   }
 
   void _checkForInvalidSealedSuperclass(NamedCompilationUnitMember node) {
-    bool currentPackageContains(Element2 element) {
+    bool currentPackageContains(Element element) {
       return _isLibraryInWorkspacePackage(element.library2);
     }
 
@@ -1056,14 +1056,14 @@ class BestPracticesVerifier extends RecursiveAstVisitor<void> {
     // ClassElement, but [_checkForInvalidSealedSuperclass] should only be
     // called with a [ClassOrMixinDeclaration], or a [ClassTypeAlias]. The
     // `declaredElement` of these specific classes is a [ClassElement].
-    var element = node.declaredFragment!.element as InterfaceElement2;
+    var element = node.declaredFragment!.element as InterfaceElement;
     // TODO(srawlins): Perhaps replace this with a getter on Element, like
     // `Element.hasOrInheritsSealed`?
     for (InterfaceType supertype in element.allSupertypes) {
       var superclass = supertype.element3;
       if (superclass.metadata2.hasSealed) {
         if (!currentPackageContains(superclass)) {
-          if (element is MixinElement2 &&
+          if (element is MixinElement &&
               element.superclassConstraints.contains(supertype)) {
             // This is a special violation of the sealed class contract,
             // requiring specific messaging.
@@ -1296,7 +1296,7 @@ class BestPracticesVerifier extends RecursiveAstVisitor<void> {
   ///
   /// Returns `true` if a warning code is generated for [node].
   bool _checkForUnnecessaryNoSuchMethod(MethodDeclaration node) {
-    if (node.name.lexeme != MethodElement2.NO_SUCH_METHOD_METHOD_NAME) {
+    if (node.name.lexeme != MethodElement.NO_SUCH_METHOD_METHOD_NAME) {
       return false;
     }
     bool isNonObjectNoSuchMethodInvocation(Expression? invocation) {
@@ -1304,11 +1304,11 @@ class BestPracticesVerifier extends RecursiveAstVisitor<void> {
           invocation.target is SuperExpression &&
           invocation.argumentList.arguments.length == 1) {
         SimpleIdentifier name = invocation.methodName;
-        if (name.name == MethodElement2.NO_SUCH_METHOD_METHOD_NAME) {
+        if (name.name == MethodElement.NO_SUCH_METHOD_METHOD_NAME) {
           var methodElement = name.element;
           var classElement = methodElement?.enclosingElement2;
-          return methodElement is MethodElement2 &&
-              classElement is ClassElement2 &&
+          return methodElement is MethodElement &&
+              classElement is ClassElement &&
               !classElement.isDartCoreObject;
         }
       }
@@ -1513,19 +1513,19 @@ class BestPracticesVerifier extends RecursiveAstVisitor<void> {
 
   /// Return subexpressions that are marked `@doNotStore`, as a map so that
   /// corresponding elements can be used in the diagnostic message.
-  Map<Expression, Element2> _getSubExpressionsMarkedDoNotStore(
+  Map<Expression, Element> _getSubExpressionsMarkedDoNotStore(
     Expression? expression, {
-    Map<Expression, Element2>? addTo,
+    Map<Expression, Element>? addTo,
   }) {
-    var expressions = addTo ?? <Expression, Element2>{};
+    var expressions = addTo ?? <Expression, Element>{};
 
-    Element2? element;
+    Element? element;
     if (expression is PropertyAccess) {
       element = expression.propertyName.element;
       // Tear-off.
       if (element is LocalFunctionElement ||
           element is TopLevelFunctionElement ||
-          element is MethodElement2) {
+          element is MethodElement) {
         element = null;
       }
     } else if (expression is MethodInvocation) {
@@ -1535,7 +1535,7 @@ class BestPracticesVerifier extends RecursiveAstVisitor<void> {
       // Tear-off.
       if (element is LocalFunctionElement ||
           element is TopLevelFunctionElement ||
-          element is MethodElement2) {
+          element is MethodElement) {
         element = null;
       }
     } else if (expression is ConditionalExpression) {
@@ -1562,7 +1562,7 @@ class BestPracticesVerifier extends RecursiveAstVisitor<void> {
         _getSubExpressionsMarkedDoNotStore(body.expression, addTo: expressions);
       }
     }
-    if (element is PropertyAccessorElement2 && element.isSynthetic) {
+    if (element is PropertyAccessorElement && element.isSynthetic) {
       element = element.variable3;
     }
 
@@ -1573,7 +1573,7 @@ class BestPracticesVerifier extends RecursiveAstVisitor<void> {
     return expressions;
   }
 
-  bool _isLibraryInWorkspacePackage(LibraryElement2? library) {
+  bool _isLibraryInWorkspacePackage(LibraryElement? library) {
     if (_workspacePackage == null || library == null) {
       // Better to not make a big claim that they _are_ in the same package,
       // if we were unable to determine what package [_currentLibrary] is in.
@@ -1586,8 +1586,8 @@ class BestPracticesVerifier extends RecursiveAstVisitor<void> {
     return node.name?.lexeme ?? '';
   }
 
-  static bool _hasNonVirtualAnnotation(ExecutableElement2 element) {
-    if (element is PropertyAccessorElement2 && element.isSynthetic) {
+  static bool _hasNonVirtualAnnotation(ExecutableElement element) {
+    if (element is PropertyAccessorElement && element.isSynthetic) {
       var variable = element.variable3;
       if (variable != null && variable.metadata2.hasNonVirtual) {
         return true;
@@ -1642,13 +1642,13 @@ class _InvalidAccessVerifier {
   static final _templateExtension = '.template';
 
   final ErrorReporter _errorReporter;
-  final LibraryElement2 _library;
+  final LibraryElement _library;
   final WorkspacePackage? _workspacePackage;
 
   final bool _inTemplateSource;
   final bool _inTestDirectory;
 
-  InterfaceElement2? _enclosingClass;
+  InterfaceElement? _enclosingClass;
 
   _InvalidAccessVerifier(
     this._errorReporter,
@@ -1823,7 +1823,7 @@ class _InvalidAccessVerifier {
     }
   }
 
-  void _checkForInvalidDoNotSubmitAccess(AstNode node, Element2 element) {
+  void _checkForInvalidDoNotSubmitAccess(AstNode node, Element element) {
     if (element is FormalParameterElement || !_hasDoNotSubmit(element)) {
       return;
     }
@@ -1915,7 +1915,7 @@ class _InvalidAccessVerifier {
   void _checkForInvalidInternalAccess({
     required AstNode? parent,
     required Token nameToken,
-    required Element2 element,
+    required Element element,
   }) {
     if (element.isInternal && !_isLibraryInWorkspacePackage(element.library2)) {
       String name;
@@ -1939,10 +1939,10 @@ class _InvalidAccessVerifier {
     }
   }
 
-  void _checkForOtherInvalidAccess(AstNode node, Element2 element) {
+  void _checkForOtherInvalidAccess(AstNode node, Element element) {
     var hasProtected = element.isProtected;
     if (hasProtected) {
-      var definingClass = element.enclosingElement2 as InterfaceElement2;
+      var definingClass = element.enclosingElement2 as InterfaceElement;
       if (_hasTypeOrSuperType(_enclosingClass, definingClass)) {
         return;
       }
@@ -2023,13 +2023,13 @@ class _InvalidAccessVerifier {
     }
   }
 
-  bool _hasDoNotSubmit(Element2 element) {
+  bool _hasDoNotSubmit(Element element) {
     if (element case Annotatable annotatable) {
       if (annotatable.metadata2.hasDoNotSubmit) {
         return true;
       }
     }
-    if (element is PropertyAccessorElement2) {
+    if (element is PropertyAccessorElement) {
       var variable = element.variable3;
       return variable != null && variable.metadata2.hasDoNotSubmit;
     }
@@ -2037,8 +2037,8 @@ class _InvalidAccessVerifier {
   }
 
   bool _hasTypeOrSuperType(
-    InterfaceElement2? element,
-    InterfaceElement2 superElement,
+    InterfaceElement? element,
+    InterfaceElement superElement,
   ) {
     if (element == null) {
       return false;
@@ -2046,14 +2046,14 @@ class _InvalidAccessVerifier {
     return element.thisType.asInstanceOf2(superElement) != null;
   }
 
-  bool _hasVisibleForOverriding(Element2 element) {
+  bool _hasVisibleForOverriding(Element element) {
     if (element case Annotatable annotatable) {
       if (annotatable.metadata2.hasVisibleForOverriding) {
         return true;
       }
     }
 
-    if (element is PropertyAccessorElement2) {
+    if (element is PropertyAccessorElement) {
       var variable = element.variable3;
       return variable != null && variable.metadata2.hasVisibleForOverriding;
     }
@@ -2061,7 +2061,7 @@ class _InvalidAccessVerifier {
     return false;
   }
 
-  bool _hasVisibleForTemplate(Element2? element) {
+  bool _hasVisibleForTemplate(Element? element) {
     if (element == null) {
       return false;
     }
@@ -2070,7 +2070,7 @@ class _InvalidAccessVerifier {
         return true;
       }
     }
-    if (element is PropertyAccessorElement2) {
+    if (element is PropertyAccessorElement) {
       var variable = element.variable3;
       if (variable != null && variable.metadata2.hasVisibleForTemplate) {
         return true;
@@ -2083,13 +2083,13 @@ class _InvalidAccessVerifier {
     return false;
   }
 
-  bool _hasVisibleOutsideTemplate(Element2 element) {
+  bool _hasVisibleOutsideTemplate(Element element) {
     if (element case Annotatable annotatable) {
       if (annotatable.metadata2.hasVisibleOutsideTemplate) {
         return true;
       }
     }
-    if (element is PropertyAccessorElement2) {
+    if (element is PropertyAccessorElement) {
       var variable = element.variable3;
       if (variable != null && variable.metadata2.hasVisibleOutsideTemplate) {
         return true;
@@ -2108,12 +2108,12 @@ class _InvalidAccessVerifier {
     return parent is CommentReference || parent?.parent is CommentReference;
   }
 
-  bool _inCurrentLibrary(Element2 element) => element.library2 == _library;
+  bool _inCurrentLibrary(Element element) => element.library2 == _library;
 
   bool _inExportDirective(AstNode node) =>
       node.parent is Combinator && node.parent!.parent is ExportDirective;
 
-  bool _isLibraryInWorkspacePackage(LibraryElement2? library) {
+  bool _isLibraryInWorkspacePackage(LibraryElement? library) {
     if (_workspacePackage == null || library == null) {
       // Better to not make a big claim that they _are_ in the same package,
       // if we were unable to determine what package [_currentLibrary] is in.
@@ -2122,18 +2122,18 @@ class _InvalidAccessVerifier {
     return _workspacePackage.contains(library.firstFragment.source);
   }
 
-  /// Check if @visibleForTemplate is applied to the given [Element2].
+  /// Check if @visibleForTemplate is applied to the given [Element].
   ///
-  /// [ClassElement2], [EnumElement2] and [MixinElement2] are excluded from the
+  /// [ClassElement], [EnumElement] and [MixinElement] are excluded from the
   /// @visibleForTemplate access checks. Instead, the access restriction is
   /// cascaded to all the corresponding members not annotated by
   /// @visibleOutsideTemplate.
   /// For other types of elements, check if they are annotated based on
   /// `hasVisibleForTemplate` value.
-  bool _isVisibleForTemplateApplied(Element2 element) {
-    if (element is ClassElement2 ||
-        element is EnumElement2 ||
-        element is MixinElement2) {
+  bool _isVisibleForTemplateApplied(Element element) {
+    if (element is ClassElement ||
+        element is EnumElement ||
+        element is MixinElement) {
       return false;
     } else {
       return _hasVisibleForTemplate(element) &&
@@ -2143,7 +2143,7 @@ class _InvalidAccessVerifier {
 
   static (String, SyntacticEntity) _getIdentifierNameAndErrorEntity(
     AstNode node,
-    Element2 element,
+    Element element,
   ) {
     String name;
     SyntacticEntity errorEntity = node;
diff --git a/pkg/analyzer/lib/src/error/const_argument_verifier.dart b/pkg/analyzer/lib/src/error/const_argument_verifier.dart
index 22d2c70128c..5fb2cc8c15e 100644
--- a/pkg/analyzer/lib/src/error/const_argument_verifier.dart
+++ b/pkg/analyzer/lib/src/error/const_argument_verifier.dart
@@ -145,7 +145,7 @@ class ConstArgumentsVerifier extends SimpleAstVisitor<void> {
       switch (element) {
         case GetterElement(variable3: var variable?):
           return variable.isConst;
-        case VariableElement2():
+        case VariableElement():
           return element.isConst;
       }
     }
diff --git a/pkg/analyzer/lib/src/error/constructor_fields_verifier.dart b/pkg/analyzer/lib/src/error/constructor_fields_verifier.dart
index bc897007d09..fe41e56c1fb 100644
--- a/pkg/analyzer/lib/src/error/constructor_fields_verifier.dart
+++ b/pkg/analyzer/lib/src/error/constructor_fields_verifier.dart
@@ -12,13 +12,13 @@ import 'package:analyzer/src/error/codes.dart';
 /// Verifier for initializing fields in constructors.
 class ConstructorFieldsVerifier {
   final TypeSystemImpl typeSystem;
-  final Map<InstanceElement2, _Interface> _interfaces = Map.identity();
+  final Map<InstanceElement, _Interface> _interfaces = Map.identity();
 
   ConstructorFieldsVerifier({required this.typeSystem});
 
   void addConstructors(
     ErrorReporter errorReporter,
-    InterfaceElement2 element,
+    InterfaceElement element,
     List<ClassMember> members,
   ) {
     var interfaceFields = _forInterface(element);
@@ -65,18 +65,18 @@ class ConstructorFieldsVerifier {
     constructorState.updateWithInitializers(errorReporter, node);
   }
 
-  _Interface _forInterface(InterfaceElement2 element) {
+  _Interface _forInterface(InterfaceElement element) {
     if (_interfaces[element] case var result?) {
       return result;
     }
 
-    var fieldMap = <FieldElement2, _InitState>{};
+    var fieldMap = <FieldElement, _InitState>{};
 
     for (var field in element.fields2) {
       if (field.isSynthetic) {
         continue;
       }
-      if (element is EnumElement2 && field.name3 == 'index') {
+      if (element is EnumElement && field.name3 == 'index') {
         continue;
       }
       fieldMap[field] =
@@ -97,8 +97,8 @@ class _Constructor {
   final TypeSystemImpl typeSystem;
   final ErrorReporter errorReporter;
   final ConstructorDeclaration node;
-  final ConstructorElement2 element;
-  final Map<FieldElement2, _InitState> fields;
+  final ConstructorElement element;
+  final Map<FieldElement, _InitState> fields;
 
   /// Set to `true` if the constructor redirects.
   bool hasRedirectingConstructorInvocation = false;
@@ -197,7 +197,7 @@ class _Constructor {
       if (initializer is ConstructorFieldInitializer) {
         var fieldName = initializer.fieldName;
         var fieldElement = fieldName.element;
-        if (fieldElement is FieldElement2) {
+        if (fieldElement is FieldElement) {
           var state = fields[fieldElement];
           if (state == _InitState.notInit) {
             fields[fieldElement] = _InitState.initInInitializer;
@@ -259,7 +259,7 @@ class _Constructor {
 
 /// The field with a non `null` name.
 class _Field {
-  final FieldElement2 element;
+  final FieldElement element;
   final String name;
 
   _Field(this.element, this.name);
@@ -287,14 +287,14 @@ enum _InitState {
 
 class _Interface {
   final TypeSystemImpl typeSystem;
-  final InterfaceElement2 element;
+  final InterfaceElement element;
 
   /// [_InitState.notInit] or [_InitState.initInDeclaration] for each field
   /// in [element]. This map works as the initial state for
   /// [_Constructor].
-  final Map<FieldElement2, _InitState> fields;
+  final Map<FieldElement, _InitState> fields;
 
-  final Map<ConstructorElement2, _Constructor> constructors = Map.identity();
+  final Map<ConstructorElement, _Constructor> constructors = Map.identity();
 
   _Interface({
     required this.typeSystem,
diff --git a/pkg/analyzer/lib/src/error/correct_override.dart b/pkg/analyzer/lib/src/error/correct_override.dart
index 16e7fa3b8b9..4476fca20ef 100644
--- a/pkg/analyzer/lib/src/error/correct_override.dart
+++ b/pkg/analyzer/lib/src/error/correct_override.dart
@@ -208,14 +208,14 @@ class CovariantParametersVerifier {
 
   /// Return a member from [classElement] that corresponds to the [proto],
   /// or `null` if no such member exist.
-  static ExecutableElement2? _correspondingMember(
-    InterfaceElement2 classElement,
-    ExecutableElement2 proto,
+  static ExecutableElement? _correspondingMember(
+    InterfaceElement classElement,
+    ExecutableElement proto,
   ) {
-    if (proto is MethodElement2) {
+    if (proto is MethodElement) {
       return classElement.getMethod2(proto.displayName);
     }
-    if (proto is PropertyAccessorElement2) {
+    if (proto is PropertyAccessorElement) {
       if (proto is GetterElement) {
         return classElement.getGetter2(proto.displayName);
       }
@@ -252,7 +252,7 @@ class CovariantParametersVerifier {
 
 class _SuperMember {
   final InterfaceType interface;
-  final ExecutableElement2 rawElement;
+  final ExecutableElement rawElement;
 
   _SuperMember(this.interface, this.rawElement);
 }
@@ -263,6 +263,6 @@ class _SuperParameter {
 
   _SuperParameter(this.element, this.type);
 
-  ExecutableElement2 get member =>
-      element.enclosingElement2 as ExecutableElement2;
+  ExecutableElement get member =>
+      element.enclosingElement2 as ExecutableElement;
 }
diff --git a/pkg/analyzer/lib/src/error/dead_code_verifier.dart b/pkg/analyzer/lib/src/error/dead_code_verifier.dart
index 174a6f1f80a..e2acd71e054 100644
--- a/pkg/analyzer/lib/src/error/dead_code_verifier.dart
+++ b/pkg/analyzer/lib/src/error/dead_code_verifier.dart
@@ -48,7 +48,7 @@ class DeadCodeVerifier extends RecursiveAstVisitor<void> {
   /// Whether the `wildcard_variables` feature is enabled.
   final bool _wildCardVariablesEnabled;
 
-  DeadCodeVerifier(this._errorReporter, LibraryElement2 library)
+  DeadCodeVerifier(this._errorReporter, LibraryElement library)
     : _wildCardVariablesEnabled = library.featureSet.isEnabled(
         Feature.wildcard_variables,
       );
@@ -131,7 +131,7 @@ class DeadCodeVerifier extends RecursiveAstVisitor<void> {
       var element = node.declaredFragment!.element;
       // TODO(pq): ask the LocalVariableElement once implemented
       if (_wildCardVariablesEnabled &&
-          element is LocalVariableElement2 &&
+          element is LocalVariableElement &&
           element.name3 == '_') {
         _errorReporter.atNode(
           initializer,
@@ -160,7 +160,7 @@ class DeadCodeVerifier extends RecursiveAstVisitor<void> {
     }
     for (SimpleIdentifier name in names) {
       String nameStr = name.name;
-      Element2? element = namespace.get2(nameStr);
+      Element? element = namespace.get2(nameStr);
       element ??= namespace.get2("$nameStr=");
       if (element == null) {
         _errorReporter.atNode(
diff --git a/pkg/analyzer/lib/src/error/deprecated_member_use_verifier.dart b/pkg/analyzer/lib/src/error/deprecated_member_use_verifier.dart
index 5ce3f4781ba..9fef7d8b5c7 100644
--- a/pkg/analyzer/lib/src/error/deprecated_member_use_verifier.dart
+++ b/pkg/analyzer/lib/src/error/deprecated_member_use_verifier.dart
@@ -46,8 +46,8 @@ abstract class BaseDeprecatedMemberUseVerifier {
 
   void functionExpressionInvocation(FunctionExpressionInvocation node) {
     var callElement = node.element;
-    if (callElement is MethodElement2 &&
-        callElement.name3 == MethodElement2.CALL_METHOD_NAME) {
+    if (callElement is MethodElement &&
+        callElement.name3 == MethodElement.CALL_METHOD_NAME) {
       _checkForDeprecated(callElement, node);
     }
   }
@@ -109,7 +109,7 @@ abstract class BaseDeprecatedMemberUseVerifier {
 
   void reportError(
     SyntacticEntity errorEntity,
-    Element2 element,
+    Element element,
     String displayName,
     String? message,
   ) {
@@ -118,7 +118,7 @@ abstract class BaseDeprecatedMemberUseVerifier {
 
   void reportError2(
     SyntacticEntity errorEntity,
-    Element2 element,
+    Element element,
     String displayName,
     String? message,
   ) {
@@ -159,7 +159,7 @@ abstract class BaseDeprecatedMemberUseVerifier {
   /// Given some [element], look at the associated metadata and report the use
   /// of the member if it is declared as deprecated. If a diagnostic is reported
   /// it should be reported at the given [node].
-  void _checkForDeprecated(Element2? element, AstNode node) {
+  void _checkForDeprecated(Element? element, AstNode node) {
     if (!_isDeprecated(element)) {
       return;
     }
@@ -208,7 +208,7 @@ abstract class BaseDeprecatedMemberUseVerifier {
     }
 
     String displayName = element!.displayName;
-    if (element is ConstructorElement2) {
+    if (element is ConstructorElement) {
       // TODO(jwren): We should modify ConstructorElement.displayName,
       // or have the logic centralized elsewhere, instead of doing this logic
       // here.
@@ -216,10 +216,10 @@ abstract class BaseDeprecatedMemberUseVerifier {
           element.name3 == null
               ? '${element.displayName}.new'
               : element.displayName;
-    } else if (element is LibraryElement2) {
+    } else if (element is LibraryElement) {
       displayName = element.firstFragment.source.uri.toString();
     } else if (node is MethodInvocation &&
-        displayName == MethodElement2.CALL_METHOD_NAME) {
+        displayName == MethodElement.CALL_METHOD_NAME) {
       var invokeType = node.staticInvokeType as InterfaceType;
       var invokeClass = invokeType.element3;
       displayName = "${invokeClass.name3}.${element.displayName}";
@@ -228,9 +228,9 @@ abstract class BaseDeprecatedMemberUseVerifier {
     reportError(errorEntity, element, displayName, message);
   }
 
-  void _invocationArguments(Element2? element, ArgumentList arguments) {
+  void _invocationArguments(Element? element, ArgumentList arguments) {
     element = element?.baseElement;
-    if (element is ExecutableElement2) {
+    if (element is ExecutableElement) {
       _visitParametersAndArguments(
         element.formalParameters,
         arguments.arguments,
@@ -247,11 +247,11 @@ abstract class BaseDeprecatedMemberUseVerifier {
   /// `null` if the element doesn't have a deprecated annotation or if the
   /// annotation does not have a message.
   static String? _deprecatedMessage(
-    Element2 element, {
+    Element element, {
     required bool strictCasts,
   }) {
     // Implicit getters/setters.
-    if (element.isSynthetic && element is PropertyAccessorElement2) {
+    if (element.isSynthetic && element is PropertyAccessorElement) {
       var variable = element.variable3;
       if (variable == null) {
         return null;
@@ -259,7 +259,7 @@ abstract class BaseDeprecatedMemberUseVerifier {
       element = variable;
     }
     var annotation = element.metadata.firstWhereOrNull((e) => e.isDeprecated);
-    if (annotation == null || annotation.element2 is PropertyAccessorElement2) {
+    if (annotation == null || annotation.element2 is PropertyAccessorElement) {
       return null;
     }
     var constantValue = annotation.computeConstantValue();
@@ -276,12 +276,12 @@ abstract class BaseDeprecatedMemberUseVerifier {
     return false;
   }
 
-  static bool _isDeprecated(Element2? element) {
+  static bool _isDeprecated(Element? element) {
     if (element == null) {
       return false;
     }
 
-    if (element is PropertyAccessorElement2 && element.isSynthetic) {
+    if (element is PropertyAccessorElement && element.isSynthetic) {
       // TODO(brianwilkerson): Why isn't this the implementation for PropertyAccessorElement?
       var variable = element.variable3;
       return variable != null && variable.metadata2.hasDeprecated;
@@ -294,11 +294,10 @@ abstract class BaseDeprecatedMemberUseVerifier {
 
   /// Returns whether [element] is a [FormalParameterElement] declared in
   /// [node].
-  static bool _isLocalParameter(Element2? element, AstNode? node) {
+  static bool _isLocalParameter(Element? element, AstNode? node) {
     if (element is FormalParameterElement) {
       var definingFunction =
-          element.firstFragment.enclosingFragment?.element
-              as ExecutableElement2;
+          element.firstFragment.enclosingFragment?.element as ExecutableElement;
 
       for (; node != null; node = node.parent) {
         if (node is ConstructorDeclaration) {
@@ -367,11 +366,11 @@ class DeprecatedMemberUseVerifier extends BaseDeprecatedMemberUseVerifier {
   @override
   void reportError(
     SyntacticEntity errorEntity,
-    Element2 element,
+    Element element,
     String displayName,
     String? message,
   ) {
-    var library = element is LibraryElement2 ? element : element.library2;
+    var library = element is LibraryElement ? element : element.library2;
 
     message = message?.trim();
     if (message == null || message.isEmpty || message == '.') {
@@ -398,7 +397,7 @@ class DeprecatedMemberUseVerifier extends BaseDeprecatedMemberUseVerifier {
     }
   }
 
-  bool _isLibraryInWorkspacePackage(LibraryElement2? library) {
+  bool _isLibraryInWorkspacePackage(LibraryElement? library) {
     // Better to not make a big claim that they _are_ in the same package,
     // if we were unable to determine what package [_currentLibrary] is in.
     if (_workspacePackage == null || library == null) {
diff --git a/pkg/analyzer/lib/src/error/duplicate_definition_verifier.dart b/pkg/analyzer/lib/src/error/duplicate_definition_verifier.dart
index 661741b4a11..6d42e248d2e 100644
--- a/pkg/analyzer/lib/src/error/duplicate_definition_verifier.dart
+++ b/pkg/analyzer/lib/src/error/duplicate_definition_verifier.dart
@@ -57,7 +57,7 @@ class DuplicateDefinitionVerifier {
   /// Check that the given list of variable declarations does not define
   /// multiple variables of the same name.
   void checkForVariables(VariableDeclarationListImpl node) {
-    var definedNames = <String, Element2>{};
+    var definedNames = <String, Element>{};
     for (var variable in node.variables) {
       _checkDuplicateIdentifier(
         definedNames,
@@ -69,7 +69,7 @@ class DuplicateDefinitionVerifier {
 
   /// Check that all of the parameters have unique names.
   void checkParameters(FormalParameterListImpl node) {
-    var definedNames = <String, Element2>{};
+    var definedNames = <String, Element>{};
     for (var parameter in node.parameters) {
       var identifier = parameter.name;
       if (identifier != null) {
@@ -90,7 +90,7 @@ class DuplicateDefinitionVerifier {
 
   /// Check that all of the variables have unique names.
   void checkStatements(List<StatementImpl> statements) {
-    var definedNames = <String, Element2>{};
+    var definedNames = <String, Element>{};
     for (var statement in statements) {
       if (statement is VariableDeclarationStatementImpl) {
         for (var variable in statement.variables.variables) {
@@ -122,7 +122,7 @@ class DuplicateDefinitionVerifier {
 
   /// Check that all of the parameters have unique names.
   void checkTypeParameters(TypeParameterListImpl node) {
-    var definedNames = <String, Element2>{};
+    var definedNames = <String, Element>{};
     for (var parameter in node.typeParameters) {
       _checkDuplicateIdentifier(
         definedNames,
@@ -135,8 +135,8 @@ class DuplicateDefinitionVerifier {
   /// Check that there are no members with the same name.
   void checkUnit(CompilationUnitImpl node) {
     var fragment = node.declaredFragment!;
-    var definedGetters = <String, Element2>{};
-    var definedSetters = <String, Element2>{};
+    var definedGetters = <String, Element>{};
+    var definedSetters = <String, Element>{};
 
     void addWithoutChecking(LibraryFragment libraryFragment) {
       for (var fragment in libraryFragment.getters) {
@@ -275,10 +275,10 @@ class DuplicateDefinitionVerifier {
   /// in one of the scopes - [getterScope] or [setterScope], and produce an
   /// error if it is.
   void _checkDuplicateIdentifier(
-    Map<String, Element2> getterScope,
+    Map<String, Element> getterScope,
     Token identifier, {
-    required Element2? element,
-    Map<String, Element2>? setterScope,
+    required Element? element,
+    Map<String, Element>? setterScope,
   }) {
     if (identifier.isSynthetic) {
       return;
@@ -301,9 +301,9 @@ class DuplicateDefinitionVerifier {
       return;
     }
 
-    ErrorCode getError(Element2 previous, Element2 current) {
-      if (previous is FieldFormalParameterElement2 &&
-          current is FieldFormalParameterElement2) {
+    ErrorCode getError(Element previous, Element current) {
+      if (previous is FieldFormalParameterElement &&
+          current is FieldFormalParameterElement) {
         return CompileTimeErrorCode.DUPLICATE_FIELD_FORMAL_PARAMETER;
       }
       return CompileTimeErrorCode.DUPLICATE_DEFINITION;
diff --git a/pkg/analyzer/lib/src/error/getter_setter_types_verifier.dart b/pkg/analyzer/lib/src/error/getter_setter_types_verifier.dart
index 89a3100069a..95afe387d30 100644
--- a/pkg/analyzer/lib/src/error/getter_setter_types_verifier.dart
+++ b/pkg/analyzer/lib/src/error/getter_setter_types_verifier.dart
@@ -70,7 +70,7 @@ class GetterSetterTypesVerifier {
           var getterType = getter.returnType;
           var setterType = setter.formalParameters[0].type;
           if (!_typeSystem.isSubtypeOf(getterType, setterType)) {
-            Element2 errorElement;
+            Element errorElement;
             if (getter.enclosingElement2 == element) {
               if (element is ExtensionTypeElementImpl2 &&
                   element.representation2.getter2 == getter) {
diff --git a/pkg/analyzer/lib/src/error/imports_verifier.dart b/pkg/analyzer/lib/src/error/imports_verifier.dart
index bfe896523c0..31a043b9da4 100644
--- a/pkg/analyzer/lib/src/error/imports_verifier.dart
+++ b/pkg/analyzer/lib/src/error/imports_verifier.dart
@@ -309,7 +309,7 @@ class ImportsVerifier {
               var importElements = importsTracking.elementsOf(importElement);
 
               var isUsed = importElements.contains(element);
-              if (element is PropertyInducingElement2) {
+              if (element is PropertyInducingElement) {
                 isUsed =
                     importElements.contains(element.getter2) ||
                     importElements.contains(element.setter2);
@@ -334,7 +334,7 @@ class ImportsVerifier {
   void _addDuplicateShownHiddenNames(NamespaceDirective directive) {
     for (var combinator in directive.combinators) {
       // Use a Set to find duplicates in faster than O(n^2) time.
-      var identifiers = <Element2>{};
+      var identifiers = <Element>{};
       if (combinator is HideCombinator) {
         for (var name in combinator.hiddenNames) {
           var element = name.element;
@@ -396,10 +396,10 @@ class ImportsVerifier {
   }
 }
 
-/// [NamespaceDirective] with non-null imported or exported [LibraryElement2].
+/// [NamespaceDirective] with non-null imported or exported [LibraryElement].
 class _NamespaceDirective {
   final NamespaceDirective node;
-  final LibraryElement2 library;
+  final LibraryElement library;
 
   _NamespaceDirective({required this.node, required this.library});
 
diff --git a/pkg/analyzer/lib/src/error/inheritance_override.dart b/pkg/analyzer/lib/src/error/inheritance_override.dart
index 5832650be21..4f15021fe1a 100644
--- a/pkg/analyzer/lib/src/error/inheritance_override.dart
+++ b/pkg/analyzer/lib/src/error/inheritance_override.dart
@@ -22,7 +22,7 @@ import 'package:analyzer/src/error/getter_setter_types_verifier.dart';
 import 'package:analyzer/src/error/inference_error.dart';
 import 'package:analyzer/src/utilities/extensions/element.dart';
 
-final _missingMustBeOverridden = Expando<List<ExecutableElement2>>();
+final _missingMustBeOverridden = Expando<List<ExecutableElement>>();
 final _missingOverrides = Expando<List<ExecutableElement2OrMember>>();
 
 class InheritanceOverrideVerifier {
@@ -130,17 +130,17 @@ class InheritanceOverrideVerifier {
     }
   }
 
-  /// Returns [ExecutableElement2] members that are in the interface of the
+  /// Returns [ExecutableElement] members that are in the interface of the
   /// given class with `@mustBeOverridden`, but don't have implementations.
-  static List<ExecutableElement2> missingMustBeOverridden(
+  static List<ExecutableElement> missingMustBeOverridden(
     NamedCompilationUnitMember node,
   ) {
     return _missingMustBeOverridden[node.name] ?? const [];
   }
 
-  /// Returns [ExecutableElement2] members that are in the interface of the
+  /// Returns [ExecutableElement] members that are in the interface of the
   /// given class, but don't have concrete implementations.
-  static List<ExecutableElement2> missingOverrides(
+  static List<ExecutableElement> missingOverrides(
     NamedCompilationUnitMember node,
   ) {
     return _missingOverrides[node.name] ?? const [];
@@ -459,7 +459,7 @@ class _ClassVerifier {
     var typeElement = type.element3;
 
     var classElement = this.classElement;
-    if (typeElement is ClassElement2 &&
+    if (typeElement is ClassElement &&
         typeElement.isDartCoreEnum &&
         library.featureSet.isEnabled(Feature.enhanced_enums)) {
       if (classElement is ClassElementImpl && classElement.isAbstract ||
@@ -561,9 +561,9 @@ class _ClassVerifier {
   /// [CompileTimeErrorCode.RECURSIVE_INTERFACE_INHERITANCE_WITH].
   bool _checkForRecursiveInterfaceInheritance(
     InterfaceElementImpl2 element, [
-    List<InterfaceElement2>? path,
+    List<InterfaceElement>? path,
   ]) {
-    path ??= <InterfaceElement2>[];
+    path ??= <InterfaceElement>[];
 
     // Detect error condition.
     int size = path.length;
@@ -668,13 +668,13 @@ class _ClassVerifier {
 
       void checkSingle(
         String memberName,
-        bool Function(ClassElement2 enclosingClass) filter,
+        bool Function(ClassElement enclosingClass) filter,
       ) {
         var member = concreteMap[Name(libraryUri, memberName)];
         if (member != null) {
           var enclosingClass = member.asElement2.enclosingElement2;
           if (enclosingClass != null) {
-            if (enclosingClass is! ClassElement2 || filter(enclosingClass)) {
+            if (enclosingClass is! ClassElement || filter(enclosingClass)) {
               reporter.atToken(
                 classNameToken,
                 CompileTimeErrorCode.ILLEGAL_CONCRETE_ENUM_MEMBER_INHERITANCE,
@@ -728,8 +728,8 @@ class _ClassVerifier {
     }
 
     var interfaceElement = type.element3;
-    if (interfaceElement is EnumElement2 ||
-        interfaceElement is ExtensionTypeElement2) {
+    if (interfaceElement is EnumElement ||
+        interfaceElement is ExtensionTypeElement) {
       return false;
     }
 
@@ -746,12 +746,12 @@ class _ClassVerifier {
 
   /// Return the error code that should be used when the given class [element]
   /// references itself directly.
-  ErrorCode _getRecursiveErrorCode(InterfaceElement2 element) {
+  ErrorCode _getRecursiveErrorCode(InterfaceElement element) {
     if (element.supertype?.element3 == classElement.asElement2) {
       return CompileTimeErrorCode.RECURSIVE_INTERFACE_INHERITANCE_EXTENDS;
     }
 
-    if (element is MixinElement2) {
+    if (element is MixinElement) {
       for (var type in element.superclassConstraints) {
         if (type.element3 == classElement.asElement2) {
           return CompileTimeErrorCode.RECURSIVE_INTERFACE_INHERITANCE_ON;
@@ -792,7 +792,7 @@ class _ClassVerifier {
       if (memberName == name) {
         reporter.atNode(
           member,
-          classElement.asElement2 is EnumElement2
+          classElement.asElement2 is EnumElement
               ? CompileTimeErrorCode.ENUM_WITH_ABSTRACT_MEMBER
               : CompileTimeErrorCode.CONCRETE_CLASS_WITH_ABSTRACT_MEMBER,
           arguments: [displayName, classElement.name],
@@ -960,13 +960,13 @@ class _ClassVerifier {
     }
 
     var noSuchMethodDeclaration = classElement.getMethod2(
-      MethodElement2.NO_SUCH_METHOD_METHOD_NAME,
+      MethodElement.NO_SUCH_METHOD_METHOD_NAME,
     );
     if (noSuchMethodDeclaration != null &&
         !noSuchMethodDeclaration.isAbstract) {
       return;
     }
-    var notOverridden = <ExecutableElement2>[];
+    var notOverridden = <ExecutableElement>[];
     for (var supertype in classElement.allSupertypes) {
       // TODO(srawlins): This looping may be expensive. Since the vast majority
       // of classes will have zero elements annotated with `@mustBeOverridden`,
diff --git a/pkg/analyzer/lib/src/error/must_call_super_verifier.dart b/pkg/analyzer/lib/src/error/must_call_super_verifier.dart
index d41097cbbf2..dc5a20483e0 100644
--- a/pkg/analyzer/lib/src/error/must_call_super_verifier.dart
+++ b/pkg/analyzer/lib/src/error/must_call_super_verifier.dart
@@ -32,7 +32,7 @@ class MustCallSuperVerifier {
       return;
     }
 
-    if (element is MethodElement2 && _hasConcreteSuperMethod(element)) {
+    if (element is MethodElement && _hasConcreteSuperMethod(element)) {
       _verifySuperIsCalled(
         node,
         overriddenName,
@@ -42,7 +42,7 @@ class MustCallSuperVerifier {
     }
 
     var enclosingElement = element.enclosingElement2;
-    if (enclosingElement is! ClassElement2) {
+    if (enclosingElement is! ClassElement) {
       return;
     }
 
@@ -82,11 +82,11 @@ class MustCallSuperVerifier {
   /// `@mustCallSuper`.
   ///
   /// [1]: https://pub.dev/documentation/meta/latest/meta/mustCallSuper-constant.html
-  ExecutableElement2? _findOverriddenMemberWithMustCallSuper(
-    ExecutableElement2 element,
+  ExecutableElement? _findOverriddenMemberWithMustCallSuper(
+    ExecutableElement element,
   ) {
     var classElement = element.enclosingElement2;
-    if (classElement is! InterfaceElement2) {
+    if (classElement is! InterfaceElement) {
       return null;
     }
 
@@ -97,19 +97,19 @@ class MustCallSuperVerifier {
 
     // Walk up the type hierarchy from [classElement], ignoring direct
     // interfaces.
-    var superclasses = Queue<InterfaceElement2?>();
+    var superclasses = Queue<InterfaceElement?>();
 
-    void addToQueue(InterfaceElement2 element) {
+    void addToQueue(InterfaceElement element) {
       superclasses.addAll(element.mixins.map((i) => i.element3));
       superclasses.add(element.supertype?.element3);
-      if (element is MixinElement2) {
+      if (element is MixinElement) {
         superclasses.addAll(
           element.superclassConstraints.map((i) => i.element3),
         );
       }
     }
 
-    var visitedClasses = <InterfaceElement2>{};
+    var visitedClasses = <InterfaceElement>{};
     addToQueue(classElement);
     while (superclasses.isNotEmpty) {
       var ancestor = superclasses.removeFirst();
@@ -117,9 +117,9 @@ class MustCallSuperVerifier {
         continue;
       }
 
-      ExecutableElement2? member;
+      ExecutableElement? member;
       switch (element) {
-        case MethodElement2():
+        case MethodElement():
           member = ancestor.getMethod2(name);
         case GetterElement():
           member = ancestor.getMethod2(name) ?? ancestor.getGetter2(name);
@@ -127,10 +127,10 @@ class MustCallSuperVerifier {
           member = ancestor.getSetter2(name);
       }
 
-      if (member is MethodElement2 && member.metadata2.hasMustCallSuper) {
+      if (member is MethodElement && member.metadata2.hasMustCallSuper) {
         return member;
       }
-      if (member is PropertyAccessorElement2 &&
+      if (member is PropertyAccessorElement &&
           member.metadata2.hasMustCallSuper) {
         return member;
       }
@@ -143,8 +143,8 @@ class MustCallSuperVerifier {
   }
 
   /// Returns whether [element] overrides a concrete method.
-  bool _hasConcreteSuperMethod(ExecutableElement2 element) {
-    var classElement = element.enclosingElement2 as InterfaceElement2;
+  bool _hasConcreteSuperMethod(ExecutableElement element) {
+    var classElement = element.enclosingElement2 as InterfaceElement;
 
     var name = element.name3;
     if (name == null) {
@@ -159,7 +159,7 @@ class MustCallSuperVerifier {
       return true;
     }
 
-    if (classElement is MixinElement2 &&
+    if (classElement is MixinElement &&
         classElement.superclassConstraints.any((c) => c.isConcrete(name))) {
       return true;
     }
@@ -187,10 +187,8 @@ class MustCallSuperVerifier {
   }
 }
 
-extension on InterfaceElement2 {
-  ExecutableElement2? lookupInheritedConcreteMember(
-    ExecutableElement2 element,
-  ) {
+extension on InterfaceElement {
+  ExecutableElement? lookupInheritedConcreteMember(ExecutableElement element) {
     var nameObj = Name.forElement(element);
     if (nameObj == null) {
       return null;
diff --git a/pkg/analyzer/lib/src/error/override_verifier.dart b/pkg/analyzer/lib/src/error/override_verifier.dart
index c7e445a9974..04c37ea1d09 100644
--- a/pkg/analyzer/lib/src/error/override_verifier.dart
+++ b/pkg/analyzer/lib/src/error/override_verifier.dart
@@ -20,7 +20,7 @@ class OverrideVerifier extends RecursiveAstVisitor<void> {
   final ErrorReporter _errorReporter;
 
   /// The current class or mixin.
-  InterfaceElement2? _currentClass;
+  InterfaceElement? _currentClass;
 
   OverrideVerifier(this._inheritance, this._errorReporter);
 
@@ -41,7 +41,7 @@ class OverrideVerifier extends RecursiveAstVisitor<void> {
   @override
   void visitFieldDeclaration(FieldDeclaration node) {
     for (VariableDeclaration field in node.fields.variables) {
-      var fieldElement = field.declaredFragment?.element as FieldElement2;
+      var fieldElement = field.declaredFragment?.element as FieldElement;
       if (fieldElement.metadata2.hasOverride) {
         var getter = fieldElement.getter2;
         if (getter != null && _isOverride(getter)) continue;
@@ -62,7 +62,7 @@ class OverrideVerifier extends RecursiveAstVisitor<void> {
     var element = node.declaredFragment!.element;
     if (element.metadata2.hasOverride && !_isOverride(element)) {
       switch (element) {
-        case MethodElement2():
+        case MethodElement():
           _errorReporter.atToken(
             node.name,
             WarningCode.OVERRIDE_ON_NON_OVERRIDING_METHOD,
@@ -89,7 +89,7 @@ class OverrideVerifier extends RecursiveAstVisitor<void> {
   }
 
   /// Return `true` if the [member] overrides a member from a superinterface.
-  bool _isOverride(ExecutableElement2 member) {
+  bool _isOverride(ExecutableElement member) {
     var currentClass = _currentClass?.firstFragment;
     if (currentClass != null) {
       var name = Name.forElement(member)!;
diff --git a/pkg/analyzer/lib/src/error/redeclare_verifier.dart b/pkg/analyzer/lib/src/error/redeclare_verifier.dart
index 5053223f108..1297d273b16 100644
--- a/pkg/analyzer/lib/src/error/redeclare_verifier.dart
+++ b/pkg/analyzer/lib/src/error/redeclare_verifier.dart
@@ -20,7 +20,7 @@ class RedeclareVerifier extends RecursiveAstVisitor<void> {
   final ErrorReporter _errorReporter;
 
   /// The current extension type.
-  InterfaceElement2? _currentExtensionType;
+  InterfaceElement? _currentExtensionType;
 
   RedeclareVerifier(this._inheritance, this._errorReporter);
 
@@ -43,7 +43,7 @@ class RedeclareVerifier extends RecursiveAstVisitor<void> {
 
     if (element.metadata2.hasRedeclare && !_redeclaresMember(element)) {
       switch (element) {
-        case MethodElement2():
+        case MethodElement():
           _errorReporter.atToken(
             node.name,
             WarningCode.REDECLARE_ON_NON_REDECLARING_MEMBER,
@@ -66,7 +66,7 @@ class RedeclareVerifier extends RecursiveAstVisitor<void> {
   }
 
   /// Return `true` if the [member] redeclares a member from a superinterface.
-  bool _redeclaresMember(ExecutableElement2 member) {
+  bool _redeclaresMember(ExecutableElement member) {
     var currentType = _currentExtensionType;
     if (currentType != null) {
       var interface = _inheritance.getInterface2(currentType);
diff --git a/pkg/analyzer/lib/src/error/required_parameters_verifier.dart b/pkg/analyzer/lib/src/error/required_parameters_verifier.dart
index 2dd195db4d6..da911ac2938 100644
--- a/pkg/analyzer/lib/src/error/required_parameters_verifier.dart
+++ b/pkg/analyzer/lib/src/error/required_parameters_verifier.dart
@@ -22,7 +22,7 @@ class RequiredParametersVerifier extends SimpleAstVisitor<void> {
   void visitAnnotation(Annotation node) {
     var element = node.element2;
     var argumentList = node.arguments;
-    if (element is ConstructorElement2 && argumentList != null) {
+    if (element is ConstructorElement && argumentList != null) {
       var errorNode = node.constructorIdentifier ?? node.classIdentifier;
       if (errorNode != null) {
         _check(
@@ -66,7 +66,7 @@ class RequiredParametersVerifier extends SimpleAstVisitor<void> {
 
   @override
   void visitMethodInvocation(MethodInvocation node) {
-    if (node.methodName.name == MethodElement2.CALL_METHOD_NAME) {
+    if (node.methodName.name == MethodElement.CALL_METHOD_NAME) {
       var targetType = node.realTarget?.staticType;
       if (targetType is FunctionType) {
         _check(
@@ -99,7 +99,7 @@ class RequiredParametersVerifier extends SimpleAstVisitor<void> {
   @override
   void visitSuperConstructorInvocation(
     SuperConstructorInvocation node, {
-    ConstructorElement2? enclosingConstructor,
+    ConstructorElement? enclosingConstructor,
   }) {
     _check(
       parameters: _executableElement(node.element)?.formalParameters,
@@ -111,7 +111,7 @@ class RequiredParametersVerifier extends SimpleAstVisitor<void> {
 
   void _check({
     required List<FormalParameterElement>? parameters,
-    ConstructorElement2? enclosingConstructor,
+    ConstructorElement? enclosingConstructor,
     required List<Expression> arguments,
     required SyntacticEntity errorEntity,
   }) {
@@ -169,7 +169,7 @@ class RequiredParametersVerifier extends SimpleAstVisitor<void> {
   }
 
   static bool _containsNamedExpression(
-    ConstructorElement2? enclosingConstructor,
+    ConstructorElement? enclosingConstructor,
     List<Expression> arguments,
     String name,
   ) {
@@ -184,16 +184,15 @@ class RequiredParametersVerifier extends SimpleAstVisitor<void> {
 
     if (enclosingConstructor != null) {
       return enclosingConstructor.formalParameters.any(
-        (e) =>
-            e is SuperFormalParameterElement2 && e.isNamed && e.name3 == name,
+        (e) => e is SuperFormalParameterElement && e.isNamed && e.name3 == name,
       );
     }
 
     return false;
   }
 
-  static ExecutableElement2? _executableElement(Element2? element) {
-    if (element is ExecutableElement2) {
+  static ExecutableElement? _executableElement(Element? element) {
+    if (element is ExecutableElement) {
       return element;
     } else {
       return null;
@@ -273,10 +272,10 @@ extension _InstantiatedAnnotation on Annotation {
   }
 
   static SimpleIdentifier? _ifClassElement(SimpleIdentifier? node) {
-    return node?.element is InterfaceElement2 ? node : null;
+    return node?.element is InterfaceElement ? node : null;
   }
 
   static SimpleIdentifier? _ifConstructorElement(SimpleIdentifier? node) {
-    return node?.element is ConstructorElement2 ? node : null;
+    return node?.element is ConstructorElement ? node : null;
   }
 }
diff --git a/pkg/analyzer/lib/src/error/type_arguments_verifier.dart b/pkg/analyzer/lib/src/error/type_arguments_verifier.dart
index fa3035098fc..c423e523ef6 100644
--- a/pkg/analyzer/lib/src/error/type_arguments_verifier.dart
+++ b/pkg/analyzer/lib/src/error/type_arguments_verifier.dart
@@ -23,7 +23,7 @@ import 'package:analyzer/src/utilities/extensions/object.dart';
 
 class TypeArgumentsVerifier {
   final AnalysisOptions _options;
-  final LibraryElement2 _libraryElement;
+  final LibraryElement _libraryElement;
   final ErrorReporter _errorReporter;
 
   TypeArgumentsVerifier(
@@ -633,7 +633,7 @@ class TypeArgumentsVerifier {
   ///
   /// - [type] does not have any `dynamic` type arguments.
   /// - the element is marked with `@optionalTypeArgs` from "package:meta".
-  bool _isMissingTypeArguments(AstNode node, DartType type, Element2? element) {
+  bool _isMissingTypeArguments(AstNode node, DartType type, Element? element) {
     var elementMetadata = element.ifTypeOrNull<Annotatable>()?.metadata2;
     if (elementMetadata == null) {
       return false;
@@ -674,7 +674,7 @@ class TypeArgumentsVerifier {
         return false;
     }
 
-    if (namedType.type?.element3 is ExtensionTypeElement2) {
+    if (namedType.type?.element3 is ExtensionTypeElement) {
       return false;
     }
 
@@ -696,7 +696,7 @@ class _TypeArgumentIssue {
   final int index;
 
   /// The type parameter with the bound that was violated.
-  final TypeParameterElement2 parameter;
+  final TypeParameterElement parameter;
 
   /// The non-null name of the [parameter].
   final String parameterName;
diff --git a/pkg/analyzer/lib/src/error/unused_local_elements_verifier.dart b/pkg/analyzer/lib/src/error/unused_local_elements_verifier.dart
index 8a260aa69d8..1e544014d5a 100644
--- a/pkg/analyzer/lib/src/error/unused_local_elements_verifier.dart
+++ b/pkg/analyzer/lib/src/error/unused_local_elements_verifier.dart
@@ -27,9 +27,9 @@ import 'package:collection/collection.dart';
 class GatherUsedLocalElementsVisitor extends RecursiveAstVisitor<void> {
   final UsedLocalElements usedElements = UsedLocalElements();
 
-  final LibraryElement2 _enclosingLibrary;
-  InterfaceElement2? _enclosingClass;
-  ExecutableElement2? _enclosingExec;
+  final LibraryElement _enclosingLibrary;
+  InterfaceElement? _enclosingClass;
+  ExecutableElement? _enclosingExec;
 
   /// Non-null when the visitor is inside an [IsExpression]'s type.
   IsExpression? _enclosingIsExpression;
@@ -115,7 +115,7 @@ class GatherUsedLocalElementsVisitor extends RecursiveAstVisitor<void> {
   @override
   void visitDefaultFormalParameter(DefaultFormalParameter node) {
     var element = node.declaredFragment?.element;
-    if (element is SuperFormalParameterElement2) {
+    if (element is SuperFormalParameterElement) {
       usedElements.addElement(element.superConstructorParameter2);
     }
 
@@ -214,7 +214,7 @@ class GatherUsedLocalElementsVisitor extends RecursiveAstVisitor<void> {
   void visitMethodInvocation(MethodInvocation node) {
     var function = node.methodName.element;
     if (function is LocalFunctionElement ||
-        function is MethodElement2 ||
+        function is MethodElement ||
         function is TopLevelFunctionElement) {
       _addParametersForArguments(node.argumentList);
     }
@@ -268,18 +268,18 @@ class GatherUsedLocalElementsVisitor extends RecursiveAstVisitor<void> {
     if (element is ExecutableMember) {
       element = element.baseElement;
     }
-    var variable = element.ifTypeOrNull<PropertyAccessorElement2>()?.variable3;
+    var variable = element.ifTypeOrNull<PropertyAccessorElement>()?.variable3;
     bool isIdentifierRead = _isReadIdentifier(node);
-    if (element is PropertyAccessorElement2 &&
+    if (element is PropertyAccessorElement &&
         isIdentifierRead &&
-        variable is TopLevelVariableElement2) {
+        variable is TopLevelVariableElement) {
       if (element.isSynthetic) {
         usedElements.addElement(variable);
       } else {
         usedElements.members.add(element);
         _addMemberAndCorrespondingGetter(element);
       }
-    } else if (element is LocalVariableElement2) {
+    } else if (element is LocalVariableElement) {
       if (isIdentifierRead) {
         usedElements.addElement(element);
       }
@@ -291,16 +291,16 @@ class GatherUsedLocalElementsVisitor extends RecursiveAstVisitor<void> {
       var grandparent = parent.parent;
       // If [node] is a tear-off, assume all parameters are used.
       var functionReferenceIsCall =
-          (element is ExecutableElement2 && parent is MethodInvocation) ||
+          (element is ExecutableElement && parent is MethodInvocation) ||
           // named constructor
-          (element is ConstructorElement2 &&
+          (element is ConstructorElement &&
               parent is ConstructorName &&
               grandparent is InstanceCreationExpression) ||
           // unnamed constructor
-          (element is InterfaceElement2 &&
+          (element is InterfaceElement &&
               grandparent is ConstructorName &&
               grandparent.parent is InstanceCreationExpression);
-      if (element is ExecutableElement2 &&
+      if (element is ExecutableElement &&
           isIdentifierRead &&
           !functionReferenceIsCall) {
         for (var parameter in element.formalParameters) {
@@ -312,8 +312,7 @@ class GatherUsedLocalElementsVisitor extends RecursiveAstVisitor<void> {
         if (isIdentifierRead) {
           usedElements.unresolvedReadMembers.add(node.name);
         }
-      } else if (enclosingElement is EnumElement2 &&
-          element.name3 == 'values') {
+      } else if (enclosingElement is EnumElement && element.name3 == 'values') {
         // If the 'values' static accessor of the enum is accessed, then all of
         // the enum values have been read.
         for (var field in enclosingElement.fields2) {
@@ -321,8 +320,8 @@ class GatherUsedLocalElementsVisitor extends RecursiveAstVisitor<void> {
             usedElements.readMembers.add(field.getter2!);
           }
         }
-      } else if ((enclosingElement is InterfaceElement2 ||
-              enclosingElement is ExtensionElement2) &&
+      } else if ((enclosingElement is InterfaceElement ||
+              enclosingElement is ExtensionElement) &&
           !identical(element, _enclosingExec)) {
         usedElements.members.add(element);
         if (isIdentifierRead) {
@@ -353,7 +352,7 @@ class GatherUsedLocalElementsVisitor extends RecursiveAstVisitor<void> {
 
   /// Add [element] as a used member and, if [element] is a setter, add its
   /// corresponding getter as a used member.
-  void _addMemberAndCorrespondingGetter(Element2 element) {
+  void _addMemberAndCorrespondingGetter(Element element) {
     if (element is SetterElement) {
       usedElements.addMember(element.correspondingGetter2);
       usedElements.addReadMember(element.correspondingGetter2);
@@ -370,7 +369,7 @@ class GatherUsedLocalElementsVisitor extends RecursiveAstVisitor<void> {
   }
 
   /// Marks the [element] as used in the library.
-  void _useIdentifierElement(Element2? element, {required AstNode parent}) {
+  void _useIdentifierElement(Element? element, {required AstNode parent}) {
     if (element == null) {
       return;
     }
@@ -388,7 +387,7 @@ class GatherUsedLocalElementsVisitor extends RecursiveAstVisitor<void> {
     // Ignore places where the element is not actually used.
     // TODO(scheglov): Do we need 'parent' at all?
     if (parent is NamedType) {
-      if (element is InterfaceElement2) {
+      if (element is InterfaceElement) {
         var enclosingVariableDeclaration = _enclosingVariableDeclaration;
         if (enclosingVariableDeclaration != null) {
           // If it's a field's type, it still counts as used.
@@ -510,14 +509,14 @@ class UnusedLocalElementsVerifier extends RecursiveAstVisitor<void> {
 
   /// The current set of pattern variable elements, used to track whether _all_
   /// within a [PatternVariableDeclaration] are used.
-  List<BindPatternVariableElement2>? _patternVariableElements;
+  List<BindPatternVariableElement>? _patternVariableElements;
 
   /// Create a new instance of the [UnusedLocalElementsVerifier].
   UnusedLocalElementsVerifier(
     this._errorListener,
     this._usedElements,
     this._inheritanceManager,
-    LibraryElement2 library,
+    LibraryElement library,
   ) : _libraryUri = library.uri,
       _wildCardVariablesEnabled = library.featureSet.isEnabled(
         Feature.wildcard_variables,
@@ -597,7 +596,7 @@ class UnusedLocalElementsVerifier extends RecursiveAstVisitor<void> {
   @override
   void visitFieldDeclaration(FieldDeclaration node) {
     for (var field in node.fields.variables) {
-      _visitFieldElement(field.declaredFragment!.element as FieldElement2);
+      _visitFieldElement(field.declaredFragment!.element as FieldElement);
     }
 
     super.visitFieldDeclaration(node);
@@ -620,7 +619,7 @@ class UnusedLocalElementsVerifier extends RecursiveAstVisitor<void> {
   void visitForPartsWithDeclarations(ForPartsWithDeclarations node) {
     for (var variable in node.variables.variables) {
       _visitLocalVariableElement(
-        variable.declaredElement2 as LocalVariableElement2,
+        variable.declaredElement2 as LocalVariableElement,
       );
     }
 
@@ -632,7 +631,7 @@ class UnusedLocalElementsVerifier extends RecursiveAstVisitor<void> {
     var declaredElement = node.declaredFragment?.element;
     if (declaredElement is LocalFunctionElement) {
       _visitLocalFunctionElement(declaredElement);
-    } else if (declaredElement is PropertyAccessorElement2) {
+    } else if (declaredElement is PropertyAccessorElement) {
       _visitPropertyAccessorElement(declaredElement);
     } else if (declaredElement is TopLevelFunctionElement) {
       _visitTopLevelFunctionElement(declaredElement);
@@ -651,7 +650,7 @@ class UnusedLocalElementsVerifier extends RecursiveAstVisitor<void> {
 
   @override
   void visitGenericTypeAlias(GenericTypeAlias node) {
-    var declaredElement = node.declaredFragment?.element as TypeAliasElement2;
+    var declaredElement = node.declaredFragment?.element as TypeAliasElement;
     _visitTypeAliasElement(declaredElement);
 
     super.visitGenericTypeAlias(node);
@@ -660,9 +659,9 @@ class UnusedLocalElementsVerifier extends RecursiveAstVisitor<void> {
   @override
   void visitMethodDeclaration(MethodDeclaration node) {
     var declaredElement = node.declaredFragment?.element;
-    if (declaredElement is MethodElement2) {
+    if (declaredElement is MethodElement) {
       _visitMethodElement(declaredElement);
-    } else if (declaredElement is PropertyAccessorElement2) {
+    } else if (declaredElement is PropertyAccessorElement) {
       _visitPropertyAccessorElement(declaredElement);
     }
 
@@ -683,7 +682,7 @@ class UnusedLocalElementsVerifier extends RecursiveAstVisitor<void> {
     var patternVariableElements = _patternVariableElements = [];
     try {
       super.visitPatternVariableDeclaration(node);
-      var elementsToReport = <BindPatternVariableElement2>[];
+      var elementsToReport = <BindPatternVariableElement>[];
       for (var element in patternVariableElements) {
         var isUsed = _usedElements.elements.contains(element);
         // Don't report any of the declared variables as unused, if any of them
@@ -711,23 +710,23 @@ class UnusedLocalElementsVerifier extends RecursiveAstVisitor<void> {
   void visitSimpleIdentifier(SimpleIdentifier node) {
     if (node.inDeclarationContext()) {
       var element = node.element;
-      if (element is ConstructorElement2) {
+      if (element is ConstructorElement) {
         _visitConstructorElement(element);
-      } else if (element is FieldElement2) {
+      } else if (element is FieldElement) {
         _visitFieldElement(element);
       } else if (element is LocalFunctionElement) {
         _visitLocalFunctionElement(element);
-      } else if (element is InterfaceElement2) {
+      } else if (element is InterfaceElement) {
         _visitClassElement(element);
-      } else if (element is LocalVariableElement2) {
+      } else if (element is LocalVariableElement) {
         _visitLocalVariableElement(element);
-      } else if (element is MethodElement2) {
+      } else if (element is MethodElement) {
         _visitMethodElement(element);
-      } else if (element is PropertyAccessorElement2) {
+      } else if (element is PropertyAccessorElement) {
         _visitPropertyAccessorElement(element);
-      } else if (element is TopLevelVariableElement2) {
+      } else if (element is TopLevelVariableElement) {
         _visitTopLevelVariableElement(element);
-      } else if (element is TypeAliasElement2) {
+      } else if (element is TypeAliasElement) {
         _visitTypeAliasElement(element);
       }
     }
@@ -737,7 +736,7 @@ class UnusedLocalElementsVerifier extends RecursiveAstVisitor<void> {
   void visitTopLevelVariableDeclaration(TopLevelVariableDeclaration node) {
     for (var variable in node.variables.variables) {
       _visitTopLevelVariableElement(
-        variable.declaredFragment?.element as TopLevelVariableElement2,
+        variable.declaredFragment?.element as TopLevelVariableElement,
       );
     }
 
@@ -748,7 +747,7 @@ class UnusedLocalElementsVerifier extends RecursiveAstVisitor<void> {
   void visitVariableDeclarationStatement(VariableDeclarationStatement node) {
     for (var variable in node.variables.variables) {
       _visitLocalVariableElement(
-        variable.declaredElement2 as LocalVariableElement2,
+        variable.declaredElement2 as LocalVariableElement,
       );
     }
 
@@ -759,8 +758,8 @@ class UnusedLocalElementsVerifier extends RecursiveAstVisitor<void> {
   /// parameter in the overridden element.
   FormalParameterElement? _getCorrespondingParameter(
     FormalParameterElement parameter,
-    ExecutableElement2 overridden,
-    ExecutableElement2 enclosingElement,
+    ExecutableElement overridden,
+    ExecutableElement enclosingElement,
   ) {
     FormalParameterElement? correspondingParameter;
     if (parameter.isNamed) {
@@ -786,7 +785,7 @@ class UnusedLocalElementsVerifier extends RecursiveAstVisitor<void> {
   }
 
   /// Returns whether the name of [element] should be treated as a wildcard.
-  bool _isNamedWildcard(LocalElement2 element) {
+  bool _isNamedWildcard(LocalElement element) {
     if (_wildCardVariablesEnabled) {
       return element.isWildcardVariable;
     } else {
@@ -796,32 +795,32 @@ class UnusedLocalElementsVerifier extends RecursiveAstVisitor<void> {
     }
   }
 
-  bool _isPrivateClassOrExtension(Element2 element) =>
-      (element is InterfaceElement2 || element is ExtensionElement2) &&
+  bool _isPrivateClassOrExtension(Element element) =>
+      (element is InterfaceElement || element is ExtensionElement) &&
       element.isPrivate;
 
   /// Returns whether [element] is accessible outside of the library in which
   /// it is declared.
-  bool _isPubliclyAccessible(ExecutableElement2 element) {
+  bool _isPubliclyAccessible(ExecutableElement element) {
     if (element.isPrivate) {
       return false;
     }
     var enclosingElement = element.enclosingElement2;
 
-    if (enclosingElement is EnumElement2) {
-      if (element is ConstructorElement2 && element.isGenerative) {
+    if (enclosingElement is EnumElement) {
+      if (element is ConstructorElement && element.isGenerative) {
         return false;
       }
     }
-    if (enclosingElement is InterfaceElement2) {
+    if (enclosingElement is InterfaceElement) {
       if (enclosingElement.isPrivate) {
-        if (element.isStatic || element is ConstructorElement2) {
+        if (element.isStatic || element is ConstructorElement) {
           return false;
         }
       }
     }
 
-    if (enclosingElement is ExtensionElement2) {
+    if (enclosingElement is ExtensionElement) {
       return enclosingElement.isPublic;
     }
 
@@ -830,9 +829,9 @@ class UnusedLocalElementsVerifier extends RecursiveAstVisitor<void> {
 
   /// Returns whether [element] is a private element which is read somewhere in
   /// the library.
-  bool _isReadMember(Element2 element) {
+  bool _isReadMember(Element element) {
     bool elementIsStaticVariable =
-        element is VariableElement2 && element.isStatic;
+        element is VariableElement && element.isStatic;
     if (element.isPublic) {
       if (_isPrivateClassOrExtension(element.enclosingElement2!) &&
           elementIsStaticVariable) {
@@ -845,7 +844,7 @@ class UnusedLocalElementsVerifier extends RecursiveAstVisitor<void> {
     if (element.isSynthetic) {
       return true;
     }
-    if (element is FieldElement2) {
+    if (element is FieldElement) {
       var getter = element.getter2;
       if (getter == null) {
         return false;
@@ -863,19 +862,19 @@ class UnusedLocalElementsVerifier extends RecursiveAstVisitor<void> {
     return _overridesUsedElement(element);
   }
 
-  bool _isUsedElement(Element2 element) {
+  bool _isUsedElement(Element element) {
     if (element.isSynthetic) {
       return true;
     }
-    if (element is LocalVariableElement2 ||
+    if (element is LocalVariableElement ||
         element is LocalFunctionElement && !element.isStatic) {
       // local variable or function
     } else if (element is FormalParameterElement) {
       var enclosingElement = element.enclosingElement2;
       // Only report unused parameters of constructors, methods, and top-level
       // functions.
-      if (enclosingElement is! ConstructorElement2 &&
-          enclosingElement is! MethodElement2 &&
+      if (enclosingElement is! ConstructorElement &&
+          enclosingElement is! MethodElement &&
           enclosingElement is! TopLevelFunctionElement) {
         return true;
       }
@@ -883,7 +882,7 @@ class UnusedLocalElementsVerifier extends RecursiveAstVisitor<void> {
       if (!element.isOptional) {
         return true;
       }
-      if (enclosingElement is ConstructorElement2 &&
+      if (enclosingElement is ConstructorElement &&
           enclosingElement.enclosingElement2.typeParameters2.isNotEmpty) {
         // There is an issue matching arguments of instance creation
         // expressions for generic classes with parameters, so for now,
@@ -891,7 +890,7 @@ class UnusedLocalElementsVerifier extends RecursiveAstVisitor<void> {
         // "used". See https://github.com/dart-lang/sdk/issues/47839.
         return true;
       }
-      if (enclosingElement is ConstructorElement2) {
+      if (enclosingElement is ConstructorElement) {
         var superConstructor = enclosingElement.superConstructor2;
         if (superConstructor != null) {
           var correspondingParameter = _getCorrespondingParameter(
@@ -907,7 +906,7 @@ class UnusedLocalElementsVerifier extends RecursiveAstVisitor<void> {
           }
         }
       }
-      if (enclosingElement is ExecutableElement2) {
+      if (enclosingElement is ExecutableElement) {
         if (enclosingElement.typeParameters2.isNotEmpty) {
           // There is an issue matching arguments of generic function
           // invocations with parameters, so for now, consider every parameter
@@ -933,7 +932,7 @@ class UnusedLocalElementsVerifier extends RecursiveAstVisitor<void> {
     return _usedElements.elements.contains(element);
   }
 
-  bool _isUsedMember(ExecutableElement2 element) {
+  bool _isUsedMember(ExecutableElement element) {
     if (_isPubliclyAccessible(element)) {
       return true;
     }
@@ -953,9 +952,9 @@ class UnusedLocalElementsVerifier extends RecursiveAstVisitor<void> {
     return _overridesUsedElement(element);
   }
 
-  Iterable<ExecutableElement2> _overriddenElements(Element2 element) {
+  Iterable<ExecutableElement> _overriddenElements(Element element) {
     var enclosingElement = element.enclosingElement2;
-    if (enclosingElement is InterfaceElement2) {
+    if (enclosingElement is InterfaceElement) {
       var elementName = element.name3;
       if (elementName != null) {
         Name name = Name(_libraryUri, elementName);
@@ -976,7 +975,7 @@ class UnusedLocalElementsVerifier extends RecursiveAstVisitor<void> {
 
   /// Check if [element] is a class member which overrides a super class's class
   /// member which is used.
-  bool _overridesUsedElement(Element2 element) {
+  bool _overridesUsedElement(Element element) {
     return _overriddenElements(
       element,
     ).any((e) => _usedElements.members.contains(e) || _overridesUsedElement(e));
@@ -986,7 +985,7 @@ class UnusedLocalElementsVerifier extends RecursiveAstVisitor<void> {
   /// class's method in which the corresponding parameter is used.
   bool _overridesUsedParameter(
     FormalParameterElement element,
-    ExecutableElement2 enclosingElement,
+    ExecutableElement enclosingElement,
   ) {
     var overriddenElements = _overriddenElements(enclosingElement);
     for (var overridden in overriddenElements) {
@@ -1010,7 +1009,7 @@ class UnusedLocalElementsVerifier extends RecursiveAstVisitor<void> {
 
   void _reportErrorForElement(
     ErrorCode errorCode,
-    Element2? element,
+    Element? element,
     List<Object> arguments,
   ) {
     if (element != null) {
@@ -1030,7 +1029,7 @@ class UnusedLocalElementsVerifier extends RecursiveAstVisitor<void> {
     }
   }
 
-  void _visitClassElement(InterfaceElement2 element) {
+  void _visitClassElement(InterfaceElement element) {
     if (!_isUsedElement(element)) {
       _reportErrorForElement(WarningCode.UNUSED_ELEMENT, element, [
         element.displayName,
@@ -1038,7 +1037,7 @@ class UnusedLocalElementsVerifier extends RecursiveAstVisitor<void> {
     }
   }
 
-  void _visitConstructorElement(ConstructorElement2 element) {
+  void _visitConstructorElement(ConstructorElement element) {
     // Only complain about an unused constructor if it is not the only
     // constructor in the class. A single unused, private constructor may serve
     // the purpose of preventing the class from being extended. In serving this
@@ -1051,7 +1050,7 @@ class UnusedLocalElementsVerifier extends RecursiveAstVisitor<void> {
     }
   }
 
-  void _visitFieldElement(FieldElement2 element) {
+  void _visitFieldElement(FieldElement element) {
     if (!_isReadMember(element)) {
       _reportErrorForElement(WarningCode.UNUSED_FIELD, element, [
         element.displayName,
@@ -1068,7 +1067,7 @@ class UnusedLocalElementsVerifier extends RecursiveAstVisitor<void> {
     }
   }
 
-  void _visitLocalVariableElement(LocalVariableElement2 element) {
+  void _visitLocalVariableElement(LocalVariableElement element) {
     if (!_isUsedElement(element) && !_isNamedWildcard(element)) {
       ErrorCode errorCode;
       if (_usedElements.isCatchException(element)) {
@@ -1082,7 +1081,7 @@ class UnusedLocalElementsVerifier extends RecursiveAstVisitor<void> {
     }
   }
 
-  void _visitMethodElement(MethodElement2 element) {
+  void _visitMethodElement(MethodElement element) {
     if (!_isUsedMember(element)) {
       _reportErrorForElement(WarningCode.UNUSED_ELEMENT, element, [
         element.displayName,
@@ -1090,7 +1089,7 @@ class UnusedLocalElementsVerifier extends RecursiveAstVisitor<void> {
     }
   }
 
-  void _visitPropertyAccessorElement(PropertyAccessorElement2 element) {
+  void _visitPropertyAccessorElement(PropertyAccessorElement element) {
     if (!_isUsedMember(element)) {
       _reportErrorForElement(WarningCode.UNUSED_ELEMENT, element, [
         element.displayName,
@@ -1106,7 +1105,7 @@ class UnusedLocalElementsVerifier extends RecursiveAstVisitor<void> {
     }
   }
 
-  void _visitTopLevelVariableElement(TopLevelVariableElement2 element) {
+  void _visitTopLevelVariableElement(TopLevelVariableElement element) {
     if (!_isUsedElement(element)) {
       _reportErrorForElement(WarningCode.UNUSED_ELEMENT, element, [
         element.displayName,
@@ -1114,7 +1113,7 @@ class UnusedLocalElementsVerifier extends RecursiveAstVisitor<void> {
     }
   }
 
-  void _visitTypeAliasElement(TypeAliasElement2 element) {
+  void _visitTypeAliasElement(TypeAliasElement element) {
     if (!_isUsedElement(element)) {
       _reportErrorForElement(WarningCode.UNUSED_ELEMENT, element, [
         element.displayName,
@@ -1122,33 +1121,33 @@ class UnusedLocalElementsVerifier extends RecursiveAstVisitor<void> {
     }
   }
 
-  static bool _hasPragmaVmEntryPoint(Element2 element) {
+  static bool _hasPragmaVmEntryPoint(Element element) {
     return element is Annotatable &&
         ((element as Annotatable).metadata2 as MetadataImpl)
             .hasPragmaVmEntryPoint;
   }
 }
 
-/// A container with sets of used [Element2]s.
+/// A container with sets of used [Element]s.
 /// All these elements are defined in a single compilation unit or a library.
 class UsedLocalElements {
   /// Resolved, locally defined elements that are used or potentially can be
   /// used.
-  final HashSet<Element2> elements = HashSet<Element2>();
+  final HashSet<Element> elements = HashSet<Element>();
 
-  /// [LocalVariableElement2]s that represent exceptions in [CatchClause]s.
-  final HashSet<LocalVariableElement2> catchExceptionElements =
-      HashSet<LocalVariableElement2>();
+  /// [LocalVariableElement]s that represent exceptions in [CatchClause]s.
+  final HashSet<LocalVariableElement> catchExceptionElements =
+      HashSet<LocalVariableElement>();
 
-  /// [LocalVariableElement2]s that represent stack traces in [CatchClause]s.
-  final HashSet<LocalVariableElement2> catchStackTraceElements =
-      HashSet<LocalVariableElement2>();
+  /// [LocalVariableElement]s that represent stack traces in [CatchClause]s.
+  final HashSet<LocalVariableElement> catchStackTraceElements =
+      HashSet<LocalVariableElement>();
 
   /// Resolved class members that are referenced in the library.
-  final HashSet<Element2> members = HashSet<Element2>();
+  final HashSet<Element> members = HashSet<Element>();
 
   /// Resolved class members that are read in the library.
-  final HashSet<Element2> readMembers = HashSet<Element2>();
+  final HashSet<Element> readMembers = HashSet<Element>();
 
   /// Unresolved class members that are read in the library.
   final HashSet<String> unresolvedReadMembers = HashSet<String>();
@@ -1170,19 +1169,19 @@ class UsedLocalElements {
     return result;
   }
 
-  void addCatchException(Element2? element) {
-    if (element is LocalVariableElement2) {
+  void addCatchException(Element? element) {
+    if (element is LocalVariableElement) {
       catchExceptionElements.add(element);
     }
   }
 
-  void addCatchStackTrace(Element2? element) {
-    if (element is LocalVariableElement2) {
+  void addCatchStackTrace(Element? element) {
+    if (element is LocalVariableElement) {
       catchStackTraceElements.add(element);
     }
   }
 
-  void addElement(Element2? element) {
+  void addElement(Element? element) {
     if (element is JoinPatternVariableElementImpl2) {
       elements.addAll(element.transitiveVariables);
     } else if (element is ExecutableMember) {
@@ -1192,7 +1191,7 @@ class UsedLocalElements {
     }
   }
 
-  void addMember(Element2? element) {
+  void addMember(Element? element) {
     // Store un-parameterized members.
     if (element is ExecutableMember) {
       element = element.baseElement;
@@ -1203,7 +1202,7 @@ class UsedLocalElements {
     }
   }
 
-  void addReadMember(Element2? element) {
+  void addReadMember(Element? element) {
     // Store un-parameterized members.
     if (element is ExecutableMember) {
       element = element.baseElement;
@@ -1214,11 +1213,11 @@ class UsedLocalElements {
     }
   }
 
-  bool isCatchException(LocalVariableElement2 element) {
+  bool isCatchException(LocalVariableElement element) {
     return catchExceptionElements.contains(element);
   }
 
-  bool isCatchStackTrace(LocalVariableElement2 element) {
+  bool isCatchStackTrace(LocalVariableElement element) {
     return catchStackTraceElements.contains(element);
   }
 }
diff --git a/pkg/analyzer/lib/src/error/use_result_verifier.dart b/pkg/analyzer/lib/src/error/use_result_verifier.dart
index 0a5c22777fb..21233795223 100644
--- a/pkg/analyzer/lib/src/error/use_result_verifier.dart
+++ b/pkg/analyzer/lib/src/error/use_result_verifier.dart
@@ -72,7 +72,7 @@ class UseResultVerifier {
     _check(node, element);
   }
 
-  void _check(AstNode node, Element2 element) {
+  void _check(AstNode node, Element element) {
     var parent = node.parent;
     if (parent is PrefixedIdentifier) {
       parent = parent.parent;
@@ -174,9 +174,9 @@ class UseResultVerifier {
     return node;
   }
 
-  static ElementAnnotation? _getUseResultMetadata(Element2 element) {
+  static ElementAnnotation? _getUseResultMetadata(Element element) {
     // Implicit getters/setters.
-    if (element.isSynthetic && element is PropertyAccessorElement2) {
+    if (element.isSynthetic && element is PropertyAccessorElement) {
       if (element.variable3 case var variable?) {
         element = variable;
       } else {
diff --git a/pkg/analyzer/lib/src/fine/library_manifest.dart b/pkg/analyzer/lib/src/fine/library_manifest.dart
index 20274d0ef78..e5a4d148401 100644
--- a/pkg/analyzer/lib/src/fine/library_manifest.dart
+++ b/pkg/analyzer/lib/src/fine/library_manifest.dart
@@ -87,7 +87,7 @@ class LibraryManifestBuilder {
   ///
   /// Then we iterate over the elements in [libraryElements], and build new
   /// items for declared elements that don't have items in this map.
-  final Map<Element2, ManifestItem> declaredItems = Map.identity();
+  final Map<Element, ManifestItem> declaredItems = Map.identity();
 
   /// The new manifests for libraries.
   final Map<Uri, LibraryManifest> newManifests = {};
@@ -622,9 +622,9 @@ class LibraryManifestBuilder {
     // Compare structures of the elements against the existing manifests.
     // At the end `affectedElements` is filled with mismatched by structure.
     // And for matched by structure we have reference maps.
-    var refElementsMap = Map<Element2, List<Element2>>.identity();
-    var refExternalIds = Map<Element2, ManifestItemId>.identity();
-    var affectedElements = Set<Element2>.identity();
+    var refElementsMap = Map<Element, List<Element>>.identity();
+    var refExternalIds = Map<Element, ManifestItemId>.identity();
+    var affectedElements = Set<Element>.identity();
     for (var libraryElement in libraryElements) {
       var libraryUri = libraryElement.uri;
       var manifest = _getInputManifest(libraryUri);
@@ -694,7 +694,7 @@ class LibraryManifestBuilder {
 
   /// Returns either the existing item from [declaredItems], or builds a new one.
   Item _getOrBuildElementItem<
-    Element extends Element2,
+    Element extends ElementImpl2,
     Item extends ManifestItem
   >(Element element, Item Function() build) {
     // We assume that when matching elements against the structure of
@@ -723,11 +723,11 @@ class _LibraryMatch {
 
   /// Elements that have structure matching the corresponding items from
   /// [manifest].
-  final Map<Element2, ManifestItem> itemMap;
+  final Map<Element, ManifestItem> itemMap;
 
   /// Elements with mismatched structure.
   /// These elements will get new identifiers.
-  final Set<Element2> structureMismatched;
+  final Set<Element> structureMismatched;
 
   /// Key: an element of [library].
   /// Value: the elements that the key references.
@@ -736,7 +736,7 @@ class _LibraryMatch {
   /// bundles. This information allows propagating invalidation from affected
   /// elements to their dependents.
   // TODO(scheglov): hm... maybe store it? And reverse it.
-  final Map<Element2, List<Element2>> refElementsMap;
+  final Map<Element, List<Element>> refElementsMap;
 
   /// Key: an element from an external bundle.
   /// Value: the identifier at the time when [manifest] was built.
@@ -744,7 +744,7 @@ class _LibraryMatch {
   /// If [LibraryManifestBuilder] later finds that some of these elements now
   /// have different identifiers, it propagates invalidation using
   /// [refElementsMap].
-  final Map<Element2, ManifestItemId> refExternalIds;
+  final Map<Element, ManifestItemId> refExternalIds;
 
   _LibraryMatch({
     required this.manifest,
diff --git a/pkg/analyzer/lib/src/fine/manifest_ast.dart b/pkg/analyzer/lib/src/fine/manifest_ast.dart
index 56407a2d67a..95a135c9d92 100644
--- a/pkg/analyzer/lib/src/fine/manifest_ast.dart
+++ b/pkg/analyzer/lib/src/fine/manifest_ast.dart
@@ -180,7 +180,7 @@ class ManifestNode {
 class _ElementCollector extends ThrowingAstVisitor<void> {
   final int Function(TypeParameterElementImpl2) indexOfTypeParameter;
   final int Function(FormalParameterElementImpl) indexOfFormalParameter;
-  final Map<Element2, int> map = Map.identity();
+  final Map<Element, int> map = Map.identity();
   final List<int> elementIndexList = [];
 
   _ElementCollector({
@@ -369,7 +369,7 @@ class _ElementCollector extends ThrowingAstVisitor<void> {
     node.visitChildren(this);
   }
 
-  void _addElement(Element2? element) {
+  void _addElement(Element? element) {
     ManifestAstElementKind kind;
     int rawIndex;
     switch (element) {
@@ -385,7 +385,7 @@ class _ElementCollector extends ThrowingAstVisitor<void> {
       case TypeParameterElementImpl2():
         kind = ManifestAstElementKind.typeParameter;
         rawIndex = indexOfTypeParameter(element);
-      case PrefixElement2():
+      case PrefixElement():
         kind = ManifestAstElementKind.importPrefix;
         rawIndex = 0;
       default:
diff --git a/pkg/analyzer/lib/src/fine/manifest_context.dart b/pkg/analyzer/lib/src/fine/manifest_context.dart
index 00b2e84538b..9aa8f4bce0b 100644
--- a/pkg/analyzer/lib/src/fine/manifest_context.dart
+++ b/pkg/analyzer/lib/src/fine/manifest_context.dart
@@ -13,13 +13,13 @@ import 'package:analyzer/src/summary2/linked_element_factory.dart';
 
 class EncodeContext {
   final LinkedElementFactory elementFactory;
-  final Map<TypeParameterElement2, int> _typeParameters = Map.identity();
+  final Map<TypeParameterElement, int> _typeParameters = Map.identity();
   final Map<FormalParameterElement, int> _formalParameters = Map.identity();
 
   EncodeContext({required this.elementFactory});
 
   /// Returns the id of [element], or `null` if from this bundle.
-  ManifestItemId? getElementId(Element2 element) {
+  ManifestItemId? getElementId(Element element) {
     return elementFactory.getElementId(element);
   }
 
@@ -31,7 +31,7 @@ class EncodeContext {
     throw StateError('No formal parameter $element');
   }
 
-  int indexOfTypeParameter(TypeParameterElement2 element) {
+  int indexOfTypeParameter(TypeParameterElement element) {
     if (_typeParameters[element] case var bottomIndex?) {
       return _typeParameters.length - 1 - bottomIndex;
     }
@@ -56,7 +56,7 @@ class EncodeContext {
   }
 
   T withTypeParameters<T>(
-    List<TypeParameterElement2> typeParameters,
+    List<TypeParameterElement> typeParameters,
     T Function(List<ManifestTypeParameter> typeParameters) operation,
   ) {
     for (var typeParameter in typeParameters) {
@@ -131,11 +131,11 @@ final class ManifestElement {
 
   /// If [element] matches this description, records the reference and id.
   /// If not, returns `false`, it is a mismatch anyway.
-  bool match(MatchContext context, Element2 element) {
+  bool match(MatchContext context, Element element) {
     var enclosingElement = element.enclosingElement2!;
-    Element2 givenTopLevelElement;
-    Element2? givenMemberElement;
-    if (enclosingElement is LibraryElement2) {
+    Element givenTopLevelElement;
+    Element? givenMemberElement;
+    if (enclosingElement is LibraryElement) {
       givenTopLevelElement = element;
     } else {
       givenTopLevelElement = enclosingElement;
@@ -167,15 +167,15 @@ final class ManifestElement {
     id.writeOptional(sink);
   }
 
-  static ManifestElement encode(EncodeContext context, Element2 element) {
-    Element2 topLevelElement;
-    Element2? memberElement;
+  static ManifestElement encode(EncodeContext context, Element element) {
+    Element topLevelElement;
+    Element? memberElement;
     var enclosingElement = element.enclosingElement2!;
-    if (enclosingElement is LibraryElement2) {
+    if (enclosingElement is LibraryElement) {
       topLevelElement = element;
     } else {
       topLevelElement = enclosingElement;
-      assert(topLevelElement.enclosingElement2 is LibraryElement2);
+      assert(topLevelElement.enclosingElement2 is LibraryElement);
       memberElement = element;
     }
 
@@ -196,21 +196,21 @@ class MatchContext {
   final MatchContext? parent;
 
   /// Any referenced elements, from this bundle or not.
-  final Set<Element2> elements = {};
+  final Set<Element> elements = {};
 
   /// The required identifiers of referenced elements that are not from this
   /// bundle.
-  final Map<Element2, ManifestItemId> externalIds = {};
+  final Map<Element, ManifestItemId> externalIds = {};
 
-  final Map<TypeParameterElement2, int> _typeParameters = Map.identity();
+  final Map<TypeParameterElement, int> _typeParameters = Map.identity();
   final Map<FormalParameterElement, int> _formalParameters = Map.identity();
 
   MatchContext({required this.parent});
 
   /// Any referenced elements, from this bundle or not.
-  List<Element2> get elementList => elements.toList(growable: false);
+  List<Element> get elementList => elements.toList(growable: false);
 
-  void addTypeParameters(List<TypeParameterElement2> typeParameters) {
+  void addTypeParameters(List<TypeParameterElement> typeParameters) {
     for (var typeParameter in typeParameters) {
       _typeParameters[typeParameter] = _typeParameters.length;
     }
@@ -224,7 +224,7 @@ class MatchContext {
     throw StateError('No formal parameter $element');
   }
 
-  int indexOfTypeParameter(TypeParameterElement2 element) {
+  int indexOfTypeParameter(TypeParameterElement element) {
     if (_typeParameters[element] case var result?) {
       return _typeParameters.length - 1 - result;
     }
@@ -254,7 +254,7 @@ class MatchContext {
   }
 
   T withTypeParameters<T>(
-    List<TypeParameterElement2> typeParameters,
+    List<TypeParameterElement> typeParameters,
     T Function() operation,
   ) {
     addTypeParameters(typeParameters);
@@ -270,10 +270,10 @@ class MatchContext {
 
 extension LinkedElementFactoryExtension on LinkedElementFactory {
   /// Returns the id of [element], or `null` if from this bundle.
-  ManifestItemId? getElementId(Element2 element) {
-    Element2 topLevelElement;
-    Element2? memberElement;
-    if (element.enclosingElement2 is LibraryElement2) {
+  ManifestItemId? getElementId(Element element) {
+    Element topLevelElement;
+    Element? memberElement;
+    if (element.enclosingElement2 is LibraryElement) {
       topLevelElement = element;
     } else {
       topLevelElement = element.enclosingElement2!;
diff --git a/pkg/analyzer/lib/src/fine/manifest_type.dart b/pkg/analyzer/lib/src/fine/manifest_type.dart
index 73e0449a5cb..cfa66e60d86 100644
--- a/pkg/analyzer/lib/src/fine/manifest_type.dart
+++ b/pkg/analyzer/lib/src/fine/manifest_type.dart
@@ -600,7 +600,7 @@ class ManifestTypeParameter {
 
   factory ManifestTypeParameter.encode(
     EncodeContext context,
-    TypeParameterElement2 element,
+    TypeParameterElement element,
   ) {
     return ManifestTypeParameter._(bound: element.bound?.encode(context));
   }
@@ -617,7 +617,7 @@ class ManifestTypeParameter {
     return other is ManifestTypeParameter && other.bound == bound;
   }
 
-  bool match(MatchContext context, TypeParameterElement2 element) {
+  bool match(MatchContext context, TypeParameterElement element) {
     return bound.match(context, element.bound);
   }
 
@@ -628,7 +628,7 @@ class ManifestTypeParameter {
   static bool matchList(
     MatchContext context,
     List<ManifestTypeParameter> manifests,
-    List<TypeParameterElement2> elements,
+    List<TypeParameterElement> elements,
   ) {
     if (manifests.length != elements.length) {
       return false;
diff --git a/pkg/analyzer/lib/src/generated/element_resolver.dart b/pkg/analyzer/lib/src/generated/element_resolver.dart
index 4825a5864fc..1b26db40f20 100644
--- a/pkg/analyzer/lib/src/generated/element_resolver.dart
+++ b/pkg/analyzer/lib/src/generated/element_resolver.dart
@@ -27,38 +27,38 @@ import 'package:analyzer/src/generated/super_context.dart';
 ///    * An identifier denoting a prefix should resolve to the element
 ///      representing the import that defines the prefix (an [LibraryImport]).
 ///    * An identifier denoting a variable should resolve to the element
-///      representing the variable (a [VariableElement2]).
+///      representing the variable (a [VariableElement]).
 ///    * An identifier denoting a parameter should resolve to the element
 ///      representing the parameter (a [FormalParameterElement]).
 ///    * An identifier denoting a field should resolve to the element
 ///      representing the getter or setter being invoked (a
-///      [PropertyAccessorElement2]).
+///      [PropertyAccessorElement]).
 ///    * An identifier denoting the name of a method or function being invoked
 ///      should resolve to the element representing the method or function (an
-///      [ExecutableElement2]).
+///      [ExecutableElement]).
 ///    * An identifier denoting a label should resolve to the element
-///      representing the label (a [LabelElement2]).
+///      representing the label (a [LabelElement]).
 ///    The identifiers within directives are exceptions to this rule and are
 ///    covered below.
 /// 2. Every node containing a token representing an operator that can be
 ///    overridden ( [BinaryExpression], [PrefixExpression], [PostfixExpression])
 ///    should resolve to the element representing the method invoked by that
-///    operator (a [MethodElement2]).
+///    operator (a [MethodElement]).
 /// 3. Every [FunctionExpressionInvocation] should resolve to the element
-///    representing the function being invoked (a [ExecutableElement2]). This
+///    representing the function being invoked (a [ExecutableElement]). This
 ///    will be the same element as that to which the name is resolved if the
 ///    function has a name, but is provided for those cases where an unnamed
 ///    function is being invoked.
 /// 4. Every [LibraryDirective] and [PartOfDirective] should resolve to the
 ///    element representing the library being specified by the directive (a
-///    [LibraryElement2]) unless, in the case of a part-of directive, the
+///    [LibraryElement]) unless, in the case of a part-of directive, the
 ///    specified library does not exist.
 /// 5. Every [ImportDirective] and [ExportDirective] should resolve to the
 ///    element representing the library being specified by the directive unless
 ///    the specified library does not exist (an [LibraryImport] or
 ///    [LibraryExport]).
 /// 6. The identifier representing the prefix in an [ImportDirective] should
-///    resolve to the element representing the prefix (a [PrefixElement2]).
+///    resolve to the element representing the prefix (a [PrefixElement]).
 /// 7. The identifiers in the hide and show combinators in [ImportDirective]s
 ///    and [ExportDirective]s should resolve to the elements that are being
 ///    hidden or shown, respectively, unless those names are not defined in the
@@ -481,7 +481,7 @@ class ElementResolver {
   /// the arguments, or `null` if no correspondence could be computed.
   List<FormalParameterElementMixin?>? _resolveArgumentsToFunction(
     ArgumentList argumentList,
-    ExecutableElement2? executableElement, {
+    ExecutableElement? executableElement, {
     ConstructorDeclaration? enclosingConstructor,
   }) {
     if (executableElement == null) {
@@ -525,7 +525,7 @@ class ElementResolver {
         if (element != null) {
           // Ensure that the name always resolves to a top-level variable
           // rather than a getter or setter
-          if (element is PropertyAccessorElement2) {
+          if (element is PropertyAccessorElement) {
             name.element = element.variable3;
           } else {
             name.element = element;
diff --git a/pkg/analyzer/lib/src/generated/error_detection_helpers.dart b/pkg/analyzer/lib/src/generated/error_detection_helpers.dart
index b3ff06b9689..4426d78898f 100644
--- a/pkg/analyzer/lib/src/generated/error_detection_helpers.dart
+++ b/pkg/analyzer/lib/src/generated/error_detection_helpers.dart
@@ -360,7 +360,7 @@ mixin ErrorDetectionHelpers {
             type,
             Name.forLibrary(
               type.element3.library2,
-              MethodElement2.CALL_METHOD_NAME,
+              MethodElement.CALL_METHOD_NAME,
             ),
           )
           .ifTypeOrNull();
@@ -371,10 +371,10 @@ mixin ErrorDetectionHelpers {
 
   /// Return the variable element represented by the given [expression], or
   /// `null` if there is no such element.
-  VariableElement2? getVariableElement(Expression? expression) {
+  VariableElement? getVariableElement(Expression? expression) {
     if (expression is Identifier) {
       var element = expression.element;
-      if (element is VariableElement2) {
+      if (element is VariableElement) {
         return element;
       }
     }
diff --git a/pkg/analyzer/lib/src/generated/error_verifier.dart b/pkg/analyzer/lib/src/generated/error_verifier.dart
index 61bc01094be..479f31789f9 100644
--- a/pkg/analyzer/lib/src/generated/error_verifier.dart
+++ b/pkg/analyzer/lib/src/generated/error_verifier.dart
@@ -109,16 +109,16 @@ class EnclosingExecutableContext {
     _ => false,
   };
 
-  bool get isConstructor => element is ConstructorElement2;
+  bool get isConstructor => element is ConstructorElement;
 
   bool get isFunction => switch (element) {
     LocalFunctionElement(:var displayName) => displayName.isNotEmpty,
     TopLevelFunctionElement(:var displayName) => displayName.isNotEmpty,
-    PropertyAccessorElement2() => true,
+    PropertyAccessorElement() => true,
     _ => false,
   };
 
-  bool get isMethod => element is MethodElement2;
+  bool get isMethod => element is MethodElement;
 
   bool get isSynchronous => !isAsynchronous;
 
@@ -126,24 +126,24 @@ class EnclosingExecutableContext {
     return catchErrorOnErrorReturnType ?? element!.returnType;
   }
 
-  static bool _inFactoryConstructor(Element2? element) {
+  static bool _inFactoryConstructor(Element? element) {
     var enclosing = element?.firstFragment.enclosingFragment;
     if (enclosing == null) {
       return false;
     }
-    if (element is ConstructorElement2) {
+    if (element is ConstructorElement) {
       return element.isFactory;
     }
     return _inFactoryConstructor(enclosing.element);
   }
 
-  static bool _inStaticMethod(Element2? element) {
+  static bool _inStaticMethod(Element? element) {
     var enclosing = element?.firstFragment.enclosingFragment;
     if (enclosing == null) {
       return false;
     }
     if (enclosing is InterfaceFragment || enclosing is ExtensionFragment) {
-      if (element is ExecutableElement2) {
+      if (element is ExecutableElement) {
         return element.isStatic;
       }
     }
@@ -222,7 +222,7 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
 
   /// The element of the extension being visited, or `null` if we are not
   /// in the scope of an extension.
-  ExtensionElement2? _enclosingExtension;
+  ExtensionElement? _enclosingExtension;
 
   /// Whether the current location has access to `this`.
   bool _hasAccessToThis = false;
@@ -613,7 +613,7 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
       SimpleIdentifier fieldName = node.fieldName;
       var element = fieldName.element;
       _checkForInvalidField(node, fieldName, element);
-      if (element is FieldElement2) {
+      if (element is FieldElement) {
         _checkForAbstractOrExternalFieldConstructorInitializer(
           node.fieldName.token,
           element,
@@ -911,7 +911,7 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
   void visitFunctionDeclaration(covariant FunctionDeclarationImpl node) {
     var fragment = node.declaredFragment!;
     var element = fragment.element;
-    if (element.enclosingElement2 is! LibraryElement2) {
+    if (element.enclosingElement2 is! LibraryElement) {
       _hiddenElements!.declare(element);
     }
 
@@ -1435,7 +1435,7 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
   void visitSuperFormalParameter(SuperFormalParameter node) {
     super.visitSuperFormalParameter(node);
 
-    if (_enclosingClass is ExtensionTypeElement2) {
+    if (_enclosingClass is ExtensionTypeElement) {
       errorReporter.atToken(
         node.superKeyword,
         CompileTimeErrorCode
@@ -1692,7 +1692,7 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
 
   void _checkForAbstractOrExternalFieldConstructorInitializer(
     Token identifier,
-    FieldElement2 fieldElement,
+    FieldElement fieldElement,
   ) {
     if (fieldElement.isAbstract) {
       errorReporter.atToken(
@@ -1713,7 +1713,7 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
   ) {
     var declaredElement = node.declaredFragment?.element;
     if (node.initializer != null) {
-      if (declaredElement is FieldElement2) {
+      if (declaredElement is FieldElement) {
         if (declaredElement.isAbstract) {
           errorReporter.atToken(
             node.name,
@@ -1726,7 +1726,7 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
             CompileTimeErrorCode.EXTERNAL_FIELD_INITIALIZER,
           );
         }
-      } else if (declaredElement is TopLevelVariableElement2) {
+      } else if (declaredElement is TopLevelVariableElement) {
         if (declaredElement.isExternal) {
           errorReporter.atToken(
             node.name,
@@ -1769,9 +1769,9 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
           )) {
             problemReported = true;
           }
-          if (mixinType.element3 is ExtensionTypeElement2) {
+          if (mixinType.element3 is ExtensionTypeElement) {
             // Already reported.
-          } else if (mixinElement is MixinElement2) {
+          } else if (mixinElement is MixinElement) {
             if (_checkForMixinSuperclassConstraints(
               mixinNameIndex,
               mixinName,
@@ -1882,7 +1882,7 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
     Namespace namespace = NamespaceBuilder().createExportNamespaceForDirective2(
       libraryExport,
     );
-    Map<String, Element2> definedNames = namespace.definedNames2;
+    Map<String, Element> definedNames = namespace.definedNames2;
     for (String name in definedNames.keys) {
       var element = definedNames[name]!;
       var prevElement = libraryContext._exportedElements[name];
@@ -1903,7 +1903,7 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
   /// imported from two or more imports.
   void _checkForAmbiguousImport({
     required Token name,
-    required Element2? element,
+    required Element? element,
   }) {
     if (element is MultiplyDefinedElementImpl2) {
       var conflictingMembers = element.conflictingElements2;
@@ -1940,7 +1940,7 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
       highlightedNode = prefixedIdentifier.identifier;
     }
     // check if element is assignable
-    if (element is VariableElement2) {
+    if (element is VariableElement) {
       if (element.isConst) {
         errorReporter.atNode(
           expression,
@@ -1957,7 +1957,7 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
           expression,
           CompileTimeErrorCode.ASSIGNMENT_TO_CONST,
         );
-      } else if (variable is FieldElement2 && variable.isSynthetic) {
+      } else if (variable is FieldElement && variable.isSynthetic) {
         errorReporter.atNode(
           highlightedNode,
           CompileTimeErrorCode.ASSIGNMENT_TO_FINAL_NO_SETTER,
@@ -1976,14 +1976,14 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
         expression,
         CompileTimeErrorCode.ASSIGNMENT_TO_FUNCTION,
       );
-    } else if (element is MethodElement2) {
+    } else if (element is MethodElement) {
       errorReporter.atNode(
         expression,
         CompileTimeErrorCode.ASSIGNMENT_TO_METHOD,
       );
-    } else if (element is InterfaceElement2 ||
+    } else if (element is InterfaceElement ||
         element is DynamicElementImpl2 ||
-        element is TypeParameterElement2) {
+        element is TypeParameterElement) {
       errorReporter.atNode(expression, CompileTimeErrorCode.ASSIGNMENT_TO_TYPE);
     }
   }
@@ -2085,7 +2085,7 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
                 CompileTimeErrorCode.BASE_CLASS_IMPLEMENTED_OUTSIDE_OF_LIBRARY,
                 arguments: [interfaceElement.name3!],
               );
-            } else if (interfaceElement is MixinElement2) {
+            } else if (interfaceElement is MixinElement) {
               errorReporter.atNode(
                 interface,
                 CompileTimeErrorCode.BASE_MIXIN_IMPLEMENTED_OUTSIDE_OF_LIBRARY,
@@ -2322,8 +2322,7 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
   /// Verify all conflicts between type variable and enclosing class.
   void _checkForConflictingClassTypeVariableErrorCodes() {
     var enclosingClass = _enclosingClass!;
-    for (TypeParameterElement2 typeParameter
-        in enclosingClass.typeParameters2) {
+    for (TypeParameterElement typeParameter in enclosingClass.typeParameters2) {
       if (typeParameter.isWildcardVariable) continue;
 
       var name = typeParameter.name3;
@@ -2332,7 +2331,7 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
       // name is same as the name of the enclosing class
       if (enclosingClass.name3 == name) {
         var code =
-            enclosingClass is MixinElement2
+            enclosingClass is MixinElement
                 ? CompileTimeErrorCode.CONFLICTING_TYPE_VARIABLE_AND_MIXIN
                 : CompileTimeErrorCode.CONFLICTING_TYPE_VARIABLE_AND_CLASS;
         errorReporter.atElement2(typeParameter, code, arguments: [name]);
@@ -2343,7 +2342,7 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
           enclosingClass.getGetter2(name) != null ||
           enclosingClass.getSetter2(name) != null) {
         var code =
-            enclosingClass is MixinElement2
+            enclosingClass is MixinElement
                 ? CompileTimeErrorCode
                     .CONFLICTING_TYPE_VARIABLE_AND_MEMBER_MIXIN
                 : CompileTimeErrorCode
@@ -2416,7 +2415,7 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
   /// See [CompileTimeErrorCode.CONFLICTING_TYPE_VARIABLE_AND_EXTENSION], and
   /// [CompileTimeErrorCode.CONFLICTING_TYPE_VARIABLE_AND_MEMBER_EXTENSION].
   void _checkForConflictingExtensionTypeVariableErrorCodes() {
-    for (TypeParameterElement2 typeParameter
+    for (TypeParameterElement typeParameter
         in _enclosingExtension!.typeParameters2) {
       var name = typeParameter.name3;
       if (name == null) continue;
@@ -2526,7 +2525,7 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
         );
         redirectingInitializerCount++;
       } else if (initializer is SuperConstructorInvocation) {
-        if (enclosingClass is EnumElement2) {
+        if (enclosingClass is EnumElement) {
           errorReporter.atToken(
             initializer.superKeyword,
             CompileTimeErrorCode.SUPER_IN_ENUM_CONSTRUCTOR,
@@ -2547,7 +2546,7 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
     if (redirectingInitializerCount > 0) {
       for (ConstructorInitializer initializer in declaration.initializers) {
         if (initializer is SuperConstructorInvocation) {
-          if (enclosingClass is! EnumElement2) {
+          if (enclosingClass is! EnumElement) {
             errorReporter.atNode(
               initializer,
               CompileTimeErrorCode.SUPER_IN_REDIRECTING_CONSTRUCTOR,
@@ -2568,7 +2567,7 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
         }
       }
     }
-    if (enclosingClass is! EnumElement2 &&
+    if (enclosingClass is! EnumElement &&
         redirectingInitializerCount == 0 &&
         superInitializerCount == 1 &&
         superInitializer != declaration.initializers.last) {
@@ -2612,7 +2611,7 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
     }
 
     // check for mixins
-    var instanceFields = <FieldElement2>[];
+    var instanceFields = <FieldElement>[];
     for (var mixin in enclosingClass.mixins) {
       instanceFields.addAll(
         mixin.element3.fields2.where((field) {
@@ -2654,7 +2653,7 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
     }
 
     // Enum(s) always call a const super-constructor.
-    if (enclosingClass is EnumElement2) {
+    if (enclosingClass is EnumElement) {
       return false;
     }
 
@@ -2693,7 +2692,7 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
   /// constructor element.
   void _checkForConstConstructorWithNonFinalField(
     ConstructorDeclaration constructor,
-    ConstructorElement2 constructorElement,
+    ConstructorElement constructorElement,
   ) {
     if (!_enclosingExecutable.isConstConstructor) {
       return;
@@ -2703,7 +2702,7 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
     }
     // check if there is non-final field
     var classElement = constructorElement.enclosingElement2;
-    if (classElement is! ClassElement2 || !classElement.hasNonFinalField) {
+    if (classElement is! ClassElement || !classElement.hasNonFinalField) {
       return;
     }
     errorReporter.atConstructorDeclaration(
@@ -2755,7 +2754,7 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
     InterfaceType type,
   ) {
     var element = type.element3;
-    if (element is ClassElement2 && element.isAbstract) {
+    if (element is ClassElement && element.isAbstract) {
       var element = expression.constructorName.element;
       if (element != null && !element.isFactory) {
         bool isImplicit =
@@ -2781,7 +2780,7 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
     NamedType namedType,
     InterfaceType type,
   ) {
-    if (type.element3 is MixinElement2) {
+    if (type.element3 is MixinElement) {
       errorReporter.atNode(namedType, CompileTimeErrorCode.MIXIN_INSTANTIATE);
     }
   }
@@ -2859,7 +2858,7 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
     LibraryImport importElement,
   ) {
     for (var element in importElement.namespace.definedNames2.values) {
-      if (element is ExtensionElement2) {
+      if (element is ExtensionElement) {
         errorReporter.atNode(
           directive.uri,
           CompileTimeErrorCode.DEFERRED_IMPORT_OF_EXTENSION,
@@ -2877,14 +2876,14 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
     NodeList<Directive> directives = unit.directives;
     int count = directives.length;
     if (count > 0) {
-      var prefixToDirectivesMap = <PrefixElement2, List<ImportDirective>>{};
+      var prefixToDirectivesMap = <PrefixElement, List<ImportDirective>>{};
       for (int i = 0; i < count; i++) {
         Directive directive = directives[i];
         if (directive is ImportDirective) {
           var prefix = directive.prefix;
           if (prefix != null) {
             var element = prefix.element;
-            if (element is PrefixElement2) {
+            if (element is PrefixElement) {
               var elements = prefixToDirectivesMap[element];
               if (elements == null) {
                 elements = <ImportDirective>[];
@@ -2903,7 +2902,7 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
 
   /// Return `true` if the caller should continue checking the rest of the
   /// information in the for-each part.
-  bool _checkForEachParts(ForEachParts node, Element2? variableElement) {
+  bool _checkForEachParts(ForEachParts node, Element? variableElement) {
     if (checkForUseOfVoidResult(node.iterable)) {
       return false;
     }
@@ -3214,7 +3213,7 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
       }
     }
 
-    if (_enclosingClass is ExtensionTypeElement2) {
+    if (_enclosingClass is ExtensionTypeElement) {
       if (node.hasObjectMemberName) {
         errorReporter.atToken(
           node.name,
@@ -3227,7 +3226,7 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
   void _checkForExtensionTypeConstructorWithSuperInvocation(
     SuperConstructorInvocation node,
   ) {
-    if (_enclosingClass is ExtensionTypeElement2) {
+    if (_enclosingClass is ExtensionTypeElement) {
       errorReporter.atToken(
         node.superKeyword,
         CompileTimeErrorCode.EXTENSION_TYPE_CONSTRUCTOR_WITH_SUPER_INVOCATION,
@@ -3236,7 +3235,7 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
   }
 
   void _checkForExtensionTypeDeclaresInstanceField(FieldDeclaration node) {
-    if (_enclosingClass is! ExtensionTypeElement2) {
+    if (_enclosingClass is! ExtensionTypeElement) {
       return;
     }
 
@@ -3284,11 +3283,11 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
     required ExtensionTypeDeclaration node,
     required ExtensionTypeElementImpl element,
   }) {
-    void report(String memberName, List<ExecutableElement2> candidates) {
+    void report(String memberName, List<ExecutableElement> candidates) {
       var contextMessages =
           candidates.map<DiagnosticMessage>((executable) {
             var nonSynthetic = executable.nonSynthetic2;
-            var container = executable.enclosingElement2 as InterfaceElement2;
+            var container = executable.enclosingElement2 as InterfaceElement;
             return DiagnosticMessageImpl(
               filePath:
                   executable.firstFragment.libraryFragment.source.fullName,
@@ -3434,10 +3433,10 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
           );
         } else {
           var variableElement = variable.declaredFragment?.element;
-          if (variableElement is FieldElement2 &&
+          if (variableElement is FieldElement &&
               (variableElement.isAbstract || variableElement.isExternal)) {
             // Abstract and external fields can't be initialized, so no error.
-          } else if (variableElement is TopLevelVariableElement2 &&
+          } else if (variableElement is TopLevelVariableElement &&
               variableElement.isExternal) {
             // External top level variables can't be initialized, so no error.
           } else if (!variable.isLate) {
@@ -3520,7 +3519,7 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
                 ...type.element3.allSupertypes,
               ].map((e) => e.element3).toList();
           for (var element in implementedInterfaces) {
-            if (element is ClassElement2 &&
+            if (element is ClassElement &&
                 element.isFinal &&
                 !element.isSealed &&
                 element.library2 != _currentLibrary &&
@@ -3551,7 +3550,7 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
         var type = namedType.type;
         if (type is InterfaceType) {
           var element = type.element3;
-          if (element is ClassElement2 &&
+          if (element is ClassElement &&
               element.isFinal &&
               !element.isSealed &&
               element.library2 != _currentLibrary &&
@@ -3672,7 +3671,7 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
   ///
   /// See [CompileTimeErrorCode.INSTANCE_ACCESS_TO_STATIC_MEMBER].
   void _checkForInstanceAccessToStaticMember(
-    InterfaceElement2? typeReference,
+    InterfaceElement? typeReference,
     Expression? target,
     SimpleIdentifier name,
   ) {
@@ -3682,21 +3681,21 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
     }
     // prepare member Element
     var element = name.writeOrReadElement2;
-    if (element is ExecutableElement2) {
+    if (element is ExecutableElement) {
       if (!element.isStatic) {
         // OK, instance member
         return;
       }
       var enclosingElement = element.enclosingElement2;
-      if (enclosingElement is ExtensionElement2) {
+      if (enclosingElement is ExtensionElement) {
         if (target is ExtensionOverride) {
           // OK, target is an extension override
           return;
         } else if (target is SimpleIdentifier &&
-            target.element is ExtensionElement2) {
+            target.element is ExtensionElement) {
           return;
         } else if (target is PrefixedIdentifier &&
-            target.element is ExtensionElement2) {
+            target.element is ExtensionElement) {
           return;
         }
       } else {
@@ -3704,7 +3703,7 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
           // OK, target is a type
           return;
         }
-        if (enclosingElement is! InterfaceElement2) {
+        if (enclosingElement is! InterfaceElement) {
           // OK, top-level element
           return;
         }
@@ -3779,9 +3778,9 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
   void _checkForInvalidField(
     ConstructorFieldInitializer initializer,
     SimpleIdentifier fieldName,
-    Element2? staticElement,
+    Element? staticElement,
   ) {
-    if (staticElement is FieldElement2) {
+    if (staticElement is FieldElement) {
       if (staticElement.isSynthetic) {
         errorReporter.atNode(
           initializer,
@@ -3809,7 +3808,7 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
     var constructorElement = node.element;
     if (constructorElement != null &&
         constructorElement.isGenerative &&
-        constructorElement.enclosingElement2 is EnumElement2) {
+        constructorElement.enclosingElement2 is EnumElement) {
       if (_currentLibrary.featureSet.isEnabled(Feature.enhanced_enums)) {
         errorReporter.atNode(
           node,
@@ -3840,18 +3839,18 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
     }
     // prepare element
     var element = identifier.writeOrReadElement2;
-    if (!(element is MethodElement2 || element is PropertyAccessorElement2)) {
+    if (!(element is MethodElement || element is PropertyAccessorElement)) {
       return;
     }
     // static element
-    ExecutableElement2 executableElement = element as ExecutableElement2;
+    ExecutableElement executableElement = element as ExecutableElement;
     if (executableElement.isStatic) {
       return;
     }
     // not a class member
     var enclosingElement = element.enclosingElement2;
-    if (enclosingElement is! InterfaceElement2 &&
-        enclosingElement is! ExtensionElement2) {
+    if (enclosingElement is! InterfaceElement &&
+        enclosingElement is! ExtensionElement) {
       return;
     }
     // qualified method invocation
@@ -4086,7 +4085,7 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
     var hasCaseNull = false;
     if (expressionType is InterfaceType) {
       var enumElement = expressionType.element3;
-      if (enumElement is EnumElement2) {
+      if (enumElement is EnumElement) {
         var constantNames =
             enumElement.fields2
                 .where((field) => field.isEnumConstant)
@@ -4152,7 +4151,7 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
   /// See [CompileTimeErrorCode.MIXIN_CLASS_DECLARES_CONSTRUCTOR].
   bool _checkForMixinClassDeclaresConstructor(
     NamedType mixinName,
-    InterfaceElement2 mixinElement,
+    InterfaceElement mixinElement,
   ) {
     for (var constructor in mixinElement.constructors2) {
       if (!constructor.isSynthetic && !constructor.isFactory) {
@@ -4222,9 +4221,9 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
   /// See [CompileTimeErrorCode.MIXIN_INHERITS_FROM_NOT_OBJECT].
   bool _checkForMixinInheritsNotFromObject(
     NamedType mixinName,
-    InterfaceElement2 mixinElement,
+    InterfaceElement mixinElement,
   ) {
-    if (mixinElement is! ClassElement2) {
+    if (mixinElement is! ClassElement) {
       return false;
     }
 
@@ -4287,7 +4286,7 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
   bool _checkForMixinSuperInvokedMembers(
     int mixinIndex,
     NamedType mixinName,
-    InterfaceElement2 mixinElement,
+    InterfaceElement mixinElement,
     InterfaceType mixinType,
   ) {
     var mixinElementImpl = mixinElement as MixinElementImpl2;
@@ -4364,14 +4363,14 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
     if (declaredSupertype is! InterfaceType) {
       return;
     }
-    var mixedInNames = <LibraryElement2, Map<String, String>>{};
+    var mixedInNames = <LibraryElement, Map<String, String>>{};
 
     /// Report an error and return `true` if the given [name] is a private name
     /// (which is defined in the given [library]) and it conflicts with another
     /// definition of that name inherited from the superclass.
     bool isConflictingName(
       String name,
-      LibraryElement2 library,
+      LibraryElement library,
       NamedType namedType,
     ) {
       if (Identifier.isPrivateName(name)) {
@@ -4482,7 +4481,7 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
     DartType type = namedType.typeOrThrow;
     if (type is InterfaceType) {
       var element = type.element3;
-      if (element is EnumElement2 || element is MixinElement2) {
+      if (element is EnumElement || element is MixinElement) {
         // We have already reported the error.
         return;
       }
@@ -4585,7 +4584,7 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
   }
 
   void _checkForNonConstGenerativeEnumConstructor(ConstructorDeclaration node) {
-    if (_enclosingClass is EnumElement2 &&
+    if (_enclosingClass is EnumElement &&
         node.constKeyword == null &&
         node.factoryKeyword == null) {
       errorReporter.atConstructorDeclaration(
@@ -4662,7 +4661,7 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
     if (variableList.isFinal) return;
 
     var enclosingClass = _enclosingClass;
-    if (enclosingClass == null || enclosingClass is! EnumElement2) {
+    if (enclosingClass == null || enclosingClass is! EnumElement) {
       return;
     }
 
@@ -4723,7 +4722,7 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
     if (_isEnclosingClassFfiUnion) return;
 
     for (var field in fields.variables) {
-      var fieldElement = field.declaredFragment?.element as FieldElement2;
+      var fieldElement = field.declaredFragment?.element as FieldElement;
       if (fieldElement.isAbstract || fieldElement.isExternal) continue;
       if (field.initializer != null) continue;
 
@@ -4923,7 +4922,7 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
   /// See [CompileTimeErrorCode.RECURSIVE_CONSTRUCTOR_REDIRECT].
   void _checkForRecursiveConstructorRedirect(
     ConstructorDeclaration declaration,
-    ConstructorElement2 constructorElement,
+    ConstructorElement constructorElement,
   ) {
     // we check generative constructor here
     if (declaration.factoryKeyword != null) {
@@ -4951,7 +4950,7 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
   /// See [CompileTimeErrorCode.RECURSIVE_FACTORY_REDIRECT].
   bool _checkForRecursiveFactoryRedirect(
     ConstructorDeclaration declaration,
-    ConstructorElement2 element,
+    ConstructorElement element,
   ) {
     // prepare redirected constructor
     var redirectedConstructorNode = declaration.redirectedConstructor;
@@ -4996,7 +4995,7 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
       redirectedConstructor,
     );
     var redirectedClass = redirectedElement?.enclosingElement2;
-    if (redirectedClass is ClassElement2 &&
+    if (redirectedClass is ClassElement &&
         redirectedClass.isAbstract &&
         redirectedElement != null &&
         !redirectedElement.isFactory) {
@@ -5019,8 +5018,8 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
   ///
   /// See [CompileTimeErrorCode.REDIRECT_TO_NON_CONST_CONSTRUCTOR].
   void _checkForRedirectToNonConstConstructor(
-    ConstructorElement2 element,
-    ConstructorElement2? redirectedElement,
+    ConstructorElement element,
+    ConstructorElement? redirectedElement,
     SyntacticEntity errorEntity,
   ) {
     // This constructor is const, but it redirects to a non-const constructor.
@@ -5036,7 +5035,7 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
 
   void _checkForReferenceBeforeDeclaration({
     required Token nameToken,
-    required Element2? element,
+    required Element? element,
   }) {
     if (element != null &&
         _hiddenElements != null &&
@@ -5053,7 +5052,7 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
   }
 
   void _checkForRepeatedType(
-    Set<InstanceElement2> accumulatedElements,
+    Set<InstanceElement> accumulatedElements,
     List<NamedType>? namedTypes,
     ErrorCode errorCode,
   ) {
@@ -5127,7 +5126,7 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
         var type = namedType.type;
         if (type is InterfaceType) {
           var element = type.element3;
-          if (element is ClassElement2 &&
+          if (element is ClassElement &&
               element.isSealed &&
               element.library2 != _currentLibrary) {
             errorReporter.atNode(
@@ -5194,7 +5193,7 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
   ///
   /// See [CompileTimeErrorCode.STATIC_ACCESS_TO_INSTANCE_MEMBER].
   void _checkForStaticAccessToInstanceMember(
-    InterfaceElement2? typeReference,
+    InterfaceElement? typeReference,
     SimpleIdentifier name,
   ) {
     // OK, in comment
@@ -5207,9 +5206,9 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
     }
     // prepare member Element
     var element = name.element;
-    if (element is ExecutableElement2) {
+    if (element is ExecutableElement) {
       // OK, static
-      if (element.isStatic || element is ConstructorElement2) {
+      if (element.isStatic || element is ConstructorElement) {
         return;
       }
       errorReporter.atNode(
@@ -5270,7 +5269,7 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
   ///
   /// See [CompileTimeErrorCode.TYPE_PARAMETER_SUPERTYPE_OF_ITS_BOUND].
   void _checkForTypeParameterBoundRecursion(List<TypeParameter> parameters) {
-    Map<TypeParameterElement2, TypeParameter>? elementToNode;
+    Map<TypeParameterElement, TypeParameter>? elementToNode;
     for (var parameter in parameters) {
       if (parameter.bound != null) {
         if (elementToNode == null) {
@@ -5308,11 +5307,11 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
 
   void _checkForTypeParameterReferencedByStatic({
     required Token name,
-    required Element2? element,
+    required Element? element,
   }) {
     if (_enclosingExecutable.inStaticMethod || _isInStaticVariableDeclaration) {
-      if (element is TypeParameterElement2 &&
-          element.enclosingElement2 is InstanceElement2) {
+      if (element is TypeParameterElement &&
+          element.enclosingElement2 is InstanceElement) {
         // The class's type parameters are not in scope for static methods.
         // However all other type parameters are legal (e.g. the static method's
         // type parameters, or a local function's type parameters).
@@ -5522,9 +5521,9 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
     } else if (targetType == null) {
       if (target is Identifier) {
         var targetElement = target.element;
-        if (targetElement is InterfaceElement2 ||
-            targetElement is ExtensionElement2 ||
-            targetElement is TypeAliasElement2) {
+        if (targetElement is InterfaceElement ||
+            targetElement is ExtensionElement ||
+            targetElement is TypeAliasElement) {
           errorReporter.atOffset(
             offset: operator.offset,
             length: endToken.end - operator.offset,
@@ -5575,7 +5574,7 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
     }
 
     var element = name.writeOrReadElement2;
-    if (element == null || element is TypeParameterElement2) {
+    if (element == null || element is TypeParameterElement) {
       return;
     }
 
@@ -5587,13 +5586,13 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
     if (identical(enclosingElement, _enclosingClass)) {
       return;
     }
-    if (enclosingElement is! InterfaceElement2) {
+    if (enclosingElement is! InterfaceElement) {
       return;
     }
-    if (element is ExecutableElement2 && !element.isStatic) {
+    if (element is ExecutableElement && !element.isStatic) {
       return;
     }
-    if (element is MethodElement2) {
+    if (element is MethodElement) {
       // Invalid methods are reported in
       // [MethodInvocationResolver._resolveReceiverNull].
       return;
@@ -6166,7 +6165,7 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
   }
 
   /// Return the name of the library that defines given [element].
-  String _getLibraryName(Element2? element) {
+  String _getLibraryName(Element? element) {
     if (element == null) {
       return '';
     }
@@ -6217,9 +6216,9 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
 
   /// Return `true` if the given [constructor] redirects to itself, directly or
   /// indirectly.
-  bool _hasRedirectingFactoryConstructorCycle(ConstructorElement2 constructor) {
-    Set<ConstructorElement2> constructors = HashSet<ConstructorElement2>();
-    ConstructorElement2? current = constructor;
+  bool _hasRedirectingFactoryConstructorCycle(ConstructorElement constructor) {
+    Set<ConstructorElement> constructors = HashSet<ConstructorElement>();
+    ConstructorElement? current = constructor;
     while (current != null) {
       if (constructors.contains(current)) {
         return identical(current, constructor);
@@ -6231,8 +6230,7 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
   }
 
   /// Returns `true` if the given [library] is the `dart:ffi` library.
-  bool _isDartFfiLibrary(LibraryElement2 library) =>
-      library.name3 == 'dart.ffi';
+  bool _isDartFfiLibrary(LibraryElement library) => library.name3 == 'dart.ffi';
 
   /// Return `true` if the given [identifier] is in a location where it is
   /// allowed to resolve to a static member of a supertype.
@@ -6301,7 +6299,7 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
   /// either the current library is also a platform library,
   /// or the current library has a language version which predates
   /// class modifiers
-  bool _mayIgnoreClassModifiers(LibraryElement2 superLibrary) {
+  bool _mayIgnoreClassModifiers(LibraryElement superLibrary) {
     // Only modifiers in platform libraries can be ignored.
     if (!superLibrary.isInSdk) return false;
 
@@ -6386,12 +6384,12 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
     }
   }
 
-  /// Return [FieldElement2]s that are declared in the [ClassDeclaration] with
+  /// Return [FieldElement]s that are declared in the [ClassDeclaration] with
   /// the given [constructor], but are not initialized.
-  static List<FieldElement2> computeNotInitializedFields(
+  static List<FieldElement> computeNotInitializedFields(
     ConstructorDeclaration constructor,
   ) {
-    var fields = <FieldElement2>{};
+    var fields = <FieldElement>{};
     var classDeclaration = constructor.parent as ClassDeclaration;
     for (ClassMember fieldDeclaration in classDeclaration.members) {
       if (fieldDeclaration is FieldDeclaration) {
@@ -6426,12 +6424,12 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
   /// Checks whether the given [expression] is a reference to a class. If it is
   /// then the element representing the class is returned, otherwise `null` is
   /// returned.
-  static InterfaceElement2? getTypeReference(Expression expression) {
+  static InterfaceElement? getTypeReference(Expression expression) {
     if (expression is Identifier) {
       var element = expression.element;
-      if (element is InterfaceElement2) {
+      if (element is InterfaceElement) {
         return element;
-      } else if (element is TypeAliasElement2) {
+      } else if (element is TypeAliasElement) {
         var aliasedType = element.aliasedType;
         if (aliasedType is InterfaceType) {
           return aliasedType.element3;
@@ -6451,7 +6449,7 @@ class HiddenElements {
 
   /// A set containing the elements that will be declared in this scope, but are
   /// not yet declared.
-  final Set<Element2> _elements = {};
+  final Set<Element> _elements = {};
 
   /// Initialize a newly created set of hidden elements to include all of the
   /// elements defined in the set of [outerElements] and all of the elements
@@ -6471,7 +6469,7 @@ class HiddenElements {
   }
 
   /// Return `true` if this set of elements contains the given [element].
-  bool contains(Element2 element) {
+  bool contains(Element element) {
     if (_elements.contains(element)) {
       return true;
     } else if (outerElements != null) {
@@ -6482,7 +6480,7 @@ class HiddenElements {
 
   /// Record that the given [element] has been declared, so it is no longer
   /// hidden.
-  void declare(Element2 element) {
+  void declare(Element element) {
     _elements.remove(element);
   }
 
@@ -6501,17 +6499,16 @@ class LibraryVerificationContext {
   final Map<FileState, FileAnalysis> files;
 
   /// A table mapping names to the exported elements.
-  final Map<String, Element2> _exportedElements = {};
+  final Map<String, Element> _exportedElements = {};
 
   /// Elements referenced in `implements` clauses.
   /// Key: the declaration element.
-  final Map<InstanceElement2, Set<InstanceElement2>> _setOfImplementsMap =
+  final Map<InstanceElement, Set<InstanceElement>> _setOfImplementsMap =
       Map.identity();
 
   /// Elements referenced in `on` clauses.
   /// Key: the declaration element.
-  final Map<MixinElement2, Set<InterfaceElement2>> _setOfOnMaps =
-      Map.identity();
+  final Map<MixinElement, Set<InterfaceElement>> _setOfOnMaps = Map.identity();
 
   LibraryVerificationContext({
     required this.libraryKind,
@@ -6523,11 +6520,11 @@ class LibraryVerificationContext {
     return libraryKind.libraryCycle.libraryUris.contains(uri);
   }
 
-  Set<InstanceElement2> setOfImplements(InstanceElement2 declaration) {
+  Set<InstanceElement> setOfImplements(InstanceElement declaration) {
     return _setOfImplementsMap[declaration] ??= Set.identity();
   }
 
-  Set<InterfaceElement2> setOfOn(MixinElement2 declaration) {
+  Set<InterfaceElement> setOfOn(MixinElement declaration) {
     return _setOfOnMaps[declaration] ??= Set.identity();
   }
 }
@@ -6551,7 +6548,7 @@ class _UninstantiatedBoundChecker extends RecursiveAstVisitor<void> {
     }
 
     var element = node.element2;
-    if (element is TypeParameterizedElement2 && !element.isSimplyBounded) {
+    if (element is TypeParameterizedElement && !element.isSimplyBounded) {
       // TODO(srawlins): Don't report this if TYPE_ALIAS_CANNOT_REFERENCE_ITSELF
       //  has been reported.
       _errorReporter.atNode(node, CompileTimeErrorCode.NOT_INSTANTIATED_BOUND);
diff --git a/pkg/analyzer/lib/src/generated/exhaustiveness.dart b/pkg/analyzer/lib/src/generated/exhaustiveness.dart
index c1bc9255227..181c8183c07 100644
--- a/pkg/analyzer/lib/src/generated/exhaustiveness.dart
+++ b/pkg/analyzer/lib/src/generated/exhaustiveness.dart
@@ -30,7 +30,7 @@ import 'package:pub_semver/pub_semver.dart';
 /// can be written latter into Dart code that considers imports. It also
 /// accumulates fragments of text, such as syntax `(`, or names of properties.
 class AnalyzerDartTemplateBuffer
-    implements DartTemplateBuffer<DartObject, FieldElement2, TypeImpl> {
+    implements DartTemplateBuffer<DartObject, FieldElement, TypeImpl> {
   final List<MissingPatternPart> parts = [];
   bool isComplete = true;
 
@@ -50,9 +50,9 @@ class AnalyzerDartTemplateBuffer
   }
 
   @override
-  void writeEnumValue(FieldElement2 value, String name) {
+  void writeEnumValue(FieldElement value, String name) {
     var enumElement = value.enclosingElement2;
-    if (enumElement is! EnumElement2) {
+    if (enumElement is! EnumElement) {
       isComplete = false;
       return;
     }
@@ -74,26 +74,25 @@ class AnalyzerDartTemplateBuffer
 }
 
 class AnalyzerEnumOperations
-    implements
-        EnumOperations<TypeImpl, EnumElement2, FieldElement2, DartObject> {
+    implements EnumOperations<TypeImpl, EnumElement, FieldElement, DartObject> {
   const AnalyzerEnumOperations();
 
   @override
-  EnumElement2? getEnumClass(TypeImpl type) {
+  EnumElement? getEnumClass(TypeImpl type) {
     var element = type.element3;
-    if (element is EnumElement2) {
+    if (element is EnumElement) {
       return element;
     }
     return null;
   }
 
   @override
-  String getEnumElementName(FieldElement2 enumField) {
+  String getEnumElementName(FieldElement enumField) {
     return '${enumField.enclosingElement2.name3}.${enumField.name3}';
   }
 
   @override
-  Iterable<FieldElement2> getEnumElements(EnumElement2 enumClass) sync* {
+  Iterable<FieldElement> getEnumElements(EnumElement enumClass) sync* {
     for (var field in enumClass.fields2) {
       if (field.isEnumConstant) {
         yield field;
@@ -102,12 +101,12 @@ class AnalyzerEnumOperations
   }
 
   @override
-  InterfaceTypeImpl getEnumElementType(FieldElement2 enumField) {
+  InterfaceTypeImpl getEnumElementType(FieldElement enumField) {
     return enumField.type as InterfaceTypeImpl;
   }
 
   @override
-  DartObject? getEnumElementValue(FieldElement2 enumField) {
+  DartObject? getEnumElementValue(FieldElement enumField) {
     return enumField.computeConstantValue();
   }
 }
@@ -116,14 +115,14 @@ class AnalyzerExhaustivenessCache
     extends
         ExhaustivenessCache<
           TypeImpl,
-          InterfaceElement2,
-          EnumElement2,
-          FieldElement2,
+          InterfaceElement,
+          EnumElement,
+          FieldElement,
           DartObject
         > {
   final TypeSystemImpl typeSystem;
 
-  AnalyzerExhaustivenessCache(this.typeSystem, LibraryElement2 enclosingLibrary)
+  AnalyzerExhaustivenessCache(this.typeSystem, LibraryElement enclosingLibrary)
     : super(
         AnalyzerTypeOperations(typeSystem, enclosingLibrary),
         const AnalyzerEnumOperations(),
@@ -145,7 +144,7 @@ class AnalyzerSealedClassOperations
     var library = sealedClass.library2;
     outer:
     for (var declaration in library.children2) {
-      if (declaration is ExtensionTypeElement2) {
+      if (declaration is ExtensionTypeElement) {
         continue;
       }
       if (declaration != sealedClass && declaration is InterfaceElementImpl2) {
@@ -242,7 +241,7 @@ class AnalyzerSealedClassOperations
 
 class AnalyzerTypeOperations implements TypeOperations<TypeImpl> {
   final TypeSystemImpl _typeSystem;
-  final LibraryElement2 _enclosingLibrary;
+  final LibraryElement _enclosingLibrary;
 
   final Map<InterfaceTypeImpl, Map<Key, TypeImpl>> _interfaceFieldTypesCaches =
       {};
@@ -465,8 +464,8 @@ class ExhaustivenessDataForTesting {
 }
 
 class MissingPatternEnumValuePart extends MissingPatternPart {
-  final EnumElement2 enumElement2;
-  final FieldElement2 value2;
+  final EnumElement enumElement2;
+  final FieldElement value2;
 
   MissingPatternEnumValuePart({
     required this.enumElement2,
diff --git a/pkg/analyzer/lib/src/generated/ffi_verifier.dart b/pkg/analyzer/lib/src/generated/ffi_verifier.dart
index da2c8e96c80..fe649a7ca6f 100644
--- a/pkg/analyzer/lib/src/generated/ffi_verifier.dart
+++ b/pkg/analyzer/lib/src/generated/ffi_verifier.dart
@@ -267,7 +267,7 @@ class FfiVerifier extends RecursiveAstVisitor<void> {
   @override
   void visitIndexExpression(covariant IndexExpressionImpl node) {
     var element = node.element;
-    if (element is MethodElement2) {
+    if (element is MethodElement) {
       var enclosingElement = element.enclosingElement2;
       if (enclosingElement.isNativeStructPointerExtension ||
           enclosingElement.isNativeStructArrayExtension ||
@@ -305,7 +305,7 @@ class FfiVerifier extends RecursiveAstVisitor<void> {
     // Ensure there is at most one @DefaultAsset annotation per library
     var hasDefaultAsset = false;
 
-    if (node.element2 case LibraryElement2 library) {
+    if (node.element2 case LibraryElement library) {
       for (var metadata in library.metadata) {
         var annotationValue = metadata.computeConstantValue();
         if (annotationValue != null && annotationValue.isDefaultAsset) {
@@ -445,7 +445,7 @@ class FfiVerifier extends RecursiveAstVisitor<void> {
 
   void _checkFfiNative({
     required Token errorNode,
-    required Element2 declarationElement,
+    required Element declarationElement,
     required NodeList<Annotation> metadata,
     required FormalParameterList? formalParameterList,
     required bool isExternal,
@@ -500,7 +500,7 @@ class FfiVerifier extends RecursiveAstVisitor<void> {
         }
       } else {
         if (declarationElement
-            case TopLevelFunctionElement() || MethodElement2()) {
+            case TopLevelFunctionElement() || MethodElement()) {
           declarationElement = declarationElement as ExecutableElement2OrMember;
           var dartSignature = declarationElement.type;
 
@@ -553,7 +553,7 @@ class FfiVerifier extends RecursiveAstVisitor<void> {
 
   void _checkFfiNativeField(
     Token errorToken,
-    Element2 declarationElement,
+    Element declarationElement,
     NodeList<Annotation> metadata,
     TypeImpl ffiSignature,
     DartObject annotationValue,
@@ -639,8 +639,8 @@ class FfiVerifier extends RecursiveAstVisitor<void> {
     var ffiParameterTypes = ffiSignature.normalParameterTypes.flattenVarArgs();
     var ffiParameters = ffiSignature.formalParameters;
 
-    if ((declarationElement is MethodElement2 ||
-            declarationElement is PropertyAccessorElement2) &&
+    if ((declarationElement is MethodElement ||
+            declarationElement is PropertyAccessorElement) &&
         !declarationElement.isStatic) {
       // Instance methods must have the receiver as an extra parameter in the
       // Native annotation.
@@ -656,7 +656,7 @@ class FfiVerifier extends RecursiveAstVisitor<void> {
       // Receiver can only be Pointer if the class extends
       // NativeFieldWrapperClass1.
       if (ffiSignature.normalParameterTypes[0].isPointer) {
-        var cls = declarationElement.enclosingElement2 as InterfaceElement2;
+        var cls = declarationElement.enclosingElement2 as InterfaceElement;
         if (!_extendsNativeFieldWrapperClass1(cls.thisType)) {
           _errorReporter.atToken(
             errorToken,
@@ -757,10 +757,10 @@ class FfiVerifier extends RecursiveAstVisitor<void> {
     }
     if (expr is Identifier) {
       var element = expr.element;
-      if (element is VariableElement2 && element.isConst) {
+      if (element is VariableElement && element.isConst) {
         return true;
       }
-      if (element is PropertyAccessorElement2) {
+      if (element is PropertyAccessorElement) {
         var variable = element.variable3;
         if (variable != null && variable.isConst) {
           return true;
@@ -938,10 +938,10 @@ class FfiVerifier extends RecursiveAstVisitor<void> {
     }
     if (expr is Identifier) {
       var element = expr.element;
-      if (element is VariableElement2 && element.isConst) {
+      if (element is VariableElement && element.isConst) {
         return element.computeConstantValue()?.toBoolValue();
       }
-      if (element is PropertyAccessorElement2) {
+      if (element is PropertyAccessorElement) {
         var variable = element.variable3;
         if (variable == null) {
           return null;
@@ -982,7 +982,7 @@ class FfiVerifier extends RecursiveAstVisitor<void> {
   /// Return an indication of the Dart type associated with the [annotation].
   _PrimitiveDartType _typeForAnnotation(Annotation annotation) {
     var element = annotation.element2;
-    if (element is ConstructorElement2) {
+    if (element is ConstructorElement) {
       var name = element.enclosingElement2.name3;
       if (_primitiveIntegerNativeTypes.contains(name)) {
         return _PrimitiveDartType.int;
@@ -1090,9 +1090,9 @@ class FfiVerifier extends RecursiveAstVisitor<void> {
     // Since we are allowing .address.cast(), we need to traverse up one level
     // to get the ffi Invocation (.cast() nested down one level the expression)
     if (parent is MethodInvocation &&
-        parent.methodName.element is MethodElement2 &&
+        parent.methodName.element is MethodElement &&
         parent.methodName.name == "cast" &&
-        parent.methodName.element?.enclosingElement2 is ClassElement2 &&
+        parent.methodName.element?.enclosingElement2 is ClassElement &&
         parent.methodName.element!.enclosingElement2.isPointer) {
       parent = parent.parent;
     }
@@ -1557,9 +1557,7 @@ class FfiVerifier extends RecursiveAstVisitor<void> {
         var fieldElement =
             node.fields.variables.first.declaredFragment?.element;
         var lastElement =
-            (fieldElement?.enclosingElement2 as ClassElement2?)
-                ?.fields2
-                .reversed
+            (fieldElement?.enclosingElement2 as ClassElement?)?.fields2.reversed
                 .where((field) {
                   if (field.isStatic) return false;
                   if (!field.isExternal) {
@@ -1599,10 +1597,7 @@ class FfiVerifier extends RecursiveAstVisitor<void> {
 
   /// Validate the invocation of the static method
   /// `Pointer<T>.fromFunction(f, e)`.
-  void _validateFromFunction(
-    MethodInvocationImpl node,
-    MethodElement2 element,
-  ) {
+  void _validateFromFunction(MethodInvocationImpl node, MethodElement element) {
     int argCount = node.argumentList.arguments.length;
     if (argCount < 1 || argCount > 2) {
       // There are other diagnostics reported against the invocation and the
@@ -2202,7 +2197,7 @@ enum _PrimitiveDartType { double, int, bool, void_, handle, none }
 extension on Annotation {
   bool get isAbiSpecificIntegerMapping {
     var element = element2;
-    return element is ConstructorElement2 &&
+    return element is ConstructorElement &&
         element.ffiClass != null &&
         element.enclosingElement2.name3 ==
             FfiVerifier._abiSpecificIntegerMappingClassName;
@@ -2210,14 +2205,14 @@ extension on Annotation {
 
   bool get isArray {
     var element = element2;
-    return element is ConstructorElement2 &&
+    return element is ConstructorElement &&
         element.ffiClass != null &&
         element.enclosingElement2.name3 == 'Array';
   }
 
   bool get isPacked {
     var element = element2;
-    return element is ConstructorElement2 &&
+    return element is ConstructorElement &&
         element.ffiClass != null &&
         element.enclosingElement2.name3 == 'Packed';
   }
@@ -2268,7 +2263,7 @@ extension on ElementAnnotation {
 
   bool get isArray {
     var element = element2;
-    return element is ConstructorElement2 &&
+    return element is ConstructorElement &&
         element.ffiClass != null &&
         element.enclosingElement2.name3 == 'Array';
     // Note: this is 'Array' instead of '_ArraySize' because it finds the
@@ -2293,7 +2288,7 @@ extension on ElementAnnotation {
 
   bool get isPacked {
     var element = element2;
-    return element is ConstructorElement2 &&
+    return element is ConstructorElement &&
         element.ffiClass != null &&
         element.enclosingElement2.name3 == 'Packed';
   }
@@ -2317,7 +2312,7 @@ extension on TopLevelFunctionElement {
   }
 }
 
-extension on MethodElement2 {
+extension on MethodElement {
   /// @Native(isLeaf: true) external function.
   bool get isNativeLeaf {
     for (var annotation in metadata2.annotations) {
@@ -2336,7 +2331,7 @@ extension on MethodInvocation {
     if (element is TopLevelFunctionElement) {
       return element.isNativeLeaf;
     }
-    if (element is MethodElement2) {
+    if (element is MethodElement) {
       return element.isNativeLeaf;
     }
     return false;
@@ -2359,14 +2354,14 @@ extension on DartObject {
   }
 }
 
-extension on Element2? {
+extension on Element? {
   /// If this is a class element from `dart:ffi`, return it.
-  ClassElement2? get ffiClass {
+  ClassElement? get ffiClass {
     var element = this;
-    if (element is ConstructorElement2) {
+    if (element is ConstructorElement) {
       element = element.enclosingElement2;
     }
-    if (element is ClassElement2 && element.isFfiClass) {
+    if (element is ClassElement && element.isFfiClass) {
       return element;
     }
     return null;
@@ -2375,7 +2370,7 @@ extension on Element2? {
   /// Return `true` if this represents the class `AbiSpecificInteger`.
   bool get isAbiSpecificInteger {
     var element = this;
-    return element is ClassElement2 &&
+    return element is ClassElement &&
         element.name3 == FfiVerifier._abiSpecificIntegerClassName &&
         element.isFfiClass;
   }
@@ -2384,12 +2379,12 @@ extension on Element2? {
   /// `AbiSpecificInteger`.
   bool get isAbiSpecificIntegerSubclass {
     var element = this;
-    return element is ClassElement2 && element.supertype.isAbiSpecificInteger;
+    return element is ClassElement && element.supertype.isAbiSpecificInteger;
   }
 
   bool get isAddressOfExtension {
     var element = this;
-    return element is ExtensionElement2 &&
+    return element is ExtensionElement &&
         element.isFfiExtension &&
         FfiVerifier._addressOfExtensionNames.contains(element.name3);
   }
@@ -2397,7 +2392,7 @@ extension on Element2? {
   /// Return `true` if this represents the extension `AllocatorAlloc`.
   bool get isAllocatorExtension {
     var element = this;
-    return element is ExtensionElement2 &&
+    return element is ExtensionElement &&
         element.name3 == FfiVerifier._allocatorExtensionName &&
         element.isFfiExtension;
   }
@@ -2405,7 +2400,7 @@ extension on Element2? {
   /// Return `true` if this represents the class `DefaultAsset`.
   bool get isDefaultAsset {
     var element = this;
-    return element is ClassElement2 &&
+    return element is ClassElement &&
         element.name3 == 'DefaultAsset' &&
         element.isFfiClass;
   }
@@ -2413,7 +2408,7 @@ extension on Element2? {
   /// Return `true` if this represents the extension `DynamicLibraryExtension`.
   bool get isDynamicLibraryExtension {
     var element = this;
-    return element is ExtensionElement2 &&
+    return element is ExtensionElement &&
         element.name3 == 'DynamicLibraryExtension' &&
         element.isFfiExtension;
   }
@@ -2421,7 +2416,7 @@ extension on Element2? {
   /// Return `true` if this represents the class `Native`.
   bool get isNative {
     var element = this;
-    return element is ClassElement2 &&
+    return element is ClassElement &&
         element.name3 == 'Native' &&
         element.isFfiClass;
   }
@@ -2429,42 +2424,42 @@ extension on Element2? {
   /// Return `true` if this represents the class `NativeCallable`.
   bool get isNativeCallable {
     var element = this;
-    return element is ClassElement2 &&
+    return element is ClassElement &&
         element.name3 == FfiVerifier._nativeCallable &&
         element.isFfiClass;
   }
 
   bool get isNativeFunctionPointerExtension {
     var element = this;
-    return element is ExtensionElement2 &&
+    return element is ExtensionElement &&
         element.name3 == 'NativeFunctionPointer' &&
         element.isFfiExtension;
   }
 
   bool get isNativeStructArrayExtension {
     var element = this;
-    return element is ExtensionElement2 &&
+    return element is ExtensionElement &&
         element.name3 == 'StructArray' &&
         element.isFfiExtension;
   }
 
   bool get isNativeStructPointerExtension {
     var element = this;
-    return element is ExtensionElement2 &&
+    return element is ExtensionElement &&
         element.name3 == 'StructPointer' &&
         element.isFfiExtension;
   }
 
   bool get isNativeUnionArrayExtension {
     var element = this;
-    return element is ExtensionElement2 &&
+    return element is ExtensionElement &&
         element.name3 == 'UnionArray' &&
         element.isFfiExtension;
   }
 
   bool get isNativeUnionPointerExtension {
     var element = this;
-    return element is ExtensionElement2 &&
+    return element is ExtensionElement &&
         element.name3 == 'UnionPointer' &&
         element.isFfiExtension;
   }
@@ -2472,7 +2467,7 @@ extension on Element2? {
   /// Return `true` if this represents the class `Opaque`.
   bool get isOpaque {
     var element = this;
-    return element is ClassElement2 &&
+    return element is ClassElement &&
         element.name3 == FfiVerifier._opaqueClassName &&
         element.isFfiClass;
   }
@@ -2480,7 +2475,7 @@ extension on Element2? {
   /// Return `true` if this represents the class `Pointer`.
   bool get isPointer {
     var element = this;
-    return element is ClassElement2 &&
+    return element is ClassElement &&
         element.name3 == 'Pointer' &&
         element.isFfiClass;
   }
@@ -2488,7 +2483,7 @@ extension on Element2? {
   /// Return `true` if this represents the class `Struct`.
   bool get isStruct {
     var element = this;
-    return element is ClassElement2 &&
+    return element is ClassElement &&
         element.name3 == 'Struct' &&
         element.isFfiClass;
   }
@@ -2496,13 +2491,13 @@ extension on Element2? {
   /// Return `true` if this represents a subclass of the class `Struct`.
   bool get isStructSubclass {
     var element = this;
-    return element is ClassElement2 && element.supertype.isStruct;
+    return element is ClassElement && element.supertype.isStruct;
   }
 
   /// Return `true` if this represents the class `Union`.
   bool get isUnion {
     var element = this;
-    return element is ClassElement2 &&
+    return element is ClassElement &&
         element.name3 == 'Union' &&
         element.isFfiClass;
   }
@@ -2510,11 +2505,11 @@ extension on Element2? {
   /// Return `true` if this represents a subclass of the class `Union`.
   bool get isUnionSubclass {
     var element = this;
-    return element is ClassElement2 && element.supertype.isUnion;
+    return element is ClassElement && element.supertype.isUnion;
   }
 }
 
-extension on InterfaceElement2 {
+extension on InterfaceElement {
   bool get isEmptyStruct {
     for (var field in fields2) {
       var declaredType = field.type;
@@ -2544,7 +2539,7 @@ extension on InterfaceElement2 {
   }
 }
 
-extension on ExtensionElement2 {
+extension on ExtensionElement {
   bool get isFfiExtension {
     return library2.name3 == FfiVerifier._dartFfiLibraryName;
   }
@@ -2727,14 +2722,14 @@ extension on DartType {
 
 extension on NamedType {
   /// If this is a name of class from `dart:ffi`, return it.
-  ClassElement2? get ffiClass {
+  ClassElement? get ffiClass {
     return element2.ffiClass;
   }
 
   /// Return `true` if this represents a subtype of `Struct` or `Union`.
   bool get isAbiSpecificIntegerSubtype {
     var element = element2;
-    if (element is ClassElement2) {
+    if (element is ClassElement) {
       return element.allSupertypes.any((e) => e.isAbiSpecificInteger);
     }
     return false;
@@ -2743,7 +2738,7 @@ extension on NamedType {
   /// Return `true` if this represents a subtype of `Struct` or `Union`.
   bool get isCompoundSubtype {
     var element = element2;
-    if (element is ClassElement2) {
+    if (element is ClassElement) {
       return element.allSupertypes.any((e) => e.isCompound);
     }
     return false;
diff --git a/pkg/analyzer/lib/src/generated/resolver.dart b/pkg/analyzer/lib/src/generated/resolver.dart
index ba8c8779663..eda3b2f0b75 100644
--- a/pkg/analyzer/lib/src/generated/resolver.dart
+++ b/pkg/analyzer/lib/src/generated/resolver.dart
@@ -652,7 +652,7 @@ class ResolverVisitor extends ThrowingAstVisitor<void>
 
   void checkReadOfNotAssignedLocalVariable(
     SimpleIdentifier node,
-    Element2? element,
+    Element? element,
   ) {
     if (flowAnalysis.flow == null) {
       return;
@@ -788,10 +788,10 @@ class ResolverVisitor extends ThrowingAstVisitor<void>
         shouldHaveType = false;
       } else if (replacementExpression is IdentifierImpl) {
         var element = replacementExpression.element;
-        if (element is ExtensionElement2 ||
-            element is InterfaceElement2 ||
-            element is PrefixElement2 ||
-            element is TypeAliasElement2) {
+        if (element is ExtensionElement ||
+            element is InterfaceElement ||
+            element is PrefixElement ||
+            element is TypeAliasElement) {
           shouldHaveType = false;
         }
       }
@@ -1070,7 +1070,7 @@ class ResolverVisitor extends ThrowingAstVisitor<void>
   void handleCase_afterCaseHeads(
     AstNode node,
     int caseIndex,
-    Iterable<PromotableElement2> variables,
+    Iterable<PromotableElement> variables,
   ) {}
 
   @override
@@ -1596,7 +1596,7 @@ class ResolverVisitor extends ThrowingAstVisitor<void>
   }
 
   @override
-  (ExecutableElement2?, SharedTypeView) resolveObjectPatternPropertyGet({
+  (ExecutableElement?, SharedTypeView) resolveObjectPatternPropertyGet({
     required covariant ObjectPatternImpl objectPattern,
     required SharedTypeView receiverType,
     required covariant SharedPatternField field,
@@ -1698,7 +1698,7 @@ class ResolverVisitor extends ThrowingAstVisitor<void>
 
   void setReadElement(
     Expression node,
-    Element2? element, {
+    Element? element, {
     required bool atDynamicTarget,
   }) {
     var readType =
@@ -1712,7 +1712,7 @@ class ResolverVisitor extends ThrowingAstVisitor<void>
         node is SimpleIdentifier) {
       if (element is GetterElement2OrMember) {
         readType = element.returnType;
-      } else if (element is VariableElement2) {
+      } else if (element is VariableElement) {
         readType = localVariableTypeProvider.getType(
           node as SimpleIdentifierImpl,
           isRead: true,
@@ -1736,7 +1736,7 @@ class ResolverVisitor extends ThrowingAstVisitor<void>
   }
 
   @override
-  void setVariableType(PromotableElement2 variable, SharedTypeView type) {
+  void setVariableType(PromotableElement variable, SharedTypeView type) {
     if (variable is LocalVariableElementImpl2) {
       variable.type = type.unwrapTypeView();
     } else {
@@ -1746,7 +1746,7 @@ class ResolverVisitor extends ThrowingAstVisitor<void>
 
   void setWriteElement(
     Expression node,
-    Element2? element, {
+    Element? element, {
     required bool atDynamicTarget,
   }) {
     var writeType =
@@ -3098,7 +3098,7 @@ class ResolverVisitor extends ThrowingAstVisitor<void>
     );
 
     var element = result.readElement2;
-    node.element = element as MethodElement2?;
+    node.element = element as MethodElement?;
 
     analyzeExpression(
       node.index,
@@ -3116,7 +3116,7 @@ class ResolverVisitor extends ThrowingAstVisitor<void>
     DartType type;
     if (identical(targetType, NeverTypeImpl.instance)) {
       type = NeverTypeImpl.instance;
-    } else if (element is MethodElement2) {
+    } else if (element is MethodElement) {
       type = element.returnType;
     } else if (targetType is DynamicType) {
       type = DynamicTypeImpl.instance;
@@ -4381,7 +4381,7 @@ class ResolverVisitor extends ThrowingAstVisitor<void>
     propertyName.element = element;
 
     DartType type;
-    if (element is MethodElement2) {
+    if (element is MethodElement) {
       type = element.type;
     } else if (element is ConstructorElementImpl2) {
       type = element.type;
@@ -4506,7 +4506,7 @@ class ResolverVisitor extends ThrowingAstVisitor<void>
           // null aware, but that has already been taken care of in
           // `visitCascadeExpression`. So there is nothing further to do.
           break;
-        case SimpleIdentifier(element: InterfaceElement2()):
+        case SimpleIdentifier(element: InterfaceElement()):
           // `?.` to access static methods is equivalent to `.`, so do nothing.
           break;
         case ExtensionOverride(
@@ -4795,7 +4795,7 @@ class ScopeResolverVisitor extends UnifyingAstVisitor<void> {
   ScopeResolverVisitor(
     this.errorReporter, {
     required this.nameScope,
-    List<LibraryElement2> docImportLibraries = const [],
+    List<LibraryElement> docImportLibraries = const [],
   }) : _docImportScope = DocumentationCommentScope(
          nameScope,
          docImportLibraries,
@@ -4808,7 +4808,7 @@ class ScopeResolverVisitor extends UnifyingAstVisitor<void> {
   @override
   void visitAssignedVariablePattern(AssignedVariablePattern node) {
     var element = node.element2;
-    if (element is PromotableElement2) {
+    if (element is PromotableElement) {
       _localVariableInfo.potentiallyMutatedInScope.add(element);
     }
   }
@@ -5093,7 +5093,7 @@ class ScopeResolverVisitor extends UnifyingAstVisitor<void> {
       nameScope = FormalParameterScope(nameScope, element.formalParameters);
     } else if (parent is FunctionTypeAlias) {
       var aliasedElement = parent.declaredFragment!.element.aliasedElement2;
-      var functionElement = aliasedElement as GenericFunctionTypeElement2;
+      var functionElement = aliasedElement as GenericFunctionTypeElement;
       nameScope = FormalParameterScope(
         nameScope,
         functionElement.formalParameters,
@@ -5237,7 +5237,7 @@ class ScopeResolverVisitor extends UnifyingAstVisitor<void> {
       node.type.accept(this);
 
       var aliasedElement = element.aliasedElement2;
-      if (aliasedElement is GenericFunctionTypeElement2) {
+      if (aliasedElement is GenericFunctionTypeElement) {
         nameScope = FormalParameterScope(
           TypeParameterScope(nameScope, aliasedElement.typeParameters2),
           aliasedElement.formalParameters,
@@ -5439,7 +5439,7 @@ class ScopeResolverVisitor extends UnifyingAstVisitor<void> {
     }
     // Prepare VariableElement.
     var element = scopeLookupResult.getter2;
-    if (element is! VariableElement2) {
+    if (element is! VariableElement) {
       return;
     }
     // Must be local or parameter.
@@ -5488,7 +5488,7 @@ class ScopeResolverVisitor extends UnifyingAstVisitor<void> {
       for (var member in node.members) {
         for (var label in member.labels) {
           var labelName = label.label;
-          var labelElement = labelName.element as LabelElement2;
+          var labelElement = labelName.element as LabelElement;
           _labelScope = LabelScope(
             _labelScope,
             labelName.name,
@@ -5563,13 +5563,13 @@ class ScopeResolverVisitor extends UnifyingAstVisitor<void> {
     for (var label in labels) {
       var labelNameNode = label.label;
       var labelName = labelNameNode.name;
-      var labelElement = labelNameNode.element as LabelElement2;
+      var labelElement = labelNameNode.element as LabelElement;
       _labelScope = LabelScope(_labelScope, labelName, node, labelElement);
     }
     return outerScope;
   }
 
-  void _define(Element2 element) {
+  void _define(Element element) {
     (nameScope as LocalScope).add(element);
   }
 
@@ -5745,7 +5745,7 @@ class ScopeResolverVisitor extends UnifyingAstVisitor<void> {
 class SwitchExhaustiveness {
   /// If the switch is on an enumeration, the set of enum constants to cover.
   /// Otherwise `null`.
-  final Set<FieldElement2>? _enumConstants;
+  final Set<FieldElement>? _enumConstants;
 
   /// If the switch is on an enumeration, is `true` if the null value is
   /// covered, because the switch expression type is non-nullable, or `null`
@@ -5808,7 +5808,7 @@ class SwitchExhaustiveness {
   void _handleCaseConstant(ExpressionImpl? caseConstant) {
     if (caseConstant != null) {
       var element = _referencedElement(caseConstant);
-      if (element is PropertyAccessorElement2) {
+      if (element is PropertyAccessorElement) {
         _enumConstants!.remove(element.variable3);
       }
       if (caseConstant is NullLiteral) {
@@ -5820,7 +5820,7 @@ class SwitchExhaustiveness {
     }
   }
 
-  static Element2? _referencedElement(Expression expression) {
+  static Element? _referencedElement(Expression expression) {
     if (expression is ParenthesizedExpression) {
       return _referencedElement(expression.expression);
     } else if (expression is PrefixedIdentifier) {
@@ -5839,7 +5839,7 @@ class _WhyNotPromotedVisitor
         NonPromotionReasonVisitor<
           List<DiagnosticMessage>,
           AstNode,
-          PromotableElement2
+          PromotableElement
         > {
   final Source source;
 
@@ -5847,13 +5847,13 @@ class _WhyNotPromotedVisitor
 
   final FlowAnalysisDataForTesting? _dataForTesting;
 
-  PropertyAccessorElement2? propertyReference;
+  PropertyAccessorElement? propertyReference;
 
   _WhyNotPromotedVisitor(this.source, this._errorEntity, this._dataForTesting);
 
   @override
   List<DiagnosticMessage> visitDemoteViaExplicitWrite(
-    DemoteViaExplicitWrite<PromotableElement2> reason,
+    DemoteViaExplicitWrite<PromotableElement> reason,
   ) {
     var node = reason.node as AstNode;
     if (node is ForEachPartsWithIdentifier) {
@@ -5871,7 +5871,7 @@ class _WhyNotPromotedVisitor
     PropertyNotPromotedForInherentReason reason,
   ) {
     var receiverElement = reason.propertyMember;
-    if (receiverElement is PropertyAccessorElement2) {
+    if (receiverElement is PropertyAccessorElement) {
       var property = propertyReference = receiverElement;
       var propertyName = reason.propertyName;
       String message = switch (reason.whyNotPromotable) {
@@ -5912,7 +5912,7 @@ class _WhyNotPromotedVisitor
     PropertyNotPromotedForNonInherentReason reason,
   ) {
     var receiverElement = reason.propertyMember;
-    if (receiverElement is PropertyAccessorElement2) {
+    if (receiverElement is PropertyAccessorElement) {
       var property = propertyReference = receiverElement;
       var propertyName = reason.propertyName;
       var library = receiverElement.library2 as LibraryElementImpl;
@@ -5920,9 +5920,9 @@ class _WhyNotPromotedVisitor
       var fieldNameInfo = fieldNonPromotabilityInfo[reason.propertyName];
       var messages = <DiagnosticMessage>[];
       void addConflictMessage({
-        required Element2 conflictingElement,
+        required Element conflictingElement,
         required String kind,
-        required Element2 enclosingElement,
+        required Element enclosingElement,
         required NonPromotionDocumentationLink link,
       }) {
         var enclosingKindName = enclosingElement.kind.displayName;
@@ -6006,7 +6006,7 @@ class _WhyNotPromotedVisitor
   DiagnosticMessageImpl _contextMessageForWrite(
     String? variableName,
     AstNode node,
-    DemoteViaExplicitWrite<PromotableElement2> reason,
+    DemoteViaExplicitWrite<PromotableElement> reason,
   ) {
     return DiagnosticMessageImpl(
       filePath: source.fullName,
@@ -6020,7 +6020,7 @@ class _WhyNotPromotedVisitor
   }
 
   DiagnosticMessageImpl _fieldPromotionUnavailableMessage(
-    PropertyAccessorElement2 property,
+    PropertyAccessorElement property,
     String propertyName,
   ) {
     return DiagnosticMessageImpl(
@@ -6036,7 +6036,7 @@ class _WhyNotPromotedVisitor
   }
 }
 
-extension on Element2 {
+extension on Element {
   bool get isWildcardFunction =>
       this is LocalFunctionElement &&
       name3 == '_' &&
diff --git a/pkg/analyzer/lib/src/hint/sdk_constraint_verifier.dart b/pkg/analyzer/lib/src/hint/sdk_constraint_verifier.dart
index c6e3b1f7b55..bd1c631b5db 100644
--- a/pkg/analyzer/lib/src/hint/sdk_constraint_verifier.dart
+++ b/pkg/analyzer/lib/src/hint/sdk_constraint_verifier.dart
@@ -161,7 +161,7 @@ class SdkConstraintVerifier extends RecursiveAstVisitor<void> {
   }
 
   void _checkSinceSdkVersion(
-    Element2? element,
+    Element? element,
     AstNode target, {
     SyntacticEntity? errorEntity,
   }) {
@@ -219,8 +219,8 @@ class SdkConstraintVerifier extends RecursiveAstVisitor<void> {
   /// Returns `true` if [element] is something else, or if the target is a
   /// concrete enum. The `index` was always available for concrete enums,
   /// but there was no common `Enum` supertype for all enums.
-  static bool _shouldReportEnumIndex(AstNode node, Element2 element) {
-    if (element is PropertyAccessorElement2 && element.name3 == 'index') {
+  static bool _shouldReportEnumIndex(AstNode node, Element element) {
+    if (element is PropertyAccessorElement && element.name3 == 'index') {
       DartType? targetType;
       if (node is PrefixedIdentifier) {
         targetType = node.prefix.staticType;
@@ -229,7 +229,7 @@ class SdkConstraintVerifier extends RecursiveAstVisitor<void> {
       }
       if (targetType != null) {
         var targetElement = targetType.element3;
-        return targetElement is ClassElement2 && targetElement.isDartCoreEnum;
+        return targetElement is ClassElement && targetElement.isDartCoreEnum;
       }
       return false;
     } else {
diff --git a/pkg/analyzer/lib/src/lint/constants.dart b/pkg/analyzer/lib/src/lint/constants.dart
index 495abf321c5..20dafe7458e 100644
--- a/pkg/analyzer/lib/src/lint/constants.dart
+++ b/pkg/analyzer/lib/src/lint/constants.dart
@@ -116,7 +116,7 @@ extension ConstructorDeclarationExtension on ConstructorDeclaration {
     var element = declaredFragment!.element;
 
     var classElement = element.enclosingElement2;
-    if (classElement is ClassElement2 && classElement.hasNonFinalField) {
+    if (classElement is ClassElement && classElement.hasNonFinalField) {
       return false;
     }
 
diff --git a/pkg/analyzer/lib/src/lint/linter.dart b/pkg/analyzer/lib/src/lint/linter.dart
index bd8fbfcd3d9..7ffa5439649 100644
--- a/pkg/analyzer/lib/src/lint/linter.dart
+++ b/pkg/analyzer/lib/src/lint/linter.dart
@@ -57,7 +57,7 @@ abstract class LinterContext {
   /// The library element representing the library that contains the compilation
   /// unit being linted.
   @experimental
-  LibraryElement2? get libraryElement2;
+  LibraryElement? get libraryElement2;
 
   /// The package in which the library being analyzed lives, or `null` if it
   /// does not live in a package.
@@ -102,7 +102,7 @@ final class LinterContextWithParsedResults implements LinterContext {
 
   @experimental
   @override
-  LibraryElement2 get libraryElement2 =>
+  LibraryElement get libraryElement2 =>
       throw UnsupportedError(
         'LinterContext with parsed results does not include a LibraryElement',
       );
@@ -172,7 +172,7 @@ final class LinterContextWithResolvedResults implements LinterContext {
 
   @experimental
   @override
-  LibraryElement2 get libraryElement2 => definingUnit.libraryFragment.element;
+  LibraryElement get libraryElement2 => definingUnit.libraryFragment.element;
 }
 
 /// Describes a lint rule.
diff --git a/pkg/analyzer/lib/src/services/top_level_declarations.dart b/pkg/analyzer/lib/src/services/top_level_declarations.dart
index 1e1a440abb7..78b90947d83 100644
--- a/pkg/analyzer/lib/src/services/top_level_declarations.dart
+++ b/pkg/analyzer/lib/src/services/top_level_declarations.dart
@@ -21,9 +21,9 @@ class TopLevelDeclarations {
 
   /// Return the first public library that exports (but does not necessary
   /// declare) [element].
-  Future<LibraryElement2?> publiclyExporting(
-    Element2 element, {
-    Map<Element2, LibraryElement2?>? resultCache,
+  Future<LibraryElement?> publiclyExporting(
+    Element element, {
+    Map<Element, LibraryElement?>? resultCache,
   }) async {
     if (resultCache?.containsKey(element) ?? false) {
       return resultCache![element];
@@ -69,14 +69,14 @@ class TopLevelDeclarations {
   /// a top-level declaration that is exported (not necessary declared) by this
   /// library, and has the requested base name. For getters and setters the
   /// corresponding top-level variable is returned.
-  Future<Map<LibraryElement2, Element2>> withName(String baseName) async {
+  Future<Map<LibraryElement, Element>> withName(String baseName) async {
     var analysisDriver = _analysisContext.driver;
     await analysisDriver.discoverAvailableFiles();
 
     var fsState = analysisDriver.fsState;
     var filter = FileStateFilter(fsState.getFileForPath(resolvedUnit.path));
 
-    var result = <LibraryElement2, Element2>{};
+    var result = <LibraryElement, Element>{};
 
     for (var file in fsState.knownFiles.toList()) {
       if (!filter.shouldInclude(file)) {
@@ -95,8 +95,8 @@ class TopLevelDeclarations {
   }
 
   static void addElement(
-    Map<LibraryElement2, Element2> result,
-    LibraryElement2 libraryElement,
+    Map<LibraryElement, Element> result,
+    LibraryElement libraryElement,
     String baseName,
   ) {
     var element = _findElement(libraryElement, baseName);
@@ -105,14 +105,11 @@ class TopLevelDeclarations {
     }
   }
 
-  static Element2? _findElement(
-    LibraryElement2 libraryElement,
-    String baseName,
-  ) {
+  static Element? _findElement(LibraryElement libraryElement, String baseName) {
     var element =
         libraryElement.exportNamespace.get2(baseName) ??
         libraryElement.exportNamespace.get2('$baseName=');
-    if (element is PropertyAccessorElement2) {
+    if (element is PropertyAccessorElement) {
       var variable = element.variable3;
       if (variable != null) {
         return variable;
diff --git a/pkg/analyzer/lib/src/summary2/ast_binary_reader.dart b/pkg/analyzer/lib/src/summary2/ast_binary_reader.dart
index 8675193b216..16a40c43b09 100644
--- a/pkg/analyzer/lib/src/summary2/ast_binary_reader.dart
+++ b/pkg/analyzer/lib/src/summary2/ast_binary_reader.dart
@@ -317,7 +317,7 @@ class AstBinaryReader {
       operator: Tokens.fromType(operatorType),
       rightOperand: rightOperand,
     );
-    node.element = _reader.readElement2() as MethodElement2?;
+    node.element = _reader.readElement2() as MethodElement?;
     node.staticInvokeType = _reader.readOptionalFunctionType();
     _readExpressionResolution(node);
     return node;
@@ -764,7 +764,7 @@ class AstBinaryReader {
         rightBracket: Tokens.closeSquareBracket(),
       );
     }
-    node.element = _reader.readElement2() as MethodElement2?;
+    node.element = _reader.readElement2() as MethodElement?;
     _readExpressionResolution(node);
     return node;
   }
@@ -1012,7 +1012,7 @@ class AstBinaryReader {
       operand: operand,
       operator: Tokens.fromType(operatorType),
     );
-    node.element = _reader.readElement2() as MethodElement2?;
+    node.element = _reader.readElement2() as MethodElement?;
     if (node.operator.type.isIncrementOperator) {
       node.readElement2 = _reader.readElement2();
       node.readType = _reader.readType();
@@ -1042,7 +1042,7 @@ class AstBinaryReader {
       operator: Tokens.fromType(operatorType),
       operand: operand,
     );
-    node.element = _reader.readElement2() as MethodElement2?;
+    node.element = _reader.readElement2() as MethodElement?;
     if (node.operator.type.isIncrementOperator) {
       node.readElement2 = _reader.readElement2();
       node.readType = _reader.readType();
@@ -1409,13 +1409,13 @@ class AstBinaryReader {
   }
 
   void _resolveNamedExpressions(
-    Element2? executable,
+    Element? executable,
     ArgumentList argumentList,
   ) {
     for (var argument in argumentList.arguments) {
       if (argument is NamedExpressionImpl) {
         var nameNode = argument.name.label;
-        if (executable is ExecutableElement2) {
+        if (executable is ExecutableElement) {
           var formalParameters = executable.formalParameters;
           var name = nameNode.name;
           nameNode.element = formalParameters.firstWhereOrNull((e) {
diff --git a/pkg/analyzer/lib/src/summary2/augmentation.dart b/pkg/analyzer/lib/src/summary2/augmentation.dart
index 7d75e199361..8bc5f4de53e 100644
--- a/pkg/analyzer/lib/src/summary2/augmentation.dart
+++ b/pkg/analyzer/lib/src/summary2/augmentation.dart
@@ -100,7 +100,7 @@ class ExtensionTypeElementBuilder
 }
 
 /// A builder for top-level fragmented elements, e.g. classes.
-class FragmentedElementBuilder<E extends Element2, F extends Fragment> {
+class FragmentedElementBuilder<E extends Element, F extends Fragment> {
   final E element;
   final F firstFragment;
   F lastFragment;
diff --git a/pkg/analyzer/lib/src/summary2/bundle_reader.dart b/pkg/analyzer/lib/src/summary2/bundle_reader.dart
index fe4dc36a452..47e85aad748 100644
--- a/pkg/analyzer/lib/src/summary2/bundle_reader.dart
+++ b/pkg/analyzer/lib/src/summary2/bundle_reader.dart
@@ -266,7 +266,7 @@ abstract class ElementLinkedData<E extends ElementImpl> {
   }
 
   /// Ensure that all members of the [element] are available. This includes
-  /// being able to ask them for example using [ClassElement2.methods2], and
+  /// being able to ask them for example using [ClassElement.methods2], and
   /// as well access them through their [Reference]s. For a class declaration
   /// this means reading them, for a named mixin application this means
   /// computing constructors.
@@ -1987,7 +1987,7 @@ class ResolutionReader {
     throw UnimplementedError('memberFlags: $memberFlags');
   }
 
-  Element2? readElement2() {
+  Element? readElement2() {
     var element = readElement();
     switch (element) {
       case null:
@@ -2003,7 +2003,7 @@ class ResolutionReader {
     }
   }
 
-  List<T> readElementList2<T extends Element2>() {
+  List<T> readElementList2<T extends Element>() {
     return _reader.readTypedListCast<T>(readElement2);
   }
 
diff --git a/pkg/analyzer/lib/src/summary2/bundle_writer.dart b/pkg/analyzer/lib/src/summary2/bundle_writer.dart
index 4fe99fc7752..968444e7bc3 100644
--- a/pkg/analyzer/lib/src/summary2/bundle_writer.dart
+++ b/pkg/analyzer/lib/src/summary2/bundle_writer.dart
@@ -723,7 +723,7 @@ class ResolutionSink extends _SummaryDataWriter {
 
   // TODO(scheglov): Triage places where we write elements.
   // Some of then cannot be members, e.g. type names.
-  void writeElement2(Element2? element) {
+  void writeElement2(Element? element) {
     if (element case Member element) {
       var baseElement = element.baseElement;
 
@@ -851,7 +851,7 @@ class ResolutionSink extends _SummaryDataWriter {
     }
   }
 
-  void _writeElement2(Element2? element) {
+  void _writeElement2(Element? element) {
     switch (element) {
       case null:
       case MultiplyDefinedElementImpl2():
@@ -886,7 +886,7 @@ class ResolutionSink extends _SummaryDataWriter {
     writeUInt30(elementIndex);
   }
 
-  void _writeElementList2(List<Element2> elements) {
+  void _writeElementList2(List<Element> elements) {
     writeUInt30(elements.length);
     for (var element in elements) {
       writeElement2(element);
@@ -1005,8 +1005,8 @@ class ResolutionSink extends _SummaryDataWriter {
   }
 
   static List<DartType> _enclosingClassTypeArguments(
-    Element2 declaration,
-    Map<TypeParameterElement2, DartType> substitution,
+    Element declaration,
+    Map<TypeParameterElement, DartType> substitution,
   ) {
     // TODO(scheglov): Just keep it null in class Member?
     if (substitution.isEmpty) {
@@ -1014,7 +1014,7 @@ class ResolutionSink extends _SummaryDataWriter {
     }
 
     var enclosing = declaration.enclosingElement2;
-    if (enclosing is InstanceElement2) {
+    if (enclosing is InstanceElement) {
       var typeParameters = enclosing.typeParameters2;
       if (typeParameters.isEmpty) {
         return const <DartType>[];
diff --git a/pkg/analyzer/lib/src/summary2/default_types_builder.dart b/pkg/analyzer/lib/src/summary2/default_types_builder.dart
index 4a54991ac1d..a0f8cc12df4 100644
--- a/pkg/analyzer/lib/src/summary2/default_types_builder.dart
+++ b/pkg/analyzer/lib/src/summary2/default_types_builder.dart
@@ -101,7 +101,7 @@ class DefaultTypesBuilder {
   }
 
   void _breakRawTypeCycles(
-    Element2 declarationElement,
+    Element declarationElement,
     TypeParameterList? parameterList,
   ) {
     if (parameterList == null) return;
@@ -115,7 +115,7 @@ class DefaultTypesBuilder {
         parameter,
         boundNode.typeOrThrow,
         declarationElement,
-        Set<Element2>.identity(),
+        Set<Element>.identity(),
       );
       allCycles.addAll(cycles);
     }
@@ -192,7 +192,7 @@ class DefaultTypesBuilder {
   /// Compute bounds to be provided as type arguments in place of missing type
   /// arguments on raw types with the given type parameters.
   void _computeBounds(
-    Element2 declarationElement,
+    Element declarationElement,
     TypeParameterListImpl? parameterList,
   ) {
     if (parameterList == null) return;
@@ -213,8 +213,8 @@ class DefaultTypesBuilder {
     var graph = _TypeParametersGraph(elements, bounds);
     var stronglyConnected = computeStrongComponents(graph);
     for (var component in stronglyConnected) {
-      var dynamicSubstitution = <TypeParameterElement2, TypeImpl>{};
-      var nullSubstitution = <TypeParameterElement2, TypeImpl>{};
+      var dynamicSubstitution = <TypeParameterElement, TypeImpl>{};
+      var nullSubstitution = <TypeParameterElement, TypeImpl>{};
       for (var i in component) {
         var element = elements[i];
         dynamicSubstitution[element] = dynamicType;
@@ -233,8 +233,8 @@ class DefaultTypesBuilder {
     }
 
     for (var i = 0; i < length; i++) {
-      var thisSubstitution = <TypeParameterElement2, TypeImpl>{};
-      var nullSubstitution = <TypeParameterElement2, TypeImpl>{};
+      var thisSubstitution = <TypeParameterElement, TypeImpl>{};
+      var nullSubstitution = <TypeParameterElement, TypeImpl>{};
       var element = elements[i];
       thisSubstitution[element] = bounds[i];
       nullSubstitution[element] = bottomType;
@@ -262,8 +262,8 @@ class DefaultTypesBuilder {
   List<List<_CycleElement>> _findRawTypePathsToDeclaration(
     TypeParameter startParameter,
     DartType startType,
-    Element2 end,
-    Set<Element2> visited,
+    Element end,
+    Set<Element> visited,
   ) {
     var paths = <List<_CycleElement>>[];
     if (startType is NamedTypeBuilder) {
@@ -272,7 +272,7 @@ class DefaultTypesBuilder {
         if (startType.element3 == end) {
           paths.add([_CycleElement(startParameter, startType)]);
         } else if (visited.add(startType.element3)) {
-          void recurseParameters(List<TypeParameterElement2> parameters) {
+          void recurseParameters(List<TypeParameterElement> parameters) {
             for (var parameter in parameters) {
               var parameterNode = _linker.getLinkingNode2(
                 parameter.firstFragment,
@@ -297,9 +297,9 @@ class DefaultTypesBuilder {
             }
           }
 
-          if (declaration is InterfaceElement2) {
+          if (declaration is InterfaceElement) {
             recurseParameters(declaration.typeParameters2);
-          } else if (declaration is TypeAliasElement2) {
+          } else if (declaration is TypeAliasElement) {
             recurseParameters(declaration.typeParameters2);
           }
           visited.remove(startType.element3);
@@ -366,10 +366,10 @@ class _TypeParametersGraph implements Graph<int> {
   // the type parameter with the index `i` in their bounds.
   final List<List<int>> _edges = [];
 
-  final Map<TypeParameterElement2, int> _parameterToIndex = Map.identity();
+  final Map<TypeParameterElement, int> _parameterToIndex = Map.identity();
 
   _TypeParametersGraph(
-    List<TypeParameterElement2> parameters,
+    List<TypeParameterElement> parameters,
     List<DartType> bounds,
   ) {
     assert(parameters.length == bounds.length);
@@ -415,13 +415,13 @@ class _TypeParametersGraph implements Graph<int> {
 }
 
 class _UpperLowerReplacementVisitor extends ReplacementVisitor {
-  final Map<TypeParameterElement2, TypeImpl> _upper;
-  final Map<TypeParameterElement2, TypeImpl> _lower;
+  final Map<TypeParameterElement, TypeImpl> _upper;
+  final Map<TypeParameterElement, TypeImpl> _lower;
   Variance _variance;
 
   _UpperLowerReplacementVisitor({
-    required Map<TypeParameterElement2, TypeImpl> upper,
-    required Map<TypeParameterElement2, TypeImpl> lower,
+    required Map<TypeParameterElement, TypeImpl> upper,
+    required Map<TypeParameterElement, TypeImpl> lower,
     required Variance variance,
   }) : _upper = upper,
        _lower = lower,
diff --git a/pkg/analyzer/lib/src/summary2/detach_nodes.dart b/pkg/analyzer/lib/src/summary2/detach_nodes.dart
index 0821a07b941..7e3c561698a 100644
--- a/pkg/analyzer/lib/src/summary2/detach_nodes.dart
+++ b/pkg/analyzer/lib/src/summary2/detach_nodes.dart
@@ -60,7 +60,7 @@ class _Visitor extends GeneralizingElementVisitor2<void> {
   }
 
   @override
-  void visitElement(Element2 element) {
+  void visitElement(Element element) {
     if (element case Annotatable annotatable) {
       for (var annotation in annotatable.metadata2.annotations) {
         var ast = (annotation as ElementAnnotationImpl).annotationAst;
@@ -94,7 +94,7 @@ class _Visitor extends GeneralizingElementVisitor2<void> {
   }
 
   @override
-  void visitPropertyInducingElement(PropertyInducingElement2 element) {
+  void visitPropertyInducingElement(PropertyInducingElement element) {
     for (var fragment in element.fragments) {
       if (fragment is PropertyInducingElementImpl) {
         fragment.typeInference = null;
diff --git a/pkg/analyzer/lib/src/summary2/library_builder.dart b/pkg/analyzer/lib/src/summary2/library_builder.dart
index 9612c4fa4be..1d7fc692c7f 100644
--- a/pkg/analyzer/lib/src/summary2/library_builder.dart
+++ b/pkg/analyzer/lib/src/summary2/library_builder.dart
@@ -362,7 +362,7 @@ class LibraryBuilder {
   void storeExportScope() {
     element.exportedReferences = exportScope.toReferences();
 
-    var definedNames = <String, Element2>{};
+    var definedNames = <String, Element>{};
     for (var entry in exportScope.map.entries) {
       var reference = entry.value.reference;
       var element = linker.elementFactory.elementOfReference(reference);
diff --git a/pkg/analyzer/lib/src/summary2/linked_element_factory.dart b/pkg/analyzer/lib/src/summary2/linked_element_factory.dart
index 4eba64c33e6..38851ad1690 100644
--- a/pkg/analyzer/lib/src/summary2/linked_element_factory.dart
+++ b/pkg/analyzer/lib/src/summary2/linked_element_factory.dart
@@ -87,7 +87,7 @@ class LinkedElementFactory {
     Uri uri,
     List<ExportedReference> exportedReferences,
   ) {
-    var exportedNames = <String, Element2>{};
+    var exportedNames = <String, Element>{};
 
     for (var exportedReference in exportedReferences) {
       var element = elementOfReference(exportedReference.reference);
@@ -201,7 +201,7 @@ class LinkedElementFactory {
   }
 
   // TODO(scheglov): Why would this method return `null`?
-  Element2? elementOfReference2(Reference reference) {
+  Element? elementOfReference2(Reference reference) {
     return elementOfReference(reference)?.asElement2;
   }
 
diff --git a/pkg/analyzer/lib/src/summary2/named_type_builder.dart b/pkg/analyzer/lib/src/summary2/named_type_builder.dart
index 6279e42db81..e84c106d359 100644
--- a/pkg/analyzer/lib/src/summary2/named_type_builder.dart
+++ b/pkg/analyzer/lib/src/summary2/named_type_builder.dart
@@ -27,7 +27,7 @@ class NamedTypeBuilder extends TypeBuilder {
   final TypeSystemImpl typeSystem;
 
   @override
-  final Element2 element3;
+  final Element element3;
 
   final List<TypeImpl> arguments;
 
@@ -58,7 +58,7 @@ class NamedTypeBuilder extends TypeBuilder {
     Linker linker,
     TypeSystemImpl typeSystem,
     NamedTypeImpl node,
-    Element2 element,
+    Element element,
     NullabilitySuffix nullabilitySuffix,
   ) {
     List<TypeImpl> arguments;
@@ -82,7 +82,7 @@ class NamedTypeBuilder extends TypeBuilder {
   factory NamedTypeBuilder.v2({
     required Linker linker,
     required TypeSystemImpl typeSystem,
-    required Element2 element,
+    required Element element,
     required List<TypeImpl> arguments,
     required NullabilitySuffix nullabilitySuffix,
     NamedTypeImpl? node,
@@ -202,7 +202,7 @@ class NamedTypeBuilder extends TypeBuilder {
   }
 
   /// Build arguments that correspond to the type [parameters].
-  List<TypeImpl> _buildArguments(List<TypeParameterElement2> parameters) {
+  List<TypeImpl> _buildArguments(List<TypeParameterElement> parameters) {
     if (parameters.isEmpty) {
       return const <TypeImpl>[];
     } else if (arguments.isNotEmpty) {
diff --git a/pkg/analyzer/lib/src/summary2/reference.dart b/pkg/analyzer/lib/src/summary2/reference.dart
index 8ee7c04c019..68094d24e42 100644
--- a/pkg/analyzer/lib/src/summary2/reference.dart
+++ b/pkg/analyzer/lib/src/summary2/reference.dart
@@ -38,8 +38,8 @@ class Reference {
   /// The corresponding [ElementImpl], or `null` if a named container.
   ElementImpl? element;
 
-  /// The corresponding [Element2], or `null` if a named container.
-  Element2? element2;
+  /// The corresponding [Element], or `null` if a named container.
+  Element? element2;
 
   /// Temporary index used during serialization and linking.
   int? index;
diff --git a/pkg/analyzer/lib/src/summary2/reference_resolver.dart b/pkg/analyzer/lib/src/summary2/reference_resolver.dart
index 274673be810..bac929598a3 100644
--- a/pkg/analyzer/lib/src/summary2/reference_resolver.dart
+++ b/pkg/analyzer/lib/src/summary2/reference_resolver.dart
@@ -51,7 +51,7 @@ class ReferenceResolver extends ThrowingAstVisitor<void> {
         var prefixElement = scope.lookup(prefixNode.name).getter2;
         prefixNode.element = prefixElement;
 
-        if (prefixElement is PrefixElement2) {
+        if (prefixElement is PrefixElement) {
           var name = identifier.identifier.name;
           var element = prefixElement.scope.lookup(name).getter2;
           identifier.identifier.element = element;
@@ -435,7 +435,7 @@ class ReferenceResolver extends ThrowingAstVisitor<void> {
 
   @override
   void visitNamedType(covariant NamedTypeImpl node) {
-    Element2? element;
+    Element? element;
     var importPrefix = node.importPrefix;
     if (importPrefix != null) {
       var prefixToken = importPrefix.name;
@@ -443,7 +443,7 @@ class ReferenceResolver extends ThrowingAstVisitor<void> {
       var prefixElement = scope.lookup(prefixName).getter2;
       importPrefix.element2 = prefixElement;
 
-      if (prefixElement is PrefixElement2) {
+      if (prefixElement is PrefixElement) {
         var name = node.name2.lexeme;
         element = prefixElement.scope.lookup(name).getter2;
       }
diff --git a/pkg/analyzer/lib/src/summary2/simply_bounded.dart b/pkg/analyzer/lib/src/summary2/simply_bounded.dart
index 3c3d00108fa..cec6b2c7e75 100644
--- a/pkg/analyzer/lib/src/summary2/simply_bounded.dart
+++ b/pkg/analyzer/lib/src/summary2/simply_bounded.dart
@@ -74,7 +74,7 @@ void computeSimplyBounded(Linker linker) {
 class SimplyBoundedDependencyWalker
     extends graph.DependencyWalker<SimplyBoundedNode> {
   final Linker linker;
-  final Map<Element2, SimplyBoundedNode> nodeMap = Map.identity();
+  final Map<Element, SimplyBoundedNode> nodeMap = Map.identity();
 
   SimplyBoundedDependencyWalker(this.linker);
 
@@ -90,7 +90,7 @@ class SimplyBoundedDependencyWalker
     }
   }
 
-  SimplyBoundedNode getNode(Element2 element) {
+  SimplyBoundedNode getNode(Element element) {
     var graphNode = nodeMap[element];
     if (graphNode == null) {
       var node = linker.getLinkingNode2(element.firstFragment);
@@ -289,7 +289,7 @@ class SimplyBoundedNode extends graph.Node<SimplyBoundedNode> {
     if (type is NamedType) {
       var element = type.element2;
 
-      if (element is TypeParameterElement2) {
+      if (element is TypeParameterElement) {
         return allowTypeParameters;
       }
 
@@ -299,7 +299,7 @@ class SimplyBoundedNode extends graph.Node<SimplyBoundedNode> {
 
         // If not a node being linked, then the flag is already set.
         if (graphNode == null) {
-          if (element is TypeParameterizedElement2) {
+          if (element is TypeParameterizedElement) {
             return element.isSimplyBounded;
           }
           return true;
diff --git a/pkg/analyzer/lib/src/summary2/types_builder.dart b/pkg/analyzer/lib/src/summary2/types_builder.dart
index 5ea56f57bc3..25b18b1c02f 100644
--- a/pkg/analyzer/lib/src/summary2/types_builder.dart
+++ b/pkg/analyzer/lib/src/summary2/types_builder.dart
@@ -22,7 +22,7 @@ import 'package:analyzer/src/utilities/extensions/element.dart';
 
 /// Return `true` if [type] can be used as a class.
 bool _isInterfaceTypeClass(InterfaceType type) {
-  if (type.element3 is! ClassElement2) {
+  if (type.element3 is! ClassElement) {
     return false;
   }
   return _isInterfaceTypeInterface(type);
@@ -30,10 +30,10 @@ bool _isInterfaceTypeClass(InterfaceType type) {
 
 /// Return `true` if [type] can be used as an interface or a mixin.
 bool _isInterfaceTypeInterface(InterfaceType type) {
-  if (type.element3 is EnumElement2) {
+  if (type.element3 is EnumElement) {
     return false;
   }
-  if (type.element3 is ExtensionTypeElement2) {
+  if (type.element3 is ExtensionTypeElement) {
     return false;
   }
   if (type.isDartCoreFunction || type.isDartCoreNull) {
@@ -431,7 +431,7 @@ class _MixinInference {
   }
 
   InterfaceTypeImpl? _findInterfaceTypeForElement(
-    InterfaceElement2 element,
+    InterfaceElement element,
     List<InterfaceTypeImpl> interfaceTypes,
   ) {
     for (var interfaceType in interfaceTypes) {
diff --git a/pkg/analyzer/lib/src/summary2/variance_builder.dart b/pkg/analyzer/lib/src/summary2/variance_builder.dart
index c4c7baa7900..aab403c8eef 100644
--- a/pkg/analyzer/lib/src/summary2/variance_builder.dart
+++ b/pkg/analyzer/lib/src/summary2/variance_builder.dart
@@ -54,7 +54,7 @@ class VarianceBuilder {
     }
   }
 
-  Variance _compute(TypeParameterElement2 variable, DartType? type) {
+  Variance _compute(TypeParameterElement variable, DartType? type) {
     if (type is TypeParameterType) {
       if (type.element3 == variable) {
         return Variance.covariant;
@@ -119,9 +119,9 @@ class VarianceBuilder {
   }
 
   Variance _computeFunctionType(
-    TypeParameterElement2 variable, {
+    TypeParameterElement variable, {
     required DartType? returnType,
-    required List<TypeParameterElement2>? typeParameters,
+    required List<TypeParameterElement>? typeParameters,
     required List<FormalParameterElement> formalParameters,
   }) {
     var result = Variance.unrelated;
diff --git a/pkg/analyzer/lib/src/test_utilities/find_element2.dart b/pkg/analyzer/lib/src/test_utilities/find_element2.dart
index ab579e26fb8..9e9d459897c 100644
--- a/pkg/analyzer/lib/src/test_utilities/find_element2.dart
+++ b/pkg/analyzer/lib/src/test_utilities/find_element2.dart
@@ -37,8 +37,8 @@ class FindElement2 extends _FindElementBase {
     throw StateError('Not found: $targetUri');
   }
 
-  FieldFormalParameterElement2 fieldFormalParameter(String name) {
-    return parameter(name) as FieldFormalParameterElement2;
+  FieldFormalParameterElement fieldFormalParameter(String name) {
+    return parameter(name) as FieldFormalParameterElement;
   }
 
   TopLevelFunctionElement function(String name) {
@@ -80,11 +80,11 @@ class FindElement2 extends _FindElementBase {
     return ImportFindElement(import);
   }
 
-  LabelElement2 label(String name) {
-    LabelElement2? result;
+  LabelElement label(String name) {
+    LabelElement? result;
 
-    void updateResult(Element2 element) {
-      if (element is LabelElement2 && element.name3 == name) {
+    void updateResult(Element element) {
+      if (element is LabelElement && element.name3 == name) {
         if (result != null) {
           throw StateError('Not unique: $name');
         }
@@ -129,11 +129,11 @@ class FindElement2 extends _FindElementBase {
     return result!;
   }
 
-  LocalVariableElement2 localVar(String name) {
-    LocalVariableElement2? result;
+  LocalVariableElement localVar(String name) {
+    LocalVariableElement? result;
 
-    void updateResult(Element2 element) {
-      if (element is LocalVariableElement2 && element.name3 == name) {
+    void updateResult(Element element) {
+      if (element is LocalVariableElement && element.name3 == name) {
         if (result != null) {
           throw StateError('Not unique: $name');
         }
@@ -179,13 +179,13 @@ class FindElement2 extends _FindElementBase {
       }
     }
 
-    void findInExecutables(List<ExecutableElement2> executables) {
+    void findInExecutables(List<ExecutableElement> executables) {
       for (var executable in executables) {
         findIn(executable.formalParameters);
       }
     }
 
-    void findInClasses(List<InterfaceElement2> classes) {
+    void findInClasses(List<InterfaceElement> classes) {
       for (var class_ in classes) {
         findInExecutables(class_.getters2);
         findInExecutables(class_.setters2);
@@ -211,7 +211,7 @@ class FindElement2 extends _FindElementBase {
 
     for (var alias in libraryElement.typeAliases) {
       var aliasedElement = alias.aliasedElement2;
-      if (aliasedElement is GenericFunctionTypeElement2) {
+      if (aliasedElement is GenericFunctionTypeElement) {
         findIn(aliasedElement.formalParameters);
       }
     }
@@ -260,7 +260,7 @@ class FindElement2 extends _FindElementBase {
     return PartFindElement(part);
   }
 
-  PrefixElement2 prefix(String name) {
+  PrefixElement prefix(String name) {
     for (var libraryFragment in libraryFragment.withEnclosing2) {
       for (var importPrefix in libraryFragment.prefixes) {
         if (importPrefix.name3 == name) {
@@ -271,8 +271,8 @@ class FindElement2 extends _FindElementBase {
     throw StateError('Not found: $name');
   }
 
-  TypeParameterElement2 typeParameter(String name) {
-    TypeParameterElement2? result;
+  TypeParameterElement typeParameter(String name) {
+    TypeParameterElement? result;
 
     unit.accept(
       FunctionAstVisitor(
@@ -301,14 +301,14 @@ class ImportFindElement extends _FindElementBase {
 
   ImportFindElement(this.import);
 
-  LibraryElement2 get importedLibrary => import.importedLibrary2!;
+  LibraryElement get importedLibrary => import.importedLibrary2!;
 
   @override
   LibraryFragment get libraryFragment {
     return importedLibrary.firstFragment;
   }
 
-  PrefixElement2? get prefix => import.prefix2?.element;
+  PrefixElement? get prefix => import.prefix2?.element;
 }
 
 class PartFindElement extends _FindElementBase {
@@ -319,11 +319,11 @@ class PartFindElement extends _FindElementBase {
 }
 
 abstract class _FindElementBase {
-  LibraryElement2 get libraryElement => libraryFragment.element;
+  LibraryElement get libraryElement => libraryFragment.element;
 
   LibraryFragment get libraryFragment;
 
-  ClassElement2 class_(String name) {
+  ClassElement class_(String name) {
     for (var class_ in libraryElement.classes) {
       if (class_.name3 == name) {
         return class_;
@@ -332,7 +332,7 @@ abstract class _FindElementBase {
     throw StateError('Not found: $name');
   }
 
-  InterfaceElement2 classOrMixin(String name) {
+  InterfaceElement classOrMixin(String name) {
     for (var class_ in libraryElement.classes) {
       if (class_.name3 == name) {
         return class_;
@@ -346,12 +346,12 @@ abstract class _FindElementBase {
     throw StateError('Not found: $name');
   }
 
-  ConstructorElement2 constructor(String name, {String? of}) {
+  ConstructorElement constructor(String name, {String? of}) {
     assert(name != '');
 
-    ConstructorElement2? result;
+    ConstructorElement? result;
 
-    void findIn(List<ConstructorElement2> constructors) {
+    void findIn(List<ConstructorElement> constructors) {
       for (var constructor in constructors) {
         if (constructor.name3 == name) {
           if (result != null) {
@@ -386,7 +386,7 @@ abstract class _FindElementBase {
     throw StateError('Not found: $name');
   }
 
-  EnumElement2 enum_(String name) {
+  EnumElement enum_(String name) {
     for (var enum_ in libraryElement.enums) {
       if (enum_.name3 == name) {
         return enum_;
@@ -395,7 +395,7 @@ abstract class _FindElementBase {
     throw StateError('Not found: $name');
   }
 
-  ExtensionElement2 extension_(String name) {
+  ExtensionElement extension_(String name) {
     for (var extension_ in libraryElement.extensions) {
       if (extension_.name3 == name) {
         return extension_;
@@ -404,7 +404,7 @@ abstract class _FindElementBase {
     throw StateError('Not found: $name');
   }
 
-  ExtensionTypeElement2 extensionType(String name) {
+  ExtensionTypeElement extensionType(String name) {
     for (var element in libraryElement.extensionTypes) {
       if (element.name3 == name) {
         return element;
@@ -413,7 +413,7 @@ abstract class _FindElementBase {
     throw StateError('Not found: $name');
   }
 
-  FieldElement2 field(String name, {String? of}) {
+  FieldElement field(String name, {String? of}) {
     return _findInClassesLike(
       className: of,
       fromClass: (element) => element.fields2.named(name),
@@ -429,7 +429,7 @@ abstract class _FindElementBase {
     );
   }
 
-  MethodElement2 method(String name, {String? of}) {
+  MethodElement method(String name, {String? of}) {
     return _findInClassesLike(
       className: of,
       fromClass: (element) => element.methods2.named(name),
@@ -437,7 +437,7 @@ abstract class _FindElementBase {
     );
   }
 
-  MixinElement2 mixin(String name) {
+  MixinElement mixin(String name) {
     for (var mixin in libraryElement.mixins) {
       if (mixin.name3 == name) {
         return mixin;
@@ -502,7 +502,7 @@ abstract class _FindElementBase {
     throw StateError('Not found: $name');
   }
 
-  TypeAliasElement2 typeAlias(String name) {
+  TypeAliasElement typeAlias(String name) {
     for (var element in libraryElement.typeAliases) {
       if (element.name3 == name) {
         return element;
@@ -511,7 +511,7 @@ abstract class _FindElementBase {
     throw StateError('Not found: $name');
   }
 
-  ConstructorElement2 unnamedConstructor(String name) {
+  ConstructorElement unnamedConstructor(String name) {
     return _findInClassesLike(
       className: name,
       fromClass:
@@ -522,7 +522,7 @@ abstract class _FindElementBase {
     );
   }
 
-  ExtensionElement2 unnamedExtension() {
+  ExtensionElement unnamedExtension() {
     for (var extension_ in libraryElement.extensions) {
       if (extension_.name3 == null) {
         return extension_;
@@ -531,12 +531,12 @@ abstract class _FindElementBase {
     throw StateError('Not found: an unnamed extension');
   }
 
-  T _findInClassesLike<T extends Element2>({
+  T _findInClassesLike<T extends Element>({
     required String? className,
-    required T? Function(InterfaceElement2 element) fromClass,
-    required T? Function(ExtensionElement2 element) fromExtension,
+    required T? Function(InterfaceElement element) fromClass,
+    required T? Function(ExtensionElement element) fromExtension,
   }) {
-    bool filter(InstanceElement2 element) {
+    bool filter(InstanceElement element) {
       return className == null || element.name3 == className;
     }
 
@@ -566,7 +566,7 @@ abstract class _FindElementBase {
   }
 }
 
-extension<T extends Element2> on List<T> {
+extension<T extends Element> on List<T> {
   T? named(String targetName) {
     for (var element in this) {
       if (element.name3 == targetName) {
@@ -577,7 +577,7 @@ extension<T extends Element2> on List<T> {
   }
 }
 
-extension ExecutableElementExtensions on ExecutableElement2 {
+extension ExecutableElementExtensions on ExecutableElement {
   FormalParameterElement parameter(String name) {
     for (var formalParameter in formalParameters) {
       if (formalParameter.name3 == name) {
@@ -587,9 +587,9 @@ extension ExecutableElementExtensions on ExecutableElement2 {
     throw StateError('Not found: $name');
   }
 
-  SuperFormalParameterElement2 superFormalParameter(String name) {
+  SuperFormalParameterElement superFormalParameter(String name) {
     for (var formalParameter in formalParameters) {
-      if (formalParameter is SuperFormalParameterElement2 &&
+      if (formalParameter is SuperFormalParameterElement &&
           formalParameter.name3 == name) {
         return formalParameter;
       }
diff --git a/pkg/analyzer/lib/src/test_utilities/find_node.dart b/pkg/analyzer/lib/src/test_utilities/find_node.dart
index 6302bb441e5..1be84a04246 100644
--- a/pkg/analyzer/lib/src/test_utilities/find_node.dart
+++ b/pkg/analyzer/lib/src/test_utilities/find_node.dart
@@ -246,7 +246,7 @@ class FindNode {
     return _node(search, (n) => n is BinaryExpression);
   }
 
-  BindPatternVariableElement2 bindPatternVariableElement(String search) {
+  BindPatternVariableElement bindPatternVariableElement(String search) {
     var node = declaredVariablePattern(search);
     return node.declaredElement2!;
   }
diff --git a/pkg/analyzer/lib/src/util/ast_data_extractor.dart b/pkg/analyzer/lib/src/util/ast_data_extractor.dart
index a6a5941aacd..e28b89c15b8 100644
--- a/pkg/analyzer/lib/src/util/ast_data_extractor.dart
+++ b/pkg/analyzer/lib/src/util/ast_data_extractor.dart
@@ -7,22 +7,22 @@ import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/ast/visitor.dart';
 import 'package:analyzer/dart/element/element.dart';
 
-MemberId computeMemberId(Element2 element) {
+MemberId computeMemberId(Element element) {
   var enclosingElement = element.enclosingElement2;
-  if (enclosingElement is LibraryElement2) {
+  if (enclosingElement is LibraryElement) {
     var memberName = element.name3!;
     if (element is SetterElement) {
       memberName += '=';
     }
     return MemberId.internal(memberName);
-  } else if (enclosingElement is InterfaceElement2) {
+  } else if (enclosingElement is InterfaceElement) {
     var memberName = element.lookupName!;
     var className = enclosingElement.name3;
     return MemberId.internal(memberName, className: className);
-  } else if (enclosingElement is ExtensionElement2) {
+  } else if (enclosingElement is ExtensionElement) {
     var memberName = element.name3!;
     var extensionName = enclosingElement.name3;
-    if (element is PropertyAccessorElement2) {
+    if (element is PropertyAccessorElement) {
       if (element is GetterElement) {
         memberName = 'get#$memberName';
       } else {
@@ -50,7 +50,7 @@ abstract class AstDataExtractor<T> extends GeneralizingAstVisitor<void>
   NodeId computeDefaultNodeId(AstNode node) =>
       NodeId(_nodeOffset(node), IdKind.node);
 
-  T? computeElementValue(Id id, Element2 element) => null;
+  T? computeElementValue(Id id, Element element) => null;
 
   void computeForClass(Declaration node, Id? id) {
     if (id == null) return;
@@ -70,7 +70,7 @@ abstract class AstDataExtractor<T> extends GeneralizingAstVisitor<void>
     registerValue(uri, _nodeOffset(node), id, value, node);
   }
 
-  void computeForLibrary(LibraryElement2 library, Id? id) {
+  void computeForLibrary(LibraryElement library, Id? id) {
     if (id == null) return;
     T? value = computeElementValue(id, library);
     registerValue(uri, 0, id, value, library);
@@ -110,7 +110,7 @@ abstract class AstDataExtractor<T> extends GeneralizingAstVisitor<void>
     return ClassId(element.name3!);
   }
 
-  Id createLibraryId(LibraryElement2 node) {
+  Id createLibraryId(LibraryElement node) {
     Uri uri = node.uri;
     if (uri.path.startsWith(r'/C:')) {
       // The `MemoryResourceProvider.convertPath` inserts '/C:' on Windows.
diff --git a/pkg/analyzer/lib/src/utilities/extensions/ast.dart b/pkg/analyzer/lib/src/utilities/extensions/ast.dart
index c7c266a7fb0..3b2aaae722a 100644
--- a/pkg/analyzer/lib/src/utilities/extensions/ast.dart
+++ b/pkg/analyzer/lib/src/utilities/extensions/ast.dart
@@ -43,8 +43,8 @@ extension AstNodeExtension on AstNode {
     return null;
   }
 
-  /// The [ExecutableElement2] of the enclosing executable [AstNode].
-  ExecutableElement2? get enclosingExecutableElement2 {
+  /// The [ExecutableElement] of the enclosing executable [AstNode].
+  ExecutableElement? get enclosingExecutableElement2 {
     for (var node in withParents) {
       if (node is FunctionDeclaration) {
         return node.declaredFragment?.element;
@@ -59,8 +59,8 @@ extension AstNodeExtension on AstNode {
     return null;
   }
 
-  /// The [InstanceElement2] of the enclosing executable [AstNode].
-  InstanceElement2? get enclosingInstanceElement2 {
+  /// The [InstanceElement] of the enclosing executable [AstNode].
+  InstanceElement? get enclosingInstanceElement2 {
     for (var node in withParents) {
       var element = switch (node) {
         ClassDeclaration(:var declaredFragment?) => declaredFragment.element,
diff --git a/pkg/analyzer/lib/src/utilities/extensions/element.dart b/pkg/analyzer/lib/src/utilities/extensions/element.dart
index 6254590b082..eb3ea85ed1b 100644
--- a/pkg/analyzer/lib/src/utilities/extensions/element.dart
+++ b/pkg/analyzer/lib/src/utilities/extensions/element.dart
@@ -11,14 +11,14 @@ import 'package:analyzer/src/dart/element/member.dart';
 import 'package:analyzer/src/dart/element/type.dart';
 import 'package:meta/meta.dart';
 
-class MockLibraryImportElement implements Element2, PrefixFragment {
+class MockLibraryImportElement implements Element, PrefixFragment {
   final LibraryImportElementImpl import;
 
   MockLibraryImportElement(LibraryImport import)
     : import = import as LibraryImportElementImpl;
 
   @override
-  LibraryElement2 get enclosingElement2 => library2;
+  LibraryElement get enclosingElement2 => library2;
 
   @override
   ElementKind get kind => ElementKind.IMPORT;
@@ -110,7 +110,7 @@ extension ConstructorElementMixinExtension on ConstructorElementMixin {
   }
 }
 
-extension Element2Extension on Element2 {
+extension Element2Extension on Element {
   /// Whether the element is effectively [internal].
   bool get isInternal {
     if (this case Annotatable annotatable) {
@@ -118,7 +118,7 @@ extension Element2Extension on Element2 {
         return true;
       }
     }
-    if (this case PropertyAccessorElement2 accessor) {
+    if (this case PropertyAccessorElement accessor) {
       var variable = accessor.variable3;
       if (variable != null && variable.metadata2.hasInternal) {
         return true;
@@ -130,8 +130,8 @@ extension Element2Extension on Element2 {
   /// Whether the element is effectively [protected].
   bool get isProtected {
     var self = this;
-    if (self is PropertyAccessorElement2 &&
-        self.enclosingElement2 is InterfaceElement2) {
+    if (self is PropertyAccessorElement &&
+        self.enclosingElement2 is InterfaceElement) {
       if (self.metadata2.hasProtected) {
         return true;
       }
@@ -140,8 +140,8 @@ extension Element2Extension on Element2 {
         return true;
       }
     }
-    if (self is MethodElement2 &&
-        self.enclosingElement2 is InterfaceElement2 &&
+    if (self is MethodElement &&
+        self.enclosingElement2 is InterfaceElement &&
         self.metadata2.hasProtected) {
       return true;
     }
@@ -155,7 +155,7 @@ extension Element2Extension on Element2 {
         return true;
       }
     }
-    if (this case PropertyAccessorElement2 accessor) {
+    if (this case PropertyAccessorElement accessor) {
       var variable = accessor.variable3;
       if (variable != null && variable.metadata2.hasVisibleForTesting) {
         return true;
@@ -181,7 +181,7 @@ extension ElementImplExtension on ElementImpl {
 }
 
 extension ElementOrNullExtension on ElementImpl? {
-  Element2? get asElement2 {
+  Element? get asElement2 {
     var self = this;
     if (self == null) {
       return null;
@@ -190,9 +190,9 @@ extension ElementOrNullExtension on ElementImpl? {
     } else if (self is ExtensionElementImpl) {
       return (self as ExtensionFragment).element;
     } else if (self is ExecutableMember) {
-      return self as ExecutableElement2;
+      return self as ExecutableElement;
     } else if (self is FieldMember) {
-      return self as FieldElement2;
+      return self as FieldElement;
     } else if (self is FieldElementImpl) {
       return (self as FieldFragment).element;
     } else if (self is FunctionElementImpl) {
@@ -226,7 +226,7 @@ extension EnumElementImplExtension on EnumElementImpl {
   }
 }
 
-extension ExecutableElement2Extension on ExecutableElement2 {
+extension ExecutableElement2Extension on ExecutableElement {
   ExecutableElementOrMember get asElement {
     if (this case ExecutableMember member) {
       return member;
@@ -399,7 +399,7 @@ extension LibraryFragmentExtension on LibraryFragment {
   }
 }
 
-extension ListOfTypeParameterElement2Extension on List<TypeParameterElement2> {
+extension ListOfTypeParameterElement2Extension on List<TypeParameterElement> {
   List<TypeParameterType> instantiateNone() {
     return map((e) {
       return e.instantiate(nullabilitySuffix: NullabilitySuffix.none);
@@ -505,7 +505,7 @@ extension PropertyAccessorElementOrMemberExtension
   }
 }
 
-extension PropertyInducingElementExtension on PropertyInducingElement2 {
+extension PropertyInducingElementExtension on PropertyInducingElement {
   bool get definesSetter {
     if (isConst) {
       return false;
@@ -560,7 +560,7 @@ extension TypeAliasElementImplExtension on TypeAliasElementImpl {
   }
 }
 
-extension TypeParameterElement2Extension on TypeParameterElement2 {
+extension TypeParameterElement2Extension on TypeParameterElement {
   TypeParameterElementImpl2 freshCopy() {
     var fragment = TypeParameterElementImpl(name3 ?? '', -1);
     fragment.bound = bound;
diff --git a/pkg/analyzer/lib/src/utilities/extensions/flutter.dart b/pkg/analyzer/lib/src/utilities/extensions/flutter.dart
index e17a0b049e6..15abeb15824 100644
--- a/pkg/analyzer/lib/src/utilities/extensions/flutter.dart
+++ b/pkg/analyzer/lib/src/utilities/extensions/flutter.dart
@@ -158,14 +158,14 @@ extension AstNodeExtension on AstNode? {
   }
 }
 
-extension ClassElementExtension2 on ClassElement2 {
+extension ClassElementExtension2 on ClassElement {
   /// Whether this is the Flutter class `State`.
   bool get isExactState => _isExactly(_nameState, _uriFramework);
 
   /// Whether this has the Flutter class `State` as a superclass.
   bool get isState => _hasSupertype(_uriFramework, _nameState);
 
-  /// Whether this is a [ClassElement2] that extends the Flutter class
+  /// Whether this is a [ClassElement] that extends the Flutter class
   /// `StatefulWidget`.
   bool get isStatefulWidgetDeclaration => supertype.isExactlyStatefulWidgetType;
 }
@@ -332,7 +332,7 @@ extension ElementAnnotationExtension on ElementAnnotation {
   /// preview.
   bool get isWidgetPreview {
     var element2 = this.element2;
-    if (element2 is! ConstructorElement2) {
+    if (element2 is! ConstructorElement) {
       return false;
     }
     return element2.enclosingElement2.name3 == 'Preview' &&
@@ -445,11 +445,11 @@ extension InstanceCreationExpressionExtension on InstanceCreationExpression {
   }
 }
 
-extension InterfaceElement2Extension on InterfaceElement2? {
+extension InterfaceElement2Extension on InterfaceElement? {
   /// Whether this is the Flutter class `Flex`, or a subtype.
   bool get isFlexWidget {
     var self = this;
-    if (self is! ClassElement2) {
+    if (self is! ClassElement) {
       return false;
     }
     if (!self.isWidget) {
@@ -464,7 +464,7 @@ extension InterfaceElement2Extension on InterfaceElement2? {
   }
 }
 
-extension InterfaceElementExtension2 on InterfaceElement2? {
+extension InterfaceElementExtension2 on InterfaceElement? {
   /// Whether this is the Flutter class `Alignment`.
   bool get isExactAlignment {
     return _isExactly('Alignment', _uriAlignment);
@@ -483,7 +483,7 @@ extension InterfaceElementExtension2 on InterfaceElement2? {
   /// Whether this is the Flutter class `Widget`, or a subtype.
   bool get isWidget {
     var self = this;
-    if (self is! ClassElement2) {
+    if (self is! ClassElement) {
       return false;
     }
     if (_isExactly(_nameWidget, _uriFramework)) {
@@ -515,7 +515,7 @@ extension InterfaceElementExtension2 on InterfaceElement2? {
   /// Whether this is the exact [type] defined in the file with the given [uri].
   bool _isExactly(String type, Uri uri) {
     var self = this;
-    return self is ClassElement2 &&
+    return self is ClassElement &&
         self.name3 == type &&
         self.firstFragment.libraryFragment.source.uri == uri;
   }
diff --git a/pkg/analyzer/lib/src/wolf/ir/ast_to_ir.dart b/pkg/analyzer/lib/src/wolf/ir/ast_to_ir.dart
index 997c4b5e52d..a89bef9ca55 100644
--- a/pkg/analyzer/lib/src/wolf/ir/ast_to_ir.dart
+++ b/pkg/analyzer/lib/src/wolf/ir/ast_to_ir.dart
@@ -23,7 +23,7 @@ import 'package:analyzer/src/wolf/ir/ir.dart';
 /// (if provided). This should provide enough information to allow the caller to
 /// map individual instructions to the AST nodes that spawned them.
 CodedIRContainer astToIR(
-  ExecutableElement2 executableElement,
+  ExecutableElement executableElement,
   FunctionBody functionBody, {
   required TypeProvider typeProvider,
   required TypeSystem typeSystem,
@@ -80,7 +80,7 @@ class _AstToIRVisitor extends ThrowingAstVisitor<_LValueTemplates> {
   final TypeProvider typeProvider;
   final TypeSystem typeSystem;
   final InheritanceManager3 inheritanceManager;
-  final LibraryElement2 coreLibrary;
+  final LibraryElement coreLibrary;
   final AstToIREventListener eventListener;
 
   /// For each enclosing flow control construct that may be the target of a
@@ -104,7 +104,7 @@ class _AstToIRVisitor extends ThrowingAstVisitor<_LValueTemplates> {
   final functionNestingStack = <int>[];
 
   final ir = CodedIRWriter();
-  final Map<VariableElement2, int> locals = {};
+  final Map<VariableElement, int> locals = {};
   late final oneArgument = ir.encodeArgumentNames([null]);
   late final twoArguments = ir.encodeArgumentNames([null, null]);
   late final null_ = ir.encodeLiteral(null);
@@ -176,7 +176,7 @@ class _AstToIRVisitor extends ThrowingAstVisitor<_LValueTemplates> {
   }
 
   void instanceCall(
-    MethodElement2? staticElement,
+    MethodElement? staticElement,
     String name,
     List<DartType> typeArguments,
     ArgumentNamesRef argumentNames,
@@ -190,7 +190,7 @@ class _AstToIRVisitor extends ThrowingAstVisitor<_LValueTemplates> {
     );
   }
 
-  void instanceGet(PropertyAccessorElement2? staticElement, String name) {
+  void instanceGet(PropertyAccessorElement? staticElement, String name) {
     if (staticElement == null) {
       throw UnimplementedError('TODO(paulberry): dynamic instance get');
     }
@@ -200,7 +200,7 @@ class _AstToIRVisitor extends ThrowingAstVisitor<_LValueTemplates> {
     );
   }
 
-  void instanceSet(PropertyAccessorElement2? staticElement, String name) {
+  void instanceSet(PropertyAccessorElement? staticElement, String name) {
     if (staticElement == null) {
       throw UnimplementedError('TODO(paulberry): dynamic instance set');
     }
@@ -210,14 +210,14 @@ class _AstToIRVisitor extends ThrowingAstVisitor<_LValueTemplates> {
     );
   }
 
-  MethodElement2 lookupToString(DartType? type) {
+  MethodElement lookupToString(DartType? type) {
     var class_ =
         type is InterfaceType ? type.element3 : typeProvider.objectElement2;
     return inheritanceManager.getMember4(
           class_,
           Name.forLibrary(coreLibrary, 'toString'),
         )
-        as MethodElement2;
+        as MethodElement;
   }
 
   /// Performs a null check that is part of a null shorting expression.
@@ -623,7 +623,7 @@ class _AstToIRVisitor extends ThrowingAstVisitor<_LValueTemplates> {
   }
 
   void visitFunctionBody(
-    ExecutableElement2 element,
+    ExecutableElement element,
     FunctionBody body, {
     required bool isInstanceMember,
   }) {
@@ -770,7 +770,7 @@ class _AstToIRVisitor extends ThrowingAstVisitor<_LValueTemplates> {
           );
         }
       // Stack: result
-      case MethodElement2(isStatic: false):
+      case MethodElement(isStatic: false):
         if (target == null) {
           assert(!node.isNullAware);
           this_();
@@ -794,7 +794,7 @@ class _AstToIRVisitor extends ThrowingAstVisitor<_LValueTemplates> {
           ir.encodeArgumentNames(argumentNames),
         );
       // Stack: BLOCK(1)? result
-      case MethodElement2(isStatic: true):
+      case MethodElement(isStatic: true):
         assert(!node.isNullAware);
         _handleInvocationArgs(
           argumentList: node.argumentList,
@@ -863,7 +863,7 @@ class _AstToIRVisitor extends ThrowingAstVisitor<_LValueTemplates> {
     var prefixElement = prefix.element;
     switch (prefixElement) {
       case FormalParameterElement():
-      case LocalVariableElement2():
+      case LocalVariableElement():
         dispatchNode(prefix);
         // Stack: prefix
         return _PropertyAccessTemplates(node.identifier);
@@ -937,9 +937,9 @@ class _AstToIRVisitor extends ThrowingAstVisitor<_LValueTemplates> {
     }
     switch (staticElement) {
       case FormalParameterElement():
-      case LocalVariableElement2():
+      case LocalVariableElement():
         return _LocalTemplates(locals[staticElement]!);
-      case PropertyAccessorElement2(isStatic: false):
+      case PropertyAccessorElement(isStatic: false):
         this_();
         // Stack: this
         return _PropertyAccessTemplates(node);
@@ -1166,7 +1166,7 @@ class _PropertyAccessTemplates extends _LValueTemplates {
     // Stack: target
     visitor.instanceGet(
       (property.element ?? visitor.assignmentTargeting(property)?.readElement2)
-          as PropertyAccessorElement2?,
+          as PropertyAccessorElement?,
       property.name,
     );
     // Stack: value
@@ -1206,7 +1206,7 @@ class _PropertyAccessTemplates extends _LValueTemplates {
     // Stack: value target value
     visitor.instanceSet(
       visitor.assignmentTargeting(property)!.writeElement2
-          as PropertyAccessorElement2?,
+          as PropertyAccessorElement?,
       property.name,
     );
     // Stack: value returnValue
diff --git a/pkg/analyzer/lib/src/wolf/ir/call_descriptor.dart b/pkg/analyzer/lib/src/wolf/ir/call_descriptor.dart
index c9b737e836a..c7cd103b000 100644
--- a/pkg/analyzer/lib/src/wolf/ir/call_descriptor.dart
+++ b/pkg/analyzer/lib/src/wolf/ir/call_descriptor.dart
@@ -14,7 +14,7 @@ sealed class CallDescriptor {
 /// Call descriptor for a call that resolves to a specific element (i.e., a
 /// non-dynamic call).
 class ElementCallDescriptor extends CallDescriptor {
-  final ExecutableElement2 element;
+  final ExecutableElement element;
 
   @override
   final List<DartType> typeArguments;
@@ -26,7 +26,7 @@ class ElementCallDescriptor extends CallDescriptor {
 
   @override
   String toString() => switch (element.enclosingElement2) {
-    InstanceElement2(name3: var typeName) =>
+    InstanceElement(name3: var typeName) =>
       '${typeName ?? '<unnamed>'}.${element.name3!}',
     _ => element.name3!,
   };
diff --git a/pkg/analyzer/lib/utilities/extensions/element.dart b/pkg/analyzer/lib/utilities/extensions/element.dart
index a71d19638a2..6b012f1a348 100644
--- a/pkg/analyzer/lib/utilities/extensions/element.dart
+++ b/pkg/analyzer/lib/utilities/extensions/element.dart
@@ -4,9 +4,9 @@
 
 import 'package:analyzer/dart/element/element.dart';
 
-extension LibraryElement2Extension on LibraryElement2 {
+extension LibraryElement2Extension on LibraryElement {
   /// All extensions exported from this library.
-  Iterable<ExtensionElement2> get exportedExtensions {
+  Iterable<ExtensionElement> get exportedExtensions {
     return exportNamespace.definedNames2.values.whereType();
   }
 }
diff --git a/pkg/analyzer/test/dart/sdk/build_sdk_summary_test.dart b/pkg/analyzer/test/dart/sdk/build_sdk_summary_test.dart
index df81928cb46..00b1158a78f 100644
--- a/pkg/analyzer/test/dart/sdk/build_sdk_summary_test.dart
+++ b/pkg/analyzer/test/dart/sdk/build_sdk_summary_test.dart
@@ -134,7 +134,7 @@ embedded_libs:
 }
 
 extension on AnalysisSession {
-  Future<LibraryElement2> getLibrary(String uriStr) async {
+  Future<LibraryElement> getLibrary(String uriStr) async {
     var libraryResult = await getLibraryByUri(uriStr);
     libraryResult as LibraryElementResult;
     return libraryResult.element2;
diff --git a/pkg/analyzer/test/generated/non_error_resolver_test.dart b/pkg/analyzer/test/generated/non_error_resolver_test.dart
index 35c9e2daa33..917a964604b 100644
--- a/pkg/analyzer/test/generated/non_error_resolver_test.dart
+++ b/pkg/analyzer/test/generated/non_error_resolver_test.dart
@@ -704,7 +704,7 @@ class D {}
 mixin E {}
 ''');
     CompilationUnit unit = result.unit;
-    ClassElement2 classC = unit.declaredFragment!.element.getClass2('C')!;
+    ClassElement classC = unit.declaredFragment!.element.getClass2('C')!;
     expect(classC.documentationComment, isNotNull);
   }
 
diff --git a/pkg/analyzer/test/generated/resolver_test_case.dart b/pkg/analyzer/test/generated/resolver_test_case.dart
index a3b64c30750..15aefa8132d 100644
--- a/pkg/analyzer/test/generated/resolver_test_case.dart
+++ b/pkg/analyzer/test/generated/resolver_test_case.dart
@@ -27,7 +27,7 @@ class StaticTypeAnalyzer2TestShared extends PubPackageResolutionTest {
   }) {
     identifierType ??= type;
 
-    String typeParametersStr(List<TypeParameterElement2> elements) {
+    String typeParametersStr(List<TypeParameterElement> elements) {
       var elementsStr = elements
           .map((e) {
             return e.displayString2();
@@ -68,9 +68,9 @@ class StaticTypeAnalyzer2TestShared extends PubPackageResolutionTest {
 
   FunctionType _getFunctionTypedElementType(SimpleIdentifier identifier) {
     var element = identifier.element;
-    if (element is ExecutableElement2) {
+    if (element is ExecutableElement) {
       return element.type;
-    } else if (element is VariableElement2) {
+    } else if (element is VariableElement) {
       return element.type as FunctionType;
     } else {
       fail('Unexpected element: (${element.runtimeType}) $element');
diff --git a/pkg/analyzer/test/generated/strong_mode_test.dart b/pkg/analyzer/test/generated/strong_mode_test.dart
index 51702cf9d68..1a6cbb62f5c 100644
--- a/pkg/analyzer/test/generated/strong_mode_test.dart
+++ b/pkg/analyzer/test/generated/strong_mode_test.dart
@@ -64,7 +64,7 @@ class StrongModeLocalInferenceTest extends PubPackageResolutionTest {
   _isMapOf;
   late final AsserterBuilder<DartType, DartType> _isType;
 
-  late final AsserterBuilder<Element2, DartType> _hasElement;
+  late final AsserterBuilder<Element, DartType> _hasElement;
 
   CompilationUnit get unit => result.unit;
 
@@ -244,7 +244,7 @@ class StrongModeLocalInferenceTest extends PubPackageResolutionTest {
     _isInstantiationOf(_hasElement(elementA))([_isInt])(cascade.typeOrThrow);
     var invoke = cascade.cascadeSections[0] as MethodInvocation;
     var function = invoke.argumentList.arguments[1] as FunctionExpression;
-    ExecutableElement2 f0 = function.declaredFragment!.element;
+    ExecutableElement f0 = function.declaredFragment!.element;
     _isListOf(_isInt)(f0.type.returnType as InterfaceType);
     expect(f0.type.normalParameterTypes[0], typeProvider.intType);
   }
@@ -409,9 +409,9 @@ class StrongModeLocalInferenceTest extends PubPackageResolutionTest {
     var body = constructor.body as BlockFunctionBody;
     var stmt = body.block.statements[0] as ReturnStatement;
     var exp = stmt.expression as InstanceCreationExpression;
-    ClassElement2 elementB =
+    ClassElement elementB =
         AstFinder.getClass(unit, "B").declaredFragment!.element;
-    ClassElement2 elementA =
+    ClassElement elementA =
         AstFinder.getClass(unit, "A").declaredFragment!.element;
     var type = exp.constructorName.type.typeOrThrow as InterfaceType;
     expect(type.element3, elementB);
@@ -1325,7 +1325,7 @@ void test() {
       error(WarningCode.UNUSED_LOCAL_VARIABLE, 347, 2),
     ]);
 
-    Element2 elementA = AstFinder.getClass(unit, "A").declaredFragment!.element;
+    Element elementA = AstFinder.getClass(unit, "A").declaredFragment!.element;
     List<Statement> statements = AstFinder.getStatementsInTopLevelFunction(
       unit,
       "test",
@@ -1358,7 +1358,7 @@ void test() {
     ]);
 
     DartType cType = findElement2.localVar('c').type;
-    Element2 elementC = AstFinder.getClass(unit, "C").declaredFragment!.element;
+    Element elementC = AstFinder.getClass(unit, "C").declaredFragment!.element;
 
     _isInstantiationOf(_hasElement(elementC))([_isType])(cType);
   }
@@ -2384,12 +2384,12 @@ MethodInvocation
     void hasType(Asserter<DartType> assertion, Expression exp) =>
         assertion(exp.typeOrThrow);
 
-    Element2 elementA = AstFinder.getClass(unit, "A").declaredFragment!.element;
-    Element2 elementB = AstFinder.getClass(unit, "B").declaredFragment!.element;
-    Element2 elementC = AstFinder.getClass(unit, "C").declaredFragment!.element;
-    Element2 elementD = AstFinder.getClass(unit, "D").declaredFragment!.element;
-    Element2 elementE = AstFinder.getClass(unit, "E").declaredFragment!.element;
-    Element2 elementF = AstFinder.getClass(unit, "F").declaredFragment!.element;
+    Element elementA = AstFinder.getClass(unit, "A").declaredFragment!.element;
+    Element elementB = AstFinder.getClass(unit, "B").declaredFragment!.element;
+    Element elementC = AstFinder.getClass(unit, "C").declaredFragment!.element;
+    Element elementD = AstFinder.getClass(unit, "D").declaredFragment!.element;
+    Element elementE = AstFinder.getClass(unit, "E").declaredFragment!.element;
+    Element elementF = AstFinder.getClass(unit, "F").declaredFragment!.element;
 
     AsserterBuilder<List<Asserter<DartType>>, DartType> assertAOf =
         _isInstantiationOf(_hasElement(elementA));
@@ -2925,7 +2925,7 @@ MethodInvocation
     _isString(body.expression.typeOrThrow);
     var invoke = body.expression as MethodInvocation;
     var function = invoke.argumentList.arguments[0] as FunctionExpression;
-    ExecutableElement2 f0 = function.declaredFragment!.element;
+    ExecutableElement f0 = function.declaredFragment!.element;
     FunctionType type = f0.type;
     _isFunction2Of(_isString, _isInt)(type);
   }
@@ -2960,7 +2960,7 @@ MethodInvocation
     var body = test.functionExpression.body as ExpressionFunctionBody;
     DartType type = body.expression.typeOrThrow;
 
-    Element2 elementB = AstFinder.getClass(unit, "B").declaredFragment!.element;
+    Element elementB = AstFinder.getClass(unit, "B").declaredFragment!.element;
 
     _isInstantiationOf(_hasElement(elementB))([_isNever])(type);
   }
@@ -2993,7 +2993,7 @@ MethodInvocation
     var body = test.functionExpression.body as ExpressionFunctionBody;
     DartType type = body.expression.typeOrThrow;
 
-    Element2 elementB = AstFinder.getClass(unit, "B").declaredFragment!.element;
+    Element elementB = AstFinder.getClass(unit, "B").declaredFragment!.element;
 
     _isInstantiationOf(_hasElement(elementB))([_isNum])(type);
   }
@@ -3028,7 +3028,7 @@ MethodInvocation
     var body = test.functionExpression.body as ExpressionFunctionBody;
     DartType type = body.expression.typeOrThrow;
 
-    Element2 elementB = AstFinder.getClass(unit, "B").declaredFragment!.element;
+    Element elementB = AstFinder.getClass(unit, "B").declaredFragment!.element;
 
     _isInstantiationOf(_hasElement(elementB))([_isNever])(type);
   }
@@ -3062,7 +3062,7 @@ MethodInvocation
     var body = test.functionExpression.body as ExpressionFunctionBody;
     DartType type = body.expression.typeOrThrow;
 
-    Element2 elementB = AstFinder.getClass(unit, "B").declaredFragment!.element;
+    Element elementB = AstFinder.getClass(unit, "B").declaredFragment!.element;
 
     _isInstantiationOf(_hasElement(elementB))([_isInt])(type);
   }
@@ -3099,7 +3099,7 @@ MethodInvocation
     var functionType = body.expression.staticType as FunctionType;
     DartType type = functionType.normalParameterTypes[0];
 
-    Element2 elementA = AstFinder.getClass(unit, "A").declaredFragment!.element;
+    Element elementA = AstFinder.getClass(unit, "A").declaredFragment!.element;
 
     _isInstantiationOf(_hasElement(elementA))([_isObject, _isObject])(type);
   }
@@ -3135,7 +3135,7 @@ MethodInvocation
     var functionType = body.expression.staticType as FunctionType;
     DartType type = functionType.normalParameterTypes[0];
 
-    Element2 elementA = AstFinder.getClass(unit, "A").declaredFragment!.element;
+    Element elementA = AstFinder.getClass(unit, "A").declaredFragment!.element;
 
     _isInstantiationOf(_hasElement(elementA))([_isNum, _isNum])(type);
   }
@@ -3172,7 +3172,7 @@ MethodInvocation
     var functionType = body.expression.staticType as FunctionType;
     DartType type = functionType.normalParameterTypes[0];
 
-    Element2 elementA = AstFinder.getClass(unit, "A").declaredFragment!.element;
+    Element elementA = AstFinder.getClass(unit, "A").declaredFragment!.element;
 
     _isInstantiationOf(_hasElement(elementA))([_isNum, _isNum])(type);
   }
@@ -3209,7 +3209,7 @@ MethodInvocation
     var functionType = body.expression.staticType as FunctionType;
     DartType type = functionType.normalParameterTypes[0];
 
-    Element2 elementA = AstFinder.getClass(unit, "A").declaredFragment!.element;
+    Element elementA = AstFinder.getClass(unit, "A").declaredFragment!.element;
 
     _isInstantiationOf(_hasElement(elementA))([_isNum, _isNum])(type);
   }
diff --git a/pkg/analyzer/test/generated/type_system_test.dart b/pkg/analyzer/test/generated/type_system_test.dart
index f2dcd08d8ef..bf9855ac197 100644
--- a/pkg/analyzer/test/generated/type_system_test.dart
+++ b/pkg/analyzer/test/generated/type_system_test.dart
@@ -67,7 +67,7 @@ class TryPromoteToTest extends AbstractTypeSystemTest {
 
     void check(
       TypeParameterTypeImpl type,
-      TypeParameterElement2 element,
+      TypeParameterElement element,
       NullabilitySuffix nullability,
       DartType promotedBound,
     ) {
diff --git a/pkg/analyzer/test/id_tests/assigned_variables_test.dart b/pkg/analyzer/test/id_tests/assigned_variables_test.dart
index eab4b0dd1d1..38850886c90 100644
--- a/pkg/analyzer/test/id_tests/assigned_variables_test.dart
+++ b/pkg/analyzer/test/id_tests/assigned_variables_test.dart
@@ -58,7 +58,7 @@ class _AssignedVariablesDataExtractor extends AstDataExtractor<_Data> {
 
   Declaration? _currentDeclaration;
 
-  AssignedVariablesForTesting<AstNode, PromotableElement2>?
+  AssignedVariablesForTesting<AstNode, PromotableElement>?
   _currentAssignedVariables;
 
   _AssignedVariablesDataExtractor(super.uri, super.actualMap, this._flowResult);
diff --git a/pkg/analyzer/test/id_tests/constant_test.dart b/pkg/analyzer/test/id_tests/constant_test.dart
index e2026ff81df..9580ef40229 100644
--- a/pkg/analyzer/test/id_tests/constant_test.dart
+++ b/pkg/analyzer/test/id_tests/constant_test.dart
@@ -85,7 +85,7 @@ class ConstantsDataExtractor extends AstDataExtractor<String> {
   String? computeNodeValue(Id id, AstNode node) {
     if (node is Identifier) {
       var element = node.element;
-      if (element is PropertyAccessorElement2 && element.isSynthetic) {
+      if (element is PropertyAccessorElement && element.isSynthetic) {
         var variable = element.variable3!;
         if (!variable.isSynthetic && variable.isConst) {
           var value = variable.computeConstantValue();
diff --git a/pkg/analyzer/test/id_tests/definite_assignment_test.dart b/pkg/analyzer/test/id_tests/definite_assignment_test.dart
index 824397836fa..4b2d57e4833 100644
--- a/pkg/analyzer/test/id_tests/definite_assignment_test.dart
+++ b/pkg/analyzer/test/id_tests/definite_assignment_test.dart
@@ -86,7 +86,7 @@ class _DefiniteAssignmentDataExtractor extends AstDataExtractor<String> {
   String? computeNodeValue(Id id, AstNode node) {
     if (node is SimpleIdentifier && node.inGetterContext()) {
       var element = node.element;
-      if (element is LocalVariableElement2 ||
+      if (element is LocalVariableElement ||
           element is FormalParameterElement) {
         if (_flowResult.notDefinitelyAssigned.contains(node)) {
           return 'unassigned';
diff --git a/pkg/analyzer/test/id_tests/definite_unassignment_test.dart b/pkg/analyzer/test/id_tests/definite_unassignment_test.dart
index 983dafc609a..79f950a5a87 100644
--- a/pkg/analyzer/test/id_tests/definite_unassignment_test.dart
+++ b/pkg/analyzer/test/id_tests/definite_unassignment_test.dart
@@ -90,7 +90,7 @@ class _DefiniteUnassignmentDataExtractor extends AstDataExtractor<String> {
   String? computeNodeValue(Id id, AstNode node) {
     if (node is SimpleIdentifier && node.inGetterContext()) {
       var element = node.element;
-      if (element is LocalVariableElement2 ||
+      if (element is LocalVariableElement ||
           element is FormalParameterElement) {
         if (_flowResult.definitelyUnassigned.contains(node)) {
           return 'unassigned';
diff --git a/pkg/analyzer/test/id_tests/inheritance_test.dart b/pkg/analyzer/test/id_tests/inheritance_test.dart
index 5d90243fa67..19f6eaa49bf 100644
--- a/pkg/analyzer/test/id_tests/inheritance_test.dart
+++ b/pkg/analyzer/test/id_tests/inheritance_test.dart
@@ -87,7 +87,7 @@ class _InheritanceDataExtractor extends AstDataExtractor<String> {
   _InheritanceDataExtractor(super.uri, super.actualMap);
 
   @override
-  String? computeElementValue(Id id, Element2 element) {
+  String? computeElementValue(Id id, Element element) {
     return null;
   }
 
@@ -110,9 +110,8 @@ class _InheritanceDataExtractor extends AstDataExtractor<String> {
       for (var name in interface.map2.keys) {
         var executable = interface.map2[name]!;
 
-        var enclosingClass = executable.enclosingElement2 as InterfaceElement2;
-        if (enclosingClass is ClassElement2 &&
-            enclosingClass.isDartCoreObject) {
+        var enclosingClass = executable.enclosingElement2 as InterfaceElement;
+        if (enclosingClass is ClassElement && enclosingClass.isDartCoreObject) {
           continue;
         }
 
@@ -125,7 +124,7 @@ class _InheritanceDataExtractor extends AstDataExtractor<String> {
         offset ??= -1;
 
         DartType type;
-        if (executable is MethodElement2) {
+        if (executable is MethodElement) {
           type = executable.type;
         } else if (executable is GetterElement) {
           type = executable.returnType;
diff --git a/pkg/analyzer/test/id_tests/nullability_test.dart b/pkg/analyzer/test/id_tests/nullability_test.dart
index 0ab0d01266d..246cf0ba747 100644
--- a/pkg/analyzer/test/id_tests/nullability_test.dart
+++ b/pkg/analyzer/test/id_tests/nullability_test.dart
@@ -66,10 +66,10 @@ class _NullabilityDataExtractor extends AstDataExtractor<String> {
         node.inGetterContext() &&
         !node.inDeclarationContext()) {
       var element = node.element;
-      if (element is LocalVariableElement2 ||
+      if (element is LocalVariableElement ||
           element is FormalParameterElement) {
         var promotedType = _readType(node);
-        var declaredType = (element as VariableElement2).type;
+        var declaredType = (element as VariableElement).type;
         var isPromoted = promotedType != declaredType;
         if (isPromoted &&
             _typeSystem.isPotentiallyNullable(declaredType) &&
diff --git a/pkg/analyzer/test/id_tests/type_promotion_test.dart b/pkg/analyzer/test/id_tests/type_promotion_test.dart
index 067ef53c132..683a8714ad4 100644
--- a/pkg/analyzer/test/id_tests/type_promotion_test.dart
+++ b/pkg/analyzer/test/id_tests/type_promotion_test.dart
@@ -57,10 +57,10 @@ class _TypePromotionDataExtractor extends AstDataExtractor<DartType> {
   DartType? computeNodeValue(Id id, AstNode node) {
     if (node is SimpleIdentifier && node.inGetterContext()) {
       var element = _readElement(node);
-      if (element is LocalVariableElement2 ||
+      if (element is LocalVariableElement ||
           element is FormalParameterElement) {
         var promotedType = _readType(node);
-        var declaredType = (element as VariableElement2).type;
+        var declaredType = (element as VariableElement).type;
         var isPromoted = promotedType != declaredType;
         if (isPromoted) {
           return promotedType;
@@ -70,7 +70,7 @@ class _TypePromotionDataExtractor extends AstDataExtractor<DartType> {
     return null;
   }
 
-  static Element2? _readElement(SimpleIdentifier node) {
+  static Element? _readElement(SimpleIdentifier node) {
     var parent = node.parent;
     if (parent is AssignmentExpression && parent.leftHandSide == node) {
       return parent.readElement2;
diff --git a/pkg/analyzer/test/src/dart/analysis/driver_caching_test.dart b/pkg/analyzer/test/src/dart/analysis/driver_caching_test.dart
index 5c15e0786c6..f3c789b5937 100644
--- a/pkg/analyzer/test/src/dart/analysis/driver_caching_test.dart
+++ b/pkg/analyzer/test/src/dart/analysis/driver_caching_test.dart
@@ -371,7 +371,7 @@ void f() {
 }
 
 extension on AnalysisDriver {
-  bool isValidLibraryElement(LibraryElement2 element) {
+  bool isValidLibraryElement(LibraryElement element) {
     return identical(element.session, currentSession);
   }
 }
diff --git a/pkg/analyzer/test/src/dart/analysis/driver_test.dart b/pkg/analyzer/test/src/dart/analysis/driver_test.dart
index 55b9f5aea16..a33316e2d32 100644
--- a/pkg/analyzer/test/src/dart/analysis/driver_test.dart
+++ b/pkg/analyzer/test/src/dart/analysis/driver_test.dart
@@ -1072,7 +1072,7 @@ import 'c.dart';
 
     var driver = driverFor(testFile);
 
-    Future<LibraryElement2> getLibrary(String shortName) async {
+    Future<LibraryElement> getLibrary(String shortName) async {
       var uriStr = 'package:test/$shortName';
       var result = await driver.getLibraryByUriValid(uriStr);
       return result.element2;
@@ -1148,7 +1148,7 @@ import 'b.dart';
 
     var driver = driverFor(testFile);
 
-    Future<LibraryElement2> getLibrary(String shortName) async {
+    Future<LibraryElement> getLibrary(String shortName) async {
       var uriStr = 'package:test/$shortName';
       var result = await driver.getLibraryByUriValid(uriStr);
       return result.element2;
diff --git a/pkg/analyzer/test/src/dart/analysis/index_test.dart b/pkg/analyzer/test/src/dart/analysis/index_test.dart
index ce959e6e139..45f417d0d18 100644
--- a/pkg/analyzer/test/src/dart/analysis/index_test.dart
+++ b/pkg/analyzer/test/src/dart/analysis/index_test.dart
@@ -37,7 +37,7 @@ class ExpectedLocation {
 
 @reflectiveTest
 class IndexTest extends PubPackageResolutionTest with _IndexMixin {
-  void assertElementIndexText(Element2 element, String expected) {
+  void assertElementIndexText(Element element, String expected) {
     var actual = _getRelationsText(element);
     if (actual != expected) {
       print(actual);
@@ -2777,7 +2777,7 @@ void f() {
     return buffer.toString();
   }
 
-  String _getRelationsText(Element2 element) {
+  String _getRelationsText(Element element) {
     var lineInfo = result.lineInfo;
     var elementId = _findElementId(element);
 
@@ -2939,7 +2939,7 @@ mixin _IndexMixin on PubPackageResolutionTest {
   }
 
   /// Return the [element] identifier in [index] or fail.
-  int _findElementId(Element2 element) {
+  int _findElementId(Element element) {
     var unitId = _getUnitId(element);
 
     // Prepare the element that was put into the index.
@@ -2970,7 +2970,7 @@ mixin _IndexMixin on PubPackageResolutionTest {
     return 0;
   }
 
-  int _getUnitId(Element2 element) {
+  int _getUnitId(Element element) {
     var unitElement = getUnitElement(element);
     return index.getLibraryFragmentId(unitElement);
   }
diff --git a/pkg/analyzer/test/src/dart/analysis/result_printer.dart b/pkg/analyzer/test/src/dart/analysis/result_printer.dart
index 5afd15996cb..2ad1d3ea598 100644
--- a/pkg/analyzer/test/src/dart/analysis/result_printer.dart
+++ b/pkg/analyzer/test/src/dart/analysis/result_printer.dart
@@ -1122,7 +1122,7 @@ class ResolvedLibraryResultPrinter {
   final ElementPrinter elementPrinter;
   final IdProvider idProvider;
 
-  late final LibraryElement2 _libraryElement;
+  late final LibraryElement _libraryElement;
 
   ResolvedLibraryResultPrinter({
     required this.configuration,
@@ -1176,7 +1176,7 @@ class ResolvedUnitResultPrinter {
   final ResolvedUnitResultPrinterConfiguration configuration;
   final TreeStringSink sink;
   final ElementPrinter elementPrinter;
-  final LibraryElement2? libraryElement;
+  final LibraryElement? libraryElement;
   final IdProvider idProvider;
 
   ResolvedUnitResultPrinter({
@@ -1262,9 +1262,9 @@ class ResolvedUnitResultPrinter {
       ) {
         sink.writeIndent();
         sink.write('${variable.name3}: ');
-        if (variable is LocalVariableElement2) {
+        if (variable is LocalVariableElement) {
           elementPrinter.writeType(variable.type);
-        } else if (variable is TopLevelVariableElement2) {
+        } else if (variable is TopLevelVariableElement) {
           elementPrinter.writeType(variable.type);
         }
       });
@@ -1276,7 +1276,7 @@ class ResolvedUnitResultPrinterConfiguration {
   var nodeConfiguration = ResolvedNodeTextConfiguration();
   AstNode? Function(ResolvedUnitResult) nodeSelector = (_) => null;
   Map<String, DartType> Function(ResolvedUnitResult) typesSelector = (_) => {};
-  List<Element2> Function(ResolvedUnitResult) variableTypesSelector = (_) => [];
+  List<Element> Function(ResolvedUnitResult) variableTypesSelector = (_) => [];
   bool Function(FileResult) withContentPredicate = (_) => false;
 }
 
@@ -1294,7 +1294,7 @@ final class SchedulerStatusEvent extends DriverEvent {
 }
 
 class UnitElementPrinterConfiguration {
-  List<Element2> Function(LibraryFragment) elementSelector = (_) => [];
+  List<Element> Function(LibraryFragment) elementSelector = (_) => [];
 }
 
 extension on LibraryCycle {
diff --git a/pkg/analyzer/test/src/dart/analysis/search_test.dart b/pkg/analyzer/test/src/dart/analysis/search_test.dart
index 7bcba5b59ce..cd28e6ad9e8 100644
--- a/pkg/analyzer/test/src/dart/analysis/search_test.dart
+++ b/pkg/analyzer/test/src/dart/analysis/search_test.dart
@@ -88,7 +88,7 @@ class SearchTest extends PubPackageResolutionTest {
   }
 
   Future<void> assertElementReferencesText(
-    Element2 element,
+    Element element,
     String expected,
   ) async {
     var searchedFiles = SearchedFiles();
@@ -3307,7 +3307,7 @@ class NoMatchABCDEF {}
     );
   }
 
-  Future<List<Element2>> _findClassMembers(String name) {
+  Future<List<Element>> _findClassMembers(String name) {
     var searchedFiles = SearchedFiles();
     return driver.search.classMembers(name, searchedFiles);
   }
diff --git a/pkg/analyzer/test/src/dart/analysis/session_test.dart b/pkg/analyzer/test/src/dart/analysis/session_test.dart
index bf9eb46a14f..418e4b54162 100644
--- a/pkg/analyzer/test/src/dart/analysis/session_test.dart
+++ b/pkg/analyzer/test/src/dart/analysis/session_test.dart
@@ -965,7 +965,7 @@ extension on AnalysisSession {
     return await getLibraryByUri(uriStr) as LibraryElementResult;
   }
 
-  ParsedLibraryResult getParsedLibraryByElementValid(LibraryElement2 element) {
+  ParsedLibraryResult getParsedLibraryByElementValid(LibraryElement element) {
     return getParsedLibraryByElement2(element) as ParsedLibraryResult;
   }
 
@@ -978,7 +978,7 @@ extension on AnalysisSession {
   }
 
   Future<ResolvedLibraryResult> getResolvedLibraryByElementValid(
-    LibraryElement2 element,
+    LibraryElement element,
   ) async {
     return await getResolvedLibraryByElement2(element) as ResolvedLibraryResult;
   }
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 f03724413d6..14a5b2537a5 100644
--- a/pkg/analyzer/test/src/dart/ast/element_locator_test.dart
+++ b/pkg/analyzer/test/src/dart/ast/element_locator_test.dart
@@ -571,7 +571,7 @@ x@12
 ''');
   }
 
-  void _assertElement(Element2? element, String expected) {
+  void _assertElement(Element? element, String expected) {
     var buffer = StringBuffer();
 
     var sink = TreeStringSink(sink: buffer, indent: '');
diff --git a/pkg/analyzer/test/src/dart/element/class_element_test.dart b/pkg/analyzer/test/src/dart/element/class_element_test.dart
index 64ae11070b6..5166b377e95 100644
--- a/pkg/analyzer/test/src/dart/element/class_element_test.dart
+++ b/pkg/analyzer/test/src/dart/element/class_element_test.dart
@@ -1268,34 +1268,34 @@ class A {}
     assertElementNull(A._lookUpInheritedMethod('foo'));
   }
 
-  static void _assertIsEnumLike(ClassElement2 element, bool expected) {
+  static void _assertIsEnumLike(ClassElement element, bool expected) {
     expect((element as ClassElementImpl2).isEnumLike, expected);
   }
 }
 
-extension on ClassElement2 {
-  PropertyAccessorElement2? _lookUpInheritedConcreteGetter(String name) {
+extension on ClassElement {
+  PropertyAccessorElement? _lookUpInheritedConcreteGetter(String name) {
     return (this as InterfaceElementImpl2).lookUpInheritedConcreteGetter(
       name,
       library2,
     );
   }
 
-  MethodElement2? _lookUpInheritedConcreteMethod(String name) {
+  MethodElement? _lookUpInheritedConcreteMethod(String name) {
     return (this as InterfaceElementImpl2).lookUpInheritedConcreteMethod(
       name,
       library2,
     );
   }
 
-  PropertyAccessorElement2? _lookUpInheritedConcreteSetter(String name) {
+  PropertyAccessorElement? _lookUpInheritedConcreteSetter(String name) {
     return (this as InterfaceElementImpl2).lookUpInheritedConcreteSetter(
       name,
       library2,
     );
   }
 
-  MethodElement2? _lookUpInheritedMethod(String name) {
+  MethodElement? _lookUpInheritedMethod(String name) {
     return (this as InterfaceElementImpl2).lookUpInheritedMethod(
       name,
       library2,
diff --git a/pkg/analyzer/test/src/dart/element/element_test.dart b/pkg/analyzer/test/src/dart/element/element_test.dart
index 433ceaa33a8..d5ba2f9c176 100644
--- a/pkg/analyzer/test/src/dart/element/element_test.dart
+++ b/pkg/analyzer/test/src/dart/element/element_test.dart
@@ -538,7 +538,7 @@ class TypeParameterTypeImplTest extends AbstractTypeSystemTest {
 
   void _assert_asInstanceOf(
     TypeImpl type,
-    ClassElement2 element,
+    ClassElement element,
     String? expected,
   ) {
     var result = type.asInstanceOf2(element);
diff --git a/pkg/analyzer/test/src/dart/element/function_type_test.dart b/pkg/analyzer/test/src/dart/element/function_type_test.dart
index bfc7a3d79e2..370d9f2e042 100644
--- a/pkg/analyzer/test/src/dart/element/function_type_test.dart
+++ b/pkg/analyzer/test/src/dart/element/function_type_test.dart
@@ -25,9 +25,9 @@ DynamicTypeImpl get dynamicType => DynamicTypeImpl.instance;
 class FunctionTypeTest extends AbstractTypeSystemTest {
   InterfaceType get intType => typeProvider.intType;
 
-  ClassElement2 get listElement => typeProvider.listElement2;
+  ClassElement get listElement => typeProvider.listElement2;
 
-  ClassElement2 get mapElement => typeProvider.mapElement2;
+  ClassElement get mapElement => typeProvider.mapElement2;
 
   InterfaceTypeImpl get objectType => typeProvider.objectType;
 
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 368c72554e6..2dcdc2f9105 100644
--- a/pkg/analyzer/test/src/dart/element/inheritance_manager3_test.dart
+++ b/pkg/analyzer/test/src/dart/element/inheritance_manager3_test.dart
@@ -969,7 +969,7 @@ abstract class B<E> {
   }
 
   test_getMember_fromGenericSuper_method_bound() async {
-    void checkTextendsFooT(TypeParameterElement2 t) {
+    void checkTextendsFooT(TypeParameterElement t) {
       var otherT = (t.bound as InterfaceType).typeArguments.single.element3;
       expect(otherT, same(t));
     }
@@ -998,7 +998,7 @@ abstract class B<XB> extends A<XB> {}
   }
 
   test_getMember_fromGenericSuper_method_bound2() async {
-    void checkTextendsFooT(TypeParameterElement2 t) {
+    void checkTextendsFooT(TypeParameterElement t) {
       var otherT = (t.bound as InterfaceType).typeArguments.single.element3;
       expect(otherT, same(t));
     }
@@ -2922,7 +2922,7 @@ class _InheritanceManager3Base extends PubPackageResolutionTest {
     manager = InheritanceManager3();
   }
 
-  void _assertExecutable(ExecutableElement2? element, String? expected) {
+  void _assertExecutable(ExecutableElement? element, String? expected) {
     if (expected != null && element != null) {
       var enclosingElement = element.enclosingElement2;
 
@@ -2949,7 +2949,7 @@ class _InheritanceManager3Base extends PubPackageResolutionTest {
   }
 
   void _assertExecutableList(
-    List<ExecutableElement2>? elements,
+    List<ExecutableElement>? elements,
     String? expected,
   ) {
     var elementsString =
@@ -3034,7 +3034,7 @@ class _InheritanceManager3Base extends PubPackageResolutionTest {
   }
 
   void _assertNameToExecutableMap(
-    Map<Name, ExecutableElement2> map,
+    Map<Name, ExecutableElement> map,
     String expected,
   ) {
     var lines = <String>[];
@@ -3142,7 +3142,7 @@ class _InterfacePrinter {
     return nameObj.name;
   }
 
-  bool _shouldWrite(ExecutableElement2 element) {
+  bool _shouldWrite(ExecutableElement element) {
     return _configuration.withObjectMembers || !element.isObjectMember;
   }
 
@@ -3152,7 +3152,7 @@ class _InterfacePrinter {
     return entries.sortedBy((e) => '${e.key.name} ${e.key.libraryUri}');
   }
 
-  List<ExecutableElement2> _withoutObject(List<ExecutableElement2> elements) {
+  List<ExecutableElement> _withoutObject(List<ExecutableElement> elements) {
     return elements.where(_shouldWrite).toList();
   }
 
@@ -3202,7 +3202,7 @@ class _InterfacePrinter {
 
   void _writeListOfMaps(
     String name,
-    List<Map<Name, ExecutableElement2>> listOfMaps,
+    List<Map<Name, ExecutableElement>> listOfMaps,
   ) {
     if (listOfMaps.isEmpty) return;
 
@@ -3216,7 +3216,7 @@ class _InterfacePrinter {
 
   void _writeNameToListMap(
     String name,
-    Map<Name, List<ExecutableElement2>> map,
+    Map<Name, List<ExecutableElement>> map,
   ) {
     var isEmpty =
         map.values.flattenedToList.where((element) {
@@ -3235,7 +3235,7 @@ class _InterfacePrinter {
     });
   }
 
-  void _writeNameToMap(String name, Map<Name, ExecutableElement2> map) {
+  void _writeNameToMap(String name, Map<Name, ExecutableElement> map) {
     var isEmpty = map.values.none(_shouldWrite);
     if (isEmpty) return;
 
diff --git a/pkg/analyzer/test/src/dart/element/nullable_test.dart b/pkg/analyzer/test/src/dart/element/nullable_test.dart
index 0ed8699b532..e55f89a7219 100644
--- a/pkg/analyzer/test/src/dart/element/nullable_test.dart
+++ b/pkg/analyzer/test/src/dart/element/nullable_test.dart
@@ -583,7 +583,7 @@ class PromoteToNonNullTest extends AbstractTypeSystemTest {
 
   void _checkTypeParameter(
     TypeParameterTypeImpl type, {
-    required TypeParameterElement2 element,
+    required TypeParameterElement element,
     required TypeImpl? promotedBound,
   }) {
     var actual = typeSystem.promoteToNonNull(type) as TypeParameterTypeImpl;
diff --git a/pkg/analyzer/test/src/dart/element/string_types.dart b/pkg/analyzer/test/src/dart/element/string_types.dart
index f3d6a1ff39e..1008fa63fdf 100644
--- a/pkg/analyzer/test/src/dart/element/string_types.dart
+++ b/pkg/analyzer/test/src/dart/element/string_types.dart
@@ -410,7 +410,7 @@ class _TypeParameterCollector extends TypeVisitor<void> {
   /// We don't need to print bounds for these type parameters, because
   /// they are already included into the function type itself, and cannot
   /// be promoted.
-  final Set<TypeParameterElement2> functionTypeParameters = {};
+  final Set<TypeParameterElement> functionTypeParameters = {};
 
   @override
   void visitDynamicType(DynamicType type) {}
diff --git a/pkg/analyzer/test/src/dart/element/type_algebra_test.dart b/pkg/analyzer/test/src/dart/element/type_algebra_test.dart
index 063536f4f96..49fe4983285 100644
--- a/pkg/analyzer/test/src/dart/element/type_algebra_test.dart
+++ b/pkg/analyzer/test/src/dart/element/type_algebra_test.dart
@@ -442,7 +442,7 @@ class SubstituteTest extends _Base {
 
   void _assertIdenticalType(
     DartType type,
-    Map<TypeParameterElement2, DartType> substitution,
+    Map<TypeParameterElement, DartType> substitution,
   ) {
     var result = substitute2(type, substitution);
     expect(result, same(type));
@@ -488,7 +488,7 @@ class _Base extends AbstractTypeSystemTest {
 
   void _assertSubstitution(
     DartType type,
-    Map<TypeParameterElement2, DartType> substitution,
+    Map<TypeParameterElement, DartType> substitution,
     String expected,
   ) {
     var result = substitute2(type, substitution);
diff --git a/pkg/analyzer/test/src/dart/element/type_constraint_gatherer_test.dart b/pkg/analyzer/test/src/dart/element/type_constraint_gatherer_test.dart
index 12b2570b3ab..20a392e68cf 100644
--- a/pkg/analyzer/test/src/dart/element/type_constraint_gatherer_test.dart
+++ b/pkg/analyzer/test/src/dart/element/type_constraint_gatherer_test.dart
@@ -1058,7 +1058,7 @@ class TypeConstraintGathererTest extends AbstractTypeSystemTest {
   }
 
   void _checkMatch(
-    List<TypeParameterElement2> typeParameters,
+    List<TypeParameterElement> typeParameters,
     TypeImpl P,
     TypeImpl Q,
     bool leftSchema,
@@ -1094,7 +1094,7 @@ class TypeConstraintGathererTest extends AbstractTypeSystemTest {
   }
 
   void _checkNotMatch(
-    List<TypeParameterElement2> typeParameters,
+    List<TypeParameterElement> typeParameters,
     TypeImpl P,
     TypeImpl Q,
     bool leftSchema,
diff --git a/pkg/analyzer/test/src/dart/micro/simple_file_resolver_test.dart b/pkg/analyzer/test/src/dart/micro/simple_file_resolver_test.dart
index 46ade59663d..7be53652374 100644
--- a/pkg/analyzer/test/src/dart/micro/simple_file_resolver_test.dart
+++ b/pkg/analyzer/test/src/dart/micro/simple_file_resolver_test.dart
@@ -2595,7 +2595,7 @@ import 'dart:math';
     }
   }
 
-  Future<Element2> _findElement(int offset, File file) async {
+  Future<Element> _findElement(int offset, File file) async {
     var resolvedUnit = await fileResolver.resolve(path: file.path);
     var node = resolvedUnit.unit.nodeCovering(offset: offset);
     var element = getElementOfNode2(node);
diff --git a/pkg/analyzer/test/src/dart/resolution/generic_type_alias_test.dart b/pkg/analyzer/test/src/dart/resolution/generic_type_alias_test.dart
index 58e2afd7088..ba440cefae4 100644
--- a/pkg/analyzer/test/src/dart/resolution/generic_type_alias_test.dart
+++ b/pkg/analyzer/test/src/dart/resolution/generic_type_alias_test.dart
@@ -325,7 +325,7 @@ typedef F<T extends A> = B Function<U extends B>(T a, U b);
     expect(t.name3, 'T');
     assertType(t.bound, 'A');
 
-    var ff = f.aliasedElement2 as GenericFunctionTypeElement2;
+    var ff = f.aliasedElement2 as GenericFunctionTypeElement;
     expect(ff.typeParameters2, hasLength(1));
 
     var u = ff.typeParameters2[0];
diff --git a/pkg/analyzer/test/src/dart/resolution/instance_member_inference_class_test.dart b/pkg/analyzer/test/src/dart/resolution/instance_member_inference_class_test.dart
index 4e8a88accef..642dd4e8d99 100644
--- a/pkg/analyzer/test/src/dart/resolution/instance_member_inference_class_test.dart
+++ b/pkg/analyzer/test/src/dart/resolution/instance_member_inference_class_test.dart
@@ -918,7 +918,7 @@ class B implements A {
   }
 
   void _assertFieldType(
-    FieldElement2 field,
+    FieldElement field,
     String type, {
     bool isCovariant = false,
   }) {
@@ -932,7 +932,7 @@ class B implements A {
     }
   }
 
-  void _assertFieldTypeDynamic(FieldElement2 field) {
+  void _assertFieldTypeDynamic(FieldElement field) {
     expect(field.isSynthetic, isFalse);
 
     _assertGetterTypeDynamic(field.getter2);
diff --git a/pkg/analyzer/test/src/dart/resolution/metadata_test.dart b/pkg/analyzer/test/src/dart/resolution/metadata_test.dart
index 8cc65e228a5..c03ea7c7352 100644
--- a/pkg/analyzer/test/src/dart/resolution/metadata_test.dart
+++ b/pkg/analyzer/test/src/dart/resolution/metadata_test.dart
@@ -1473,7 +1473,7 @@ import 'a.dart';
 void f(C c) {}
 ''');
 
-    var classC = findNode.namedType('C c').element2 as ClassElement2;
+    var classC = findNode.namedType('C c').element2 as ClassElement;
     var annotation = classC.metadata2.annotations.first;
     _assertElementAnnotationValueText(annotation, r'''
 B
@@ -1503,7 +1503,7 @@ import 'b.dart';
 void f(B b) {}
 ''');
 
-    var classB = findNode.namedType('B b').element2! as ClassElement2;
+    var classB = findNode.namedType('B b').element2! as ClassElement;
     var annotation = classB.metadata2.annotations.first;
     _assertElementAnnotationValueText(annotation, r'''
 A
@@ -1532,7 +1532,7 @@ import 'b.dart';
 void f(B b) {}
 ''');
 
-    var classB = findNode.namedType('B b').element2 as ClassElement2;
+    var classB = findNode.namedType('B b').element2 as ClassElement;
     var annotation = classB.metadata2.annotations.first;
     _assertElementAnnotationValueText(annotation, r'''
 A
diff --git a/pkg/analyzer/test/src/dart/resolution/optional_const_test.dart b/pkg/analyzer/test/src/dart/resolution/optional_const_test.dart
index 178154b824c..ac5a06e2bdd 100644
--- a/pkg/analyzer/test/src/dart/resolution/optional_const_test.dart
+++ b/pkg/analyzer/test/src/dart/resolution/optional_const_test.dart
@@ -276,7 +276,7 @@ import 'b.dart';
 var v = a;
 ''');
 
-    var vg = findNode.simple('a;').element as PropertyAccessorElement2;
+    var vg = findNode.simple('a;').element as PropertyAccessorElement;
     var v = vg.variable3!.firstFragment as ConstVariableElement;
 
     var creation = v.constantInitializer as InstanceCreationExpression;
diff --git a/pkg/analyzer/test/src/dart/resolution/resolution.dart b/pkg/analyzer/test/src/dart/resolution/resolution.dart
index fc69ea7adcc..4d4713926d6 100644
--- a/pkg/analyzer/test/src/dart/resolution/resolution.dart
+++ b/pkg/analyzer/test/src/dart/resolution/resolution.dart
@@ -50,37 +50,37 @@ mixin ResolutionTest implements ResourceProviderMixin {
   final DartObjectPrinterConfiguration dartObjectPrinterConfiguration =
       DartObjectPrinterConfiguration();
 
-  ClassElement2 get boolElement => typeProvider.boolElement2;
+  ClassElement get boolElement => typeProvider.boolElement2;
 
-  ClassElement2 get doubleElement => typeProvider.doubleElement2;
+  ClassElement get doubleElement => typeProvider.doubleElement2;
 
   InterfaceType get doubleType => typeProvider.doubleType;
 
-  Element2 get dynamicElement =>
+  Element get dynamicElement =>
       (typeProvider.dynamicType as DynamicTypeImpl).element3;
 
   FeatureSet get featureSet => result.libraryElement2.featureSet;
 
-  ClassElement2 get futureElement => typeProvider.futureElement2;
+  ClassElement get futureElement => typeProvider.futureElement2;
 
   InheritanceManager3 get inheritanceManager {
     var library = result.libraryElement2;
     return library.session.inheritanceManager;
   }
 
-  ClassElement2 get intElement => typeProvider.intElement2;
+  ClassElement get intElement => typeProvider.intElement2;
 
   InterfaceType get intType => typeProvider.intType;
 
-  ClassElement2 get listElement => typeProvider.listElement2;
+  ClassElement get listElement => typeProvider.listElement2;
 
-  ClassElement2 get mapElement => typeProvider.mapElement2;
+  ClassElement get mapElement => typeProvider.mapElement2;
 
   NeverElementImpl2 get neverElement => NeverElementImpl2.instance;
 
-  ClassElement2 get numElement => typeProvider.numElement2;
+  ClassElement get numElement => typeProvider.numElement2;
 
-  ClassElement2 get objectElement => typeProvider.objectElement2;
+  ClassElement get objectElement => typeProvider.objectElement2;
 
   bool get strictCasts {
     var analysisOptions = result.session.analysisContext
@@ -88,7 +88,7 @@ mixin ResolutionTest implements ResourceProviderMixin {
     return analysisOptions.strictCasts;
   }
 
-  ClassElement2 get stringElement => typeProvider.stringElement2;
+  ClassElement get stringElement => typeProvider.stringElement2;
 
   InterfaceType get stringType => typeProvider.stringType;
 
@@ -124,14 +124,14 @@ mixin ResolutionTest implements ResourceProviderMixin {
 
   void assertElement(
     Object? nodeOrElement, {
-    required Element2 declaration,
+    required Element declaration,
     Map<String, String> substitution = const {},
   }) {
-    Element2? element;
+    Element? element;
     if (nodeOrElement is AstNode) {
       element = getNodeElement2(nodeOrElement);
     } else {
-      element = nodeOrElement as Element2?;
+      element = nodeOrElement as Element?;
     }
 
     var actualDeclaration = element?.baseElement;
@@ -144,7 +144,7 @@ mixin ResolutionTest implements ResourceProviderMixin {
     }
   }
 
-  void assertElementNull(Element2? element) {
+  void assertElementNull(Element? element) {
     expect(element, isNull);
   }
 
@@ -310,7 +310,7 @@ mixin ResolutionTest implements ResourceProviderMixin {
     var actualMapString = Map.fromEntries(
       substitution.map.entries
           .where((entry) {
-            return entry.key.enclosingElement2 is! ExecutableElement2;
+            return entry.key.enclosingElement2 is! ExecutableElement;
           })
           .map((entry) {
             return MapEntry(entry.key.name3, typeString(entry.value));
@@ -377,7 +377,7 @@ mixin ResolutionTest implements ResourceProviderMixin {
     expectedContextMessages: contextMessages,
   );
 
-  Element2? getNodeElement2(AstNode node) {
+  Element? getNodeElement2(AstNode node) {
     if (node is Annotation) {
       return node.element2;
     } else if (node is AssignmentExpression) {
diff --git a/pkg/analyzer/test/src/lint/lint_rule_test.dart b/pkg/analyzer/test/src/lint/lint_rule_test.dart
index 90fd1ebc40d..698479979b2 100644
--- a/pkg/analyzer/test/src/lint/lint_rule_test.dart
+++ b/pkg/analyzer/test/src/lint/lint_rule_test.dart
@@ -88,7 +88,7 @@ class CollectingReporter extends ErrorReporter {
 
   @override
   void atElement2(
-    Element2 element,
+    Element element,
     ErrorCode errorCode, {
     List<Object>? arguments,
     List<DiagnosticMessage>? contextMessages,
diff --git a/pkg/analyzer/test/src/services/top_level_declarations_test.dart b/pkg/analyzer/test/src/services/top_level_declarations_test.dart
index 3931f3d6a5e..d5cd79bd151 100644
--- a/pkg/analyzer/test/src/services/top_level_declarations_test.dart
+++ b/pkg/analyzer/test/src/services/top_level_declarations_test.dart
@@ -19,7 +19,7 @@ main() {
 class TopLevelDeclarationsTest extends PubPackageResolutionTest {
   /// Verifies that the located public export for [element] is the library with
   /// URI [libraryUri].
-  Future<void> expectPublicExport(Element2 element, String libraryUri) async {
+  Future<void> expectPublicExport(Element element, String libraryUri) async {
     var publicLibrary = await TopLevelDeclarations(
       result,
     ).publiclyExporting(element);
diff --git a/pkg/analyzer/test/src/summary/element_text.dart b/pkg/analyzer/test/src/summary/element_text.dart
index 62720968377..e060f5cb800 100644
--- a/pkg/analyzer/test/src/summary/element_text.dart
+++ b/pkg/analyzer/test/src/summary/element_text.dart
@@ -78,10 +78,10 @@ class ElementTextConfiguration {
           return true;
         case ClassElementImpl():
           return classNames.contains(o.name);
-        case ClassElement2():
+        case ClassElement():
           return classNames.contains(o.name3);
         case ConstructorFragment():
-        case ConstructorElement2():
+        case ConstructorElement():
           return true;
       }
       return false;
@@ -99,19 +99,19 @@ class ElementTextConfiguration {
       switch (o) {
         case LibraryFragment():
           return false;
-        case ClassElement2():
+        case ClassElement():
           return classNames.contains(o.name3);
-        case ConstructorElement2():
+        case ConstructorElement():
           return false;
-        case EnumElement2():
+        case EnumElement():
           return enumNames.contains(o.name3);
-        case ExtensionTypeElement2():
+        case ExtensionTypeElement():
           return extensionTypeNames.contains(o.name3);
-        case FieldElement2():
+        case FieldElement():
           return fieldNames.isEmpty || fieldNames.contains(o.name3);
-        case MixinElement2():
+        case MixinElement():
           return mixinNames.contains(o.name3);
-        case PropertyAccessorElement2():
+        case PropertyAccessorElement():
           return false;
       }
       return true;
@@ -339,7 +339,7 @@ class _Element2Writer extends _AbstractElementWriter {
     });
   }
 
-  void _assertNonSyntheticElementSelf(Element2 element) {
+  void _assertNonSyntheticElementSelf(Element element) {
     expect(element.isSynthetic, isFalse);
     expect(element.nonSynthetic2, same(element));
   }
@@ -356,7 +356,7 @@ class _Element2Writer extends _AbstractElementWriter {
     }
   }
 
-  void _writeConstructorElement(ConstructorElement2 e) {
+  void _writeConstructorElement(ConstructorElement e) {
     e as ConstructorElementImpl2;
 
     // Check that the reference exists, and filled with the element.
@@ -474,9 +474,9 @@ class _Element2Writer extends _AbstractElementWriter {
     }
   }
 
-  void _writeElementList<E extends Element2>(
+  void _writeElementList<E extends Element>(
     String name,
-    Element2 expectedEnclosingElement,
+    Element expectedEnclosingElement,
     List<E> elements,
     void Function(E) write,
   ) {
@@ -488,7 +488,7 @@ class _Element2Writer extends _AbstractElementWriter {
           if (element is LibraryImport || element is LibraryExport) {
             // These are only accidentally subtypes of `Element2` and don't have
             // an enclosing element.
-          } else if (element is PrefixElement2) {
+          } else if (element is PrefixElement) {
             // Asking a `PrefixElement2` for it's enclosing element currently
             // throws an exception (because it doesn't have an enclosing
             // element, only an enclosing fragment).
@@ -504,12 +504,12 @@ class _Element2Writer extends _AbstractElementWriter {
     }
   }
 
-  void _writeElementName(Element2 e) {
+  void _writeElementName(Element e) {
     var name = e.name3 ?? '<null-name>';
     _sink.write(name);
 
     switch (e) {
-      case MethodElement2():
+      case MethodElement():
         if (e.name3 == '-' && e.formalParameters.isEmpty) {
           expect(e.lookupName, 'unary-');
         } else {
@@ -526,7 +526,7 @@ class _Element2Writer extends _AbstractElementWriter {
     }
   }
 
-  void _writeElementReference(String name, Element2? e) {
+  void _writeElementReference(String name, Element? e) {
     if (!configuration.withReferences) {
       return;
     }
@@ -538,7 +538,7 @@ class _Element2Writer extends _AbstractElementWriter {
     _elementPrinter.writeNamedElement2(name, e);
   }
 
-  void _writeExportNamespace(LibraryElement2 e) {
+  void _writeExportNamespace(LibraryElement e) {
     var map = e.exportNamespace.definedNames2;
     var sortedEntries = map.entries.sortedBy((entry) => entry.key);
     for (var entry in sortedEntries) {
@@ -940,9 +940,9 @@ class _Element2Writer extends _AbstractElementWriter {
     var variable = e.variable3;
     if (variable != null) {
       var variableEnclosing = variable.enclosingElement2;
-      if (variableEnclosing is LibraryElement2) {
+      if (variableEnclosing is LibraryElement) {
         expect(variableEnclosing.topLevelVariables, contains(variable));
-      } else if (variableEnclosing is InterfaceElement2) {
+      } else if (variableEnclosing is InterfaceElement) {
         // TODO(augmentations): Remove the invocations of `field.baseElement`.
         //  There shouldn't be any members in the list of fields.
         expect(
@@ -1074,7 +1074,7 @@ class _Element2Writer extends _AbstractElementWriter {
   }
 
   void _writeInstanceElement(InstanceElementImpl2 e) {
-    expect(e.thisOrAncestorOfType2<InstanceElement2>(), same(e));
+    expect(e.thisOrAncestorOfType2<InstanceElement>(), same(e));
     expect(e.thisOrAncestorOfType2<GetterElement>(), isNull);
     expect(e.thisOrAncestorMatching2((_) => true), same(e));
     expect(e.thisOrAncestorMatching2((_) => false), isNull);
@@ -1129,7 +1129,7 @@ class _Element2Writer extends _AbstractElementWriter {
         _writeTypeParameterElement,
       );
 
-      void writeSupertype(InterfaceElement2 e) {
+      void writeSupertype(InterfaceElement e) {
         if (e.supertype case var supertype?) {
           if (supertype.element3.name3 != 'Object' || e.mixins.isNotEmpty) {
             _writeType('supertype', supertype);
@@ -1252,7 +1252,7 @@ class _Element2Writer extends _AbstractElementWriter {
       _writeFragmentList('fields', f, f.fields2, _writeFieldFragment);
       if (f is InterfaceFragment) {
         var constructors = f.constructors2;
-        if (f is MixinElement2) {
+        if (f is MixinElement) {
           expect(constructors, isEmpty);
         } else if (configuration.withConstructors) {
           _writeFragmentList(
@@ -1500,9 +1500,9 @@ class _Element2Writer extends _AbstractElementWriter {
     var variable = e.variable3;
     if (variable != null) {
       var variableEnclosing = variable.enclosingElement2;
-      if (variableEnclosing is LibraryElement2) {
+      if (variableEnclosing is LibraryElement) {
         expect(variableEnclosing.topLevelVariables, contains(variable));
-      } else if (variableEnclosing is InterfaceElement2) {
+      } else if (variableEnclosing is InterfaceElement) {
         // TODO(augmentations): Remove the invocations of `field.baseElement`.
         //  There shouldn't be any members in the list of fields.
         expect(
@@ -1625,7 +1625,7 @@ class _Element2Writer extends _AbstractElementWriter {
     });
   }
 
-  void _writeSinceSdkVersion(Element2 element) {
+  void _writeSinceSdkVersion(Element element) {
     if (element case HasSinceSdkVersion hasSince) {
       var version = hasSince.sinceSdkVersion;
       if (version != null) {
@@ -1831,7 +1831,7 @@ class _Element2Writer extends _AbstractElementWriter {
     // }
   }
 
-  void _writeTypeAliasElement(TypeAliasElement2 e) {
+  void _writeTypeAliasElement(TypeAliasElement e) {
     _sink.writeIndentedLine(() {
       // _sink.writeIf(e.isAugmentation, 'augment ');
       // _sink.writeIf(e.isFunctionTypeAliasBased, 'functionTypeAliasBased ');
@@ -1913,7 +1913,7 @@ class _Element2Writer extends _AbstractElementWriter {
     // _assertNonSyntheticElementSelf(e);
   }
 
-  void _writeTypeParameterElement(TypeParameterElement2 e) {
+  void _writeTypeParameterElement(TypeParameterElement e) {
     _sink.writeIndentedLine(() {
       // _sink.write('${e.variance.name} ');
       _writeElementName(e);
diff --git a/pkg/analyzer/test/src/summary/resolved_ast_printer.dart b/pkg/analyzer/test/src/summary/resolved_ast_printer.dart
index 93d1f40bff8..200a29a5547 100644
--- a/pkg/analyzer/test/src/summary/resolved_ast_printer.dart
+++ b/pkg/analyzer/test/src/summary/resolved_ast_printer.dart
@@ -1820,7 +1820,7 @@ Expected parent: (${parent.runtimeType}) $parent
     });
   }
 
-  void _writeElement2(String name, Element2? element) {
+  void _writeElement2(String name, Element? element) {
     if (_withResolution) {
       _elementPrinter.writeNamedElement2(name, element);
     }
@@ -2116,11 +2116,11 @@ class ResolvedNodeTextConfiguration {
   /// If `true`, [Expression.correspondingParameter] should be printed.
   bool withParameterElements = true;
 
-  /// If `true`, `redirectedConstructor` properties of [ConstructorElement2]s
+  /// If `true`, `redirectedConstructor` properties of [ConstructorElement]s
   /// should be printer.
   bool withRedirectedConstructors = false;
 
-  /// If `true`, `superConstructor` properties of [ConstructorElement2]s
+  /// If `true`, `superConstructor` properties of [ConstructorElement]s
   /// should be printer.
   bool withSuperConstructors = false;
 
diff --git a/pkg/analyzer/test/src/task/strong/dart2_inference_test.dart b/pkg/analyzer/test/src/task/strong/dart2_inference_test.dart
index 74dbc7e8152..215aa436245 100644
--- a/pkg/analyzer/test/src/task/strong/dart2_inference_test.dart
+++ b/pkg/analyzer/test/src/task/strong/dart2_inference_test.dart
@@ -246,7 +246,7 @@ void test(List<A> listA, List<B> listB) {
     ) {
       var node = findNode.declaredIdentifier(vSearch);
 
-      var element = node.declaredElement2 as LocalVariableElement2;
+      var element = node.declaredElement2 as LocalVariableElement;
       assertType(element.type, vType);
 
       var invocation = findNode.methodInvocation(fSearch);
@@ -268,12 +268,12 @@ class C {
 }
 ''';
     await resolveTestCode(code);
-    ClassElement2 c = findElement2.class_('C');
+    ClassElement c = findElement2.class_('C');
 
     SetterElement x = c.setters2[0];
     expect(x.returnType, VoidTypeImpl.instance);
 
-    MethodElement2 operator = c.methods2[0];
+    MethodElement operator = c.methods2[0];
     expect(operator.displayName, '[]=');
     expect(operator.returnType, VoidTypeImpl.instance);
   }
@@ -289,12 +289,12 @@ class Derived extends Base {
   operator[]=(int x, int y) {}
 }''';
     await resolveTestCode(code);
-    ClassElement2 c = findElement2.class_('Derived');
+    ClassElement c = findElement2.class_('Derived');
 
     SetterElement x = c.setters2[0];
     expect(x.returnType, VoidTypeImpl.instance);
 
-    MethodElement2 operator = c.methods2[0];
+    MethodElement operator = c.methods2[0];
     expect(operator.displayName, '[]=');
     expect(operator.returnType, VoidTypeImpl.instance);
   }
@@ -524,7 +524,7 @@ main() {
           if (comment != null) {
             var expectedType = types[comment.offset];
             if (expectedType != null) {
-              var element = node.element as VariableElement2;
+              var element = node.element as VariableElement;
               String actualType = typeString(element.type);
               expect(actualType, expectedType, reason: '@${comment.offset}');
             }
diff --git a/pkg/analyzer/test/src/task/strong/inferred_type_test.dart b/pkg/analyzer/test/src/task/strong/inferred_type_test.dart
index 0aedf92d935..2d958e0a20c 100644
--- a/pkg/analyzer/test/src/task/strong/inferred_type_test.dart
+++ b/pkg/analyzer/test/src/task/strong/inferred_type_test.dart
@@ -25,7 +25,7 @@ class InferredTypeTest extends PubPackageResolutionTest {
     return getFile('${sdkRoot.posixPath}/lib/async/async.dart');
   }
 
-  LibraryElement2 get _resultLibraryElement {
+  LibraryElement get _resultLibraryElement {
     return result.libraryElement2;
   }
 
diff --git a/pkg/analyzer/test/src/wolf/ir/ast_to_ir_test.dart b/pkg/analyzer/test/src/wolf/ir/ast_to_ir_test.dart
index 877d5cf50a7..12a6535fe0e 100644
--- a/pkg/analyzer/test/src/wolf/ir/ast_to_ir_test.dart
+++ b/pkg/analyzer/test/src/wolf/ir/ast_to_ir_test.dart
@@ -1986,7 +1986,7 @@ class _CallDispatcher implements CallDispatcher {
     CallHandler? handler;
     switch (callDescriptor) {
       case ElementCallDescriptor(:var name, :var element):
-        if (element.enclosingElement2 case InstanceElement2(
+        if (element.enclosingElement2 case InstanceElement(
           name3: var typeName,
         )) {
           name = '${typeName ?? '<unnamed>'}.$name';
diff --git a/pkg/analyzer/test/util/element_printer.dart b/pkg/analyzer/test/util/element_printer.dart
index cc34d7295ae..c1563d45c42 100644
--- a/pkg/analyzer/test/util/element_printer.dart
+++ b/pkg/analyzer/test/util/element_printer.dart
@@ -58,7 +58,7 @@ class ElementPrinter {
     }
   }
 
-  void writeElement2(Element2? element) {
+  void writeElement2(Element? element) {
     switch (element) {
       case null:
         _sink.writeln('<null>');
@@ -70,7 +70,7 @@ class ElementPrinter {
         writelnReference(element.reference);
       case TypeParameterElementImpl2():
         _sink.writeln('${element.name3}@${element.firstFragment.nameOffset2}');
-      case ConstructorElement2 element:
+      case ConstructorElement element:
         var firstFragment = element.firstFragment as ElementImpl;
         var reference = firstFragment.reference;
         writeReference(reference!);
@@ -122,7 +122,7 @@ class ElementPrinter {
         writelnReference(element.reference);
       case MixinElementImpl2 element:
         writelnReference(element.reference);
-      case MethodElement2 element:
+      case MethodElement element:
         var firstFragment = element.firstFragment as ElementImpl;
         var reference = firstFragment.reference;
         writeReference(reference!);
@@ -149,7 +149,7 @@ class ElementPrinter {
     }
   }
 
-  void writeElementList2(String name, List<Element2> elements) {
+  void writeElementList2(String name, List<Element> elements) {
     _sink.writeElements(name, elements, (element) {
       _sink.writeIndent();
       writeElement2(element);
@@ -191,7 +191,7 @@ class ElementPrinter {
     _sink.writeln();
   }
 
-  void writeNamedElement2(String name, Element2? element) {
+  void writeNamedElement2(String name, Element? element) {
     _sink.writeIndent();
     _sink.write('$name: ');
     writeElement2(element);
@@ -358,7 +358,7 @@ class ElementPrinter {
     return '${source.uri}';
   }
 
-  String _substitutionMapStr(Map<TypeParameterElement2, DartType> map) {
+  String _substitutionMapStr(Map<TypeParameterElement, DartType> map) {
     var entriesStr = map.entries
         .map((entry) {
           return '${entry.key.name3}: ${_typeStr(entry.value)}';
diff --git a/pkg/analyzer/test/utils.dart b/pkg/analyzer/test/utils.dart
index 652d8f1f0de..55e29845a70 100644
--- a/pkg/analyzer/test/utils.dart
+++ b/pkg/analyzer/test/utils.dart
@@ -171,7 +171,7 @@ class TypeAssertions {
   Asserter<DartType> get isString => isType(_typeProvider.stringType);
 
   /// Assert that a type has the element that is equal to the [expected].
-  Asserter<DartType> hasElement(Element2 expected) =>
+  Asserter<DartType> hasElement(Element expected) =>
       (DartType type) => expect(expected, (type as InterfaceType).element3);
 
   /// Given assertions for the argument and return types, produce an
diff --git a/pkg/analyzer/tool/api/generate.dart b/pkg/analyzer/tool/api/generate.dart
index b75636e211f..ccb57f83a29 100644
--- a/pkg/analyzer/tool/api/generate.dart
+++ b/pkg/analyzer/tool/api/generate.dart
@@ -74,7 +74,7 @@ class ApiDescription {
   ///
   /// If an element is seen again in a different library, it will be followed
   /// with `(see above)` (rather than having its child elements dumped twice).
-  final _dumpedTopLevelElements = <Element2>{};
+  final _dumpedTopLevelElements = <Element>{};
 
   /// Top level elements that have been referenced so far and haven't yet been
   /// processed by [build].
@@ -82,14 +82,14 @@ class ApiDescription {
   /// This is used to ensure that all elements referred to by the public API
   /// (e.g., by being mentioned in the type of an API element) also show up in
   /// the output.
-  final _potentiallyDanglingReferences = Queue<Element2>();
+  final _potentiallyDanglingReferences = Queue<Element>();
 
   final _uniqueNamer = UniqueNamer();
 
   /// Cache of values returned by [_getOrComputeImmediateSubinterfaceMap], to
   /// avoid unnecessary recomputation.
   final _immediateSubinterfaceCache =
-      <LibraryElement2, Map<ClassElement2, Set<InterfaceElement2>>>{};
+      <LibraryElement, Map<ClassElement, Set<InterfaceElement>>>{};
 
   /// Builds a list of [Node] objects representing all the libraries that are
   /// relevant to the analyzer public API.
@@ -234,7 +234,7 @@ class ApiDescription {
 
   /// Creates a list of objects which, when their string representations are
   /// concatenated, describes [typeParameter].
-  List<Object?> _describeTypeParameter(TypeParameterElement2 typeParameter) {
+  List<Object?> _describeTypeParameter(TypeParameterElement typeParameter) {
     return [
       typeParameter.name3!,
       if (typeParameter.bound case var bound?) ...[
@@ -245,9 +245,9 @@ class ApiDescription {
   }
 
   /// Appends information to [node] describing [element].
-  void _dumpElement(Element2 element, Node<MemberSortKey> node) {
+  void _dumpElement(Element element, Node<MemberSortKey> node) {
     var enclosingElement = element.enclosingElement2;
-    if (enclosingElement is LibraryElement2 && !element.isInAnalyzerPublicApi) {
+    if (enclosingElement is LibraryElement && !element.isInAnalyzerPublicApi) {
       if (!enclosingElement.uri.isInAnalyzer) {
         node.text.add(' (referenced)');
       } else {
@@ -257,7 +257,7 @@ class ApiDescription {
     }
     var parentheticals = <List<Object?>>[];
     switch (element) {
-      case TypeAliasElement2(:var aliasedType, :var typeParameters2):
+      case TypeAliasElement(:var aliasedType, :var typeParameters2):
         List<Object?> description = ['type alias'];
         if (typeParameters2.isNotEmpty) {
           description.addAll(
@@ -268,18 +268,18 @@ class ApiDescription {
         }
         description.addAll([' for ', ..._describeType(aliasedType)]);
         parentheticals.add(description);
-      case InstanceElement2():
+      case InstanceElement():
         switch (element) {
-          case InterfaceElement2(
+          case InterfaceElement(
             :var typeParameters2,
             :var supertype,
             :var interfaces,
           ):
             List<Object?> instanceDescription = [
               switch (element) {
-                ClassElement2() => 'class',
-                EnumElement2() => 'enum',
-                MixinElement2() => 'mixin',
+                ClassElement() => 'class',
+                EnumElement() => 'enum',
+                MixinElement() => 'mixin',
                 dynamic(:var runtimeType) => 'TODO: $runtimeType',
               },
             ];
@@ -290,13 +290,13 @@ class ApiDescription {
                     .separate(prefix: '<', suffix: '>'),
               );
             }
-            if (element is! EnumElement2 && supertype != null) {
+            if (element is! EnumElement && supertype != null) {
               instanceDescription.addAll([
                 ' extends ',
                 ..._describeType(supertype),
               ]);
             }
-            if (element is MixinElement2 &&
+            if (element is MixinElement &&
                 element.superclassConstraints.isNotEmpty) {
               instanceDescription.addAll(
                 element.superclassConstraints
@@ -310,7 +310,7 @@ class ApiDescription {
               );
             }
             parentheticals.add(instanceDescription);
-            if (element is ClassElement2 && element.isSealed) {
+            if (element is ClassElement && element.isSealed) {
               var parenthetical = <Object>['sealed'];
               parentheticals.add(parenthetical);
               if (_getOrComputeImmediateSubinterfaceMap(
@@ -339,7 +339,7 @@ class ApiDescription {
                 parenthetical.add(')');
               }
             }
-          case ExtensionElement2(:var extendedType):
+          case ExtensionElement(:var extendedType):
             parentheticals.add([
               'extension on ',
               ..._describeType(extendedType),
@@ -352,19 +352,19 @@ class ApiDescription {
             // Ignore private members
             continue;
           }
-          if (member is FieldElement2) {
+          if (member is FieldElement) {
             // Ignore fields; we care about the getters and setters they induce.
             continue;
           }
-          if (member is ConstructorElement2 &&
-              element is ClassElement2 &&
+          if (member is ConstructorElement &&
+              element is ClassElement &&
               element.isAbstract &&
               (element.isFinal || element.isInterface || element.isSealed)) {
             // The class can't be constructed from outside of the library that
             // declares it, so its constructors aren't part of the public API.
             continue;
           }
-          if (member is ConstructorElement2 && element is EnumElement2) {
+          if (member is ConstructorElement && element is EnumElement) {
             // Enum constructors can't be called from outside the enum itself,
             // so they aren't part of the public API.
             continue;
@@ -376,7 +376,7 @@ class ApiDescription {
         }
       case TopLevelFunctionElement(:var type):
         parentheticals.add(['function: ', ..._describeType(type)]);
-      case ExecutableElement2(:var isStatic):
+      case ExecutableElement(:var isStatic):
         String maybeStatic = isStatic ? 'static ' : '';
         switch (element) {
           case GetterElement(:var type):
@@ -389,12 +389,12 @@ class ApiDescription {
               '${maybeStatic}setter: ',
               ..._describeType(type.formalParameters.single.type),
             ]);
-          case MethodElement2(:var type):
+          case MethodElement(:var type):
             parentheticals.add([
               '${maybeStatic}method: ',
               ..._describeType(type),
             ]);
-          case ConstructorElement2(:var type):
+          case ConstructorElement(:var type):
             parentheticals.add(['constructor: ', ..._describeType(type)]);
           case dynamic(:var runtimeType):
             throw UnimplementedError('Unexpected element: $runtimeType');
@@ -419,7 +419,7 @@ class ApiDescription {
   }
 
   /// Appends information to [node] describing [element].
-  void _dumpLibrary(LibraryElement2 library, Node<MemberSortKey> node) {
+  void _dumpLibrary(LibraryElement library, Node<MemberSortKey> node) {
     var uri = library.uri;
     node.text.addAll([uri, ':']);
     var definedNames = library.exportNamespace.definedNames2;
@@ -442,10 +442,10 @@ class ApiDescription {
   /// If this method has been called before with the same [library], a cached
   /// map is returned from [_immediateSubinterfaceCache]. Otherwise a fresh map
   /// is computed.
-  Map<ClassElement2, Set<InterfaceElement2>>
-  _getOrComputeImmediateSubinterfaceMap(LibraryElement2 library) {
+  Map<ClassElement, Set<InterfaceElement>>
+  _getOrComputeImmediateSubinterfaceMap(LibraryElement library) {
     if (_immediateSubinterfaceCache[library] case var m?) return m;
-    var result = <ClassElement2, Set<InterfaceElement2>>{};
+    var result = <ClassElement, Set<InterfaceElement>>{};
     for (var interface in [
       ...library.classes,
       ...library.mixins,
@@ -456,11 +456,11 @@ class ApiDescription {
         interface.supertype,
         ...interface.interfaces,
         ...interface.mixins,
-        if (interface is MixinElement2) ...interface.superclassConstraints,
+        if (interface is MixinElement) ...interface.superclassConstraints,
       ]) {
         if (superinterface == null) continue;
         var superinterfaceElement = superinterface.element3;
-        if (superinterfaceElement is ClassElement2 &&
+        if (superinterfaceElement is ClassElement &&
             superinterfaceElement.isSealed) {
           (result[superinterfaceElement] ??= {}).add(interface);
         }
@@ -507,7 +507,7 @@ class MemberSortKey implements Comparable<MemberSortKey> {
   final MemberCategory _category;
   final String _name;
 
-  MemberSortKey(Element2 element)
+  MemberSortKey(Element element)
     : _isInstanceMember = _computeIsInstanceMember(element),
       _category = _computeCategory(element),
       _name = element.name3!;
@@ -525,22 +525,22 @@ class MemberSortKey implements Comparable<MemberSortKey> {
     return _name.compareTo(other._name);
   }
 
-  static MemberCategory _computeCategory(Element2 element) => switch (element) {
-    ConstructorElement2() => MemberCategory.constructor,
-    PropertyAccessorElement2() => MemberCategory.propertyAccessor,
+  static MemberCategory _computeCategory(Element element) => switch (element) {
+    ConstructorElement() => MemberCategory.constructor,
+    PropertyAccessorElement() => MemberCategory.propertyAccessor,
     TopLevelFunctionElement() => MemberCategory.topLevelFunctionOrMethod,
-    MethodElement2() => MemberCategory.topLevelFunctionOrMethod,
-    InterfaceElement2() => MemberCategory.interface,
-    ExtensionElement2() => MemberCategory.extension,
-    TypeAliasElement2() => MemberCategory.typeAlias,
+    MethodElement() => MemberCategory.topLevelFunctionOrMethod,
+    InterfaceElement() => MemberCategory.interface,
+    ExtensionElement() => MemberCategory.extension,
+    TypeAliasElement() => MemberCategory.typeAlias,
     dynamic(:var runtimeType) =>
       throw UnimplementedError('Unexpected element: $runtimeType'),
   };
 
-  static bool _computeIsInstanceMember(Element2 element) =>
-      element.enclosingElement2 is InstanceElement2 &&
+  static bool _computeIsInstanceMember(Element element) =>
+      element.enclosingElement2 is InstanceElement &&
       switch (element) {
-        ExecutableElement2(:var isStatic) => !isStatic,
+        ExecutableElement(:var isStatic) => !isStatic,
         dynamic(:var runtimeType) =>
           throw UnimplementedError('Unexpected element: $runtimeType'),
       };
@@ -606,12 +606,12 @@ class UniqueName {
 
 /// Manager of unique names for elements.
 class UniqueNamer {
-  final _names = <Element2, UniqueName>{};
+  final _names = <Element, UniqueName>{};
   final _conflicts = <String, List<UniqueName>>{};
 
   /// Returns a [UniqueName] object whose [toString] method will produce a
   /// unique name for [element].
-  UniqueName name(Element2 element) =>
+  UniqueName name(Element element) =>
       _names[element] ??= UniqueName(this, element.apiName);
 }
 
@@ -664,7 +664,7 @@ extension on Iterable<Iterable<Object?>> {
   }
 }
 
-extension on Element2 {
+extension on Element {
   /// Returns the appropriate name for describing the element in `api.txt`.
   ///
   /// The name is the same as [name3], but with `=` appended for setters.
@@ -677,7 +677,7 @@ extension on Element2 {
   }
 
   bool get isInAnalyzerPublicApi {
-    if (this case PropertyAccessorElement2(
+    if (this case PropertyAccessorElement(
       isSynthetic: true,
       :var variable3?,
     ) when variable3.isInAnalyzerPublicApi) {
@@ -696,7 +696,7 @@ extension on Element2 {
   bool _isPublicApiAnnotation(ElementAnnotation annotation) {
     if (annotation.computeConstantValue() case DartObject(
       type: InterfaceType(
-        element3: InterfaceElement2(name3: 'AnalyzerPublicApi'),
+        element3: InterfaceElement(name3: 'AnalyzerPublicApi'),
       ),
     )) {
       return true;
diff --git a/pkg/analyzer/tool/benchmark/heap/flutter_elements.dart b/pkg/analyzer/tool/benchmark/heap/flutter_elements.dart
index 01e2b355bff..2cd8f7fda4d 100644
--- a/pkg/analyzer/tool/benchmark/heap/flutter_elements.dart
+++ b/pkg/analyzer/tool/benchmark/heap/flutter_elements.dart
@@ -313,7 +313,7 @@ void _writeResultFile(BenchmarkResultCompound result) {
 
 class _AllElementVisitor extends GeneralizingElementVisitor2<void> {
   @override
-  void visitElement(Element2 element) {
+  void visitElement(Element element) {
     // This triggers lazy reading.
     if (element case Annotatable element) {
       element.metadata2;
diff --git a/pkg/analyzer_cli/lib/src/analyzer_impl.dart b/pkg/analyzer_cli/lib/src/analyzer_impl.dart
index 5c07d6075fa..6ca650199da 100644
--- a/pkg/analyzer_cli/lib/src/analyzer_impl.dart
+++ b/pkg/analyzer_cli/lib/src/analyzer_impl.dart
@@ -66,8 +66,8 @@ class AnalyzerImpl {
   }
 
   void addLibrarySources(
-    LibraryElement2 library,
-    Set<LibraryElement2> libraries,
+    LibraryElement library,
+    Set<LibraryElement> libraries,
     Set<LibraryFragment> units,
   ) {
     if (!libraries.add(library)) {
@@ -137,9 +137,9 @@ class AnalyzerImpl {
   }
 
   /// Fills [files].
-  void prepareSources(LibraryElement2 library) {
+  void prepareSources(LibraryElement library) {
     var units = <LibraryFragment>{};
-    var libraries = <LibraryElement2>{};
+    var libraries = <LibraryElement>{};
     addLibrarySources(library, libraries, units);
   }
 
@@ -184,7 +184,7 @@ class AnalyzerImpl {
       determineProcessedSeverity(error, options, analysisOptions);
 
   /// Returns true if we want to report diagnostics for this library.
-  bool _isAnalyzedLibrary(LibraryElement2 library) {
+  bool _isAnalyzedLibrary(LibraryElement library) {
     var source = library.firstFragment.source;
     if (source.uri.isScheme('dart')) {
       return false;
@@ -218,7 +218,7 @@ class AnalyzerImpl {
     outSink.writeln('total-cold:$totalTime');
   }
 
-  Future<LibraryElement2> _resolveLibrary() async {
+  Future<LibraryElement> _resolveLibrary() async {
     var libraryPath = libraryFile.path;
     analysisDriver.priorityFiles = [libraryPath];
     var elementResult =
diff --git a/pkg/analyzer_plugin/lib/src/utilities/change_builder/change_builder_dart.dart b/pkg/analyzer_plugin/lib/src/utilities/change_builder/change_builder_dart.dart
index c02211aac28..39d0817880d 100644
--- a/pkg/analyzer_plugin/lib/src/utilities/change_builder/change_builder_dart.dart
+++ b/pkg/analyzer_plugin/lib/src/utilities/change_builder/change_builder_dart.dart
@@ -42,12 +42,12 @@ class DartEditBuilderImpl extends EditBuilderImpl implements DartEditBuilder {
   /// by the edit isn't inside a class declaration.
   ///
   /// This field is lazily initialized in [_initializeEnclosingElements].
-  ClassElement2? _enclosingClass;
+  ClassElement? _enclosingClass;
 
   /// The enclosing executable element, possibly `null`.
   ///
   /// This field is lazily initialized in [_initializeEnclosingElements].
-  ExecutableElement2? _enclosingExecutable;
+  ExecutableElement? _enclosingExecutable;
 
   /// If not `null`, [write] will copy everything into this buffer.
   StringBuffer? _carbonCopyBuffer;
@@ -65,7 +65,7 @@ class DartEditBuilderImpl extends EditBuilderImpl implements DartEditBuilder {
           (builder) => buildLinkedEdit(builder as DartLinkedEditBuilder));
 
   @override
-  bool canWriteType(DartType? type, {ExecutableElement2? methodBeingCopied}) =>
+  bool canWriteType(DartType? type, {ExecutableElement? methodBeingCopied}) =>
       type != null && type is! DynamicType
           ? _canWriteType(type, methodBeingCopied: methodBeingCopied)
           : false;
@@ -226,7 +226,7 @@ class DartEditBuilderImpl extends EditBuilderImpl implements DartEditBuilder {
   void writeFormalParameter(String name,
       {bool isCovariant = false,
       bool isRequiredNamed = false,
-      ExecutableElement2? methodBeingCopied,
+      ExecutableElement? methodBeingCopied,
       String? nameGroupName,
       DartType? type,
       String? typeGroupName,
@@ -275,7 +275,7 @@ class DartEditBuilderImpl extends EditBuilderImpl implements DartEditBuilder {
 
   @override
   void writeFormalParameters(Iterable<FormalParameterElement> parameters,
-      {ExecutableElement2? methodBeingCopied,
+      {ExecutableElement? methodBeingCopied,
       bool includeDefaultValues = true,
       bool requiredTypes = false}) {
     var parameterNames = parameters.map((e) => e.name3).nonNulls.toSet();
@@ -497,7 +497,7 @@ class DartEditBuilderImpl extends EditBuilderImpl implements DartEditBuilder {
 
   @override
   void writeOverride(
-    ExecutableElement2 element, {
+    ExecutableElement element, {
     StringBuffer? displayTextBuffer,
     String? returnTypeGroupName,
     bool invokeSuper = false,
@@ -522,7 +522,7 @@ class DartEditBuilderImpl extends EditBuilderImpl implements DartEditBuilder {
     var isGetter = elementKind == ElementKind.GETTER;
     var isSetter = elementKind == ElementKind.SETTER;
     var isMethod = elementKind == ElementKind.METHOD;
-    var isOperator = isMethod && (element as MethodElement2).isOperator;
+    var isOperator = isMethod && (element as MethodElement).isOperator;
     var memberName = element.displayName;
 
     // `@override` annotation.
@@ -630,7 +630,7 @@ class DartEditBuilderImpl extends EditBuilderImpl implements DartEditBuilder {
   void writeParameter(String name,
       {bool isCovariant = false,
       bool isRequiredNamed = false,
-      ExecutableElement2? methodBeingCopied,
+      ExecutableElement? methodBeingCopied,
       String? nameGroupName,
       DartType? type,
       String? typeGroupName,
@@ -680,7 +680,7 @@ class DartEditBuilderImpl extends EditBuilderImpl implements DartEditBuilder {
   @override
   void writeParameterMatchingArgument(
       Expression argument, int index, Set<String> usedNames,
-      {ExecutableElement2? methodBeingCopied}) {
+      {ExecutableElement? methodBeingCopied}) {
     // Append type name.
     var type = argument.staticType;
     if (type == null || type.isBottom || type.isDartCoreNull) {
@@ -713,7 +713,7 @@ class DartEditBuilderImpl extends EditBuilderImpl implements DartEditBuilder {
 
   @override
   void writeParametersMatchingArguments(ArgumentList argumentList,
-      {ExecutableElement2? methodBeingCopied}) {
+      {ExecutableElement? methodBeingCopied}) {
     // TODO(brianwilkerson): Handle the case when there are required parameters
     // after named parameters.
     var usedNames = <String>{};
@@ -737,8 +737,8 @@ class DartEditBuilderImpl extends EditBuilderImpl implements DartEditBuilder {
   }
 
   @override
-  void writeReference(Element2 element) {
-    if (element.enclosingElement2 is LibraryElement2) {
+  void writeReference(Element element) {
+    if (element.enclosingElement2 is LibraryElement) {
       _writeLibraryReference(element);
     }
     write(element.displayName);
@@ -752,7 +752,7 @@ class DartEditBuilderImpl extends EditBuilderImpl implements DartEditBuilder {
     String? nameGroupName,
     DartType? parameterType,
     String? parameterTypeGroupName,
-    ExecutableElement2? methodBeingCopied,
+    ExecutableElement? methodBeingCopied,
   }) {
     if (isStatic) {
       write(Keyword.STATIC.lexeme);
@@ -789,7 +789,7 @@ class DartEditBuilderImpl extends EditBuilderImpl implements DartEditBuilder {
     DartType? type, {
     bool addSupertypeProposals = false,
     String? groupName,
-    ExecutableElement2? methodBeingCopied,
+    ExecutableElement? methodBeingCopied,
     bool required = false,
     bool shouldWriteDynamic = false,
   }) {
@@ -822,8 +822,8 @@ class DartEditBuilderImpl extends EditBuilderImpl implements DartEditBuilder {
   }
 
   @override
-  void writeTypeParameter(TypeParameterElement2 typeParameter,
-      {ExecutableElement2? methodBeingCopied}) {
+  void writeTypeParameter(TypeParameterElement typeParameter,
+      {ExecutableElement? methodBeingCopied}) {
     write(typeParameter.name3 ?? '');
     if (typeParameter.bound != null) {
       write(' extends ');
@@ -832,8 +832,8 @@ class DartEditBuilderImpl extends EditBuilderImpl implements DartEditBuilder {
   }
 
   @override
-  void writeTypeParameters(List<TypeParameterElement2> typeParameters,
-      {ExecutableElement2? methodBeingCopied}) {
+  void writeTypeParameters(List<TypeParameterElement> typeParameters,
+      {ExecutableElement? methodBeingCopied}) {
     if (typeParameters.isNotEmpty) {
       write('<');
       writeTypeParameter(typeParameters.first,
@@ -918,7 +918,7 @@ class DartEditBuilderImpl extends EditBuilderImpl implements DartEditBuilder {
   /// written.
   ///
   /// See also [_writeType].
-  bool _canWriteType(DartType? type, {ExecutableElement2? methodBeingCopied}) {
+  bool _canWriteType(DartType? type, {ExecutableElement? methodBeingCopied}) {
     type = _getVisibleType(type, methodBeingCopied: methodBeingCopied);
 
     // If not a useful type, don't write it.
@@ -1025,7 +1025,7 @@ class DartEditBuilderImpl extends EditBuilderImpl implements DartEditBuilder {
         return namedType.name2.lexeme;
       }
       // `new prefix.ClassName()`.
-      if (importPrefix.element2 is PrefixElement2) {
+      if (importPrefix.element2 is PrefixElement) {
         return namedType.name2.lexeme;
       }
       // `new ClassName.constructorName()`.
@@ -1154,7 +1154,7 @@ class DartEditBuilderImpl extends EditBuilderImpl implements DartEditBuilder {
   /// in the case of a type parameter from a superclass), then returns the type
   /// that is locally visible. Otherwise, return `null`.
   DartType? _getVisibleType(DartType? type,
-      {ExecutableElement2? methodBeingCopied}) {
+      {ExecutableElement? methodBeingCopied}) {
     if (type is InterfaceType) {
       var element = type.element3;
       if (element.isPrivate &&
@@ -1167,7 +1167,7 @@ class DartEditBuilderImpl extends EditBuilderImpl implements DartEditBuilder {
       _initializeEnclosingElements();
       var element = type.element3;
       var enclosing = element.enclosingElement2;
-      while (enclosing is GenericFunctionTypeElement2 ||
+      while (enclosing is GenericFunctionTypeElement ||
           enclosing is FormalParameterElement) {
         enclosing = enclosing!.enclosingElement2;
       }
@@ -1199,7 +1199,7 @@ class DartEditBuilderImpl extends EditBuilderImpl implements DartEditBuilder {
   /// [element]. If there are no existing import that exports the [element], a
   /// library that exports the [element] is scheduled for import, possibly with
   /// a prefix.
-  void _writeLibraryReference(Element2 element) {
+  void _writeLibraryReference(Element element) {
     // If the element is defined in the library, then no prefix needed.
     if (_dartFileEditBuilder._isDefinedLocally(element)) {
       return;
@@ -1207,7 +1207,7 @@ class DartEditBuilderImpl extends EditBuilderImpl implements DartEditBuilder {
 
     // TODO(scheglov): We should use "methodBeingCopied" to verify that
     // we really are just copying this type parameter.
-    if (element is TypeParameterElement2) {
+    if (element is TypeParameterElement) {
       return;
     }
 
@@ -1228,9 +1228,9 @@ class DartEditBuilderImpl extends EditBuilderImpl implements DartEditBuilder {
     }
   }
 
-  void _writeSuperMemberInvocation(ExecutableElement2 element,
+  void _writeSuperMemberInvocation(ExecutableElement element,
       String memberName, List<FormalParameterElement> parameters) {
-    var isOperator = element is MethodElement2 && element.isOperator;
+    var isOperator = element is MethodElement && element.isOperator;
     write(isOperator ? ' ' : '.');
     write(memberName);
     write(isOperator ? ' ' : '(');
@@ -1258,7 +1258,7 @@ class DartEditBuilderImpl extends EditBuilderImpl implements DartEditBuilder {
   /// Causes any libraries whose elements are used by the generated code, to be
   /// imported.
   bool _writeType(DartType? type,
-      {ExecutableElement2? methodBeingCopied, bool required = false}) {
+      {ExecutableElement? methodBeingCopied, bool required = false}) {
     type = _getVisibleType(type, methodBeingCopied: methodBeingCopied);
 
     // If not a useful type, don't write it.
@@ -1382,9 +1382,9 @@ class DartEditBuilderImpl extends EditBuilderImpl implements DartEditBuilder {
   }
 
   void _writeTypeElementArguments({
-    required Element2 element,
+    required Element element,
     required List<DartType> typeArguments,
-    required ExecutableElement2? methodBeingCopied,
+    required ExecutableElement? methodBeingCopied,
   }) {
     // Ensure that the element is imported.
     _writeLibraryReference(element);
@@ -1453,7 +1453,7 @@ class DartFileEditBuilderImpl extends FileEditBuilderImpl
 
   /// A mapping of elements to pending imports that will be added to make them
   /// visible in the generated code.
-  final Map<Element2, _LibraryImport> _elementLibrariesToImport = {};
+  final Map<Element, _LibraryImport> _elementLibrariesToImport = {};
 
   /// Initializes a newly created builder to build a source file edit within the
   /// change being built by the given [changeBuilder].
@@ -1491,7 +1491,7 @@ class DartFileEditBuilderImpl extends FileEditBuilderImpl
           range, (builder) => buildEdit(builder as DartEditBuilder));
 
   @override
-  bool canWriteType(DartType? type, {ExecutableElement2? methodBeingCopied}) {
+  bool canWriteType(DartType? type, {ExecutableElement? methodBeingCopied}) {
     var builder = createEditBuilder(0, 0);
     return builder.canWriteType(type, methodBeingCopied: methodBeingCopied);
   }
@@ -1602,8 +1602,8 @@ class DartFileEditBuilderImpl extends FileEditBuilderImpl
   ///
   /// If the library [element] is declared in is inside a package's 'lib/src'
   /// directory, will try to locate a public URI to import instead.
-  Future<void> importElementLibrary(Element2 element,
-      {Map<Element2, LibraryElement2?>? resultCache}) async {
+  Future<void> importElementLibrary(Element element,
+      {Map<Element, LibraryElement?>? resultCache}) async {
     if (_isDefinedLocally(element)) {
       return;
     }
@@ -2240,7 +2240,7 @@ class DartFileEditBuilderImpl extends FileEditBuilderImpl
   /// as when the element is declared in the same library.
   ///
   /// The result may be an existing import, or one that is pending.
-  _LibraryImport? _getImportElement(Element2 element) {
+  _LibraryImport? _getImportElement(Element element) {
     for (var import
         in resolvedUnit.libraryElement2.firstFragment.libraryImports2) {
       var lookupName = element.lookupName;
@@ -2440,15 +2440,15 @@ class DartFileEditBuilderImpl extends FileEditBuilderImpl
   }
 
   /// Returns whether the [element] is defined in the target library.
-  bool _isDefinedLocally(Element2 element) {
+  bool _isDefinedLocally(Element element) {
     return element.library2 == resolvedUnit.libraryElement2;
   }
 
-  /// Removes any pending imports (for [Element2]s) that are no longer necessary
+  /// Removes any pending imports (for [Element]s) that are no longer necessary
   /// because the newly-added [newImport] for [newLibrary] also provides those
-  /// [Element2]s.
+  /// [Element]s.
   void _removeUnnecessaryPendingElementImports(
-      _LibraryImport newImport, LibraryElement2? newLibrary) {
+      _LibraryImport newImport, LibraryElement? newLibrary) {
     var elementLibrariesToImport =
         (libraryChangeBuilder ?? this)._elementLibrariesToImport;
 
@@ -2564,8 +2564,8 @@ class ImportLibraryElementResultImpl implements ImportLibraryElementResult {
 }
 
 class _EnclosingElementFinder {
-  ClassElement2? enclosingClass;
-  ExecutableElement2? enclosingExecutable;
+  ClassElement? enclosingClass;
+  ExecutableElement? enclosingExecutable;
 
   _EnclosingElementFinder();
 
@@ -2758,10 +2758,10 @@ class _LibraryImport implements Comparable<_LibraryImport> {
   final List<List<String>> hiddenNames;
 
   /// Whether this import was added explicitly, either because it already exists
-  /// or a caller requested it was added without the context of an [Element2].
+  /// or a caller requested it was added without the context of an [Element].
   ///
   /// If `false`, this is a pending import that only currently exists to satisfy
-  /// [Element2] imports and could be removed if subsequent imports also provide
+  /// [Element] imports and could be removed if subsequent imports also provide
   /// that element. If an explicit call is made to import this library, this
   /// flag may change from `false` to `true`.
   bool isExplicitlyImported;
diff --git a/pkg/analyzer_plugin/lib/src/utilities/completion/completion_target.dart b/pkg/analyzer_plugin/lib/src/utilities/completion/completion_target.dart
index c96430361cb..3ecb8948f7e 100644
--- a/pkg/analyzer_plugin/lib/src/utilities/completion/completion_target.dart
+++ b/pkg/analyzer_plugin/lib/src/utilities/completion/completion_target.dart
@@ -105,8 +105,8 @@ class CompletionTarget {
   final int? argIndex;
 
   /// If the target is an argument in an [ArgumentList], then this is the
-  /// invoked [ExecutableElement2], otherwise this is `null`.
-  ExecutableElement2? _executableElement;
+  /// invoked [ExecutableElement], otherwise this is `null`.
+  ExecutableElement? _executableElement;
 
   /// If the target is in an argument list of a [FunctionExpressionInvocation],
   /// then this is the static type of the function being invoked, otherwise this
@@ -115,11 +115,11 @@ class CompletionTarget {
 
   /// If the target is an argument in an [ArgumentList], then this is the
   /// corresponding [FormalParameterElement] in the invoked
-  /// [ExecutableElement2], otherwise this is `null`.
+  /// [ExecutableElement], otherwise this is `null`.
   FormalParameterElement? _parameterElement;
 
-  /// The enclosing [InterfaceElement2], or `null` if not in a class.
-  late final InterfaceElement2? enclosingInterfaceElement = () {
+  /// The enclosing [InterfaceElement], or `null` if not in a class.
+  late final InterfaceElement? enclosingInterfaceElement = () {
     var unitMember =
         containingNode.thisOrAncestorOfType<CompilationUnitMember>();
     if (unitMember is ClassDeclaration) {
@@ -131,8 +131,8 @@ class CompletionTarget {
     }
   }();
 
-  /// The enclosing [ExtensionElement2], or `null` if not in an extension.
-  late final ExtensionElement2? enclosingExtensionElement = containingNode
+  /// The enclosing [ExtensionElement], or `null` if not in an extension.
+  late final ExtensionElement? enclosingExtensionElement = containingNode
       .thisOrAncestorOfType<ExtensionDeclaration>()
       ?.declaredFragment
       ?.element;
@@ -301,8 +301,8 @@ class CompletionTarget {
   }
 
   /// If the target is an argument in an argument list, and the invocation is
-  /// resolved, return the invoked [ExecutableElement2].
-  ExecutableElement2? get executableElement {
+  /// resolved, return the invoked [ExecutableElement].
+  ExecutableElement? get executableElement {
     if (_executableElement == null) {
       AstNode? argumentList = containingNode;
       if (argumentList is NamedExpression) {
@@ -314,7 +314,7 @@ class CompletionTarget {
 
       var invocation = argumentList.parent;
 
-      Element2? executable;
+      Element? executable;
       if (invocation is Annotation) {
         executable = invocation.element2;
       } else if (invocation is EnumConstantArguments) {
@@ -333,7 +333,7 @@ class CompletionTarget {
         executable = invocation.element;
       }
 
-      if (executable is ExecutableElement2) {
+      if (executable is ExecutableElement) {
         _executableElement = executable;
       }
     }
diff --git a/pkg/analyzer_plugin/lib/src/utilities/completion/element_suggestion_builder.dart b/pkg/analyzer_plugin/lib/src/utilities/completion/element_suggestion_builder.dart
index 0d279fdffc5..48cb892e4d8 100644
--- a/pkg/analyzer_plugin/lib/src/utilities/completion/element_suggestion_builder.dart
+++ b/pkg/analyzer_plugin/lib/src/utilities/completion/element_suggestion_builder.dart
@@ -24,7 +24,7 @@ mixin ElementSuggestionBuilder {
       <String, CompletionSuggestion>{};
 
   /// Return the library in which the completion is requested.
-  LibraryElement2? get containingLibrary;
+  LibraryElement? get containingLibrary;
 
   /// Return the kind of suggestions that should be built.
   CompletionSuggestionKind? get kind;
@@ -33,7 +33,7 @@ mixin ElementSuggestionBuilder {
   ResourceProvider? get resourceProvider;
 
   /// Add a suggestion based upon the given element.
-  void addSuggestion(Element2 element,
+  void addSuggestion(Element element,
       {String? prefix, int relevance = DART_RELEVANCE_DEFAULT}) {
     if (element.isPrivate) {
       if (element.library2 != containingLibrary) {
@@ -55,7 +55,7 @@ mixin ElementSuggestionBuilder {
     var suggestion = builder.forElement(element,
         completion: completion, kind: kind, relevance: relevance);
     if (suggestion != null) {
-      if (element.isSynthetic && element is PropertyAccessorElement2) {
+      if (element.isSynthetic && element is PropertyAccessorElement) {
         var cacheKey = element.name3;
         if (cacheKey != null) {
           var existingSuggestion = _syntheticMap[cacheKey];
@@ -64,7 +64,7 @@ mixin ElementSuggestionBuilder {
           if (existingSuggestion != null) {
             var getter =
                 element is GetterElement ? suggestion : existingSuggestion;
-            var elemKind = element.enclosingElement2 is ClassElement2
+            var elemKind = element.enclosingElement2 is ClassElement
                 ? protocol.ElementKind.FIELD
                 : protocol.ElementKind.TOP_LEVEL_VARIABLE;
             existingSuggestion.element = protocol.Element(
diff --git a/pkg/analyzer_plugin/lib/src/utilities/completion/optype.dart b/pkg/analyzer_plugin/lib/src/utilities/completion/optype.dart
index 070de46b0cd..e0d2e5bab1a 100644
--- a/pkg/analyzer_plugin/lib/src/utilities/completion/optype.dart
+++ b/pkg/analyzer_plugin/lib/src/utilities/completion/optype.dart
@@ -217,17 +217,17 @@ class _OpTypeAstVisitor extends GeneralizingAstVisitor<void> {
     var parent = node.parent;
     List<FormalParameterElement>? parameters;
     if (parent is InstanceCreationExpression) {
-      Element2? constructor;
+      Element? constructor;
       var name = parent.constructorName.name;
       if (name != null) {
         constructor = name.element;
       } else {
         var classElem = parent.constructorName.type.element2;
-        if (classElem is ClassElement2) {
+        if (classElem is ClassElement) {
           constructor = classElem.unnamedConstructor2;
         }
       }
-      if (constructor is ConstructorElement2) {
+      if (constructor is ConstructorElement) {
         parameters = constructor.formalParameters;
       } else if (constructor == null) {
         // If unresolved, then include named arguments
@@ -237,7 +237,7 @@ class _OpTypeAstVisitor extends GeneralizingAstVisitor<void> {
       var function = parent.function;
       if (function is SimpleIdentifier) {
         var elem = function.element;
-        if (elem is FunctionTypedElement2) {
+        if (elem is FunctionTypedElement) {
           parameters = elem.formalParameters;
         } else if (elem == null) {
           // If unresolved, then include named arguments
@@ -250,7 +250,7 @@ class _OpTypeAstVisitor extends GeneralizingAstVisitor<void> {
       parameters = parent.element?.formalParameters;
     } else if (parent is Annotation) {
       var constructor = parent.element2;
-      if (constructor is ConstructorElement2) {
+      if (constructor is ConstructorElement) {
         parameters = constructor.formalParameters;
       } else if (constructor == null) {
         // If unresolved, then include named arguments
@@ -1153,7 +1153,7 @@ class _OpTypeAstVisitor extends GeneralizingAstVisitor<void> {
       } else {
         var argKind = 'unnamed';
         var method = node.methodName.element;
-        if (method is MethodElement2 &&
+        if (method is MethodElement &&
             method.formalParameters.isNotEmpty &&
             method.formalParameters[0].isNamed) {
           argKind = 'named';
@@ -1189,7 +1189,7 @@ class _OpTypeAstVisitor extends GeneralizingAstVisitor<void> {
 
       // Check for named parameters in constructor calls.
       var grandparent = node.parent?.parent;
-      Element2? element;
+      Element? element;
       if (grandparent is ConstructorReferenceNode) {
         element = grandparent.element;
       } else if (grandparent is InstanceCreationExpression) {
@@ -1197,10 +1197,10 @@ class _OpTypeAstVisitor extends GeneralizingAstVisitor<void> {
       } else if (grandparent is MethodInvocation) {
         element = grandparent.methodName.element;
       }
-      if (element is ExecutableElement2) {
+      if (element is ExecutableElement) {
         var parameters = element.formalParameters;
         var parameterElement = parameters.firstWhereOrNull((e) {
-          if (e is FieldFormalParameterElement2) {
+          if (e is FieldFormalParameterElement) {
             return e.field2?.name3 == node.name.label.name;
           }
           return e.isNamed && e.name3 == node.name.label.name;
diff --git a/pkg/analyzer_plugin/lib/src/utilities/completion/suggestion_builder.dart b/pkg/analyzer_plugin/lib/src/utilities/completion/suggestion_builder.dart
index d878c5ad30b..17787ddfd45 100644
--- a/pkg/analyzer_plugin/lib/src/utilities/completion/suggestion_builder.dart
+++ b/pkg/analyzer_plugin/lib/src/utilities/completion/suggestion_builder.dart
@@ -26,7 +26,7 @@ class SuggestionBuilderImpl implements SuggestionBuilder {
   /// [requiredParams] and [namedParams].
   void addDefaultArgDetails(
       CompletionSuggestion suggestion,
-      Element2 element,
+      Element element,
       Iterable<FormalParameterElement> requiredParams,
       Iterable<FormalParameterElement> namedParams) {
     // Copied from analysis_server/lib/src/services/completion/dart/suggestion_builder.dart
@@ -65,7 +65,7 @@ class SuggestionBuilderImpl implements SuggestionBuilder {
   }
 
   @override
-  CompletionSuggestion? forElement(Element2? element,
+  CompletionSuggestion? forElement(Element? element,
       {String? completion,
       CompletionSuggestionKind? kind,
       int relevance = DART_RELEVANCE_DEFAULT}) {
@@ -73,7 +73,7 @@ class SuggestionBuilderImpl implements SuggestionBuilder {
     if (element == null) {
       return null;
     }
-    if (element is MethodElement2 && element.isOperator) {
+    if (element is MethodElement && element.isOperator) {
       // Do not include operators in suggestions
       return null;
     }
@@ -101,11 +101,11 @@ class SuggestionBuilderImpl implements SuggestionBuilder {
 
     suggestion.element = converter.convertElement(element);
     var enclosingElement = element.enclosingElement2;
-    if (enclosingElement is ClassElement2) {
+    if (enclosingElement is ClassElement) {
       suggestion.declaringType = enclosingElement.displayName;
     }
     suggestion.returnType = getReturnTypeString(element);
-    if (element is ExecutableElement2 && element is! PropertyAccessorElement2) {
+    if (element is ExecutableElement && element is! PropertyAccessorElement) {
       suggestion.parameterNames = element.formalParameters
           .map((parameter) => parameter.name3 ?? '')
           .toList();
@@ -127,20 +127,20 @@ class SuggestionBuilderImpl implements SuggestionBuilder {
     return suggestion;
   }
 
-  String? getReturnTypeString(Element2 element) {
+  String? getReturnTypeString(Element element) {
     // Copied from analysis_server/lib/src/protocol_server.dart
-    if (element is ExecutableElement2) {
+    if (element is ExecutableElement) {
       if (element.kind == ElementKind.SETTER) {
         return null;
       } else {
         return element.returnType.getDisplayString();
       }
-    } else if (element is VariableElement2) {
+    } else if (element is VariableElement) {
       var type = element.type;
       return type.getDisplayString();
-    } else if (element is TypeAliasElement2) {
+    } else if (element is TypeAliasElement) {
       var aliasedElement = element.aliasedElement2;
-      if (aliasedElement is GenericFunctionTypeElement2) {
+      if (aliasedElement is GenericFunctionTypeElement) {
         var returnType = aliasedElement.returnType;
         return returnType.getDisplayString();
       } else {
diff --git a/pkg/analyzer_plugin/lib/src/utilities/navigation/navigation_dart.dart b/pkg/analyzer_plugin/lib/src/utilities/navigation/navigation_dart.dart
index b49a2f97cc4..51cd2b22894 100644
--- a/pkg/analyzer_plugin/lib/src/utilities/navigation/navigation_dart.dart
+++ b/pkg/analyzer_plugin/lib/src/utilities/navigation/navigation_dart.dart
@@ -126,7 +126,7 @@ class _DartNavigationCollector {
     );
   }
 
-  void _addRegionForElement(SyntacticEntity? nodeOrToken, Element2? element) {
+  void _addRegionForElement(SyntacticEntity? nodeOrToken, Element? element) {
     _addRegionForFragment(nodeOrToken, element?.nonSynthetic2.firstFragment);
   }
 
@@ -152,7 +152,7 @@ class _DartNavigationCollector {
     if (fragment.element == DynamicElementImpl2.instance) {
       return;
     }
-    if (fragment.element is MultiplyDefinedElement2) {
+    if (fragment.element is MultiplyDefinedElement) {
       return;
     }
 
@@ -231,14 +231,14 @@ class _DartNavigationComputerVisitor extends RecursiveAstVisitor<void> {
   @override
   void visitAnnotation(Annotation node) {
     var element = node.element2;
-    if (element is ConstructorElement2 && element.isSynthetic) {
+    if (element is ConstructorElement && element.isSynthetic) {
       element = element.enclosingElement2;
     }
     var name = node.name;
     if (name is PrefixedIdentifier) {
       // use constructor in: @PrefixClass.constructorName
       var prefixElement = name.prefix.element;
-      if (prefixElement is ClassElement2) {
+      if (prefixElement is ClassElement) {
         prefixElement = element;
       }
       computer._addRegionForElement(name.prefix, prefixElement);
@@ -335,7 +335,7 @@ class _DartNavigationComputerVisitor extends RecursiveAstVisitor<void> {
 
   @override
   void visitConstructorName(ConstructorName node) {
-    Element2? element = node.element;
+    Element? element = node.element;
     if (element == null) {
       return;
     }
@@ -376,7 +376,7 @@ class _DartNavigationComputerVisitor extends RecursiveAstVisitor<void> {
 
   @override
   void visitDeclaredVariablePattern(DeclaredVariablePattern node) {
-    if (node.declaredElement2 case BindPatternVariableElement2(:var join2?)) {
+    if (node.declaredElement2 case BindPatternVariableElement(:var join2?)) {
       for (var variable in join2.variables2) {
         computer._addRegionForElement(node.name, variable);
       }
@@ -545,7 +545,7 @@ class _DartNavigationComputerVisitor extends RecursiveAstVisitor<void> {
   void visitRedirectingConstructorInvocation(
     RedirectingConstructorInvocation node,
   ) {
-    Element2? element = node.element;
+    Element? element = node.element;
     if (element != null && element.isSynthetic) {
       element = element.enclosingElement2;
     }
@@ -579,7 +579,7 @@ class _DartNavigationComputerVisitor extends RecursiveAstVisitor<void> {
   @override
   void visitSimpleIdentifier(SimpleIdentifier node) {
     var element = node.writeOrReadElement2;
-    if (element case PrefixElement2(:var fragments, :var name3)) {
+    if (element case PrefixElement(:var fragments, :var name3)) {
       for (var fragment in fragments) {
         computer._addRegionForFragmentRange(
           node.offset,
@@ -587,7 +587,7 @@ class _DartNavigationComputerVisitor extends RecursiveAstVisitor<void> {
           fragment,
         );
       }
-    } else if (element case JoinPatternVariableElement2(:var variables2)) {
+    } else if (element case JoinPatternVariableElement(:var variables2)) {
       for (var variable in variables2) {
         computer._addRegionForElement(node, variable);
       }
@@ -598,7 +598,7 @@ class _DartNavigationComputerVisitor extends RecursiveAstVisitor<void> {
 
   @override
   void visitSuperConstructorInvocation(SuperConstructorInvocation node) {
-    Element2? element = node.element;
+    Element? element = node.element;
     if (element != null && element.isSynthetic) {
       element = element.enclosingElement2;
     }
@@ -640,7 +640,7 @@ class _DartNavigationComputerVisitor extends RecursiveAstVisitor<void> {
     /// Return the element for the type inferred for each of the variables in
     /// the given list of [variables], or `null` if not all variable have the
     /// same inferred type.
-    Element2? getCommonElement(List<VariableDeclaration> variables) {
+    Element? getCommonElement(List<VariableDeclaration> variables) {
       var firstType = variables[0].declaredFragment?.element.type;
       if (firstType is! InterfaceType) {
         return null;
diff --git a/pkg/analyzer_plugin/lib/src/utilities/visitors/local_declaration_visitor.dart b/pkg/analyzer_plugin/lib/src/utilities/visitors/local_declaration_visitor.dart
index f0368069d3f..9fb34b700d4 100644
--- a/pkg/analyzer_plugin/lib/src/utilities/visitors/local_declaration_visitor.dart
+++ b/pkg/analyzer_plugin/lib/src/utilities/visitors/local_declaration_visitor.dart
@@ -38,14 +38,14 @@ abstract class LocalDeclarationVisitor extends UnifyingAstVisitor {
   void declaredLocalVar(
     Token name,
     TypeAnnotation? type,
-    LocalVariableElement2 declaredElement,
+    LocalVariableElement declaredElement,
   ) {}
 
   void declaredMethod(MethodDeclaration declaration) {}
 
   void declaredMixin(MixinDeclaration declaration) {}
 
-  void declaredParam(Token name, Element2? element, TypeAnnotation? type) {}
+  void declaredParam(Token name, Element? element, TypeAnnotation? type) {}
 
   void declaredTopLevelVar(
       VariableDeclarationList varList, VariableDeclaration varDecl) {}
@@ -139,7 +139,7 @@ abstract class LocalDeclarationVisitor extends UnifyingAstVisitor {
       var varList = forLoopParts.variables;
       for (var varDecl in varList.variables) {
         declaredLocalVar(varDecl.name, varList.type,
-            varDecl.declaredElement2 as LocalVariableElement2);
+            varDecl.declaredElement2 as LocalVariableElement);
       }
     }
     visitNode(node);
@@ -156,7 +156,7 @@ abstract class LocalDeclarationVisitor extends UnifyingAstVisitor {
       var varList = forLoopParts.variables;
       for (var varDecl in varList.variables) {
         declaredLocalVar(varDecl.name, varList.type,
-            varDecl.declaredElement2 as LocalVariableElement2);
+            varDecl.declaredElement2 as LocalVariableElement);
       }
     }
     visitNode(node);
@@ -448,7 +448,7 @@ abstract class LocalDeclarationVisitor extends UnifyingAstVisitor {
           for (var varDecl in varList.variables) {
             if (varDecl.end < offset) {
               declaredLocalVar(varDecl.name, varList.type,
-                  varDecl.declaredElement2 as LocalVariableElement2);
+                  varDecl.declaredElement2 as LocalVariableElement);
             }
           }
         } else if (stmt is FunctionDeclarationStatement) {
diff --git a/pkg/analyzer_plugin/lib/utilities/analyzer_converter.dart b/pkg/analyzer_plugin/lib/utilities/analyzer_converter.dart
index f37d5de4a90..009723ddd32 100644
--- a/pkg/analyzer_plugin/lib/utilities/analyzer_converter.dart
+++ b/pkg/analyzer_plugin/lib/utilities/analyzer_converter.dart
@@ -123,7 +123,7 @@ class AnalyzerConverter {
             endLine: endLine, endColumn: endColumn));
   }
 
-  Element convertElement(analyzer.Element2 element) {
+  Element convertElement(analyzer.Element element) {
     var kind = convertElementToElementKind(element);
     var name = getElementDisplayName(element);
     var elementTypeParameters = _getTypeParametersString(element);
@@ -160,14 +160,14 @@ class AnalyzerConverter {
   plugin.ElementKind convertElementKind(analyzer.ElementKind kind) =>
       kind.toPluginElementKind;
 
-  /// Return an [ElementKind] corresponding to the given [analyzer.Element2].
-  ElementKind convertElementToElementKind(analyzer.Element2 element) {
-    if (element is analyzer.EnumElement2) {
+  /// Return an [ElementKind] corresponding to the given [analyzer.Element].
+  ElementKind convertElementToElementKind(analyzer.Element element) {
+    if (element is analyzer.EnumElement) {
       return ElementKind.ENUM;
-    } else if (element is analyzer.MixinElement2) {
+    } else if (element is analyzer.MixinElement) {
       return ElementKind.MIXIN;
     }
-    if (element is analyzer.FieldElement2 && element.isEnumConstant) {
+    if (element is analyzer.FieldElement && element.isEnumConstant) {
       return ElementKind.ENUM_CONSTANT;
     }
     return convertElementKind(element.kind);
@@ -184,7 +184,7 @@ class AnalyzerConverter {
   plugin.AnalysisErrorType convertErrorType(analyzer.ErrorType type) =>
       plugin.AnalysisErrorType.values.byName(type.name);
 
-  String getElementDisplayName(analyzer.Element2 element) {
+  String getElementDisplayName(analyzer.Element element) {
     if (element is analyzer.LibraryFragment) {
       return path
           .basename((element as analyzer.LibraryFragment).source.fullName);
@@ -193,8 +193,8 @@ class AnalyzerConverter {
     }
   }
 
-  /// Create a Location based on an [analyzer.Element2].
-  Location? newLocation_fromElement(analyzer.Element2? element) {
+  /// Create a Location based on an [analyzer.Element].
+  Location? newLocation_fromElement(analyzer.Element? element) {
     if (element == null) {
       return null;
     }
@@ -209,25 +209,25 @@ class AnalyzerConverter {
     return _locationForArgs(fragment, range);
   }
 
-  String? _getAliasedTypeString(analyzer.Element2 element) {
-    if (element is analyzer.TypeAliasElement2) {
+  String? _getAliasedTypeString(analyzer.Element element) {
+    if (element is analyzer.TypeAliasElement) {
       var aliasedType = element.aliasedType;
       return aliasedType.getDisplayString();
     }
     return null;
   }
 
-  String? _getParametersString(analyzer.Element2 element) {
+  String? _getParametersString(analyzer.Element element) {
     // TODO(scheglov): expose the corresponding feature from ExecutableElement
     List<analyzer.FormalParameterElement> parameters;
-    if (element is analyzer.ExecutableElement2) {
+    if (element is analyzer.ExecutableElement) {
       // valid getters don't have parameters
       if (element.kind == analyzer.ElementKind.GETTER &&
           element.formalParameters.isEmpty) {
         return null;
       }
       parameters = element.formalParameters.toList();
-    } else if (element is analyzer.TypeAliasElement2) {
+    } else if (element is analyzer.TypeAliasElement) {
       var aliasedType = element.aliasedType;
       if (aliasedType is FunctionType) {
         parameters = aliasedType.formalParameters.toList();
@@ -266,17 +266,17 @@ class AnalyzerConverter {
     return '($sb)';
   }
 
-  String? _getReturnTypeString(analyzer.Element2 element) {
-    if (element is analyzer.ExecutableElement2) {
+  String? _getReturnTypeString(analyzer.Element element) {
+    if (element is analyzer.ExecutableElement) {
       if (element.kind == analyzer.ElementKind.SETTER) {
         return null;
       } else {
         return element.returnType.getDisplayString();
       }
-    } else if (element is analyzer.VariableElement2) {
+    } else if (element is analyzer.VariableElement) {
       var type = element.type;
       return type.getDisplayString();
-    } else if (element is analyzer.TypeAliasElement2) {
+    } else if (element is analyzer.TypeAliasElement) {
       var aliasedType = element.aliasedType;
       if (aliasedType is FunctionType) {
         var returnType = aliasedType.returnType;
@@ -286,11 +286,11 @@ class AnalyzerConverter {
     return null;
   }
 
-  String? _getTypeParametersString(analyzer.Element2 element) {
-    List<analyzer.TypeParameterElement2>? typeParameters;
-    if (element is analyzer.InterfaceElement2) {
+  String? _getTypeParametersString(analyzer.Element element) {
+    List<analyzer.TypeParameterElement>? typeParameters;
+    if (element is analyzer.InterfaceElement) {
       typeParameters = element.typeParameters2;
-    } else if (element is analyzer.TypeAliasElement2) {
+    } else if (element is analyzer.TypeAliasElement) {
       typeParameters = element.typeParameters2;
     }
     if (typeParameters == null || typeParameters.isEmpty) {
@@ -299,41 +299,41 @@ class AnalyzerConverter {
     return '<${typeParameters.join(', ')}>';
   }
 
-  bool _isAbstract(analyzer.Element2 element) {
-    if (element is analyzer.ClassElement2) {
+  bool _isAbstract(analyzer.Element element) {
+    if (element is analyzer.ClassElement) {
       return element.isAbstract;
     }
-    if (element is analyzer.MethodElement2) {
+    if (element is analyzer.MethodElement) {
       return element.isAbstract;
     }
-    if (element is analyzer.MixinElement2) {
+    if (element is analyzer.MixinElement) {
       return true;
     }
     return false;
   }
 
-  bool _isConst(analyzer.Element2 element) {
-    if (element is analyzer.ConstructorElement2) {
+  bool _isConst(analyzer.Element element) {
+    if (element is analyzer.ConstructorElement) {
       return element.isConst;
     }
-    if (element is analyzer.VariableElement2) {
+    if (element is analyzer.VariableElement) {
       return element.isConst;
     }
     return false;
   }
 
-  bool _isFinal(analyzer.Element2 element) {
-    if (element is analyzer.VariableElement2) {
+  bool _isFinal(analyzer.Element element) {
+    if (element is analyzer.VariableElement) {
       return element.isFinal;
     }
     return false;
   }
 
-  bool _isStatic(analyzer.Element2 element) {
-    if (element is analyzer.ExecutableElement2) {
+  bool _isStatic(analyzer.Element element) {
+    if (element is analyzer.ExecutableElement) {
       return element.isStatic;
     }
-    if (element is analyzer.PropertyInducingElement2) {
+    if (element is analyzer.PropertyInducingElement) {
       return element.isStatic;
     }
     return false;
diff --git a/pkg/analyzer_plugin/lib/utilities/change_builder/change_builder_dart.dart b/pkg/analyzer_plugin/lib/utilities/change_builder/change_builder_dart.dart
index 0ee81b55a3d..ba475e782b1 100644
--- a/pkg/analyzer_plugin/lib/utilities/change_builder/change_builder_dart.dart
+++ b/pkg/analyzer_plugin/lib/utilities/change_builder/change_builder_dart.dart
@@ -30,7 +30,7 @@ abstract class DartEditBuilder implements EditBuilder {
   /// types.
   ///
   /// The logic is the same as the one used in [writeType].
-  bool canWriteType(DartType? type, {ExecutableElement2? methodBeingCopied});
+  bool canWriteType(DartType? type, {ExecutableElement? methodBeingCopied});
 
   /// Returns the indentation with the given [level].
   String getIndent(int level);
@@ -132,7 +132,7 @@ abstract class DartEditBuilder implements EditBuilder {
   void writeFormalParameter(String name,
       {bool isCovariant,
       bool isRequiredNamed,
-      ExecutableElement2? methodBeingCopied,
+      ExecutableElement? methodBeingCopied,
       String? nameGroupName,
       DartType? type,
       String? typeGroupName,
@@ -147,7 +147,7 @@ abstract class DartEditBuilder implements EditBuilder {
   ///
   /// If [requiredTypes] is `true`, then the types are always written.
   void writeFormalParameters(Iterable<FormalParameterElement> parameters,
-      {ExecutableElement2? methodBeingCopied,
+      {ExecutableElement? methodBeingCopied,
       bool includeDefaultValues = true,
       bool requiredTypes});
 
@@ -241,7 +241,7 @@ abstract class DartEditBuilder implements EditBuilder {
   /// If [setSelection] is `true`, then the cursor will be placed in the body of
   /// the override.
   void writeOverride(
-    ExecutableElement2 element, {
+    ExecutableElement element, {
     StringBuffer? displayTextBuffer,
     bool invokeSuper = false,
     bool setSelection = true,
@@ -272,7 +272,7 @@ abstract class DartEditBuilder implements EditBuilder {
   void writeParameter(String name,
       {bool isCovariant,
       bool isRequiredNamed,
-      ExecutableElement2? methodBeingCopied,
+      ExecutableElement? methodBeingCopied,
       String? nameGroupName,
       DartType? type,
       String? typeGroupName,
@@ -289,7 +289,7 @@ abstract class DartEditBuilder implements EditBuilder {
     Expression argument,
     int index,
     Set<String> usedNames, {
-    ExecutableElement2? methodBeingCopied,
+    ExecutableElement? methodBeingCopied,
   });
 
   /// Writes the code for a list of parameters that would match the given list
@@ -298,14 +298,14 @@ abstract class DartEditBuilder implements EditBuilder {
   /// The surrounding parentheses are *not* written.
   void writeParametersMatchingArguments(
     ArgumentList arguments, {
-    ExecutableElement2? methodBeingCopied,
+    ExecutableElement? methodBeingCopied,
   });
 
   /// Writes the code that references the [element].
   ///
   /// If the [element] is a top-level element that has not been imported into
   /// the current library, imports will be updated.
-  void writeReference(Element2 element);
+  void writeReference(Element element);
 
   /// Writes the code for a declaration of a setter with the given [name].
   ///
@@ -324,7 +324,7 @@ abstract class DartEditBuilder implements EditBuilder {
     String? nameGroupName,
     DartType? parameterType,
     String? parameterTypeGroupName,
-    ExecutableElement2? methodBeingCopied,
+    ExecutableElement? methodBeingCopied,
   });
 
   /// Writes the code for a type annotation for the given [type].
@@ -351,7 +351,7 @@ abstract class DartEditBuilder implements EditBuilder {
     DartType? type, {
     bool addSupertypeProposals = false,
     String? groupName,
-    ExecutableElement2? methodBeingCopied,
+    ExecutableElement? methodBeingCopied,
     bool required = false,
     bool shouldWriteDynamic = false,
   });
@@ -363,8 +363,8 @@ abstract class DartEditBuilder implements EditBuilder {
   /// If a [methodBeingCopied] is provided, then type parameters defined by that
   /// method are assumed to be part of what is being written and hence valid
   /// types.
-  void writeTypeParameter(TypeParameterElement2 typeParameter,
-      {ExecutableElement2? methodBeingCopied});
+  void writeTypeParameter(TypeParameterElement typeParameter,
+      {ExecutableElement? methodBeingCopied});
 
   /// Writes the code to declare the given list of [typeParameters]. The
   /// enclosing angle brackets are automatically written.
@@ -372,8 +372,8 @@ abstract class DartEditBuilder implements EditBuilder {
   /// If a [methodBeingCopied] is provided, then type parameters defined by that
   /// method are assumed to be part of what is being written and hence valid
   /// types.
-  void writeTypeParameters(List<TypeParameterElement2> typeParameters,
-      {ExecutableElement2? methodBeingCopied});
+  void writeTypeParameters(List<TypeParameterElement> typeParameters,
+      {ExecutableElement? methodBeingCopied});
 
   /// Writes the code for a comma-separated list of [types], optionally prefixed
   /// by a [prefix].
@@ -420,7 +420,7 @@ abstract class DartFileEditBuilder implements FileEditBuilder {
   /// If a [methodBeingCopied] is provided, then type parameters defined by that
   /// method are assumed to be part of what is being written and hence valid
   /// types.
-  bool canWriteType(DartType? type, {ExecutableElement2? methodBeingCopied});
+  bool canWriteType(DartType? type, {ExecutableElement? methodBeingCopied});
 
   /// Creates one or more edits that will convert the given function [body] from
   /// being synchronous to be asynchronous. This includes adding the `async`
diff --git a/pkg/analyzer_plugin/lib/utilities/completion/inherited_reference_contributor.dart b/pkg/analyzer_plugin/lib/utilities/completion/inherited_reference_contributor.dart
index 44c16b2d215..11980022567 100644
--- a/pkg/analyzer_plugin/lib/utilities/completion/inherited_reference_contributor.dart
+++ b/pkg/analyzer_plugin/lib/utilities/completion/inherited_reference_contributor.dart
@@ -20,7 +20,7 @@ class InheritedReferenceContributor
     with ElementSuggestionBuilder
     implements CompletionContributor {
   @override
-  LibraryElement2? containingLibrary;
+  LibraryElement? containingLibrary;
 
   @override
   CompletionSuggestionKind? kind;
@@ -53,7 +53,7 @@ class InheritedReferenceContributor
   Future<void> computeSuggestionsForClass(
     DartCompletionRequest request,
     CompletionCollector collector,
-    ClassElement2? classElement, {
+    ClassElement? classElement, {
     AstNode? entryPoint,
     bool skipChildClass = true,
     CompletionTarget? target,
@@ -105,7 +105,7 @@ class InheritedReferenceContributor
   }
 
   void _computeSuggestionsForClass(CompletionCollector collector,
-      CompletionTarget target, ClassElement2 classElement, OpType optype,
+      CompletionTarget target, ClassElement classElement, OpType optype,
       {bool skipChildClass = true}) {
     var isFunctionalArgument = target.isFunctionalArgument();
     kind = isFunctionalArgument
diff --git a/pkg/analyzer_plugin/lib/utilities/completion/suggestion_builder.dart b/pkg/analyzer_plugin/lib/utilities/completion/suggestion_builder.dart
index deb3035377f..2c8531c09ee 100644
--- a/pkg/analyzer_plugin/lib/utilities/completion/suggestion_builder.dart
+++ b/pkg/analyzer_plugin/lib/utilities/completion/suggestion_builder.dart
@@ -10,7 +10,7 @@ import 'package:analyzer_plugin/utilities/completion/relevance.dart';
 abstract class SuggestionBuilder {
   /// Return a suggestion based on the given [element], or `null` if a
   /// suggestion is not appropriate for the given element.
-  CompletionSuggestion? forElement(Element2 element,
+  CompletionSuggestion? forElement(Element element,
       {String? completion,
       CompletionSuggestionKind kind = CompletionSuggestionKind.INVOCATION,
       int relevance = DART_RELEVANCE_DEFAULT});
diff --git a/pkg/analyzer_plugin/lib/utilities/completion/type_member_contributor.dart b/pkg/analyzer_plugin/lib/utilities/completion/type_member_contributor.dart
index 0b04442c54e..1301bb94c2d 100644
--- a/pkg/analyzer_plugin/lib/utilities/completion/type_member_contributor.dart
+++ b/pkg/analyzer_plugin/lib/utilities/completion/type_member_contributor.dart
@@ -59,15 +59,15 @@ class TypeMemberContributor implements CompletionContributor {
   void _computeSuggestions(
       DartCompletionRequest request,
       CompletionCollector collector,
-      LibraryElement2 containingLibrary,
+      LibraryElement containingLibrary,
       Expression expression) {
     if (expression is Identifier) {
       var element = expression.element;
-      if (element is ClassElement2) {
+      if (element is ClassElement) {
         // Suggestions provided by StaticMemberContributor
         return;
       }
-      if (element is PrefixElement2) {
+      if (element is PrefixElement) {
         // Suggestions provided by LibraryMemberContributor
         return;
       }
@@ -80,11 +80,11 @@ class TypeMemberContributor implements CompletionContributor {
       // then attempt to get a better type from the element
       if (expression is Identifier) {
         var elem = expression.element;
-        if (elem is FunctionTypedElement2) {
+        if (elem is FunctionTypedElement) {
           type = elem.returnType;
         } else if (elem is FormalParameterElement) {
           type = elem.type;
-        } else if (elem is LocalVariableElement2) {
+        } else if (elem is LocalVariableElement) {
           type = elem.type;
         }
         if ((type == null || type is DynamicType) &&
@@ -210,7 +210,7 @@ class _LocalBestTypeVisitor extends LocalDeclarationVisitor {
   void declaredLocalVar(
     Token name,
     TypeAnnotation? type,
-    LocalVariableElement2 declaredElement,
+    LocalVariableElement declaredElement,
   ) {
     if (name.lexeme == targetName) {
       typeFound = declaredElement.type;
@@ -230,7 +230,7 @@ class _LocalBestTypeVisitor extends LocalDeclarationVisitor {
   }
 
   @override
-  void declaredParam(Token name, Element2? element, TypeAnnotation? type) {
+  void declaredParam(Token name, Element? element, TypeAnnotation? type) {
     if (name.lexeme == targetName) {
       // Type provided by the element in computeFull above
       finished();
@@ -273,7 +273,7 @@ class _SuggestionBuilder {
   final CompletionCollector collector;
 
   /// The library containing the unit in which the completion is requested.
-  final LibraryElement2 containingLibrary;
+  final LibraryElement containingLibrary;
 
   /// Map indicating, for each possible completion identifier, whether we have
   /// already generated completions for a getter, setter, or both. The "both"
@@ -343,7 +343,7 @@ class _SuggestionBuilder {
 
   /// Add a suggestion based upon the given element, provided that it is not
   /// shadowed by a previously added suggestion.
-  void _addSuggestion(Element2 element, {int? relevance}) {
+  void _addSuggestion(Element element, {int? relevance}) {
     if (element.isPrivate) {
       if (element.library2 != containingLibrary) {
         // Do not suggest private members for imported libraries
@@ -364,14 +364,14 @@ class _SuggestionBuilder {
 
     var alreadyGenerated = _completionTypesGenerated.putIfAbsent(
         identifier, () => _COMPLETION_TYPE_NONE);
-    if (element is MethodElement2) {
+    if (element is MethodElement) {
       // Anything shadows a method.
       if (alreadyGenerated != _COMPLETION_TYPE_NONE) {
         return;
       }
       _completionTypesGenerated[identifier] =
           _COMPLETION_TYPE_FIELD_OR_METHOD_OR_GETSET;
-    } else if (element is PropertyAccessorElement2) {
+    } else if (element is PropertyAccessorElement) {
       if (element is GetterElement) {
         // Getters, fields, and methods shadow a getter.
         if ((alreadyGenerated & _COMPLETION_TYPE_GETTER) != 0) {
@@ -387,7 +387,7 @@ class _SuggestionBuilder {
         _completionTypesGenerated[identifier] =
             _completionTypesGenerated[identifier]! | _COMPLETION_TYPE_SETTER;
       }
-    } else if (element is FieldElement2) {
+    } else if (element is FieldElement) {
       // Fields and methods shadow a field. A getter/setter pair shadows a
       // field, but a getter or setter by itself doesn't.
       if (alreadyGenerated == _COMPLETION_TYPE_FIELD_OR_METHOD_OR_GETSET) {
@@ -420,7 +420,7 @@ class _SuggestionBuilder {
     // classes seen (not the interfaces) so that we won't be fooled by nonsense
     // like "class C<T> extends C<List<T>> {}"
     var result = <InterfaceType>[];
-    var classesSeen = <InterfaceElement2>{};
+    var classesSeen = <InterfaceElement>{};
     var typesToVisit = <InterfaceType>[type];
     while (typesToVisit.isNotEmpty) {
       var nextType = typesToVisit.removeLast();
diff --git a/pkg/analyzer_plugin/test/src/utilities/change_builder/change_builder_dart_test.dart b/pkg/analyzer_plugin/test/src/utilities/change_builder/change_builder_dart_test.dart
index 070379eb1de..c7b328e0536 100644
--- a/pkg/analyzer_plugin/test/src/utilities/change_builder/change_builder_dart_test.dart
+++ b/pkg/analyzer_plugin/test/src/utilities/change_builder/change_builder_dart_test.dart
@@ -2084,12 +2084,12 @@ A'''));
     expect(edit.replacement, typeCode);
   }
 
-  Future<ClassElement2> _getClassElement(String path, String name) async {
+  Future<ClassElement> _getClassElement(String path, String name) async {
     var unitResult = await resolveFile(path);
     return unitResult.libraryElement2.getClass2(name)!;
   }
 
-  Future<PropertyAccessorElement2> _getTopLevelGetter(
+  Future<PropertyAccessorElement> _getTopLevelGetter(
       String path, String name) async {
     var unitResult = await resolveFile(path);
     return unitResult.libraryElement2.getGetter(name)!;
@@ -2333,7 +2333,7 @@ void functionAfter() {
 
     var findNode = FindNode(resolvedLibUnit.content, resolvedLibUnit.unit);
     var classElement = findNode.classDeclaration('A').declaredFragment!.element;
-    var cache = <Element2, LibraryElement2?>{};
+    var cache = <Element, LibraryElement?>{};
     var builder = await newBuilder();
     await builder.addDartFileEdit(resolvedUnit.path, (builder) async {
       var builderImpl = builder as DartFileEditBuilderImpl;
@@ -2373,7 +2373,7 @@ class B {}
         .declaredFragment!
         .element;
 
-    var cache = <Element2, LibraryElement2?>{};
+    var cache = <Element, LibraryElement?>{};
     var builder = await newBuilder();
     await builder.addDartFileEdit(resolvedUnit.path, (builder) async {
       var builderImpl = builder as DartFileEditBuilderImpl;
@@ -2389,7 +2389,7 @@ class B {}
 
   /// [test_importElementLibrary_replacesPendingImports] verifies that
   /// `importElementLibrary` can replace pending imports, but it must not do so
-  /// if they were added explicitly (and not to satisfy a given [Element2]).
+  /// if they were added explicitly (and not to satisfy a given [Element]).
   Future<void>
       test_importElementLibrary_replacesPendingImports_unlessImportedExplicitly() async {
     var resolvedUnit = await resolveContent('/home/test/lib/test.dart', '');
@@ -2413,7 +2413,7 @@ class B {}
         .declaredFragment!
         .element;
 
-    var cache = <Element2, LibraryElement2?>{};
+    var cache = <Element, LibraryElement?>{};
     var builder = await newBuilder();
     await builder.addDartFileEdit(resolvedUnit.path, (builder) async {
       var builderImpl = builder as DartFileEditBuilderImpl;
@@ -2436,7 +2436,7 @@ import 'package:test/all.dart';
     var resolvedUnit = await resolveContent('/home/test/lib/test.dart', '');
 
     var futureOrElement = resolvedUnit.typeProvider.futureOrElement2;
-    var cache = <Element2, LibraryElement2?>{};
+    var cache = <Element, LibraryElement?>{};
     var builder = await newBuilder();
     await builder.addDartFileEdit(resolvedUnit.path, (builder) async {
       var builderImpl = builder as DartFileEditBuilderImpl;
@@ -2462,7 +2462,7 @@ import 'package:test/all.dart';
 
     var findNode = FindNode(resolvedSrcUnit.content, resolvedSrcUnit.unit);
     var classElement = findNode.classDeclaration('A').declaredFragment!.element;
-    var cache = <Element2, LibraryElement2?>{};
+    var cache = <Element, LibraryElement?>{};
     var builder = await newBuilder();
     await builder.addDartFileEdit(resolvedUnit.path, (builder) async {
       var builderImpl = builder as DartFileEditBuilderImpl;
@@ -2483,7 +2483,7 @@ import 'package:test/all.dart';
     var resolvedFakeUnit = await resolveContent('/home/test/lib/fake.dart', '');
 
     var futureOrElement = resolvedUnit.typeProvider.futureOrElement2;
-    var cache = <Element2, LibraryElement2?>{
+    var cache = <Element, LibraryElement?>{
       futureOrElement: resolvedFakeUnit.libraryElement2,
     };
     var builder = await newBuilder();
@@ -4107,7 +4107,7 @@ class B extends A {
     var path = convertPath('/home/test/lib/test.dart');
     addSource(path, content);
 
-    InterfaceElement2? targetElement;
+    InterfaceElement? targetElement;
     {
       var unitResult = await resolveFile(path);
       if (targetMixinName != null) {
diff --git a/pkg/analyzer_plugin/test/src/utilities/completion/completion_target_test.dart b/pkg/analyzer_plugin/test/src/utilities/completion/completion_target_test.dart
index 8512394a647..34e79efd6d9 100644
--- a/pkg/analyzer_plugin/test/src/utilities/completion/completion_target_test.dart
+++ b/pkg/analyzer_plugin/test/src/utilities/completion/completion_target_test.dart
@@ -959,23 +959,23 @@ class _Base extends AbstractContextTest {
     target = CompletionTarget.forOffset(result.unit, offset!);
   }
 
-  static String _executableNameStr(ExecutableElement2 executable) {
+  static String _executableNameStr(ExecutableElement executable) {
     var executableEnclosing = executable.enclosingElement2;
-    if (executableEnclosing is LibraryElement2) {
+    if (executableEnclosing is LibraryElement) {
       return executable.name3!;
-    } else if (executable is ConstructorElement2) {
+    } else if (executable is ConstructorElement) {
       if (executable.name3 == 'new') {
         return '${executableEnclosing!.name3}.<init>';
       } else {
         return '${executableEnclosing!.name3}.${executable.name3}';
       }
-    } else if (executable is MethodElement2) {
+    } else if (executable is MethodElement) {
       return '${executableEnclosing!.name3}.${executable.name3}';
     }
     fail('Unexpected element: $executable');
   }
 
-  static String _executableStr(ExecutableElement2 element) {
+  static String _executableStr(ExecutableElement element) {
     var executableStr = _executableNameStr(element);
     var typeStr = element.type.getDisplayString();
     return '$executableStr: $typeStr';
diff --git a/pkg/analyzer_plugin/test/src/utilities/visitors/local_declaration_visitor_test.dart b/pkg/analyzer_plugin/test/src/utilities/visitors/local_declaration_visitor_test.dart
index 05b7ff154d3..0fc5bd3f135 100644
--- a/pkg/analyzer_plugin/test/src/utilities/visitors/local_declaration_visitor_test.dart
+++ b/pkg/analyzer_plugin/test/src/utilities/visitors/local_declaration_visitor_test.dart
@@ -47,7 +47,7 @@ class TestVisitor extends LocalDeclarationVisitor {
   void declaredLocalVar(
     Token name,
     TypeAnnotation? type,
-    LocalVariableElement2 declaredElement,
+    LocalVariableElement declaredElement,
   ) {
     expect(name, isNotNull);
   }
diff --git a/pkg/analyzer_plugin/test/support/abstract_single_unit.dart b/pkg/analyzer_plugin/test/support/abstract_single_unit.dart
index e8ccaa41910..7a10a44e9b1 100644
--- a/pkg/analyzer_plugin/test/support/abstract_single_unit.dart
+++ b/pkg/analyzer_plugin/test/support/abstract_single_unit.dart
@@ -59,7 +59,7 @@ class AbstractSingleUnitTest extends AbstractContextTest {
     return findNodeAtOffset(offset, predicate);
   }
 
-  Element2? findNodeElementAtString(
+  Element? findNodeElementAtString(
     String search, [
     bool Function(AstNode)? predicate,
   ]) {
diff --git a/pkg/linter/lib/src/ast.dart b/pkg/linter/lib/src/ast.dart
index 90306b03920..456d351781d 100644
--- a/pkg/linter/lib/src/ast.dart
+++ b/pkg/linter/lib/src/ast.dart
@@ -23,9 +23,9 @@ import 'utils.dart';
 final List<String> reservedWords = _collectReservedWords();
 
 /// Returns direct children of [parent].
-List<Element2> getChildren(Element2 parent, [String? name]) {
-  var children = <Element2>[];
-  visitChildren(parent, (Element2 element) {
+List<Element> getChildren(Element parent, [String? name]) {
+  var children = <Element>[];
+  visitChildren(parent, (Element element) {
     if (name == null || element.displayName == name) {
       children.add(element);
     }
@@ -121,7 +121,7 @@ SyntacticEntity getNodeToAnnotate(Declaration node) {
 /// If the [node] is the finishing identifier of an assignment, return its
 /// "writeElement", otherwise return its "element", which might be
 /// thought as the "readElement".
-Element2? getWriteOrReadElement(SimpleIdentifier node) =>
+Element? getWriteOrReadElement(SimpleIdentifier node) =>
     _getWriteElement(node) ?? node.element;
 
 bool hasConstantError(Expression node) =>
@@ -295,7 +295,7 @@ File? locatePubspecFile(CompilationUnit compilationUnit) {
 
 /// Uses [processor] to visit all of the children of [element].
 /// If [processor] returns `true`, then children of a child are visited too.
-void visitChildren(Element2 element, ElementProcessor processor) {
+void visitChildren(Element element, ElementProcessor processor) {
   element.visitChildren2(_ElementVisitorAdapter(processor));
 }
 
@@ -382,7 +382,7 @@ int? _getIntValue(
 /// return the corresponding "writeElement", which is the local variable,
 /// the setter referenced with a [SimpleIdentifier] or a [PropertyAccess],
 /// or the `[]=` operator.
-Element2? _getWriteElement(AstNode node) {
+Element? _getWriteElement(AstNode node) {
   var parent = node.parent;
   if (parent is AssignmentExpression && parent.leftHandSide == node) {
     return parent.writeElement2;
@@ -409,9 +409,9 @@ bool _hasFieldOrMethod(ClassMember element, String name) =>
     (element is MethodDeclaration && element.name.lexeme == name) ||
     (element is FieldDeclaration && getFieldName(element, name) != null);
 
-/// An [Element2] processor function type.
+/// An [Element] processor function type.
 /// If `true` is returned, children of [element] will be visited.
-typedef ElementProcessor = bool Function(Element2 element);
+typedef ElementProcessor = bool Function(Element element);
 
 /// A [GeneralizingElementVisitor2] adapter for [ElementProcessor].
 class _ElementVisitorAdapter extends GeneralizingElementVisitor2<void> {
@@ -420,7 +420,7 @@ class _ElementVisitorAdapter extends GeneralizingElementVisitor2<void> {
   _ElementVisitorAdapter(this.processor);
 
   @override
-  void visitElement(Element2 element) {
+  void visitElement(Element element) {
     var visitChildren = processor(element);
     if (visitChildren) {
       element.visitChildren2(this);
diff --git a/pkg/linter/lib/src/extensions.dart b/pkg/linter/lib/src/extensions.dart
index 6ca8f22d384..94552e01afc 100644
--- a/pkg/linter/lib/src/extensions.dart
+++ b/pkg/linter/lib/src/extensions.dart
@@ -20,11 +20,11 @@ import 'analyzer.dart';
 import 'util/dart_type_utilities.dart';
 
 class EnumLikeClassDescription {
-  final Map<DartObject, Set<FieldElement2>> _enumConstants;
+  final Map<DartObject, Set<FieldElement>> _enumConstants;
   EnumLikeClassDescription(this._enumConstants);
 
   /// Returns a fresh map of the class's enum-like constant values.
-  Map<DartObject, Set<FieldElement2>> get enumConstants => {..._enumConstants};
+  Map<DartObject, Set<FieldElement>> get enumConstants => {..._enumConstants};
 }
 
 extension AstNodeExtension on AstNode {
@@ -88,7 +88,7 @@ extension AstNodeExtension on AstNode {
 }
 
 extension AstNodeNullableExtension on AstNode? {
-  Element2? get canonicalElement {
+  Element? get canonicalElement {
     var self = this;
     if (self is Expression) {
       var node = self.unParenthesized;
@@ -143,9 +143,9 @@ extension BlockExtension on Block {
   }
 }
 
-extension ClassElementExtension on ClassElement2 {
+extension ClassElementExtension on ClassElement {
   bool get hasImmutableAnnotation {
-    var inheritedAndSelfElements = <InterfaceElement2>[
+    var inheritedAndSelfElements = <InterfaceElement>[
       ...allSupertypes.map((t) => t.element3),
       this,
     ];
@@ -206,7 +206,7 @@ extension ClassElementExtension on ClassElement2 {
 
     // And 2 or more static const fields whose type is the enclosing class.
     var enumConstantCount = 0;
-    var enumConstants = <DartObject, Set<FieldElement2>>{};
+    var enumConstants = <DartObject, Set<FieldElement>>{};
     for (var field in fields2) {
       // Ensure static const.
       if (field.isSynthetic || !field.isConst || !field.isStatic) {
@@ -241,7 +241,7 @@ extension ClassMemberListExtension on List<ClassMember> {
       .firstWhereOrNull((node) => node.name.lexeme == name);
 }
 
-extension ConstructorElementExtension on ConstructorElement2 {
+extension ConstructorElementExtension on ConstructorElement {
   /// Returns whether `this` is the same element as the [className] constructor
   /// named [constructorName] declared in [uri].
   bool isSameAs({
@@ -258,7 +258,7 @@ extension DartTypeExtension on DartType? {
   bool extendsClass(String? className, String library) {
     var self = this;
     if (self is InterfaceType) {
-      return _extendsClass(self, <InterfaceElement2>{}, className, library);
+      return _extendsClass(self, <InterfaceElement>{}, className, library);
     }
     return false;
   }
@@ -302,7 +302,7 @@ extension DartTypeExtension on DartType? {
 
   static bool _extendsClass(
     InterfaceType? type,
-    Set<InterfaceElement2> seenElements,
+    Set<InterfaceElement> seenElements,
     String? className,
     String? library,
   ) =>
@@ -322,9 +322,9 @@ extension ElementAnnotationExtension on ElementAnnotation {
   };
 }
 
-extension ElementExtension on Element2? {
-  Element2? get canonicalElement2 => switch (this) {
-    PropertyAccessorElement2(:var variable3?) => variable3,
+extension ElementExtension on Element? {
+  Element? get canonicalElement2 => switch (this) {
+    PropertyAccessorElement(:var variable3?) => variable3,
     _ => this,
   };
 
@@ -359,11 +359,11 @@ extension ExpressionExtension on Expression {
     if (elementName == null) return false;
 
     var enclosingElement = element.enclosingElement2;
-    if (enclosingElement is! InterfaceElement2) return false;
+    if (enclosingElement is! InterfaceElement) return false;
 
     var superTypes = enclosingElement.allSupertypes;
     var superMembers =
-        element is MethodElement2
+        element is MethodElement
             ? superTypes.map((t) => t.getMethod2(elementName))
             : superTypes.map((t) => t.getGetter2(elementName));
     return superMembers.any((e) => e.hasAwaitNotRequired);
@@ -407,7 +407,7 @@ extension ExpressionNullableExtension on Expression? {
         return ancestor.staticType;
       case ConstructorFieldInitializer():
         var fieldElement = ancestor.fieldName.element;
-        return (fieldElement is VariableElement2) ? fieldElement.type : null;
+        return (fieldElement is VariableElement) ? fieldElement.type : null;
       case ExpressionFunctionBody(parent: var function)
           when function is FunctionExpression:
         // Allow `<int, LinkedHashSet>{}.putIfAbsent(3, () => LinkedHashSet())`
@@ -504,18 +504,18 @@ extension FunctionBodyExtension on FunctionBody? {
 extension InhertanceManager3Extension on InheritanceManager3 {
   /// Returns the class member that is overridden by [member], if there is one,
   /// as defined by [getInherited].
-  ExecutableElement2? overriddenMember(Element2? member) {
+  ExecutableElement? overriddenMember(Element? member) {
     var executable = switch (member) {
-      FieldElement2() => member.getter2,
-      MethodElement2() => member,
-      PropertyAccessorElement2() => member,
+      FieldElement() => member.getter2,
+      MethodElement() => member,
+      PropertyAccessorElement() => member,
       _ => null,
     };
 
     if (executable == null) return null;
 
     var interfaceElement = executable.enclosingElement2;
-    if (interfaceElement is! InterfaceElement2) return null;
+    if (interfaceElement is! InterfaceElement) return null;
 
     var nameObj = Name.forElement(executable);
     if (nameObj == null) return null;
@@ -524,13 +524,13 @@ extension InhertanceManager3Extension on InheritanceManager3 {
   }
 }
 
-extension InstanceElementExtension on InstanceElement2 {
+extension InstanceElementExtension on InstanceElement {
   bool get isReflectiveTest =>
-      this is ClassElement2 &&
+      this is ClassElement &&
       metadata2.annotations.any((a) => a.isReflectiveTest);
 }
 
-extension InterfaceElementExtension on InterfaceElement2 {
+extension InterfaceElementExtension on InterfaceElement {
   /// Whether this element has the exact [name] and defined in the file with
   /// the given [uri].
   bool isExactly(String name, Uri uri) =>
@@ -543,7 +543,7 @@ extension InterfaceTypeExtension on InterfaceType {
   Iterable<InterfaceType> get implementedInterfaces {
     void searchSupertypes(
       InterfaceType? type,
-      Set<InterfaceElement2> alreadyVisited,
+      Set<InterfaceElement> alreadyVisited,
       List<InterfaceType> interfaceTypes,
     ) {
       if (type == null || !alreadyVisited.add(type.element3)) {
@@ -564,7 +564,7 @@ extension InterfaceTypeExtension on InterfaceType {
     return interfaceTypes;
   }
 
-  GetterElement? getGetter2(String name, {LibraryElement2? library}) =>
+  GetterElement? getGetter2(String name, {LibraryElement? library}) =>
       getters.firstWhereOrNull(
         (s) => s.name3 == name && (library == null || (s.library2 == library)),
       );
@@ -588,7 +588,7 @@ extension MethodDeclarationExtension on MethodDeclaration {
     if (name == null) return false;
 
     var parentElement = element?.enclosingElement2;
-    if (parentElement is! InterfaceElement2) return false;
+    if (parentElement is! InterfaceElement) return false;
 
     var parentLibrary = parentElement.library2;
 
@@ -613,13 +613,11 @@ extension MethodDeclarationExtension on MethodDeclaration {
   bool hasInheritedMethod(InheritanceManager3 inheritanceManager) =>
       lookUpInheritedMethod(inheritanceManager) != null;
 
-  MethodElement2? lookUpInheritedMethod(
-    InheritanceManager3 inheritanceManager,
-  ) {
+  MethodElement? lookUpInheritedMethod(InheritanceManager3 inheritanceManager) {
     var declaredElement = declaredFragment?.element;
     if (declaredElement != null) {
       var parent = declaredElement.enclosingElement2;
-      if (parent is InterfaceElement2) {
+      if (parent is InterfaceElement) {
         var methodName = Name.forElement(declaredElement);
         if (methodName == null) return null;
         var inherited = inheritanceManager.getInherited4(parent, methodName);
diff --git a/pkg/linter/lib/src/rules/always_specify_types.dart b/pkg/linter/lib/src/rules/always_specify_types.dart
index 96f82b98960..b887f7d5a62 100644
--- a/pkg/linter/lib/src/rules/always_specify_types.dart
+++ b/pkg/linter/lib/src/rules/always_specify_types.dart
@@ -69,7 +69,7 @@ class _Visitor extends SimpleAstVisitor<void> {
     var keyword = node.keyword;
     if (node.type == null && keyword != null) {
       var element = node.declaredElement2;
-      if (element is VariableElement2) {
+      if (element is VariableElement) {
         if (keyword.keyword == Keyword.VAR) {
           rule.reportAtToken(
             keyword,
@@ -119,7 +119,7 @@ class _Visitor extends SimpleAstVisitor<void> {
     var type = namedType.type;
     if (type is InterfaceType) {
       var element = namedType.element2;
-      if (element is TypeParameterizedElement2 &&
+      if (element is TypeParameterizedElement &&
           element.typeParameters2.isNotEmpty &&
           namedType.typeArguments == null &&
           namedType.parent is! IsExpression &&
@@ -229,7 +229,7 @@ class _Visitor extends SimpleAstVisitor<void> {
         DartType? type;
         if (initializer is Identifier) {
           var element = initializer.element;
-          if (element is LocalVariableElement2) {
+          if (element is LocalVariableElement) {
             type = element.type;
           }
         }
diff --git a/pkg/linter/lib/src/rules/analyzer_public_api.dart b/pkg/linter/lib/src/rules/analyzer_public_api.dart
index cfe46ba608f..be13e680f5f 100644
--- a/pkg/linter/lib/src/rules/analyzer_public_api.dart
+++ b/pkg/linter/lib/src/rules/analyzer_public_api.dart
@@ -118,7 +118,7 @@ class _Visitor extends SimpleAstVisitor<void> {
   /// Elements in this set are part of the public APIs of their respective
   /// packages, so it is safe for a part of the analyzer public API to refer to
   /// them.
-  late Set<Element2> importedPublicElements;
+  late Set<Element> importedPublicElements;
 
   _Visitor(this.rule);
 
@@ -184,7 +184,7 @@ class _Visitor extends SimpleAstVisitor<void> {
 
   void _checkMember(Fragment fragment) {
     if (fragment is ConstructorFragment &&
-        fragment.element.enclosingElement2 is EnumElement2) {
+        fragment.element.enclosingElement2 is EnumElement) {
       // Enum constructors aren't callable from outside of the enum, so they
       // aren't public API.
       return;
@@ -345,10 +345,10 @@ class _Visitor extends SimpleAstVisitor<void> {
 
   /// Called during [visitCompilationUnit] to compute the value of
   /// [importedPublicElements].
-  static Set<Element2> _computeImportedPublicElements(
+  static Set<Element> _computeImportedPublicElements(
     CompilationUnit compilationUnit,
   ) {
-    var elements = <Element2>{};
+    var elements = <Element>{};
     for (var directive in compilationUnit.directives) {
       if (directive is! ImportDirective) continue;
       var libraryImport = directive.libraryImport!;
@@ -369,9 +369,9 @@ extension on String {
   bool get isPublic => !startsWith('_');
 }
 
-extension on Element2 {
+extension on Element {
   bool get isInAnalyzerPublicApi {
-    if (this case PropertyAccessorElement2(
+    if (this case PropertyAccessorElement(
       isSynthetic: true,
       :var variable3?,
     ) when variable3.isInAnalyzerPublicApi) {
@@ -404,7 +404,7 @@ extension on Element2 {
         // in practice it doesn't matter (we don't expect to have multiple
         // declarations of this annotation that we need to distinguish), and the
         // advantage of not checking the URI is that unit testing is easier.
-        element3: InterfaceElement2(name3: 'AnalyzerPublicApi'),
+        element3: InterfaceElement(name3: 'AnalyzerPublicApi'),
       ),
     )) {
       return true;
diff --git a/pkg/linter/lib/src/rules/analyzer_use_new_elements.dart b/pkg/linter/lib/src/rules/analyzer_use_new_elements.dart
index 6f5fe2188d2..25af031c9ff 100644
--- a/pkg/linter/lib/src/rules/analyzer_use_new_elements.dart
+++ b/pkg/linter/lib/src/rules/analyzer_use_new_elements.dart
@@ -14,7 +14,7 @@ import '../extensions.dart';
 
 const _desc = r'Use new element model in opted-in files.';
 
-bool _isOldModelElement(Element2? element) {
+bool _isOldModelElement(Element? element) {
   if (element == null) {
     return false;
   }
@@ -28,7 +28,7 @@ bool _isOldModelElement(Element2? element) {
   var uriStr = libraryFragment.source.uri.toString();
 
   switch (element) {
-    case InstanceElement2():
+    case InstanceElement():
       if (uriStr == 'package:analyzer/dart/element/element.dart') {
         // Skip classes that don't required migration.
         if (const {
@@ -56,7 +56,7 @@ bool _isOldModelElement(Element2? element) {
           return element.name3 == 'declaredElement';
         case 'package:analyzer/src/dart/element/type.dart':
           var enclosingElement = element.enclosingElement2;
-          if (enclosingElement is InterfaceElement2) {
+          if (enclosingElement is InterfaceElement) {
             if (enclosingElement.thisType.implementsDartType) {
               return element.name3 == 'element';
             }
diff --git a/pkg/linter/lib/src/rules/annotate_overrides.dart b/pkg/linter/lib/src/rules/annotate_overrides.dart
index 9748ebab1dc..7b51cd0d51f 100644
--- a/pkg/linter/lib/src/rules/annotate_overrides.dart
+++ b/pkg/linter/lib/src/rules/annotate_overrides.dart
@@ -36,7 +36,7 @@ class _Visitor extends SimpleAstVisitor<void> {
 
   _Visitor(this.rule, this.context);
 
-  void check(Element2? element, Token target) {
+  void check(Element? element, Token target) {
     if (element == null) return;
     if (element case Annotatable a when a.metadata2.hasOverride) return;
 
diff --git a/pkg/linter/lib/src/rules/annotate_redeclares.dart b/pkg/linter/lib/src/rules/annotate_redeclares.dart
index 4020d0caabe..6b50cf33de8 100644
--- a/pkg/linter/lib/src/rules/annotate_redeclares.dart
+++ b/pkg/linter/lib/src/rules/annotate_redeclares.dart
@@ -62,8 +62,8 @@ class _Visitor extends SimpleAstVisitor<void> {
 
   /// Return `true` if the [member] redeclares a member from a superinterface.
   bool _redeclaresMember(
-    ExecutableElement2 member,
-    InterfaceElement2 extensionType,
+    ExecutableElement member,
+    InterfaceElement extensionType,
   ) {
     // TODO(pq): unify with similar logic in `redeclare_verifier` and move to inheritanceManager
     var interface = context.inheritanceManager.getInterface2(extensionType);
diff --git a/pkg/linter/lib/src/rules/avoid_catches_without_on_clauses.dart b/pkg/linter/lib/src/rules/avoid_catches_without_on_clauses.dart
index 796bdf5e7e2..2f2b2993311 100644
--- a/pkg/linter/lib/src/rules/avoid_catches_without_on_clauses.dart
+++ b/pkg/linter/lib/src/rules/avoid_catches_without_on_clauses.dart
@@ -33,7 +33,7 @@ class AvoidCatchesWithoutOnClauses extends LintRule {
 }
 
 class _CaughtExceptionUseVisitor extends RecursiveAstVisitor<void> {
-  final Element2 caughtException;
+  final Element caughtException;
 
   var exceptionWasUsed = false;
 
@@ -48,7 +48,7 @@ class _CaughtExceptionUseVisitor extends RecursiveAstVisitor<void> {
 }
 
 class _ValidUseVisitor extends RecursiveAstVisitor<void> {
-  final Element2 caughtException;
+  final Element caughtException;
 
   bool hasValidUse = false;
 
@@ -88,7 +88,7 @@ class _ValidUseVisitor extends RecursiveAstVisitor<void> {
     } else if (node.methodName.name == 'reportError') {
       var target = node.realTarget;
       var targetElement = target is Identifier ? target.element : null;
-      if (targetElement is ClassElement2 &&
+      if (targetElement is ClassElement &&
           targetElement.name3 == 'FlutterError') {
         _checkUseInArgument(node.argumentList);
       }
diff --git a/pkg/linter/lib/src/rules/avoid_classes_with_only_static_members.dart b/pkg/linter/lib/src/rules/avoid_classes_with_only_static_members.dart
index bc1e4a8dd8d..979ad0a26dd 100644
--- a/pkg/linter/lib/src/rules/avoid_classes_with_only_static_members.dart
+++ b/pkg/linter/lib/src/rules/avoid_classes_with_only_static_members.dart
@@ -48,7 +48,7 @@ class _Visitor extends SimpleAstVisitor<void> {
     var map = interface.map2;
     for (var member in map.values) {
       var enclosingElement = member.enclosingElement2;
-      if (enclosingElement is ClassElement2 &&
+      if (enclosingElement is ClassElement &&
           !enclosingElement.isDartCoreObject) {
         return;
       }
diff --git a/pkg/linter/lib/src/rules/avoid_double_and_int_checks.dart b/pkg/linter/lib/src/rules/avoid_double_and_int_checks.dart
index bd90183b01f..a22fc1168dc 100644
--- a/pkg/linter/lib/src/rules/avoid_double_and_int_checks.dart
+++ b/pkg/linter/lib/src/rules/avoid_double_and_int_checks.dart
@@ -50,7 +50,7 @@ class _Visitor extends SimpleAstVisitor<void> {
             ifCondition.type.type == typeProvider.doubleType &&
             elseCondition.type.type == typeProvider.intType &&
             (ifExpression.element is FormalParameterElement ||
-                ifExpression.element is LocalVariableElement2)) {
+                ifExpression.element is LocalVariableElement)) {
           rule.reportLint(elseCondition);
         }
       }
diff --git a/pkg/linter/lib/src/rules/avoid_equals_and_hash_code_on_mutable_classes.dart b/pkg/linter/lib/src/rules/avoid_equals_and_hash_code_on_mutable_classes.dart
index 0dbadc03d11..6dee9031bf5 100644
--- a/pkg/linter/lib/src/rules/avoid_equals_and_hash_code_on_mutable_classes.dart
+++ b/pkg/linter/lib/src/rules/avoid_equals_and_hash_code_on_mutable_classes.dart
@@ -57,7 +57,7 @@ class _Visitor extends SimpleAstVisitor<void> {
 }
 
 extension on MethodDeclaration {
-  ClassElement2? get classElement =>
+  ClassElement? get classElement =>
       // TODO(pq): should this be ClassOrMixinDeclaration ?
       thisOrAncestorOfType<ClassDeclaration>()?.declaredFragment?.element;
 }
diff --git a/pkg/linter/lib/src/rules/avoid_implementing_value_types.dart b/pkg/linter/lib/src/rules/avoid_implementing_value_types.dart
index 0d3e3ba956b..38f92ebbb7b 100644
--- a/pkg/linter/lib/src/rules/avoid_implementing_value_types.dart
+++ b/pkg/linter/lib/src/rules/avoid_implementing_value_types.dart
@@ -52,7 +52,7 @@ class _Visitor extends SimpleAstVisitor<void> {
     }
   }
 
-  bool _overridesEquals(InterfaceElement2 element) {
+  bool _overridesEquals(InterfaceElement element) {
     var member = inheritanceManager.getMember4(
       element,
       equalsName,
diff --git a/pkg/linter/lib/src/rules/avoid_init_to_null.dart b/pkg/linter/lib/src/rules/avoid_init_to_null.dart
index 9a07cf1833a..8deeabdc02d 100644
--- a/pkg/linter/lib/src/rules/avoid_init_to_null.dart
+++ b/pkg/linter/lib/src/rules/avoid_init_to_null.dart
@@ -43,7 +43,7 @@ class _Visitor extends SimpleAstVisitor<void> {
     var declaredElement = node.declaredFragment?.element;
     if (declaredElement == null) return;
 
-    if (declaredElement is SuperFormalParameterElement2) {
+    if (declaredElement is SuperFormalParameterElement) {
       var superConstructorParameter =
           declaredElement.superConstructorParameter2;
       if (superConstructorParameter is! FormalParameterElement) return;
diff --git a/pkg/linter/lib/src/rules/avoid_null_checks_in_equality_operators.dart b/pkg/linter/lib/src/rules/avoid_null_checks_in_equality_operators.dart
index 0d4fd0fbe93..08f82f49cac 100644
--- a/pkg/linter/lib/src/rules/avoid_null_checks_in_equality_operators.dart
+++ b/pkg/linter/lib/src/rules/avoid_null_checks_in_equality_operators.dart
@@ -16,22 +16,19 @@ const _desc = r"Don't check for `null` in custom `==` operators.";
 bool _isComparingEquality(TokenType tokenType) =>
     tokenType == TokenType.BANG_EQ || tokenType == TokenType.EQ_EQ;
 
-bool _isComparingParameterWithNull(
-  BinaryExpression node,
-  Element2? parameter,
-) =>
+bool _isComparingParameterWithNull(BinaryExpression node, Element? parameter) =>
     _isComparingEquality(node.operator.type) &&
     ((node.leftOperand.isNullLiteral &&
             _isParameter(node.rightOperand, parameter)) ||
         (node.rightOperand.isNullLiteral &&
             _isParameter(node.leftOperand, parameter)));
 
-bool _isParameter(Expression expression, Element2? parameter) =>
+bool _isParameter(Expression expression, Element? parameter) =>
     expression.canonicalElement == parameter;
 
 bool _isParameterWithQuestionQuestion(
   BinaryExpression node,
-  Element2? parameter,
+  Element? parameter,
 ) =>
     node.operator.type == TokenType.QUESTION_QUESTION &&
     _isParameter(node.leftOperand, parameter);
@@ -58,7 +55,7 @@ class AvoidNullChecksInEqualityOperators extends LintRule {
 }
 
 class _BodyVisitor extends RecursiveAstVisitor<void> {
-  final Element2? parameter;
+  final Element? parameter;
   final LintRule rule;
 
   _BodyVisitor(this.parameter, this.rule);
diff --git a/pkg/linter/lib/src/rules/avoid_positional_boolean_parameters.dart b/pkg/linter/lib/src/rules/avoid_positional_boolean_parameters.dart
index 07df2e5caa7..746ba452510 100644
--- a/pkg/linter/lib/src/rules/avoid_positional_boolean_parameters.dart
+++ b/pkg/linter/lib/src/rules/avoid_positional_boolean_parameters.dart
@@ -92,8 +92,8 @@ class _Visitor extends SimpleAstVisitor<void> {
     }
   }
 
-  bool _isOverridingMember(Element2 member) {
-    var classElement = member.thisOrAncestorOfType2<ClassElement2>();
+  bool _isOverridingMember(Element member) {
+    var classElement = member.thisOrAncestorOfType2<ClassElement>();
     if (classElement == null) return false;
 
     var name = member.name3;
diff --git a/pkg/linter/lib/src/rules/avoid_renaming_method_parameters.dart b/pkg/linter/lib/src/rules/avoid_renaming_method_parameters.dart
index 5ea56e061b8..0694d9c536f 100644
--- a/pkg/linter/lib/src/rules/avoid_renaming_method_parameters.dart
+++ b/pkg/linter/lib/src/rules/avoid_renaming_method_parameters.dart
@@ -70,7 +70,7 @@ class _Visitor extends SimpleAstVisitor<void> {
       var parentElement = parentNode.declaredFragment?.element;
 
       // Note: there are no override semantics with extension methods.
-      if (parentElement is! InterfaceElement2) return;
+      if (parentElement is! InterfaceElement) return;
       if (parentElement.isPrivate) return;
 
       var parentMethod = inheritanceManager.getMember4(
diff --git a/pkg/linter/lib/src/rules/avoid_setters_without_getters.dart b/pkg/linter/lib/src/rules/avoid_setters_without_getters.dart
index e006bb2e9fb..4857216627f 100644
--- a/pkg/linter/lib/src/rules/avoid_setters_without_getters.dart
+++ b/pkg/linter/lib/src/rules/avoid_setters_without_getters.dart
@@ -57,7 +57,7 @@ class _Visitor extends SimpleAstVisitor<void> {
 
       var element = member.declaredFragment?.element;
       var interface = element?.enclosingElement2;
-      if (interface is! InterfaceElement2) continue;
+      if (interface is! InterfaceElement) continue;
 
       var name = Name.forElement(element!);
       if (name == null) continue;
@@ -70,7 +70,7 @@ class _Visitor extends SimpleAstVisitor<void> {
       if (getterName == null) continue;
 
       // Check for a declared (static) getter.
-      ExecutableElement2? getter = interface.getGetter2(getterName);
+      ExecutableElement? getter = interface.getGetter2(getterName);
       // Then look up for an inherited one.
       getter ??= inheritanceManager.getMember4(
         interface,
diff --git a/pkg/linter/lib/src/rules/avoid_slow_async_io.dart b/pkg/linter/lib/src/rules/avoid_slow_async_io.dart
index 8e0c3b7c425..cbc546bcfb6 100644
--- a/pkg/linter/lib/src/rules/avoid_slow_async_io.dart
+++ b/pkg/linter/lib/src/rules/avoid_slow_async_io.dart
@@ -82,7 +82,7 @@ class _Visitor extends SimpleAstVisitor<void> {
     var target = node.target;
     if (target is Identifier) {
       var element = target.element;
-      if (element is ClassElement2 && element.name3 == 'FileSystemEntity') {
+      if (element is ClassElement && element.name3 == 'FileSystemEntity') {
         if (_fileSystemEntityMethodNames.contains(node.methodName.name)) {
           rule.reportLint(node);
         }
diff --git a/pkg/linter/lib/src/rules/avoid_type_to_string.dart b/pkg/linter/lib/src/rules/avoid_type_to_string.dart
index 05ec89d8abe..9204c971f72 100644
--- a/pkg/linter/lib/src/rules/avoid_type_to_string.dart
+++ b/pkg/linter/lib/src/rules/avoid_type_to_string.dart
@@ -87,7 +87,7 @@ class _Visitor extends SimpleAstVisitor<void> {
 
   bool _isSimpleIdDeclByCoreObj(SimpleIdentifier simpleIdentifier) {
     var encloser = simpleIdentifier.element?.enclosingElement2;
-    return encloser is ClassElement2 && encloser.isDartCoreObject;
+    return encloser is ClassElement && encloser.isDartCoreObject;
   }
 
   bool _isToStringOnCoreTypeClass(
diff --git a/pkg/linter/lib/src/rules/avoid_types_as_parameter_names.dart b/pkg/linter/lib/src/rules/avoid_types_as_parameter_names.dart
index 8f850ee0bdf..38d83539aa0 100644
--- a/pkg/linter/lib/src/rules/avoid_types_as_parameter_names.dart
+++ b/pkg/linter/lib/src/rules/avoid_types_as_parameter_names.dart
@@ -52,7 +52,7 @@ class _Visitor extends SimpleAstVisitor<void> {
       var declaredElement = parameter.declaredFragment?.element;
       var name = parameter.name;
       if (declaredElement != null &&
-          declaredElement is! FieldFormalParameterElement2 &&
+          declaredElement is! FieldFormalParameterElement &&
           declaredElement.hasImplicitType &&
           name != null &&
           _isTypeName(node, name)) {
@@ -69,10 +69,10 @@ class _Visitor extends SimpleAstVisitor<void> {
     );
     if (result.isRequestedName) {
       var element = result.element;
-      return element is ClassElement2 ||
-          element is ExtensionTypeElement2 ||
-          element is TypeAliasElement2 ||
-          (element is TypeParameterElement2 && !element.isWildcardVariable);
+      return element is ClassElement ||
+          element is ExtensionTypeElement ||
+          element is TypeAliasElement ||
+          (element is TypeParameterElement && !element.isWildcardVariable);
     }
     return false;
   }
diff --git a/pkg/linter/lib/src/rules/avoid_unused_constructor_parameters.dart b/pkg/linter/lib/src/rules/avoid_unused_constructor_parameters.dart
index 90aec2343fb..5ae059d2af6 100644
--- a/pkg/linter/lib/src/rules/avoid_unused_constructor_parameters.dart
+++ b/pkg/linter/lib/src/rules/avoid_unused_constructor_parameters.dart
@@ -41,8 +41,8 @@ class _ConstructorVisitor extends RecursiveAstVisitor<void> {
           element.parameters.parameters.where((p) {
             var element = p.declaredFragment?.element;
             return element != null &&
-                element is! FieldFormalParameterElement2 &&
-                element is! SuperFormalParameterElement2 &&
+                element is! FieldFormalParameterElement &&
+                element is! SuperFormalParameterElement &&
                 !element.metadata2.hasDeprecated &&
                 !(element.name3 ?? '').isJustUnderscores;
           }).toSet();
diff --git a/pkg/linter/lib/src/rules/await_only_futures.dart b/pkg/linter/lib/src/rules/await_only_futures.dart
index 72ecb55cc04..df419951ea1 100644
--- a/pkg/linter/lib/src/rules/await_only_futures.dart
+++ b/pkg/linter/lib/src/rules/await_only_futures.dart
@@ -40,7 +40,7 @@ class _Visitor extends SimpleAstVisitor<void> {
 
     var type = node.expression.staticType;
     if (!(type == null ||
-        type.element3 is ExtensionTypeElement2 ||
+        type.element3 is ExtensionTypeElement ||
         type.isDartAsyncFuture ||
         type is DynamicType ||
         type is InvalidType ||
diff --git a/pkg/linter/lib/src/rules/cascade_invocations.dart b/pkg/linter/lib/src/rules/cascade_invocations.dart
index 9e502393b2d..4b09ccba639 100644
--- a/pkg/linter/lib/src/rules/cascade_invocations.dart
+++ b/pkg/linter/lib/src/rules/cascade_invocations.dart
@@ -12,7 +12,7 @@ import '../extensions.dart';
 
 const _desc = r'Cascade consecutive method invocations on the same reference.';
 
-Element2? _getElementFromVariableDeclarationStatement(
+Element? _getElementFromVariableDeclarationStatement(
   VariableDeclarationStatement statement,
 ) {
   var variables = statement.variables.variables;
@@ -31,19 +31,19 @@ Element2? _getElementFromVariableDeclarationStatement(
   return null;
 }
 
-ExecutableElement2? _getExecutableElementFromMethodInvocation(
+ExecutableElement? _getExecutableElementFromMethodInvocation(
   MethodInvocation node,
 ) {
   if (_isInvokedWithoutNullAwareOperator(node.operator)) {
     var executableElement = node.methodName.canonicalElement;
-    if (executableElement is ExecutableElement2) {
+    if (executableElement is ExecutableElement) {
       return executableElement;
     }
   }
   return null;
 }
 
-Element2? _getPrefixElementFromExpression(Expression rawExpression) {
+Element? _getPrefixElementFromExpression(Expression rawExpression) {
   var expression = rawExpression.unParenthesized;
   if (expression is PrefixedIdentifier) {
     return expression.prefix.canonicalElement;
@@ -55,10 +55,10 @@ Element2? _getPrefixElementFromExpression(Expression rawExpression) {
   return null;
 }
 
-Element2? _getTargetElementFromCascadeExpression(CascadeExpression node) =>
+Element? _getTargetElementFromCascadeExpression(CascadeExpression node) =>
     node.target.canonicalElement;
 
-Element2? _getTargetElementFromMethodInvocation(MethodInvocation node) =>
+Element? _getTargetElementFromMethodInvocation(MethodInvocation node) =>
     node.target.canonicalElement;
 
 bool _isInvokedWithoutNullAwareOperator(Token? token) =>
@@ -129,7 +129,7 @@ class _CascadableExpression {
   /// in the right part of an assignment in a following expression that we would
   /// like to join to this.
   final bool isCritical;
-  final Element2? element;
+  final Element? element;
   final List<AstNode> criticalNodes;
 
   factory _CascadableExpression.fromExpressionStatement(
@@ -183,7 +183,7 @@ class _CascadableExpression {
     var variable = _getPrefixElementFromExpression(leftExpression);
     var canReceive =
         node.operator.type != TokenType.QUESTION_QUESTION_EQ &&
-        variable is VariableElement2 &&
+        variable is VariableElement &&
         !variable.isStatic;
     return _CascadableExpression._internal(
       variable,
diff --git a/pkg/linter/lib/src/rules/collection_methods_unrelated_type.dart b/pkg/linter/lib/src/rules/collection_methods_unrelated_type.dart
index 49ab1f22743..6d5fb2f83bd 100644
--- a/pkg/linter/lib/src/rules/collection_methods_unrelated_type.dart
+++ b/pkg/linter/lib/src/rules/collection_methods_unrelated_type.dart
@@ -71,7 +71,7 @@ abstract class _MethodDefinition {
 
 class _MethodDefinitionForElement extends _MethodDefinition {
   /// The element on which this method is declared.
-  final ClassElement2 element;
+  final ClassElement element;
 
   _MethodDefinitionForElement(
     this.element,
diff --git a/pkg/linter/lib/src/rules/deprecated_consistency.dart b/pkg/linter/lib/src/rules/deprecated_consistency.dart
index 4e1c7d369c9..85eebd9f217 100644
--- a/pkg/linter/lib/src/rules/deprecated_consistency.dart
+++ b/pkg/linter/lib/src/rules/deprecated_consistency.dart
@@ -55,7 +55,7 @@ class _Visitor extends SimpleAstVisitor<void> {
   @override
   void visitFieldFormalParameter(FieldFormalParameter node) {
     var declaredElement = node.declaredFragment?.element;
-    if (declaredElement is! FieldFormalParameterElement2) return;
+    if (declaredElement is! FieldFormalParameterElement) return;
 
     var field = declaredElement.field2;
     if (field == null) return;
diff --git a/pkg/linter/lib/src/rules/deprecated_member_use_from_same_package.dart b/pkg/linter/lib/src/rules/deprecated_member_use_from_same_package.dart
index dfc51f7faa5..15ae2fde118 100644
--- a/pkg/linter/lib/src/rules/deprecated_member_use_from_same_package.dart
+++ b/pkg/linter/lib/src/rules/deprecated_member_use_from_same_package.dart
@@ -52,11 +52,11 @@ class _DeprecatedMemberUseVerifier extends BaseDeprecatedMemberUseVerifier {
   @override
   void reportError2(
     SyntacticEntity errorEntity,
-    Element2 element,
+    Element element,
     String displayName,
     String? message,
   ) {
-    var library = element is LibraryElement2 ? element : element.library2;
+    var library = element is LibraryElement ? element : element.library2;
     if (library == null ||
         !_workspacePackage.contains(library.firstFragment.source)) {
       // In this case, `DEPRECATED_MEMBER_USE` is reported by the analyzer.
diff --git a/pkg/linter/lib/src/rules/diagnostic_describe_all_properties.dart b/pkg/linter/lib/src/rules/diagnostic_describe_all_properties.dart
index 4842d8f6f22..74fd053aedb 100644
--- a/pkg/linter/lib/src/rules/diagnostic_describe_all_properties.dart
+++ b/pkg/linter/lib/src/rules/diagnostic_describe_all_properties.dart
@@ -72,7 +72,7 @@ class _Visitor extends SimpleAstVisitor<void> {
     method?.body.accept(_IdentifierVisitor(properties));
   }
 
-  bool skipForDiagnostic({Element2? element, DartType? type, Token? name}) =>
+  bool skipForDiagnostic({Element? element, DartType? type, Token? name}) =>
       name.isPrivate || _isOverridingMember(element) || isWidgetProperty(type);
 
   @override
@@ -123,10 +123,10 @@ class _Visitor extends SimpleAstVisitor<void> {
     properties.forEach(rule.reportAtToken);
   }
 
-  bool _isOverridingMember(Element2? member) {
+  bool _isOverridingMember(Element? member) {
     if (member == null) return false;
 
-    var classElement = member.thisOrAncestorOfType2<InterfaceElement2>();
+    var classElement = member.thisOrAncestorOfType2<InterfaceElement>();
     if (classElement == null) return false;
 
     var name = member.name3;
diff --git a/pkg/linter/lib/src/rules/discarded_futures.dart b/pkg/linter/lib/src/rules/discarded_futures.dart
index 20446e796ea..174cc6077bf 100644
--- a/pkg/linter/lib/src/rules/discarded_futures.dart
+++ b/pkg/linter/lib/src/rules/discarded_futures.dart
@@ -95,8 +95,8 @@ class _Visitor extends SimpleAstVisitor<void> {
       expr.constructorName.name?.name == 'delayed' &&
       expr.argumentList.arguments.length == 2;
 
-  bool _isMapClass(Element2? e) =>
-      e is ClassElement2 && e.name3 == 'Map' && e.library2.name3 == 'dart.core';
+  bool _isMapClass(Element? e) =>
+      e is ClassElement && e.name3 == 'Map' && e.library2.name3 == 'dart.core';
 
   /// Detects Map.putIfAbsent invocations.
   bool _isMapPutIfAbsentInvocation(Expression expr) =>
diff --git a/pkg/linter/lib/src/rules/exhaustive_cases.dart b/pkg/linter/lib/src/rules/exhaustive_cases.dart
index 98b17f8bbc5..9167af7a197 100644
--- a/pkg/linter/lib/src/rules/exhaustive_cases.dart
+++ b/pkg/linter/lib/src/rules/exhaustive_cases.dart
@@ -40,7 +40,7 @@ class _Visitor extends SimpleAstVisitor<void> {
     if (expressionType is InterfaceType) {
       var interfaceElement = expressionType.element3;
       // Handled in analyzer.
-      if (interfaceElement is! ClassElement2) {
+      if (interfaceElement is! ClassElement) {
         return;
       }
       var enumDescription = interfaceElement.asEnumLikeClass();
@@ -61,12 +61,12 @@ class _Visitor extends SimpleAstVisitor<void> {
         }
         if (expression is Identifier) {
           var variable = expression.element.variableElement;
-          if (variable is VariableElement2) {
+          if (variable is VariableElement) {
             enumConstants.remove(variable.computeConstantValue());
           }
         } else if (expression is PropertyAccess) {
           var variable = expression.propertyName.element.variableElement;
-          if (variable is VariableElement2) {
+          if (variable is VariableElement) {
             enumConstants.remove(variable.computeConstantValue());
           }
         }
@@ -92,8 +92,8 @@ class _Visitor extends SimpleAstVisitor<void> {
   }
 }
 
-extension on Element2? {
-  Element2? get variableElement {
+extension on Element? {
+  Element? get variableElement {
     var self = this;
     if (self is GetterElement) {
       var variable = self.variable3;
diff --git a/pkg/linter/lib/src/rules/hash_and_equals.dart b/pkg/linter/lib/src/rules/hash_and_equals.dart
index e1ea493fede..c63626ffab6 100644
--- a/pkg/linter/lib/src/rules/hash_and_equals.dart
+++ b/pkg/linter/lib/src/rules/hash_and_equals.dart
@@ -73,6 +73,6 @@ extension on ClassDeclaration {
       declaredFragment?.element.methods2.namedOrNull(name) != null;
 }
 
-extension<E extends Element2> on List<E> {
+extension<E extends Element> on List<E> {
   E? namedOrNull(String name) => firstWhereOrNull((e) => e.name3 == name);
 }
diff --git a/pkg/linter/lib/src/rules/implicit_reopen.dart b/pkg/linter/lib/src/rules/implicit_reopen.dart
index 32dc779fce4..acee2ecffa4 100644
--- a/pkg/linter/lib/src/rules/implicit_reopen.dart
+++ b/pkg/linter/lib/src/rules/implicit_reopen.dart
@@ -38,18 +38,18 @@ class _Visitor extends SimpleAstVisitor<void> {
   _Visitor(this.rule);
 
   void checkElement(
-    InterfaceElement2? element,
+    InterfaceElement? element,
     NamedCompilationUnitMember node, {
     required String type,
   }) {
-    if (element is! ClassElement2) return;
+    if (element is! ClassElement) return;
     if (element.metadata2.hasReopen) return;
     if (element.isSealed) return;
     if (element.isMixinClass) return;
 
     var library = element.library2;
     var supertype = element.supertype?.element3;
-    if (supertype is! ClassElement2) return;
+    if (supertype is! ClassElement) return;
     if (supertype.library2 != library) return;
 
     if (element.isBase) {
@@ -89,8 +89,8 @@ class _Visitor extends SimpleAstVisitor<void> {
   void reportLint(
     NamedCompilationUnitMember member, {
     required String type,
-    required InterfaceElement2 target,
-    required InterfaceElement2 other,
+    required InterfaceElement target,
+    required InterfaceElement other,
     required String reason,
   }) {
     var targetName = target.name3;
@@ -114,6 +114,6 @@ class _Visitor extends SimpleAstVisitor<void> {
   }
 }
 
-extension on ClassElement2 {
+extension on ClassElement {
   bool get hasNoModifiers => !isInterface && !isBase && !isSealed && !isFinal;
 }
diff --git a/pkg/linter/lib/src/rules/invalid_runtime_check_with_js_interop_types.dart b/pkg/linter/lib/src/rules/invalid_runtime_check_with_js_interop_types.dart
index bc4fcae8cf6..0669e30f88d 100644
--- a/pkg/linter/lib/src/rules/invalid_runtime_check_with_js_interop_types.dart
+++ b/pkg/linter/lib/src/rules/invalid_runtime_check_with_js_interop_types.dart
@@ -45,7 +45,7 @@ bool _isJsInteropType(DartType type, _InteropTypeKind kind) {
     var userJsInteropTypeKind =
         kind == _InteropTypeKind.userJsInteropType ||
         kind == _InteropTypeKind.any;
-    if (element is ExtensionTypeElement2) {
+    if (element is ExtensionTypeElement) {
       if (dartJsInteropTypeKind && element.isFromLibrary(_dartJsInteropUri)) {
         return true;
       } else if (userJsInteropTypeKind) {
@@ -100,14 +100,14 @@ bool _isWasmIncompatibleJsInterop(DartType type) {
 /// Returns null if `type` is not a `dart:js_interop` `@staticInterop` class.
 DartType? _jsTypeForStaticInterop(InterfaceType type) {
   var element = type.element3;
-  if (element is! ClassElement2) return null;
+  if (element is! ClassElement) return null;
   var metadata = element.metadata2;
   var hasJS = false;
   var hasStaticInterop = false;
-  LibraryElement2? dartJsInterop;
+  LibraryElement? dartJsInterop;
   for (var annotation in metadata.annotations) {
     var annotationElement = annotation.element2;
-    if (annotationElement is ConstructorElement2 &&
+    if (annotationElement is ConstructorElement &&
         annotationElement.isFromLibrary(_dartJsInteropUri) &&
         annotationElement.enclosingElement2.name3 == 'JS') {
       hasJS = true;
@@ -436,7 +436,7 @@ class _Visitor extends SimpleAstVisitor<void> {
   }
 }
 
-extension on Element2 {
+extension on Element {
   /// Returns whether this is from the Dart library at [uri].
   bool isFromLibrary(String uri) => library2?.uri.toString() == uri;
 }
diff --git a/pkg/linter/lib/src/rules/library_annotations.dart b/pkg/linter/lib/src/rules/library_annotations.dart
index 1b628b2017a..253af43369b 100644
--- a/pkg/linter/lib/src/rules/library_annotations.dart
+++ b/pkg/linter/lib/src/rules/library_annotations.dart
@@ -88,7 +88,7 @@ extension on ElementAnnotation {
     required String className,
   }) {
     var element = element2;
-    return element is ConstructorElement2 &&
+    return element is ConstructorElement &&
         element.enclosingElement2.name3 == className &&
         element.library2.name3 == libraryName;
   }
diff --git a/pkg/linter/lib/src/rules/library_private_types_in_public_api.dart b/pkg/linter/lib/src/rules/library_private_types_in_public_api.dart
index 12648fb2c47..acf957b8c71 100644
--- a/pkg/linter/lib/src/rules/library_private_types_in_public_api.dart
+++ b/pkg/linter/lib/src/rules/library_private_types_in_public_api.dart
@@ -133,7 +133,7 @@ class Validator extends SimpleAstVisitor<void> {
 
     // Check implicit type.
     var element = node.declaredFragment?.element;
-    if (element is FieldFormalParameterElement2) {
+    if (element is FieldFormalParameterElement) {
       var type = element.type;
       if (type is InterfaceType && isPrivateName(type.element3.name3)) {
         rule.reportAtToken(node.name);
@@ -245,7 +245,7 @@ class Validator extends SimpleAstVisitor<void> {
 
     // Check implicit type.
     var element = node.declaredFragment?.element;
-    if (element is SuperFormalParameterElement2) {
+    if (element is SuperFormalParameterElement) {
       var type = element.type;
       if (type is InterfaceType && isPrivateName(type.element3.name3)) {
         rule.reportAtToken(node.name);
@@ -279,7 +279,7 @@ class Validator extends SimpleAstVisitor<void> {
 
   /// Return `true` if the given [element] is private or is defined in a private
   /// library.
-  static bool isPrivate(Element2 element) => isPrivateName(element.name3);
+  static bool isPrivate(Element element) => isPrivateName(element.name3);
 
   static bool isPrivateName(String? name) =>
       name != null && Identifier.isPrivateName(name);
diff --git a/pkg/linter/lib/src/rules/matching_super_parameters.dart b/pkg/linter/lib/src/rules/matching_super_parameters.dart
index 3a6e9e3a4ad..e315041b609 100644
--- a/pkg/linter/lib/src/rules/matching_super_parameters.dart
+++ b/pkg/linter/lib/src/rules/matching_super_parameters.dart
@@ -59,7 +59,7 @@ class _Visitor extends SimpleAstVisitor<void> {
                 .unnamedConstructor2;
       }
     }
-    if (superConstructor is! ConstructorElement2) return;
+    if (superConstructor is! ConstructorElement) return;
 
     var positionalParametersOfSuper =
         superConstructor.formalParameters.where((p) => p.isPositional).toList();
diff --git a/pkg/linter/lib/src/rules/no_default_cases.dart b/pkg/linter/lib/src/rules/no_default_cases.dart
index f1aab3ea999..141aed30046 100644
--- a/pkg/linter/lib/src/rules/no_default_cases.dart
+++ b/pkg/linter/lib/src/rules/no_default_cases.dart
@@ -45,8 +45,8 @@ class _Visitor extends SimpleAstVisitor<void> {
       for (var member in statement.members) {
         if (member is SwitchDefault) {
           var interfaceElement = expressionType.element3;
-          if (interfaceElement is EnumElement2 ||
-              interfaceElement is ClassElement2 &&
+          if (interfaceElement is EnumElement ||
+              interfaceElement is ClassElement &&
                   interfaceElement.isEnumLikeClass()) {
             rule.reportLint(member);
           }
diff --git a/pkg/linter/lib/src/rules/no_runtimeType_toString.dart b/pkg/linter/lib/src/rules/no_runtimeType_toString.dart
index 7f4df3c6bcf..fba586fd677 100644
--- a/pkg/linter/lib/src/rules/no_runtimeType_toString.dart
+++ b/pkg/linter/lib/src/rules/no_runtimeType_toString.dart
@@ -65,7 +65,7 @@ class _Visitor extends SimpleAstVisitor<void> {
             var extendedType = declaredElement.extendedType;
             if (extendedType is InterfaceType) {
               var extendedElement = extendedType.element3;
-              return !(extendedElement is ClassElement2 &&
+              return !(extendedElement is ClassElement &&
                   !extendedElement.isAbstract);
             }
           }
diff --git a/pkg/linter/lib/src/rules/no_wildcard_variable_uses.dart b/pkg/linter/lib/src/rules/no_wildcard_variable_uses.dart
index b9ae7c1b207..9db29eec6d6 100644
--- a/pkg/linter/lib/src/rules/no_wildcard_variable_uses.dart
+++ b/pkg/linter/lib/src/rules/no_wildcard_variable_uses.dart
@@ -39,7 +39,7 @@ class _Visitor extends SimpleAstVisitor<void> {
   @override
   void visitSimpleIdentifier(SimpleIdentifier node) {
     var element = node.element;
-    if (element is! LocalVariableElement2 &&
+    if (element is! LocalVariableElement &&
         element is! FormalParameterElement) {
       return;
     }
diff --git a/pkg/linter/lib/src/rules/null_closures.dart b/pkg/linter/lib/src/rules/null_closures.dart
index 842a6083178..de02325716f 100644
--- a/pkg/linter/lib/src/rules/null_closures.dart
+++ b/pkg/linter/lib/src/rules/null_closures.dart
@@ -229,7 +229,7 @@ class _Visitor extends SimpleAstVisitor<void> {
     var target = node.target;
     var methodName = node.methodName.name;
     var element = target is Identifier ? target.element : null;
-    if (element is ClassElement2) {
+    if (element is ClassElement) {
       // Static function called, "target" is the class.
       for (var function in _staticFunctionsWithNonNullableArguments) {
         if (methodName == function.name) {
diff --git a/pkg/linter/lib/src/rules/overridden_fields.dart b/pkg/linter/lib/src/rules/overridden_fields.dart
index 53c2877c912..e3883455968 100644
--- a/pkg/linter/lib/src/rules/overridden_fields.dart
+++ b/pkg/linter/lib/src/rules/overridden_fields.dart
@@ -42,7 +42,7 @@ class _Visitor extends SimpleAstVisitor<void> {
 
     for (var variable in node.fields.variables) {
       var parent = variable.declaredFragment?.element.enclosingElement2;
-      if (parent is InterfaceElement2) {
+      if (parent is InterfaceElement) {
         var overriddenMember = inheritanceManager.getMember4(
           parent,
           Name(parent.library2.uri, variable.name.lexeme),
diff --git a/pkg/linter/lib/src/rules/parameter_assignments.dart b/pkg/linter/lib/src/rules/parameter_assignments.dart
index 565bbb3e084..c9833e788f9 100644
--- a/pkg/linter/lib/src/rules/parameter_assignments.dart
+++ b/pkg/linter/lib/src/rules/parameter_assignments.dart
@@ -55,7 +55,7 @@ class _DeclarationVisitor extends RecursiveAstVisitor<void> {
     required this.paramDefaultsToNull,
   });
 
-  Element2? get parameterElement => parameter.declaredFragment?.element;
+  Element? get parameterElement => parameter.declaredFragment?.element;
 
   void checkPatternElements(DartPattern node) {
     NodeList<PatternField>? fields;
@@ -184,7 +184,7 @@ class _Visitor extends SimpleAstVisitor<void> {
 }
 
 extension on AstNode {
-  Element2? get element => switch (this) {
+  Element? get element => switch (this) {
     AssignedVariablePattern(:var element2) => element2,
     _ => null,
   };
diff --git a/pkg/linter/lib/src/rules/prefer_asserts_in_initializer_lists.dart b/pkg/linter/lib/src/rules/prefer_asserts_in_initializer_lists.dart
index ae8b72bb086..491e065b0e0 100644
--- a/pkg/linter/lib/src/rules/prefer_asserts_in_initializer_lists.dart
+++ b/pkg/linter/lib/src/rules/prefer_asserts_in_initializer_lists.dart
@@ -33,7 +33,7 @@ class PreferAssertsInInitializerLists extends LintRule {
 }
 
 class _AssertVisitor extends RecursiveAstVisitor<void> {
-  final ConstructorElement2 constructorElement;
+  final ConstructorElement constructorElement;
   final _ClassAndSuperClasses? classAndSuperClasses;
 
   bool needInstance = false;
@@ -47,12 +47,12 @@ class _AssertVisitor extends RecursiveAstVisitor<void> {
     // use method
     needInstance =
         needInstance ||
-        element is MethodElement2 && !element.isStatic && _hasMethod(element);
+        element is MethodElement && !element.isStatic && _hasMethod(element);
 
     // use property accessor not used as field formal parameter
     needInstance =
         needInstance ||
-        (element is PropertyAccessorElement2) &&
+        (element is PropertyAccessorElement) &&
             !element.isStatic &&
             _hasAccessor(element) &&
             !_paramMatchesField(element, constructorElement.formalParameters);
@@ -63,27 +63,27 @@ class _AssertVisitor extends RecursiveAstVisitor<void> {
     needInstance = true;
   }
 
-  bool _hasAccessor(PropertyAccessorElement2 element) {
+  bool _hasAccessor(PropertyAccessorElement element) {
     var classes = classAndSuperClasses?.classes;
     return classes != null && classes.contains(element.enclosingElement2);
   }
 
-  bool _hasMethod(MethodElement2 element) {
+  bool _hasMethod(MethodElement element) {
     var classes = classAndSuperClasses?.classes;
     return classes != null && classes.contains(element.enclosingElement2);
   }
 
   bool _paramMatchesField(
-    PropertyAccessorElement2 element,
+    PropertyAccessorElement element,
     List<FormalParameterElement> parameters,
   ) {
     for (var p in parameters) {
       FormalParameterElement? parameterElement = p;
-      if (parameterElement is SuperFormalParameterElement2) {
+      if (parameterElement is SuperFormalParameterElement) {
         parameterElement = parameterElement.superConstructorParameter2;
       }
 
-      if (parameterElement is FieldFormalParameterElement2) {
+      if (parameterElement is FieldFormalParameterElement) {
         if (parameterElement.field2?.getter2 == element) {
           return true;
         }
@@ -95,15 +95,15 @@ class _AssertVisitor extends RecursiveAstVisitor<void> {
 
 /// Lazy cache of elements.
 class _ClassAndSuperClasses {
-  final ClassElement2? element;
-  final Set<InterfaceElement2> _classes = {};
+  final ClassElement? element;
+  final Set<InterfaceElement> _classes = {};
 
   _ClassAndSuperClasses(this.element);
 
   /// The [element] and its super classes, including mixins.
-  Set<InterfaceElement2> get classes {
+  Set<InterfaceElement> get classes {
     if (_classes.isEmpty) {
-      void addRecursively(InterfaceElement2? element) {
+      void addRecursively(InterfaceElement? element) {
         if (element != null && _classes.add(element)) {
           for (var t in element.mixins) {
             addRecursively(t.element3);
diff --git a/pkg/linter/lib/src/rules/prefer_collection_literals.dart b/pkg/linter/lib/src/rules/prefer_collection_literals.dart
index b6237d49889..620cdb4bfcb 100644
--- a/pkg/linter/lib/src/rules/prefer_collection_literals.dart
+++ b/pkg/linter/lib/src/rules/prefer_collection_literals.dart
@@ -40,7 +40,7 @@ class _Visitor extends SimpleAstVisitor<void> {
   void visitInstanceCreationExpression(InstanceCreationExpression node) {
     var constructorName = node.constructorName.name?.name;
 
-    if (node.constructorName.type.element2 is TypeAliasElement2) {
+    if (node.constructorName.type.element2 is TypeAliasElement) {
       // Allow the use of typedef constructors.
       return;
     }
diff --git a/pkg/linter/lib/src/rules/prefer_const_constructors.dart b/pkg/linter/lib/src/rules/prefer_const_constructors.dart
index 9dcc0439c35..39be1a25365 100644
--- a/pkg/linter/lib/src/rules/prefer_const_constructors.dart
+++ b/pkg/linter/lib/src/rules/prefer_const_constructors.dart
@@ -48,8 +48,7 @@ class _Visitor extends SimpleAstVisitor<void> {
     if (element.metadata2.hasLiteral) return;
 
     var enclosingElement = element.enclosingElement2;
-    if (enclosingElement is ClassElement2 &&
-        enclosingElement.isDartCoreObject) {
+    if (enclosingElement is ClassElement && enclosingElement.isDartCoreObject) {
       // Skip lint for `new Object()`, because it can be used for ID creation.
       return;
     }
diff --git a/pkg/linter/lib/src/rules/prefer_const_constructors_in_immutables.dart b/pkg/linter/lib/src/rules/prefer_const_constructors_in_immutables.dart
index f187c41385e..3a9d52da005 100644
--- a/pkg/linter/lib/src/rules/prefer_const_constructors_in_immutables.dart
+++ b/pkg/linter/lib/src/rules/prefer_const_constructors_in_immutables.dart
@@ -71,11 +71,9 @@ class _Visitor extends SimpleAstVisitor<void> {
     }
   }
 
-  static List<InterfaceElement2> _getSelfAndSuperClasses(
-    InterfaceElement2 self,
-  ) {
-    InterfaceElement2? current = self;
-    var seenElements = <InterfaceElement2>{};
+  static List<InterfaceElement> _getSelfAndSuperClasses(InterfaceElement self) {
+    InterfaceElement? current = self;
+    var seenElements = <InterfaceElement>{};
     while (current != null && seenElements.add(current)) {
       current = current.supertype?.element3;
     }
@@ -103,7 +101,7 @@ class _Visitor extends SimpleAstVisitor<void> {
       return redirectInvocation.element?.isConst ?? false;
     }
 
-    if (clazz is ExtensionTypeElement2) {
+    if (clazz is ExtensionTypeElement) {
       return clazz.primaryConstructor2.isConst;
     }
 
@@ -115,7 +113,7 @@ class _Visitor extends SimpleAstVisitor<void> {
 
   /// Whether [clazz] or any of its super-types are annotated with
   /// `@immutable`.
-  static bool _hasImmutableAnnotation(InterfaceElement2 clazz) {
+  static bool _hasImmutableAnnotation(InterfaceElement clazz) {
     var selfAndInheritedClasses = _getSelfAndSuperClasses(clazz);
     return selfAndInheritedClasses.any((cls) => cls.metadata2.hasImmutable);
   }
diff --git a/pkg/linter/lib/src/rules/prefer_final_fields.dart b/pkg/linter/lib/src/rules/prefer_final_fields.dart
index 32b27e75cda..094be4054f7 100644
--- a/pkg/linter/lib/src/rules/prefer_final_fields.dart
+++ b/pkg/linter/lib/src/rules/prefer_final_fields.dart
@@ -30,13 +30,13 @@ class PreferFinalFields extends LintRule {
 }
 
 class _DeclarationsCollector extends RecursiveAstVisitor<void> {
-  final fields = <FieldElement2, VariableDeclaration>{};
+  final fields = <FieldElement, VariableDeclaration>{};
   final InheritanceManager3 inheritanceManager;
 
   _DeclarationsCollector(this.inheritanceManager);
-  bool overridesField(FieldElement2 field) {
+  bool overridesField(FieldElement field) {
     var enclosingElement = field.enclosingElement2;
-    if (enclosingElement is! InterfaceElement2) return false;
+    if (enclosingElement is! InterfaceElement) return false;
     return inheritanceManager.getOverridden4(
           enclosingElement,
           Name.forLibrary(field.library2, '${field.name3!}='),
@@ -54,7 +54,7 @@ class _DeclarationsCollector extends RecursiveAstVisitor<void> {
 
     for (var variable in node.fields.variables) {
       var element = variable.declaredFragment?.element;
-      if (element is FieldElement2 &&
+      if (element is FieldElement &&
           element.isPrivate &&
           !overridesField(element)) {
         fields[element] = variable;
@@ -67,7 +67,7 @@ class _FieldMutationFinder extends RecursiveAstVisitor<void> {
   /// The collection of fields declared in this library.
   ///
   /// This visitor removes a field when it finds that it is assigned anywhere.
-  final Map<FieldElement2, VariableDeclaration> _fields;
+  final Map<FieldElement, VariableDeclaration> _fields;
 
   _FieldMutationFinder(this._fields);
 
@@ -97,7 +97,7 @@ class _FieldMutationFinder extends RecursiveAstVisitor<void> {
     var element = assignment.writeElement2?.canonicalElement2;
     element = element?.baseElement;
 
-    if (element is FieldElement2) {
+    if (element is FieldElement) {
       _fields.remove(element);
     }
   }
@@ -152,7 +152,7 @@ class _Visitor extends SimpleAstVisitor<void> {
   }
 }
 
-extension on VariableElement2 {
+extension on VariableElement {
   bool isSetInConstructor(ConstructorDeclaration constructor) =>
       constructor.initializers.any(isSetInInitializer) ||
       constructor.parameters.parameters.any(isSetInParameter);
@@ -165,7 +165,7 @@ extension on VariableElement2 {
   /// Whether `this` is initialized with [parameter].
   bool isSetInParameter(FormalParameter parameter) {
     var formalField = parameter.declaredFragment?.element;
-    return formalField is FieldFormalParameterElement2 &&
+    return formalField is FieldFormalParameterElement &&
         formalField.field2 == this;
   }
 }
diff --git a/pkg/linter/lib/src/rules/prefer_final_locals.dart b/pkg/linter/lib/src/rules/prefer_final_locals.dart
index 1eece0ea5d0..21433f4bd76 100644
--- a/pkg/linter/lib/src/rules/prefer_final_locals.dart
+++ b/pkg/linter/lib/src/rules/prefer_final_locals.dart
@@ -36,7 +36,7 @@ class PreferFinalLocals extends LintRule {
 }
 
 class _DeclaredVariableVisitor extends RecursiveAstVisitor<void> {
-  final List<BindPatternVariableElement2> declaredElements = [];
+  final List<BindPatternVariableElement> declaredElements = [];
 
   @override
   void visitDeclaredVariablePattern(DeclaredVariablePattern node) {
diff --git a/pkg/linter/lib/src/rules/prefer_foreach.dart b/pkg/linter/lib/src/rules/prefer_foreach.dart
index 41d3e69ab0a..9ad516205ae 100644
--- a/pkg/linter/lib/src/rules/prefer_foreach.dart
+++ b/pkg/linter/lib/src/rules/prefer_foreach.dart
@@ -29,7 +29,7 @@ class PreferForeach extends LintRule {
 
 class _PreferForEachVisitor extends SimpleAstVisitor<void> {
   final LintRule rule;
-  LocalVariableElement2? element;
+  LocalVariableElement? element;
   ForStatement? forEachStatement;
 
   _PreferForEachVisitor(this.rule);
@@ -86,7 +86,7 @@ class _PreferForEachVisitor extends SimpleAstVisitor<void> {
 
 class _ReferenceFinder extends UnifyingAstVisitor<void> {
   bool found = false;
-  final LocalVariableElement2? element;
+  final LocalVariableElement? element;
   _ReferenceFinder(this.element);
 
   bool references(Expression target) {
diff --git a/pkg/linter/lib/src/rules/prefer_initializing_formals.dart b/pkg/linter/lib/src/rules/prefer_initializing_formals.dart
index f82a464b8fb..467ca55b4ad 100644
--- a/pkg/linter/lib/src/rules/prefer_initializing_formals.dart
+++ b/pkg/linter/lib/src/rules/prefer_initializing_formals.dart
@@ -32,13 +32,13 @@ Iterable<ConstructorFieldInitializer>
 _getConstructorFieldInitializersInInitializers(ConstructorDeclaration node) =>
     node.initializers.whereType<ConstructorFieldInitializer>();
 
-Element2? _getLeftElement(AssignmentExpression assignment) =>
+Element? _getLeftElement(AssignmentExpression assignment) =>
     assignment.writeElement2?.canonicalElement2;
 
 Iterable<FormalParameterElement?> _getParameters(ConstructorDeclaration node) =>
     node.parameters.parameters.map((e) => e.declaredFragment?.element);
 
-Element2? _getRightElement(AssignmentExpression assignment) =>
+Element? _getRightElement(AssignmentExpression assignment) =>
     assignment.rightHandSide.canonicalElement;
 
 class PreferInitializingFormals extends LintRule {
@@ -72,8 +72,8 @@ class _Visitor extends SimpleAstVisitor<void> {
     }
 
     var parameters = _getParameters(node);
-    var parametersUsedOnce = <Element2?>{};
-    var parametersUsedMoreThanOnce = <Element2?>{};
+    var parametersUsedOnce = <Element?>{};
+    var parametersUsedMoreThanOnce = <Element?>{};
 
     bool isAssignmentExpressionToLint(AssignmentExpression assignment) {
       var leftElement = _getLeftElement(assignment);
@@ -82,7 +82,7 @@ class _Visitor extends SimpleAstVisitor<void> {
           rightElement != null &&
           leftElement.name3 == rightElement.name3 &&
           !leftElement.isPrivate &&
-          leftElement is FieldElement2 &&
+          leftElement is FieldElement &&
           !leftElement.isSynthetic &&
           leftElement.enclosingElement2 ==
               node.declaredFragment?.element.enclosingElement2 &&
@@ -114,7 +114,7 @@ class _Visitor extends SimpleAstVisitor<void> {
       return false;
     }
 
-    void processElement(Element2? element) {
+    void processElement(Element? element) {
       if (!parametersUsedOnce.add(element)) {
         parametersUsedMoreThanOnce.add(element);
       }
diff --git a/pkg/linter/lib/src/rules/prefer_mixin.dart b/pkg/linter/lib/src/rules/prefer_mixin.dart
index d4d95f84ab5..d41d94e4e37 100644
--- a/pkg/linter/lib/src/rules/prefer_mixin.dart
+++ b/pkg/linter/lib/src/rules/prefer_mixin.dart
@@ -38,8 +38,8 @@ class _Visitor extends SimpleAstVisitor<void> {
       var type = mixinNode.type;
       if (type is InterfaceType) {
         var element = type.element3;
-        if (element is MixinElement2) continue;
-        if (element is ClassElement2 && !element.isMixinClass) {
+        if (element is MixinElement) continue;
+        if (element is ClassElement && !element.isMixinClass) {
           rule.reportLint(mixinNode, arguments: [mixinNode.name2.lexeme]);
         }
       }
diff --git a/pkg/linter/lib/src/rules/recursive_getters.dart b/pkg/linter/lib/src/rules/recursive_getters.dart
index 5744d1aae05..18a59ee4ff7 100644
--- a/pkg/linter/lib/src/rules/recursive_getters.dart
+++ b/pkg/linter/lib/src/rules/recursive_getters.dart
@@ -30,7 +30,7 @@ class RecursiveGetters extends LintRule {
 
 class _BodyVisitor extends RecursiveAstVisitor<void> {
   final LintRule rule;
-  final ExecutableElement2 element;
+  final ExecutableElement element;
   _BodyVisitor(this.element, this.rule);
 
   bool isSelfReference(SimpleIdentifier node) {
@@ -86,7 +86,7 @@ class _Visitor extends SimpleAstVisitor<void> {
     _verifyElement(node.body, node.declaredFragment?.element);
   }
 
-  void _verifyElement(AstNode node, ExecutableElement2? element) {
+  void _verifyElement(AstNode node, ExecutableElement? element) {
     if (element == null) return;
     node.accept(_BodyVisitor(element, rule));
   }
diff --git a/pkg/linter/lib/src/rules/specify_nonobvious_property_types.dart b/pkg/linter/lib/src/rules/specify_nonobvious_property_types.dart
index 277917c88c0..b7b8534afb2 100644
--- a/pkg/linter/lib/src/rules/specify_nonobvious_property_types.dart
+++ b/pkg/linter/lib/src/rules/specify_nonobvious_property_types.dart
@@ -70,7 +70,7 @@ class _Visitor extends SimpleAstVisitor<void> {
         bool ignoreThisVariable = false;
         AstNode? owningDeclaration = node;
         while (owningDeclaration != null) {
-          InterfaceElement2? owningElement = switch (owningDeclaration) {
+          InterfaceElement? owningElement = switch (owningDeclaration) {
             ClassDeclaration(:var declaredFragment?) =>
               declaredFragment.element,
             MixinDeclaration(:var declaredFragment?) =>
diff --git a/pkg/linter/lib/src/rules/strict_top_level_inference.dart b/pkg/linter/lib/src/rules/strict_top_level_inference.dart
index 5a6224a09dc..3a1436b14c1 100644
--- a/pkg/linter/lib/src/rules/strict_top_level_inference.dart
+++ b/pkg/linter/lib/src/rules/strict_top_level_inference.dart
@@ -128,7 +128,7 @@ class _Visitor extends SimpleAstVisitor<void> {
 
   void _checkFormalParameters(
     List<FormalParameter> parameters, {
-    ExecutableElement2? overriddenMember,
+    ExecutableElement? overriddenMember,
   }) {
     for (var i = 0; i < parameters.length; i++) {
       var parameter = parameters[i];
@@ -173,7 +173,7 @@ class _Visitor extends SimpleAstVisitor<void> {
     }
   }
 
-  void _checkGetter(MethodDeclaration node, PropertyAccessorElement2 element) {
+  void _checkGetter(MethodDeclaration node, PropertyAccessorElement element) {
     if (node.returnType != null) return;
 
     if (!_isOverride(node, element)) {
@@ -194,8 +194,8 @@ class _Visitor extends SimpleAstVisitor<void> {
     var container = element.enclosingFragment!.element;
     var noOverride =
         node.isStatic ||
-        container is ExtensionElement2 ||
-        container is ExtensionTypeElement2;
+        container is ExtensionElement ||
+        container is ExtensionTypeElement;
 
     if (noOverride) {
       if (node.returnType == null) {
@@ -227,7 +227,7 @@ class _Visitor extends SimpleAstVisitor<void> {
     }
   }
 
-  void _checkSetter(MethodDeclaration node, PropertyAccessorElement2 element) {
+  void _checkSetter(MethodDeclaration node, PropertyAccessorElement element) {
     var parameter = node.parameters?.parameters.firstOrNull;
     if (parameter == null) return;
     if (parameter is! SimpleFormalParameter) return;
@@ -241,11 +241,11 @@ class _Visitor extends SimpleAstVisitor<void> {
     }
   }
 
-  bool _isOverride(MethodDeclaration node, PropertyAccessorElement2 element) {
+  bool _isOverride(MethodDeclaration node, PropertyAccessorElement element) {
     var container = element.enclosingElement2;
     if (node.isStatic) return false;
-    if (container is ExtensionElement2) return false;
-    if (container is ExtensionTypeElement2) return false;
+    if (container is ExtensionElement) return false;
+    if (container is ExtensionTypeElement) return false;
     var overriddenMember = context.inheritanceManager.overriddenMember(
       node.declaredFragment?.element,
     );
diff --git a/pkg/linter/lib/src/rules/tighten_type_of_initializing_formals.dart b/pkg/linter/lib/src/rules/tighten_type_of_initializing_formals.dart
index d17fc261ae5..cf75bc965d1 100644
--- a/pkg/linter/lib/src/rules/tighten_type_of_initializing_formals.dart
+++ b/pkg/linter/lib/src/rules/tighten_type_of_initializing_formals.dart
@@ -69,9 +69,9 @@ class _Visitor extends SimpleAstVisitor<void> {
     }
   }
 
-  void _check(Element2? element, ConstructorDeclaration node) {
-    if (element is FieldFormalParameterElement2 ||
-        element is SuperFormalParameterElement2) {
+  void _check(Element? element, ConstructorDeclaration node) {
+    if (element is FieldFormalParameterElement ||
+        element is SuperFormalParameterElement) {
       rule.reportLint(
         node.parameters.parameters.firstWhere(
           (p) => p.declaredFragment?.element == element,
diff --git a/pkg/linter/lib/src/rules/type_init_formals.dart b/pkg/linter/lib/src/rules/type_init_formals.dart
index 1089761157d..2dfe02cdd58 100644
--- a/pkg/linter/lib/src/rules/type_init_formals.dart
+++ b/pkg/linter/lib/src/rules/type_init_formals.dart
@@ -39,7 +39,7 @@ class _Visitor extends SimpleAstVisitor<void> {
     if (nodeType == null) return;
 
     var paramElement = node.declaredFragment?.element;
-    if (paramElement is! FieldFormalParameterElement2) return;
+    if (paramElement is! FieldFormalParameterElement) return;
 
     var field = paramElement.field2;
     // If no such field exists, the code is invalid; do not report lint.
@@ -54,7 +54,7 @@ class _Visitor extends SimpleAstVisitor<void> {
     if (nodeType == null) return;
 
     var paramElement = node.declaredFragment?.element;
-    if (paramElement is! SuperFormalParameterElement2) return;
+    if (paramElement is! SuperFormalParameterElement) return;
 
     var superConstructorParameter = paramElement.superConstructorParameter2;
     if (superConstructorParameter == null) return;
diff --git a/pkg/linter/lib/src/rules/unawaited_futures.dart b/pkg/linter/lib/src/rules/unawaited_futures.dart
index 24b2aa45c52..9ecc59f4854 100644
--- a/pkg/linter/lib/src/rules/unawaited_futures.dart
+++ b/pkg/linter/lib/src/rules/unawaited_futures.dart
@@ -93,8 +93,8 @@ class _Visitor extends SimpleAstVisitor<void> {
       expr.constructorName.name?.name == 'delayed' &&
       expr.argumentList.arguments.length == 2;
 
-  bool _isMapClass(Element2? e) =>
-      e is ClassElement2 && e.name3 == 'Map' && e.library2.name3 == 'dart.core';
+  bool _isMapClass(Element? e) =>
+      e is ClassElement && e.name3 == 'Map' && e.library2.name3 == 'dart.core';
 
   /// Detects Map.putIfAbsent invocations.
   bool _isMapPutIfAbsentInvocation(Expression expr) =>
diff --git a/pkg/linter/lib/src/rules/unnecessary_lambdas.dart b/pkg/linter/lib/src/rules/unnecessary_lambdas.dart
index d084994d692..5c5d929004d 100644
--- a/pkg/linter/lib/src/rules/unnecessary_lambdas.dart
+++ b/pkg/linter/lib/src/rules/unnecessary_lambdas.dart
@@ -13,7 +13,7 @@ import '../util/dart_type_utilities.dart';
 
 const _desc = r"Don't create a lambda when a tear-off will do.";
 
-Set<Element2?> _extractElementsOfSimpleIdentifiers(AstNode node) =>
+Set<Element?> _extractElementsOfSimpleIdentifiers(AstNode node) =>
     _IdentifierVisitor().extractElements(node);
 
 class UnnecessaryLambdas extends LintRule {
@@ -71,11 +71,11 @@ class _FinalExpressionChecker {
 }
 
 class _IdentifierVisitor extends RecursiveAstVisitor<void> {
-  final _elements = <Element2?>{};
+  final _elements = <Element?>{};
 
   _IdentifierVisitor();
 
-  Set<Element2?> extractElements(AstNode node) {
+  Set<Element?> extractElements(AstNode node) {
     node.accept(this);
     return _elements;
   }
@@ -234,17 +234,17 @@ extension on Expression? {
       SimpleIdentifier(:var element) => element,
       _ => null,
     };
-    return element is PrefixElement2 &&
+    return element is PrefixElement &&
         element.imports.any((e) => e.prefix2?.isDeferred ?? false);
   }
 }
 
-extension on Element2? {
+extension on Element? {
   /// Returns whether this is a `final` variable or property and not `late`.
   bool get isFinal => switch (this) {
-    PropertyAccessorElement2(:var isSynthetic, :var variable3?) =>
+    PropertyAccessorElement(:var isSynthetic, :var variable3?) =>
       isSynthetic && variable3.isFinal && !variable3.isLate,
-    VariableElement2(:var isLate, :var isFinal) => isFinal && !isLate,
+    VariableElement(:var isLate, :var isFinal) => isFinal && !isLate,
     // TODO(pq): [element model] this preserves existing v1 semantics but looks fishy
     _ => true,
   };
diff --git a/pkg/linter/lib/src/rules/unnecessary_null_aware_operator_on_extension_on_nullable.dart b/pkg/linter/lib/src/rules/unnecessary_null_aware_operator_on_extension_on_nullable.dart
index 4c5f48c84c8..3d6e2213200 100644
--- a/pkg/linter/lib/src/rules/unnecessary_null_aware_operator_on_extension_on_nullable.dart
+++ b/pkg/linter/lib/src/rules/unnecessary_null_aware_operator_on_extension_on_nullable.dart
@@ -86,7 +86,7 @@ class _Visitor extends SimpleAstVisitor<void> {
     }
   }
 
-  bool _isExtensionOnNullableType(Element2? enclosingElement) =>
-      enclosingElement is ExtensionElement2 &&
+  bool _isExtensionOnNullableType(Element? enclosingElement) =>
+      enclosingElement is ExtensionElement &&
       context.typeSystem.isNullable(enclosingElement.extendedType);
 }
diff --git a/pkg/linter/lib/src/rules/unnecessary_overrides.dart b/pkg/linter/lib/src/rules/unnecessary_overrides.dart
index b31e0f8c162..2041f97ed70 100644
--- a/pkg/linter/lib/src/rules/unnecessary_overrides.dart
+++ b/pkg/linter/lib/src/rules/unnecessary_overrides.dart
@@ -37,12 +37,12 @@ abstract class _AbstractUnnecessaryOverrideVisitor
 
   /// If [declaration] is an inherited member of interest, then this is set in
   /// [visitMethodDeclaration].
-  late ExecutableElement2 _inheritedMethod;
+  late ExecutableElement _inheritedMethod;
   late MethodDeclaration declaration;
 
   _AbstractUnnecessaryOverrideVisitor(this.rule);
 
-  ExecutableElement2? getInheritedElement(MethodDeclaration node);
+  ExecutableElement? getInheritedElement(MethodDeclaration node);
 
   @override
   void visitBlock(Block node) {
@@ -181,11 +181,11 @@ class _UnnecessaryGetterOverrideVisitor
   _UnnecessaryGetterOverrideVisitor(super.rule);
 
   @override
-  ExecutableElement2? getInheritedElement(MethodDeclaration node) {
+  ExecutableElement? getInheritedElement(MethodDeclaration node) {
     var element = node.declaredFragment?.element;
     if (element == null) return null;
     var enclosingElement = element.enclosingElement2;
-    if (enclosingElement is! InterfaceElement2) return null;
+    if (enclosingElement is! InterfaceElement) return null;
     var getterName = element.name3;
     if (getterName == null) return null;
     return enclosingElement.thisType.lookUpGetter3(
@@ -209,12 +209,12 @@ class _UnnecessaryMethodOverrideVisitor
   _UnnecessaryMethodOverrideVisitor(super.rule);
 
   @override
-  ExecutableElement2? getInheritedElement(node) {
+  ExecutableElement? getInheritedElement(node) {
     var element = node.declaredFragment?.element;
     if (element == null) return null;
 
     var enclosingElement = element.enclosingElement2;
-    if (enclosingElement is! InterfaceElement2) return null;
+    if (enclosingElement is! InterfaceElement) return null;
 
     return enclosingElement.firstFragment.element.thisType.lookUpMethod3(
       node.name.lexeme,
@@ -243,11 +243,11 @@ class _UnnecessaryOperatorOverrideVisitor
   _UnnecessaryOperatorOverrideVisitor(super.rule);
 
   @override
-  ExecutableElement2? getInheritedElement(node) {
+  ExecutableElement? getInheritedElement(node) {
     var element = node.declaredFragment?.element;
     if (element == null) return null;
     var enclosingElement = element.enclosingElement2;
-    if (enclosingElement is! InterfaceElement2) return null;
+    if (enclosingElement is! InterfaceElement) return null;
     var methodName = element.name3;
     if (methodName == null) return null;
     return enclosingElement.thisType.lookUpMethod3(
@@ -292,11 +292,11 @@ class _UnnecessarySetterOverrideVisitor
   _UnnecessarySetterOverrideVisitor(super.rule);
 
   @override
-  ExecutableElement2? getInheritedElement(node) {
+  ExecutableElement? getInheritedElement(node) {
     var element = node.declaredFragment?.element;
     if (element == null) return null;
     var enclosingElement = element.enclosingElement2;
-    if (enclosingElement is! InterfaceElement2) return null;
+    if (enclosingElement is! InterfaceElement) return null;
     return enclosingElement.thisType.lookUpSetter3(
       node.name.lexeme,
       element.library2,
diff --git a/pkg/linter/lib/src/rules/unnecessary_parenthesis.dart b/pkg/linter/lib/src/rules/unnecessary_parenthesis.dart
index d81c1129b5d..6edf6d70231 100644
--- a/pkg/linter/lib/src/rules/unnecessary_parenthesis.dart
+++ b/pkg/linter/lib/src/rules/unnecessary_parenthesis.dart
@@ -117,7 +117,7 @@ class _Visitor extends SimpleAstVisitor<void> {
         // allows an extension getter, which extends a nullable type, to be
         // called on a `null` value.
         var target = parent.propertyName.element?.enclosingElement2;
-        if (target is ExtensionElement2 &&
+        if (target is ExtensionElement &&
             typeSystem.isNullable(target.extendedType)) {
           return;
         }
@@ -132,7 +132,7 @@ class _Visitor extends SimpleAstVisitor<void> {
         // allows an extension method, which extends a nullable type, to be
         // called on a `null` value.
         var target = parent.methodName.element?.enclosingElement2;
-        if (target is ExtensionElement2 &&
+        if (target is ExtensionElement &&
             typeSystem.isNullable(target.extendedType)) {
           return;
         }
diff --git a/pkg/linter/lib/src/rules/unnecessary_this.dart b/pkg/linter/lib/src/rules/unnecessary_this.dart
index ca719fe1170..77fa93a1d9a 100644
--- a/pkg/linter/lib/src/rules/unnecessary_this.dart
+++ b/pkg/linter/lib/src/rules/unnecessary_this.dart
@@ -49,7 +49,7 @@ class _Visitor extends SimpleAstVisitor<void> {
   void visitThisExpression(ThisExpression node) {
     var parent = node.parent;
 
-    Element2? element;
+    Element? element;
     if (parent is PropertyAccess && !parent.isNullAware) {
       element = getWriteOrReadElement(parent.propertyName);
     } else if (parent is MethodInvocation && !parent.isNullAware) {
@@ -64,7 +64,7 @@ class _Visitor extends SimpleAstVisitor<void> {
     }
   }
 
-  bool _canReferenceElementWithoutThisPrefix(Element2? element, AstNode node) {
+  bool _canReferenceElementWithoutThisPrefix(Element? element, AstNode node) {
     if (element == null) return false;
 
     var id = element.displayName;
@@ -93,7 +93,7 @@ class _Visitor extends SimpleAstVisitor<void> {
     //  - the requested element must be inherited, or from an extension.
     if (result.isDifferentName) {
       var enclosing = resultElement?.enclosingElement2;
-      return enclosing is ClassElement2;
+      return enclosing is ClassElement;
     }
 
     // Should not happen.
diff --git a/pkg/linter/lib/src/rules/unnecessary_underscores.dart b/pkg/linter/lib/src/rules/unnecessary_underscores.dart
index 1eac9b7445d..933441cba1a 100644
--- a/pkg/linter/lib/src/rules/unnecessary_underscores.dart
+++ b/pkg/linter/lib/src/rules/unnecessary_underscores.dart
@@ -35,7 +35,7 @@ class UnnecessaryUnderscores extends LintRule {
 }
 
 class _BodyVisitor extends RecursiveAstVisitor<void> {
-  final Set<Element2> referencedElements = <Element2>{};
+  final Set<Element> referencedElements = <Element>{};
 
   _BodyVisitor();
 
@@ -52,7 +52,7 @@ class _Visitor extends SimpleAstVisitor<void> {
 
   @override
   void visitFormalParameterList(FormalParameterList node) {
-    late Set<Element2> referencedElements = collectReferences(node.parent);
+    late Set<Element> referencedElements = collectReferences(node.parent);
 
     for (var parameter in node.parameters) {
       var parameterName = parameter.name;
@@ -70,7 +70,7 @@ class _Visitor extends SimpleAstVisitor<void> {
   @override
   void visitVariableDeclaration(VariableDeclaration node) {
     var element = node.declaredFragment?.element;
-    if (element is FieldElement2 || element is TopLevelVariableElement2) return;
+    if (element is FieldElement || element is TopLevelVariableElement) return;
 
     if (isJustUnderscores(node.name.lexeme)) {
       var parent = node.thisOrAncestorOfType<FunctionBody>();
@@ -80,7 +80,7 @@ class _Visitor extends SimpleAstVisitor<void> {
     }
   }
 
-  static Set<Element2> collectReferences(AstNode? node) {
+  static Set<Element> collectReferences(AstNode? node) {
     if (node == null) return {};
     var visitor = _BodyVisitor();
     node.accept(visitor);
diff --git a/pkg/linter/lib/src/rules/unreachable_from_main.dart b/pkg/linter/lib/src/rules/unreachable_from_main.dart
index e531046e1fc..174cdf10240 100644
--- a/pkg/linter/lib/src/rules/unreachable_from_main.dart
+++ b/pkg/linter/lib/src/rules/unreachable_from_main.dart
@@ -82,11 +82,11 @@ class _DeclarationGatherer {
   }
 
   void _addMembers({
-    required Element2? containerElement,
+    required Element? containerElement,
     required List<ClassMember> members,
   }) {
-    bool isOverride(ExecutableElement2? element) {
-      if (containerElement is! InterfaceElement2) {
+    bool isOverride(ExecutableElement? element) {
+      if (containerElement is! InterfaceElement) {
         return false;
       }
 
@@ -113,7 +113,7 @@ class _DeclarationGatherer {
         case FieldDeclaration():
           for (var field in member.fields.variables) {
             var element = field.declaredFragment?.element;
-            if (element is FieldElement2 && element.isPublic) {
+            if (element is FieldElement && element.isPublic) {
               if (!isOverride(element.getter2)) {
                 declarations.add(field);
               }
@@ -142,7 +142,7 @@ class _DeclarationGatherer {
 /// "References" are most often [SimpleIdentifier]s, but can also be other
 /// nodes which refer to a declaration.
 class _ReferenceVisitor extends RecursiveAstVisitor<void> {
-  Map<Element2, Declaration> declarationMap;
+  Map<Element, Declaration> declarationMap;
 
   Set<Declaration> declarations = {};
 
@@ -280,7 +280,7 @@ class _ReferenceVisitor extends RecursiveAstVisitor<void> {
     node.type?.alias != null ||
         // Any reference to an extension type marks it as reachable, since
         // casting can be used to instantiate the type.
-        node.type?.element3 is ExtensionTypeElement2 ||
+        node.type?.element3 is ExtensionTypeElement ||
         nodeIsInTypeArgument ||
         // A reference to any type in an external variable declaration marks
         // that type as reachable, since the external implementation can
@@ -372,11 +372,11 @@ class _ReferenceVisitor extends RecursiveAstVisitor<void> {
   ///
   /// Also adds the declaration of [element] if it is a public static accessor
   /// or static method on a public top-level element.
-  void _addDeclaration(Element2 element) {
+  void _addDeclaration(Element element) {
     // First add the enclosing top-level declaration.
     var enclosingTopLevelElement = element.thisOrAncestorMatching2(
       (a) =>
-          a.enclosingElement2 == null || a.enclosingElement2 is LibraryElement2,
+          a.enclosingElement2 == null || a.enclosingElement2 is LibraryElement,
     );
     var enclosingTopLevelDeclaration = declarationMap[enclosingTopLevelElement];
     if (enclosingTopLevelDeclaration != null) {
@@ -392,9 +392,9 @@ class _ReferenceVisitor extends RecursiveAstVisitor<void> {
     if (enclosingElement == null || enclosingElement.isPrivate) {
       return;
     }
-    if (enclosingElement is InterfaceElement2 ||
-        enclosingElement is ExtensionElement2 ||
-        enclosingElement is ExtensionTypeElement2) {
+    if (enclosingElement is InterfaceElement ||
+        enclosingElement is ExtensionElement ||
+        enclosingElement is ExtensionTypeElement) {
       var declarationElement = element.baseElement;
       var declaration = declarationMap[declarationElement];
       if (declaration != null) {
@@ -467,17 +467,17 @@ class _Visitor extends SimpleAstVisitor<void> {
     if (entryPoints.isEmpty) return;
 
     // Map each top-level and static element to its declaration.
-    var declarationByElement = <Element2, Declaration>{};
+    var declarationByElement = <Element, Declaration>{};
     for (var declaration in declarations) {
       var element = declaration.declaredFragment?.element;
       if (element != null) {
         declarationByElement[element] = declaration;
-        if (element is TopLevelVariableElement2) {
+        if (element is TopLevelVariableElement) {
           var getter = element.getter2;
           if (getter != null) declarationByElement[getter] = declaration;
           var setter = element.setter2;
           if (setter != null) declarationByElement[setter] = declaration;
-        } else if (element is FieldElement2) {
+        } else if (element is FieldElement) {
           var getter = element.getter2;
           if (getter != null) declarationByElement[getter] = declaration;
           var setter = element.setter2;
@@ -597,19 +597,19 @@ extension on ElementAnnotation {
 
   bool get isWidgetPreview {
     var element2 = this.element2;
-    return element2 is ConstructorElement2 &&
+    return element2 is ConstructorElement &&
         element2.enclosingElement2.name3 == 'Preview' &&
         element2.library2.uri == _flutterWidgetPreviewLibraryUri;
   }
 }
 
-extension on LibraryElement2 {
+extension on LibraryElement {
   bool get isWidgetPreviews =>
       uri ==
       Uri.parse('package:flutter/src/widget_previews/widget_previews.dart');
 }
 
-extension on Element2 {
+extension on Element {
   bool get hasVisibleForTesting => switch (this) {
     Annotatable(:var metadata2) => metadata2.hasVisibleForTesting,
     _ => false,
@@ -620,10 +620,10 @@ extension on Element2 {
       //   - Constructors (generative and factory)
       //   - Top-level functions
       //   - Static member functions
-      (this is ConstructorElement2 ||
+      (this is ConstructorElement ||
               this is TopLevelFunctionElement ||
-              (this is ExecutableElement2 &&
-                  (this as ExecutableElement2).isStatic)) &&
+              (this is ExecutableElement &&
+                  (this as ExecutableElement).isStatic)) &&
           !isPrivate &&
           metadata2.hasWidgetPreview,
     _ => false,
@@ -655,7 +655,7 @@ extension on Annotation {
   DartType? get _elementType {
     var element = elementAnnotation?.element2;
     DartType? type;
-    if (element is ConstructorElement2) {
+    if (element is ConstructorElement) {
       type = element.returnType;
     } else if (element is GetterElement) {
       type = element.returnType;
diff --git a/pkg/linter/lib/src/rules/unsafe_variance.dart b/pkg/linter/lib/src/rules/unsafe_variance.dart
index ddd746c04b8..83b9045f6cb 100644
--- a/pkg/linter/lib/src/rules/unsafe_variance.dart
+++ b/pkg/linter/lib/src/rules/unsafe_variance.dart
@@ -61,20 +61,20 @@ class _UnsafeVarianceChecker extends VarianceChecker {
     }
   }
 
-  bool owningDeclarationSupportsVariance(Element2 element) {
+  bool owningDeclarationSupportsVariance(Element element) {
     var parent = element.enclosingElement2;
     while (parent != null) {
       switch (parent) {
-        case InstanceElement2():
-          if (parent is ClassElement2 ||
-              parent is MixinElement2 ||
-              parent is EnumElement2) {
+        case InstanceElement():
+          if (parent is ClassElement ||
+              parent is MixinElement ||
+              parent is EnumElement) {
             return true;
           }
-          if (parent is ExtensionTypeElement2 || parent is ExtensionElement2) {
+          if (parent is ExtensionTypeElement || parent is ExtensionElement) {
             return false;
           }
-        case ExecutableElement2():
+        case ExecutableElement():
           return false;
       }
       parent = parent.enclosingElement2;
diff --git a/pkg/linter/lib/src/rules/use_build_context_synchronously.dart b/pkg/linter/lib/src/rules/use_build_context_synchronously.dart
index 89967f6ac43..0f8adaa9b11 100644
--- a/pkg/linter/lib/src/rules/use_build_context_synchronously.dart
+++ b/pkg/linter/lib/src/rules/use_build_context_synchronously.dart
@@ -56,7 +56,7 @@ class AsyncStateTracker {
   ///
   /// [reference] must be a direct child of `this`, or a sibling of `this`
   /// in a List of [AstNode]s.
-  AsyncState? asyncStateFor(AstNode reference, Element2 mountedElement) {
+  AsyncState? asyncStateFor(AstNode reference, Element mountedElement) {
     _asyncStateVisitor.setReference(reference, mountedElement);
     var parent = reference.parent;
     if (parent == null) return null;
@@ -126,7 +126,7 @@ class AsyncStateVisitor extends SimpleAstVisitor<AsyncState> {
   ///
   /// Generally speaking, this is `State.mounted` when [_reference] refers to
   /// `State.context`, and this is `BuildContext.mounted` otherwise.
-  late Element2 _mountedElement;
+  late Element _mountedElement;
 
   final Map<AstNode, AsyncState?> _stateCache = {};
 
@@ -149,7 +149,7 @@ class AsyncStateVisitor extends SimpleAstVisitor<AsyncState> {
 
   /// Sets [_reference] and [_mountedElement], readying the visitor to accept
   /// nodes.
-  void setReference(AstNode reference, Element2 mountedElement) {
+  void setReference(AstNode reference, Element mountedElement) {
     _reference = reference;
     _mountedElement = mountedElement;
   }
@@ -1104,7 +1104,7 @@ class _Visitor extends SimpleAstVisitor<void> {
 
   _Visitor(this.rule);
 
-  void check(Expression node, Element2 mountedElement) {
+  void check(Expression node, Element mountedElement) {
     // Checks each of the statements before `child` for a `mounted` check, and
     // returns whether it did not find one (and the caller should keep looking).
 
@@ -1210,7 +1210,7 @@ class _Visitor extends SimpleAstVisitor<void> {
 
     var target = invocation.realTarget;
     var targetElement = target is Identifier ? target.element : null;
-    if (targetElement is ClassElement2) {
+    if (targetElement is ClassElement) {
       // Static function called; `target` is the class.
       for (var method in protectedStaticMethods) {
         if (invocation.methodName.name == method.name &&
@@ -1388,7 +1388,7 @@ extension on BinaryExpression {
 
 extension on Expression {
   /// The element of this expression, if it is typed as a BuildContext.
-  Element2? get buildContextTypedElement {
+  Element? get buildContextTypedElement {
     var self = this;
     if (self is NamedExpression) {
       self = self.expression;
@@ -1406,12 +1406,12 @@ extension on Expression {
       var declaration = element.baseElement;
       // Get the declaration to ensure checks from un-migrated libraries work.
       var argType = switch (declaration) {
-        ExecutableElement2() => declaration.returnType,
-        VariableElement2() => declaration.type,
+        ExecutableElement() => declaration.returnType,
+        VariableElement() => declaration.type,
         _ => null,
       };
 
-      var isGetter = element is PropertyAccessorElement2;
+      var isGetter = element is PropertyAccessorElement;
       if (isBuildContext(argType, skipNullable: isGetter)) {
         return declaration;
       }
@@ -1450,15 +1450,15 @@ extension on Expression {
 }
 
 @visibleForTesting
-extension ElementExtension on Element2 {
+extension ElementExtension on Element {
   /// The `mounted` getter which is associated with `this`, if this static
   /// element is `BuildContext` from Flutter.
-  Element2? get associatedMountedGetter {
+  Element? get associatedMountedGetter {
     var self = this;
 
-    if (self is PropertyAccessorElement2) {
+    if (self is PropertyAccessorElement) {
       var enclosingElement = self.enclosingElement2;
-      if (enclosingElement is InterfaceElement2 && isState(enclosingElement)) {
+      if (enclosingElement is InterfaceElement && isState(enclosingElement)) {
         // The BuildContext object is the field on Flutter's State class.
         // This object can only be guarded by async gaps with a mounted
         // check on the State.
@@ -1471,11 +1471,11 @@ extension ElementExtension on Element2 {
 
     var buildContextElement =
         switch (self) {
-          ExecutableElement2() => self.returnType,
-          VariableElement2() => self.type,
+          ExecutableElement() => self.returnType,
+          VariableElement() => self.type,
           _ => null,
         }?.element3;
-    if (buildContextElement is InterfaceElement2) {
+    if (buildContextElement is InterfaceElement) {
       return buildContextElement.lookUpGetter2(
         name: 'mounted',
         library: buildContextElement.library2,
diff --git a/pkg/linter/lib/src/rules/use_enums.dart b/pkg/linter/lib/src/rules/use_enums.dart
index 0f780c78f7b..e0a65d8d687 100644
--- a/pkg/linter/lib/src/rules/use_enums.dart
+++ b/pkg/linter/lib/src/rules/use_enums.dart
@@ -34,7 +34,7 @@ class UseEnums extends LintRule {
 /// A superclass for the [_EnumVisitor] and [_NonEnumVisitor].
 class _BaseVisitor extends RecursiveAstVisitor<void> {
   /// The element representing the enum declaration that's being visited.
-  final ClassElement2 classElement;
+  final ClassElement classElement;
 
   _BaseVisitor(this.classElement);
 
@@ -161,7 +161,7 @@ class _Visitor extends SimpleAstVisitor<void> {
         if (!member.isStatic) continue;
         for (var field in member.fields.variables) {
           var fieldElement = field.declaredFragment?.element;
-          if (fieldElement is! FieldElement2) continue;
+          if (fieldElement is! FieldElement) continue;
           if (field.isSynthetic || !field.isConst) continue;
           var initializer = field.initializer;
           if (initializer is! InstanceCreationExpression) continue;
diff --git a/pkg/linter/lib/src/rules/use_key_in_widget_constructors.dart b/pkg/linter/lib/src/rules/use_key_in_widget_constructors.dart
index 9befca6690b..bef8251e78d 100644
--- a/pkg/linter/lib/src/rules/use_key_in_widget_constructors.dart
+++ b/pkg/linter/lib/src/rules/use_key_in_widget_constructors.dart
@@ -60,7 +60,7 @@ class _Visitor extends SimpleAstVisitor<void> {
     if (constructorElement.isPublic &&
         !constructorElement.isFactory &&
         classElement.isPublic &&
-        classElement is ClassElement2 &&
+        classElement is ClassElement &&
         !classElement.isExactlyWidget &&
         classElement.extendsWidget &&
         !_hasKeySuperParameterInitializerArg(node) &&
@@ -87,14 +87,14 @@ class _Visitor extends SimpleAstVisitor<void> {
   bool _defineKeyArgument(ArgumentList argumentList) => argumentList.arguments
       .any((a) => a.correspondingParameter?.name3 == 'key');
 
-  bool _defineKeyParameter(ConstructorElement2 element) => element
+  bool _defineKeyParameter(ConstructorElement element) => element
       .formalParameters
       .any((e) => e.name3 == 'key' && _isKeyType(e.type));
 
   bool _hasKeySuperParameterInitializerArg(ConstructorDeclaration node) {
     for (var parameter in node.parameters.parameterFragments) {
       var element = parameter?.element;
-      if (element is SuperFormalParameterElement2 && element.name3 == 'key') {
+      if (element is SuperFormalParameterElement && element.name3 == 'key') {
         return true;
       }
     }
diff --git a/pkg/linter/lib/src/rules/use_late_for_private_fields_and_variables.dart b/pkg/linter/lib/src/rules/use_late_for_private_fields_and_variables.dart
index a1912266221..271e59107f6 100644
--- a/pkg/linter/lib/src/rules/use_late_for_private_fields_and_variables.dart
+++ b/pkg/linter/lib/src/rules/use_late_for_private_fields_and_variables.dart
@@ -48,7 +48,7 @@ class _Visitor extends RecursiveAstVisitor<void> {
   final Map<LibraryFragment, List<VariableDeclaration>> lateables =
       <LibraryFragment, List<VariableDeclaration>>{};
 
-  final Set<Element2> nullableAccess = <Element2>{};
+  final Set<Element> nullableAccess = <Element>{};
 
   final LintRule rule;
   final LinterContext context;
@@ -190,7 +190,7 @@ class _Visitor extends RecursiveAstVisitor<void> {
   /// [PropertyAccess], and its [canonicalElement], represent a nullable access.
   void _visitIdentifierOrPropertyAccess(
     Expression expression,
-    Element2? canonicalElement,
+    Element? canonicalElement,
   ) {
     assert(expression is Identifier || expression is PropertyAccess);
     if (canonicalElement == null) return;
diff --git a/pkg/linter/lib/src/rules/use_named_constants.dart b/pkg/linter/lib/src/rules/use_named_constants.dart
index e9ee69c9942..533e8174201 100644
--- a/pkg/linter/lib/src/rules/use_named_constants.dart
+++ b/pkg/linter/lib/src/rules/use_named_constants.dart
@@ -40,7 +40,7 @@ class _Visitor extends SimpleAstVisitor<void> {
       var type = node.staticType;
       if (type is! InterfaceType) return;
       var element = type.element3;
-      if (element is ClassElement2) {
+      if (element is ClassElement) {
         var nodeField =
             node
                 .thisOrAncestorOfType<VariableDeclaration>()
diff --git a/pkg/linter/lib/src/rules/use_null_aware_elements.dart b/pkg/linter/lib/src/rules/use_null_aware_elements.dart
index f9d4e98cfd4..1825db9d378 100644
--- a/pkg/linter/lib/src/rules/use_null_aware_elements.dart
+++ b/pkg/linter/lib/src/rules/use_null_aware_elements.dart
@@ -41,7 +41,7 @@ class _Visitor extends SimpleAstVisitor<void> {
   @override
   void visitIfElement(IfElement node) {
     if (node case IfElement(:var thenElement, elseKeyword: null)) {
-      Element2? nullCheckTarget;
+      Element? nullCheckTarget;
       if (node.expression case BinaryExpression(
         :var operator,
         :var leftOperand,
diff --git a/pkg/linter/lib/src/rules/use_setters_to_change_properties.dart b/pkg/linter/lib/src/rules/use_setters_to_change_properties.dart
index 8f7259fe156..f2d45f18577 100644
--- a/pkg/linter/lib/src/rules/use_setters_to_change_properties.dart
+++ b/pkg/linter/lib/src/rules/use_setters_to_change_properties.dart
@@ -56,7 +56,7 @@ class _Visitor extends SimpleAstVisitor<void> {
         var rightOperand = expression.rightHandSide.canonicalElement;
         var parameterElement =
             node.declaredFragment?.element.formalParameters.first;
-        if (rightOperand == parameterElement && leftOperand is FieldElement2) {
+        if (rightOperand == parameterElement && leftOperand is FieldElement) {
           rule.reportAtToken(node.name);
         }
       }
diff --git a/pkg/linter/lib/src/rules/use_string_buffers.dart b/pkg/linter/lib/src/rules/use_string_buffers.dart
index 079065bbfe0..4ca97090771 100644
--- a/pkg/linter/lib/src/rules/use_string_buffers.dart
+++ b/pkg/linter/lib/src/rules/use_string_buffers.dart
@@ -81,7 +81,7 @@ class _IdentifierIsPrefixVisitor extends SimpleAstVisitor<void> {
 
 class _UseStringBufferVisitor extends SimpleAstVisitor<void> {
   final LintRule rule;
-  final localElements = <Element2?>{};
+  final localElements = <Element?>{};
 
   _UseStringBufferVisitor(this.rule);
 
diff --git a/pkg/linter/lib/src/rules/use_super_parameters.dart b/pkg/linter/lib/src/rules/use_super_parameters.dart
index 96f193b0292..7008cd90c2e 100644
--- a/pkg/linter/lib/src/rules/use_super_parameters.dart
+++ b/pkg/linter/lib/src/rules/use_super_parameters.dart
@@ -93,7 +93,7 @@ class _Visitor extends SimpleAstVisitor<void> {
     for (var parameter in parameters.parameters) {
       var parameterElement = parameter.declaredFragment?.element;
       if (parameterElement == null) continue;
-      if (parameterElement is FieldFormalParameterElement2) continue;
+      if (parameterElement is FieldFormalParameterElement) continue;
       if (parameterElement.isNamed &&
           !referencedParameters.contains(parameterElement)) {
         if (_checkNamedParameter(
@@ -128,7 +128,7 @@ class _Visitor extends SimpleAstVisitor<void> {
   /// there are parameters that can't be converted since this will short-circuit
   /// the lint.
   List<String>? _checkForConvertiblePositionalParams(
-    ConstructorElement2 constructorElement,
+    ConstructorElement constructorElement,
     SuperConstructorInvocation superInvocation,
     FormalParameterList parameters,
     Set<FormalParameterElement> referencedParameters,
@@ -148,7 +148,7 @@ class _Visitor extends SimpleAstVisitor<void> {
     var convertibleConstructorParams = <String>[];
     var matchedConstructorParamIndex = 0;
 
-    var seenSuperParams = <Element2>{};
+    var seenSuperParams = <Element>{};
 
     // For each super arg, ensure there is a constructor param (in the right
     // order).
@@ -196,7 +196,7 @@ class _Visitor extends SimpleAstVisitor<void> {
   bool _checkNamedParameter(
     FormalParameter parameter,
     FormalParameterElement parameterElement,
-    ConstructorElement2 superConstructor,
+    ConstructorElement superConstructor,
     SuperConstructorInvocation superInvocation,
   ) {
     var superParameter = _correspondingNamedParameter(
@@ -237,7 +237,7 @@ class _Visitor extends SimpleAstVisitor<void> {
   }
 
   FormalParameterElement? _correspondingNamedParameter(
-    ConstructorElement2 superConstructor,
+    ConstructorElement superConstructor,
     FormalParameterElement thisParameter,
   ) {
     for (var superParameter in superConstructor.formalParameters) {
diff --git a/pkg/linter/lib/src/rules/void_checks.dart b/pkg/linter/lib/src/rules/void_checks.dart
index ec17bc1c7bf..56df59dcc2a 100644
--- a/pkg/linter/lib/src/rules/void_checks.dart
+++ b/pkg/linter/lib/src/rules/void_checks.dart
@@ -69,7 +69,7 @@ class _Visitor extends SimpleAstVisitor<void> {
   void visitAssignedVariablePattern(AssignedVariablePattern node) {
     var valueType = node.matchedValueType;
     var element = node.element2;
-    if (element is! VariableElement2) return;
+    if (element is! VariableElement) return;
     _check(element.type, valueType, node);
   }
 
diff --git a/pkg/linter/lib/src/util/dart_type_utilities.dart b/pkg/linter/lib/src/util/dart_type_utilities.dart
index fafd32aedfc..7655b27aa0a 100644
--- a/pkg/linter/lib/src/util/dart_type_utilities.dart
+++ b/pkg/linter/lib/src/util/dart_type_utilities.dart
@@ -15,10 +15,10 @@ bool argumentsMatchParameters(
   NodeList<Expression> arguments,
   NodeList<FormalParameter> parameters,
 ) {
-  var namedParameters = <String, Element2?>{};
-  var namedArguments = <String, Element2>{};
-  var positionalParameters = <Element2?>[];
-  var positionalArguments = <Element2>[];
+  var namedParameters = <String, Element?>{};
+  var namedArguments = <String, Element>{};
+  var positionalParameters = <Element?>[];
+  var positionalArguments = <Element>[];
   for (var parameter in parameters) {
     var identifier = parameter.name;
     var parameterElement = parameter.declaredFragment?.element;
@@ -66,7 +66,7 @@ bool argumentsMatchParameters(
 
 /// Returns whether the canonical elements of [element1] and [element2] are
 /// equal.
-bool canonicalElementsAreEqual(Element2? element1, Element2? element2) =>
+bool canonicalElementsAreEqual(Element? element1, Element? element2) =>
     element1?.canonicalElement2 == element2?.canonicalElement2;
 
 /// Returns whether the canonical elements from two nodes are equal.
@@ -215,7 +215,7 @@ bool _isFunctionTypeUnrelatedToType(FunctionType type1, DartType type2) {
   }
   if (type2 is InterfaceType) {
     var element2 = type2.element3;
-    if (element2 is ClassElement2 &&
+    if (element2 is ClassElement &&
         element2.thisType.lookUpMethod3(
               'call',
               element2.library2,
@@ -286,7 +286,7 @@ extension on TypeSystem {
 
       // Unrelated Enums have the same supertype, but they are not the same element, so
       // they are unrelated.
-      if (sameSupertypes && leftElement is EnumElement2) {
+      if (sameSupertypes && leftElement is EnumElement) {
         return true;
       }
 
diff --git a/pkg/linter/lib/src/util/flutter_utils.dart b/pkg/linter/lib/src/util/flutter_utils.dart
index f2f255d7d59..ac5368a0f4c 100644
--- a/pkg/linter/lib/src/util/flutter_utils.dart
+++ b/pkg/linter/lib/src/util/flutter_utils.dart
@@ -32,13 +32,13 @@ final Uri _uriFramework = Uri.parse(
 
 _Flutter get _flutter => _flutterInstance;
 
-bool hasWidgetAsAscendant(ClassElement2 element) =>
+bool hasWidgetAsAscendant(ClassElement element) =>
     _flutter.hasWidgetAsAscendant(element);
 
 bool isBuildContext(DartType? type, {bool skipNullable = false}) =>
     _flutter.isBuildContext(type, skipNullable: skipNullable);
 
-bool isExactWidget(ClassElement2 element) => _flutter.isExactWidget(element);
+bool isExactWidget(ClassElement element) => _flutter.isExactWidget(element);
 
 bool isExactWidgetTypeContainer(DartType? type) =>
     _flutter.isExactWidgetTypeContainer(type);
@@ -46,11 +46,11 @@ bool isExactWidgetTypeContainer(DartType? type) =>
 bool isExactWidgetTypeSizedBox(DartType? type) =>
     _flutter.isExactWidgetTypeSizedBox(type);
 
-bool isKDebugMode(Element2? element) => _flutter.isKDebugMode(element);
+bool isKDebugMode(Element? element) => _flutter.isKDebugMode(element);
 
-bool isState(InterfaceElement2 element) => _flutter.isState(element);
+bool isState(InterfaceElement element) => _flutter.isState(element);
 
-bool isStatefulWidget(ClassElement2? element) =>
+bool isStatefulWidget(ClassElement? element) =>
     element != null && _flutter.isStatefulWidget(element);
 
 bool isWidgetProperty(DartType? type) {
@@ -88,8 +88,8 @@ class _Flutter {
       _uriFoundation = Uri.parse('$uriPrefix/src/foundation/constants.dart');
 
   bool hasWidgetAsAscendant(
-    InterfaceElement2? element, [
-    Set<InterfaceElement2>? alreadySeen,
+    InterfaceElement? element, [
+    Set<InterfaceElement>? alreadySeen,
   ]) {
     if (element == null) return false;
 
@@ -116,10 +116,10 @@ class _Flutter {
   }
 
   /// Whether [element] is exactly the element named [type], from Flutter.
-  bool isExactly(InterfaceElement2 element, String type, Uri uri) =>
+  bool isExactly(InterfaceElement element, String type, Uri uri) =>
       element.name3 == type && element.library2.firstFragment.source.uri == uri;
 
-  bool isExactWidget(ClassElement2 element) =>
+  bool isExactWidget(ClassElement element) =>
       isExactly(element, _nameWidget, _uriFramework);
 
   bool isExactWidgetTypeContainer(DartType? type) =>
@@ -130,24 +130,24 @@ class _Flutter {
       type is InterfaceType &&
       isExactly(type.element3, _nameSizedBox, _uriBasic);
 
-  bool isKDebugMode(Element2? element) =>
+  bool isKDebugMode(Element? element) =>
       element != null &&
       element.name3 == 'kDebugMode' &&
       element.library2?.uri == _uriFoundation;
 
-  bool isState(InterfaceElement2 element) =>
+  bool isState(InterfaceElement element) =>
       isExactly(element, _nameState, _uriFramework) ||
       element.allSupertypes.any(
         (type) => isExactly(type.element3, _nameState, _uriFramework),
       );
 
-  bool isStatefulWidget(ClassElement2 element) =>
+  bool isStatefulWidget(ClassElement element) =>
       isExactly(element, _nameStatefulWidget, _uriFramework) ||
       element.allSupertypes.any(
         (type) => isExactly(type.element3, _nameStatefulWidget, _uriFramework),
       );
 
-  bool isWidget(InterfaceElement2 element) {
+  bool isWidget(InterfaceElement element) {
     if (isExactly(element, _nameWidget, _uriFramework)) {
       return true;
     }
@@ -164,7 +164,7 @@ class _Flutter {
 }
 
 // TODO(pq): based on similar extension in server. (Move and reuse.)
-extension InterfaceElementExtension2 on InterfaceElement2? {
+extension InterfaceElementExtension2 on InterfaceElement? {
   bool get extendsWidget => _hasWidgetAsAscendant(this, {});
 
   bool get isExactlyWidget => _isExactly(_nameWidget, _uriFramework);
@@ -172,7 +172,7 @@ extension InterfaceElementExtension2 on InterfaceElement2? {
   /// Whether this is the Flutter class `Widget`, or a subtype.
   bool get isWidget {
     var self = this;
-    if (self is! ClassElement2) return false;
+    if (self is! ClassElement) return false;
 
     if (isExactlyWidget) return true;
 
@@ -184,14 +184,14 @@ extension InterfaceElementExtension2 on InterfaceElement2? {
   /// Whether this is the exact [type] defined in the file with the given [uri].
   bool _isExactly(String type, Uri uri) {
     var self = this;
-    return self is ClassElement2 &&
+    return self is ClassElement &&
         self.name3 == type &&
         self.firstFragment.libraryFragment.source.uri == uri;
   }
 
   static bool _hasWidgetAsAscendant(
-    InterfaceElement2? element,
-    Set<InterfaceElement2> alreadySeen,
+    InterfaceElement? element,
+    Set<InterfaceElement> alreadySeen,
   ) {
     if (element == null) return false;
     if (element.isExactlyWidget) return true;
diff --git a/pkg/linter/lib/src/util/leak_detector_visitor.dart b/pkg/linter/lib/src/util/leak_detector_visitor.dart
index 134bfa7437d..91c650bb106 100644
--- a/pkg/linter/lib/src/util/leak_detector_visitor.dart
+++ b/pkg/linter/lib/src/util/leak_detector_visitor.dart
@@ -56,15 +56,15 @@ bool _hasMatch(
 ) => predicates.keys.any((p) => predicates[p] == methodName && p(type));
 
 bool _isElementEqualToVariable(
-  Element2? propertyElement,
-  VariableElement2? variableElement,
+  Element? propertyElement,
+  VariableElement? variableElement,
 ) =>
     propertyElement == variableElement ||
     propertyElement.matches(variableElement);
 
 bool _isInvocationThroughCascadeExpression(
   MethodInvocation invocation,
-  VariableElement2 variableElement,
+  VariableElement variableElement,
 ) {
   if (invocation.realTarget is! SimpleIdentifier) {
     return false;
@@ -79,7 +79,7 @@ bool _isInvocationThroughCascadeExpression(
 
 bool _isPostfixExpressionOperandEqualToVariable(
   AstNode? n,
-  VariableElement2 variableElement,
+  VariableElement variableElement,
 ) {
   if (n is PostfixExpression) {
     var operand = n.operand;
@@ -91,7 +91,7 @@ bool _isPostfixExpressionOperandEqualToVariable(
 
 bool _isPropertyAccessThroughThis(
   Expression? n,
-  VariableElement2 variableElement,
+  VariableElement variableElement,
 ) {
   if (n is! PropertyAccess) {
     return false;
@@ -108,7 +108,7 @@ bool _isPropertyAccessThroughThis(
 
 bool _isSimpleIdentifierElementEqualToVariable(
   AstNode? n,
-  VariableElement2 variableElement,
+  VariableElement variableElement,
 ) =>
     n is SimpleIdentifier &&
     _isElementEqualToVariable(n.element, variableElement);
@@ -174,7 +174,7 @@ class _ValidUseVisitor extends RecursiveAstVisitor<void> {
 
   /// The element of the variable under consideration; stored here as a non-
   /// `null` value.
-  final VariableElement2 variableElement;
+  final VariableElement variableElement;
 
   /// The predicates that determine whether a method call or method tear-off is
   /// a valid use.
@@ -230,7 +230,7 @@ class _ValidUseVisitor extends RecursiveAstVisitor<void> {
   void visitFieldFormalParameter(FieldFormalParameter node) {
     if (variableType == _VariableType.field) {
       var staticElement = node.declaredFragment?.element;
-      if (staticElement is FieldFormalParameterElement2 &&
+      if (staticElement is FieldFormalParameterElement &&
           staticElement.field2 == variableElement) {
         containsValidUse = true;
         return;
@@ -309,9 +309,9 @@ class _ValidUseVisitor extends RecursiveAstVisitor<void> {
 /// The type of variable being assessed.
 enum _VariableType { field, local }
 
-extension on Element2? {
-  bool matches(VariableElement2? variable) => switch (this) {
-    PropertyAccessorElement2(:var variable3) => variable3 == variable,
+extension on Element? {
+  bool matches(VariableElement? variable) => switch (this) {
+    PropertyAccessorElement(:var variable3) => variable3 == variable,
     _ => false,
   };
 }
diff --git a/pkg/linter/lib/src/util/obvious_types.dart b/pkg/linter/lib/src/util/obvious_types.dart
index eae7f44c027..b659055cae0 100644
--- a/pkg/linter/lib/src/util/obvious_types.dart
+++ b/pkg/linter/lib/src/util/obvious_types.dart
@@ -164,7 +164,7 @@ extension ExpressionExtensions on Expression {
       case SimpleIdentifier():
         if (self.isQualified) return false;
         var declaration = self.element;
-        if (declaration is! LocalVariableElement2) return false;
+        if (declaration is! LocalVariableElement) return false;
         return self.staticType == declaration.type;
       case InstanceCreationExpression():
         var createdType = self.constructorName.type;
diff --git a/pkg/linter/lib/src/util/scope.dart b/pkg/linter/lib/src/util/scope.dart
index 8e72e5ee396..7b1d5eba7aa 100644
--- a/pkg/linter/lib/src/util/scope.dart
+++ b/pkg/linter/lib/src/util/scope.dart
@@ -42,7 +42,7 @@ LinterNameInScopeResolutionResult resolveNameInScope(
 /// The result of resolving of a basename `id` in a scope.
 class LinterNameInScopeResolutionResult {
   /// The element with the requested basename, `null` is [isNone].
-  final Element2? element;
+  final Element? element;
 
   /// The state of the result.
   final _LinterNameInScopeResolutionResultState _state;
diff --git a/pkg/linter/lib/src/util/variance_checker.dart b/pkg/linter/lib/src/util/variance_checker.dart
index d5578ca626f..d5d6d9186a7 100644
--- a/pkg/linter/lib/src/util/variance_checker.dart
+++ b/pkg/linter/lib/src/util/variance_checker.dart
@@ -44,13 +44,13 @@ abstract class VarianceChecker {
         var arguments = typeAnnotation.typeArguments?.arguments;
         if (arguments != null) {
           var element = typeAnnotation.element2?.baseElement;
-          List<TypeParameterElement2>? typeParameterList;
+          List<TypeParameterElement>? typeParameterList;
           if (element != null) {
             switch (element) {
-              case ClassElement2(:var typeParameters2):
-              case MixinElement2(:var typeParameters2):
-              case EnumElement2(:var typeParameters2):
-              case TypeAliasElement2(:var typeParameters2):
+              case ClassElement(:var typeParameters2):
+              case MixinElement(:var typeParameters2):
+              case EnumElement(:var typeParameters2):
+              case TypeAliasElement(:var typeParameters2):
                 typeParameterList = typeParameters2;
               default:
                 typeParameterList = null;
diff --git a/pkg/linter/test/rules/use_build_context_synchronously_test.dart b/pkg/linter/test/rules/use_build_context_synchronously_test.dart
index 0f165da7530..0c40138f318 100644
--- a/pkg/linter/test/rules/use_build_context_synchronously_test.dart
+++ b/pkg/linter/test/rules/use_build_context_synchronously_test.dart
@@ -23,7 +23,7 @@ class AsyncStateTest extends PubPackageResolutionTest {
   @override
   bool get addFlutterPackageDep => true;
 
-  Element2 get contextElement => findNode.simple('context /* ref */').element!;
+  Element get contextElement => findNode.simple('context /* ref */').element!;
 
   FindNode get findNode => FindNode(result.content, result.unit);
 
@@ -2953,7 +2953,7 @@ void foo(BuildContext context, StreamSubscription<void> s) async {
 }
 
 extension on AstNode {
-  AsyncState? asyncStateFor(AstNode reference, Element2 expressionElement) {
+  AsyncState? asyncStateFor(AstNode reference, Element expressionElement) {
     assert(
       () {
         if (reference.parent == this) return true;
diff --git a/pkg/linter/test/scope_util_test.dart b/pkg/linter/test/scope_util_test.dart
index a83a1dc2df8..dafc84b9f53 100644
--- a/pkg/linter/test/scope_util_test.dart
+++ b/pkg/linter/test/scope_util_test.dart
@@ -837,7 +837,7 @@ mixin A<T> {
     _resultRequested(node, 'T', false, findElement.typeParameter('T'));
   }
 
-  void _checkGetterDifferent(Element2 expected) {
+  void _checkGetterDifferent(Element expected) {
     var node = findNode.this_('this.foo;');
     _resultDifferent(node, 'foo', false, expected);
   }
@@ -847,12 +847,12 @@ mixin A<T> {
     _resultNone(node, 'foo', false);
   }
 
-  void _checkGetterRequested(Element2 expected) {
+  void _checkGetterRequested(Element expected) {
     var node = findNode.this_('this.foo;');
     _resultRequested(node, 'foo', false, expected);
   }
 
-  void _checkMethodDifferent(Element2 expected) {
+  void _checkMethodDifferent(Element expected) {
     var node = findNode.this_('this.foo()');
     _resultDifferent(node, 'foo', false, expected);
   }
@@ -862,7 +862,7 @@ mixin A<T> {
     _resultNone(node, 'foo', false);
   }
 
-  void _checkMethodRequested(Element2 expected) {
+  void _checkMethodRequested(Element expected) {
     var node = findNode.this_('this.foo()');
     _resultRequested(node, 'foo', false, expected);
   }
@@ -871,7 +871,7 @@ mixin A<T> {
     _checkMethodRequested(findElement.localVar('foo'));
   }
 
-  void _checkSetterDifferent(Element2 expected) {
+  void _checkSetterDifferent(Element expected) {
     var node = findNode.this_('this.foo = 0;');
     _resultDifferent(node, 'foo', true, expected);
   }
@@ -881,17 +881,12 @@ mixin A<T> {
     _resultNone(node, 'foo', true);
   }
 
-  void _checkSetterRequested(Element2 expected) {
+  void _checkSetterRequested(Element expected) {
     var node = findNode.this_('this.foo = 0;');
     _resultRequested(node, 'foo', true, expected);
   }
 
-  void _resultDifferent(
-    AstNode node,
-    String id,
-    bool setter,
-    Element2 element,
-  ) {
+  void _resultDifferent(AstNode node, String id, bool setter, Element element) {
     var result = resolveNameInScope(id, node, shouldResolveSetter: setter);
     if (!result.isDifferentName || result.element != element) {
       fail('Expected different $element, actual: $result');
@@ -905,12 +900,7 @@ mixin A<T> {
     }
   }
 
-  void _resultRequested(
-    AstNode node,
-    String id,
-    bool setter,
-    Element2 element,
-  ) {
+  void _resultRequested(AstNode node, String id, bool setter, Element element) {
     var result = resolveNameInScope(id, node, shouldResolveSetter: setter);
     if (!result.isRequestedName || result.element != element) {
       fail('Expected requested $element, actual: $result');
diff --git a/pkg/linter/tool/checks/rules/visit_registered_nodes.dart b/pkg/linter/tool/checks/rules/visit_registered_nodes.dart
index 26501ee924c..ac592521b39 100644
--- a/pkg/linter/tool/checks/rules/visit_registered_nodes.dart
+++ b/pkg/linter/tool/checks/rules/visit_registered_nodes.dart
@@ -40,7 +40,7 @@ class _BodyVisitor extends RecursiveAstVisitor<void> {
   final InheritanceManager3 inheritanceManager;
   _BodyVisitor(this.rule, this.inheritanceManager);
 
-  bool implements(ClassElement2 visitor, String methodName) {
+  bool implements(ClassElement visitor, String methodName) {
     var member = inheritanceManager.getMember4(
       visitor,
       Name(null, methodName),
@@ -67,7 +67,7 @@ class _BodyVisitor extends RecursiveAstVisitor<void> {
     var argType = args[1].staticType;
     if (argType is! InterfaceType) return;
     var visitor = argType.element3;
-    if (visitor is! ClassElement2) return;
+    if (visitor is! ClassElement) return;
     if (implements(visitor, 'visit$nodeType')) return;
 
     rule.reportLint(node.methodName);