diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index daf488d..1ef7525 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -19,7 +19,8 @@ jobs:
           - packages/freezed
           - packages/freezed/example
           - packages/freezed_annotation
-          - packages/freezed_lint
+          # Disabled until custom_lint is removed
+          # - packages/freezed_lint
         channel:
           - stable
         dependencies:
diff --git a/packages/freezed_lint/lib/src/missing_mixin.dart b/packages/freezed_lint/lib/src/missing_mixin.dart
index f8374a0..2cce858 100644
--- a/packages/freezed_lint/lib/src/missing_mixin.dart
+++ b/packages/freezed_lint/lib/src/missing_mixin.dart
@@ -24,7 +24,7 @@ class MissingMixin extends DartLintRule {
       final annotation = freezedAnnotationChecker.hasAnnotationOfExact(element);
       if (!annotation) return;
 
-      final name = '_\$${element.name3}';
+      final name = '_\$${element.name}';
       final withClause = node.withClause;
       if (withClause == null) {
         reporter.atElement2(element, _code, arguments: [name]);
@@ -32,7 +32,7 @@ class MissingMixin extends DartLintRule {
       }
 
       final mixins = withClause.mixinTypes;
-      if (mixins.any((m) => name == m.name2.lexeme)) return;
+      if (mixins.any((m) => name == m.name.lexeme)) return;
       reporter.atElement2(element, _code, arguments: [name]);
     });
   }
diff --git a/packages/freezed_lint/lib/src/missing_private_empty_ctor.dart b/packages/freezed_lint/lib/src/missing_private_empty_ctor.dart
index 23c1163..935027f 100644
--- a/packages/freezed_lint/lib/src/missing_private_empty_ctor.dart
+++ b/packages/freezed_lint/lib/src/missing_private_empty_ctor.dart
@@ -29,17 +29,17 @@ class MissingPrivateEmptyCtor extends DartLintRule {
       final annotation = freezedAnnotationChecker.hasAnnotationOfExact(element);
       if (!annotation) return;
 
-      final methods = element.methods2.where((method) => !method.isStatic);
-      final fields = element.fields2.where((field) => !field.isStatic);
+      final methods = element.methods.where((method) => !method.isStatic);
+      final fields = element.fields.where((field) => !field.isStatic);
 
       final accessors = [
-        ...element.getters2,
+        ...element.getters,
         ...element.setters2,
       ].where((accessor) => !accessor.isStatic);
       if (methods.isEmpty && fields.isEmpty && accessors.isEmpty) return;
 
       final ctors = element.constructors2.where((ctor) =>
-          ctor.isPrivate && ctor.formalParameters.isEmpty && ctor.name3 == '_');
+          ctor.isPrivate && ctor.formalParameters.isEmpty && ctor.name == '_');
       if (ctors.isNotEmpty) return;
 
       final constToken = element.constToken();
diff --git a/packages/freezed_lint/lib/src/tools/element_extensions.dart b/packages/freezed_lint/lib/src/tools/element_extensions.dart
index 683e84c..5d8e211 100644
--- a/packages/freezed_lint/lib/src/tools/element_extensions.dart
+++ b/packages/freezed_lint/lib/src/tools/element_extensions.dart
@@ -1,11 +1,11 @@
-import 'package:analyzer/dart/element/element2.dart';
+import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/type.dart';
 
 extension DartTypeExt on DartType {
   bool hasName(String name) => getDisplayString() == name;
 }
 
-extension ClassElementExt on ClassElement2 {
+extension ClassElementExt on ClassElement {
   String? constToken() {
     if (constructors2.any((c) => c.isConst)) return 'const ';
     return null;
diff --git a/packages/freezed_lint/pubspec.yaml b/packages/freezed_lint/pubspec.yaml
index eb19a4e..552643f 100644
--- a/packages/freezed_lint/pubspec.yaml
+++ b/packages/freezed_lint/pubspec.yaml
@@ -9,7 +9,7 @@ environment:
   sdk: ">=3.0.0 <4.0.0"
 
 dependencies:
-  analyzer: ">=7.5.9 <9.0.0"
+  analyzer: ^9.0.0
   analyzer_plugin: ^0.13.0
   custom_lint_builder: ^0.8.0
   freezed_annotation: 3.1.0