diff --git a/pkg/analyzer/lib/src/generated/resolver.dart b/pkg/analyzer/lib/src/generated/resolver.dart
index 3049ed4..cc2ed46 100644
--- a/pkg/analyzer/lib/src/generated/resolver.dart
+++ b/pkg/analyzer/lib/src/generated/resolver.dart
@@ -580,8 +580,12 @@
                   computeMemberId(whyNotPromotedVisitor.propertyReference!);
               args.add('target: $id');
             }
-            if (whyNotPromotedVisitor.propertyType != null) {
-              args.add('type: ${whyNotPromotedVisitor.propertyType}');
+            var propertyType = whyNotPromotedVisitor.propertyType;
+            if (propertyType != null) {
+              var propertyTypeStr = propertyType.getDisplayString(
+                withNullability: true,
+              );
+              args.add('type: $propertyTypeStr');
             }
             if (args.isNotEmpty) {
               nonPromotionReasonText += '(${args.join(', ')})';
diff --git a/pkg/analyzer/test/src/dart/analysis/driver_resolution_test.dart b/pkg/analyzer/test/src/dart/analysis/driver_resolution_test.dart
index 9da6792..757cb6f 100644
--- a/pkg/analyzer/test/src/dart/analysis/driver_resolution_test.dart
+++ b/pkg/analyzer/test/src/dart/analysis/driver_resolution_test.dart
@@ -2463,11 +2463,11 @@
       assertType(creation, 'C<int, double>');
 
       var typeName = creation.constructorName.type;
-      assertTypeName(typeName, cElement, 'C<int, double>');
+      assertNamedType(typeName, cElement, 'C<int, double>');
 
       var typeArguments = typeName.typeArguments!.arguments;
-      assertTypeName(typeArguments[0] as TypeName, intElement, 'int');
-      assertTypeName(typeArguments[1] as TypeName, doubleElement, 'double');
+      assertNamedType(typeArguments[0] as TypeName, intElement, 'int');
+      assertNamedType(typeArguments[1] as TypeName, doubleElement, 'double');
 
       expect(creation.constructorName.name, isNull);
 
@@ -2482,11 +2482,11 @@
       assertType(creation, 'C<num, String>');
 
       var typeName = creation.constructorName.type;
-      assertTypeName(typeName, cElement, 'C<num, String>');
+      assertNamedType(typeName, cElement, 'C<num, String>');
 
       var typeArguments = typeName.typeArguments!.arguments;
-      assertTypeName(typeArguments[0] as TypeName, numElement, 'num');
-      assertTypeName(typeArguments[1] as TypeName, stringElement, 'String');
+      assertNamedType(typeArguments[0] as TypeName, numElement, 'num');
+      assertNamedType(typeArguments[1] as TypeName, stringElement, 'String');
 
       var constructorName = creation.constructorName.name;
       assertMember(
@@ -2587,7 +2587,7 @@
     assertElement(aRef, findElement.topGet('a'));
     assertType(aRef, 'num');
 
-    assertTypeName(findNode.typeName('int;'), intElement, 'int');
+    assertNamedType(findNode.typeName('int;'), intElement, 'int');
   }
 
   test_invalid_const_constructor_initializer_field_multiple() async {
@@ -2907,13 +2907,13 @@
     await resolveTestFile();
     expect(result.errors, isNotEmpty);
 
-    assertTypeName(
+    assertNamedType(
       findNode.typeName('a.Future'),
       futureElement,
       'Future<int>',
       expectedPrefix: findElement.import('dart:async').prefix,
     );
-    assertTypeName(findNode.typeName('int>'), intElement, 'int');
+    assertNamedType(findNode.typeName('int>'), intElement, 'int');
   }
 
   test_invalid_fieldInitializer_field() async {
@@ -5622,7 +5622,7 @@
       assertElement(creation, c.unnamedConstructor);
       assertType(creation, 'C');
 
-      assertTypeName(creation.constructorName.type, c, 'C');
+      assertNamedType(creation.constructorName.type, c, 'C');
     }
 
     {
@@ -5631,7 +5631,7 @@
       assertElement(creation, namedConstructor);
       assertType(creation, 'C');
 
-      assertTypeName(creation.constructorName.type, c, 'C');
+      assertNamedType(creation.constructorName.type, c, 'C');
       assertElement(creation.constructorName.name, namedConstructor);
     }
   }
@@ -5658,7 +5658,7 @@
       assertElement(creation, c.unnamedConstructor);
       assertType(creation, 'C');
 
-      assertTypeName(creation.constructorName.type, c, 'C',
+      assertNamedType(creation.constructorName.type, c, 'C',
           expectedPrefix: import.prefix);
     }
 
@@ -5668,7 +5668,7 @@
       assertElement(creation, namedConstructor);
       assertType(creation, 'C');
 
-      assertTypeName(creation.constructorName.type, c, 'C',
+      assertNamedType(creation.constructorName.type, c, 'C',
           expectedPrefix: import.prefix);
       assertElement(creation.constructorName.name, namedConstructor);
     }
@@ -5692,8 +5692,8 @@
       assertMember(creation, c.unnamedConstructor!, {'T': 'int'});
       assertType(creation, 'C<int>');
 
-      assertTypeName(creation.constructorName.type, c, 'C<int>');
-      assertTypeName(findNode.typeName('int>'), intElement, 'int');
+      assertNamedType(creation.constructorName.type, c, 'C<int>');
+      assertNamedType(findNode.typeName('int>'), intElement, 'int');
     }
 
     {
@@ -5702,8 +5702,8 @@
       assertMember(creation, namedConstructor, {'T': 'String'});
       assertType(creation, 'C<String>');
 
-      assertTypeName(creation.constructorName.type, c, 'C<String>');
-      assertTypeName(findNode.typeName('String>'), stringElement, 'String');
+      assertNamedType(creation.constructorName.type, c, 'C<String>');
+      assertNamedType(findNode.typeName('String>'), stringElement, 'String');
 
       assertMember(
           creation.constructorName.name, namedConstructor, {'T': 'String'});
@@ -5718,10 +5718,10 @@
     expect(result.errors, isNotEmpty);
 
     var mapRef = findNode.typeName('Map<');
-    assertTypeName(mapRef, mapElement, 'Map<dynamic, dynamic>');
+    assertNamedType(mapRef, mapElement, 'Map<dynamic, dynamic>');
 
     var intRef = findNode.typeName('int>');
-    assertTypeName(intRef, intElement, 'int');
+    assertNamedType(intRef, intElement, 'int');
   }
 
   test_outline_invalid_mixin_arguments_tooMany() async {
@@ -5732,13 +5732,13 @@
     expect(result.errors, isNotEmpty);
 
     var listRef = findNode.typeName('List<');
-    assertTypeName(listRef, listElement, 'List<dynamic>');
+    assertNamedType(listRef, listElement, 'List<dynamic>');
 
     var intRef = findNode.typeName('int,');
-    assertTypeName(intRef, intElement, 'int');
+    assertNamedType(intRef, intElement, 'int');
 
     var doubleRef = findNode.typeName('double>');
-    assertTypeName(doubleRef, doubleElement, 'double');
+    assertNamedType(doubleRef, doubleElement, 'double');
   }
 
   test_outline_invalid_mixin_typeParameter() async {
@@ -5749,13 +5749,13 @@
     expect(result.errors, isNotEmpty);
 
     var tRef = findNode.typeName('T<');
-    assertTypeName(tRef, findElement.typeParameter('T'), 'T');
+    assertNamedType(tRef, findElement.typeParameter('T'), 'T');
 
     var intRef = findNode.typeName('int,');
-    assertTypeName(intRef, intElement, 'int');
+    assertNamedType(intRef, intElement, 'int');
 
     var doubleRef = findNode.typeName('double>');
-    assertTypeName(doubleRef, doubleElement, 'double');
+    assertNamedType(doubleRef, doubleElement, 'double');
   }
 
   test_outline_invalid_supertype_arguments_tooFew() async {
@@ -5766,10 +5766,10 @@
     expect(result.errors, isNotEmpty);
 
     var mapRef = findNode.typeName('Map<');
-    assertTypeName(mapRef, mapElement, 'Map<dynamic, dynamic>');
+    assertNamedType(mapRef, mapElement, 'Map<dynamic, dynamic>');
 
     var intRef = findNode.typeName('int>');
-    assertTypeName(intRef, intElement, 'int');
+    assertNamedType(intRef, intElement, 'int');
   }
 
   test_outline_invalid_supertype_arguments_tooMany() async {
@@ -5780,13 +5780,13 @@
     expect(result.errors, isNotEmpty);
 
     var listRef = findNode.typeName('List<');
-    assertTypeName(listRef, listElement, 'List<dynamic>');
+    assertNamedType(listRef, listElement, 'List<dynamic>');
 
     var intRef = findNode.typeName('int,');
-    assertTypeName(intRef, intElement, 'int');
+    assertNamedType(intRef, intElement, 'int');
 
     var doubleRef = findNode.typeName('double>');
-    assertTypeName(doubleRef, doubleElement, 'double');
+    assertNamedType(doubleRef, doubleElement, 'double');
   }
 
   test_outline_invalid_supertype_hasArguments() async {
@@ -5797,13 +5797,13 @@
     expect(result.errors, isNotEmpty);
 
     var xRef = findNode.typeName('X<');
-    assertTypeName(xRef, null, 'dynamic');
+    assertNamedType(xRef, null, 'dynamic');
 
     var intRef = findNode.typeName('int,');
-    assertTypeName(intRef, intElement, 'int');
+    assertNamedType(intRef, intElement, 'int');
 
     var doubleRef = findNode.typeName('double>');
-    assertTypeName(doubleRef, doubleElement, 'double');
+    assertNamedType(doubleRef, doubleElement, 'double');
   }
 
   test_outline_invalid_supertype_noArguments() async {
@@ -5814,7 +5814,7 @@
     expect(result.errors, isNotEmpty);
 
     var xRef = findNode.typeName('X {}');
-    assertTypeName(xRef, null, 'dynamic');
+    assertNamedType(xRef, null, 'dynamic');
   }
 
   test_outline_invalid_supertype_typeParameter() async {
@@ -5825,13 +5825,13 @@
     expect(result.errors, isNotEmpty);
 
     var tRef = findNode.typeName('T<');
-    assertTypeName(tRef, findElement.typeParameter('T'), 'T');
+    assertNamedType(tRef, findElement.typeParameter('T'), 'T');
 
     var intRef = findNode.typeName('int,');
-    assertTypeName(intRef, intElement, 'int');
+    assertNamedType(intRef, intElement, 'int');
 
     var doubleRef = findNode.typeName('double>');
-    assertTypeName(doubleRef, doubleElement, 'double');
+    assertNamedType(doubleRef, doubleElement, 'double');
   }
 
   test_outline_invalid_type_arguments_tooFew() async {
@@ -5842,10 +5842,10 @@
     expect(result.errors, isNotEmpty);
 
     var mapRef = findNode.typeName('Map<');
-    assertTypeName(mapRef, mapElement, 'Map<dynamic, dynamic>');
+    assertNamedType(mapRef, mapElement, 'Map<dynamic, dynamic>');
 
     var intRef = findNode.typeName('int>');
-    assertTypeName(intRef, intElement, 'int');
+    assertNamedType(intRef, intElement, 'int');
   }
 
   test_outline_invalid_type_arguments_tooMany() async {
@@ -5856,13 +5856,13 @@
     expect(result.errors, isNotEmpty);
 
     var listRef = findNode.typeName('List<');
-    assertTypeName(listRef, listElement, 'List<dynamic>');
+    assertNamedType(listRef, listElement, 'List<dynamic>');
 
     var intRef = findNode.typeName('int,');
-    assertTypeName(intRef, intElement, 'int');
+    assertNamedType(intRef, intElement, 'int');
 
     var doubleRef = findNode.typeName('double>');
-    assertTypeName(doubleRef, doubleElement, 'double');
+    assertNamedType(doubleRef, doubleElement, 'double');
   }
 
   test_outline_invalid_type_typeParameter() async {
@@ -5873,10 +5873,10 @@
     expect(result.errors, isNotEmpty);
 
     var tRef = findNode.typeName('T<');
-    assertTypeName(tRef, findElement.typeParameter('T'), 'T');
+    assertNamedType(tRef, findElement.typeParameter('T'), 'T');
 
     var intRef = findNode.typeName('int>');
-    assertTypeName(intRef, intElement, 'int');
+    assertNamedType(intRef, intElement, 'int');
   }
 
   test_outline_type_genericFunction() async {
@@ -5887,13 +5887,13 @@
     expect(result.errors, isEmpty);
 
     var intRef = findNode.typeName('int Function');
-    assertTypeName(intRef, intElement, 'int');
+    assertNamedType(intRef, intElement, 'int');
 
     var functionRef = findNode.genericFunctionType('Function(double)');
     assertType(functionRef, 'int Function(double)');
 
     var doubleRef = findNode.typeName('double) g');
-    assertTypeName(doubleRef, doubleElement, 'double');
+    assertNamedType(doubleRef, doubleElement, 'double');
   }
 
   test_outline_type_topLevelVar_named() async {
@@ -5905,13 +5905,13 @@
     expect(result.errors, isEmpty);
 
     var intRef = findNode.typeName('int a');
-    assertTypeName(intRef, intElement, 'int');
+    assertNamedType(intRef, intElement, 'int');
 
     var listRef = findNode.typeName('List<double> b');
-    assertTypeName(listRef, listElement, 'List<double>');
+    assertNamedType(listRef, listElement, 'List<double>');
 
     var doubleRef = findNode.typeName('double> b');
-    assertTypeName(doubleRef, doubleElement, 'double');
+    assertNamedType(doubleRef, doubleElement, 'double');
   }
 
   test_outline_type_topLevelVar_named_prefixed() async {
@@ -5923,10 +5923,10 @@
     ImportElement myImport = result.libraryElement.imports[0];
 
     var intRef = findNode.typeName('int> a');
-    assertTypeName(intRef, intElement, 'int');
+    assertNamedType(intRef, intElement, 'int');
 
     var futureRef = findNode.typeName('my.Future<int> a');
-    assertTypeName(futureRef, futureElement, 'Future<int>',
+    assertNamedType(futureRef, futureElement, 'Future<int>',
         expectedPrefix: myImport.prefix);
   }
 
@@ -6911,10 +6911,10 @@
     await resolveTestFile();
 
     var aRef = findNode.typeName('A<int>');
-    assertTypeName(aRef, findElement.class_('A'), 'A<int>');
+    assertNamedType(aRef, findElement.class_('A'), 'A<int>');
 
     var intRef = findNode.typeName('int>');
-    assertTypeName(intRef, intElement, 'int');
+    assertNamedType(intRef, intElement, 'int');
   }
 
   test_top_class_full() async {
diff --git a/pkg/analyzer/test/src/dart/resolution/class_alias_test.dart b/pkg/analyzer/test/src/dart/resolution/class_alias_test.dart
index 9dcfa57..3be6471 100644
--- a/pkg/analyzer/test/src/dart/resolution/class_alias_test.dart
+++ b/pkg/analyzer/test/src/dart/resolution/class_alias_test.dart
@@ -35,9 +35,9 @@
 
     var x = findElement.class_('X');
 
-    assertTypeName(findNode.typeName('A with'), findElement.class_('A'), 'A');
-    assertTypeName(findNode.typeName('B impl'), findElement.class_('B'), 'B');
-    assertTypeName(findNode.typeName('C;'), findElement.class_('C'), 'C');
+    assertNamedType(findNode.typeName('A with'), findElement.class_('A'), 'A');
+    assertNamedType(findNode.typeName('B impl'), findElement.class_('B'), 'B');
+    assertNamedType(findNode.typeName('C;'), findElement.class_('C'), 'C');
 
     assertType(x.supertype, 'A');
     assertElementTypes(x.mixins, ['B']);
diff --git a/pkg/analyzer/test/src/dart/resolution/class_test.dart b/pkg/analyzer/test/src/dart/resolution/class_test.dart
index 2828f29..14282df 100644
--- a/pkg/analyzer/test/src/dart/resolution/class_test.dart
+++ b/pkg/analyzer/test/src/dart/resolution/class_test.dart
@@ -380,7 +380,7 @@
     assertType(a.supertype, 'Object');
 
     var eRef = findNode.typeName('E {}');
-    assertTypeName(eRef, findElement.enum_('E'), 'E');
+    assertNamedType(eRef, findElement.enum_('E'), 'E');
   }
 
   test_error_extendsNonClass_mixin() async {
@@ -395,7 +395,7 @@
     assertType(a.supertype, 'Object');
 
     var mRef = findNode.typeName('M {} // ref');
-    assertTypeName(mRef, findElement.mixin('M'), 'M');
+    assertNamedType(mRef, findElement.mixin('M'), 'M');
   }
 
   test_error_extendsNonClass_variable() async {
diff --git a/pkg/analyzer/test/src/dart/resolution/instance_creation_test.dart b/pkg/analyzer/test/src/dart/resolution/instance_creation_test.dart
index 1aa9945..637b28d 100644
--- a/pkg/analyzer/test/src/dart/resolution/instance_creation_test.dart
+++ b/pkg/analyzer/test/src/dart/resolution/instance_creation_test.dart
@@ -64,7 +64,7 @@
       expectedConstructorMember: true,
       expectedSubstitution: {'T': 'int'},
     );
-    assertTypeName(findNode.typeName('int>'), intElement, 'int');
+    assertNamedType(findNode.typeName('int>'), intElement, 'int');
   }
 
   test_class_generic_unnamed_inferTypeArguments() async {
@@ -107,7 +107,7 @@
       expectedConstructorMember: true,
       expectedSubstitution: {'T': 'int'},
     );
-    assertTypeName(findNode.typeName('int>'), intElement, 'int');
+    assertNamedType(findNode.typeName('int>'), intElement, 'int');
   }
 
   test_class_notGeneric() async {
diff --git a/pkg/analyzer/test/src/dart/resolution/method_invocation_test.dart b/pkg/analyzer/test/src/dart/resolution/method_invocation_test.dart
index 8b89110..86c30be 100644
--- a/pkg/analyzer/test/src/dart/resolution/method_invocation_test.dart
+++ b/pkg/analyzer/test/src/dart/resolution/method_invocation_test.dart
@@ -943,7 +943,7 @@
       'foo<int>();',
       expectedTypeArguments: ['int'],
     );
-    assertTypeName(findNode.typeName('int>'), intElement, 'int');
+    assertNamedType(findNode.typeName('int>'), intElement, 'int');
   }
 
   test_error_undefinedMethod_hasTarget_class_typeParameter() async {
@@ -1296,7 +1296,7 @@
       findElement.topFunction('foo'),
       'void Function()',
     );
-    assertTypeName(findNode.typeName('int>'), intElement, 'int');
+    assertNamedType(findNode.typeName('int>'), intElement, 'int');
   }
 
   test_error_wrongNumberOfTypeArgumentsMethod_21() async {
@@ -1315,7 +1315,7 @@
       'Map<dynamic, dynamic> Function()',
       expectedTypeArguments: ['dynamic', 'dynamic'],
     );
-    assertTypeName(findNode.typeName('int>'), intElement, 'int');
+    assertNamedType(findNode.typeName('int>'), intElement, 'int');
   }
 
   test_hasReceiver_class_staticGetter() async {
diff --git a/pkg/analyzer/test/src/dart/resolution/mixin_test.dart b/pkg/analyzer/test/src/dart/resolution/mixin_test.dart
index 5a1ce26..6fa9868 100644
--- a/pkg/analyzer/test/src/dart/resolution/mixin_test.dart
+++ b/pkg/analyzer/test/src/dart/resolution/mixin_test.dart
@@ -94,7 +94,7 @@
     assertElementTypes(aElement.mixins, ['M']);
 
     var mRef = findNode.typeName('M {} // A');
-    assertTypeName(mRef, mElement, 'M');
+    assertNamedType(mRef, mElement, 'M');
   }
 
   test_classTypeAlias_with() async {
@@ -109,7 +109,7 @@
     assertElementTypes(aElement.mixins, ['M']);
 
     var mRef = findNode.typeName('M;');
-    assertTypeName(mRef, mElement, 'M');
+    assertNamedType(mRef, mElement, 'M');
   }
 
   test_commentReference() async {
@@ -309,7 +309,7 @@
     assertElementTypes(element.interfaces, ['Random']);
 
     var typeRef = findNode.typeName('Random {}');
-    assertTypeName(typeRef, randomElement, 'Random',
+    assertNamedType(typeRef, randomElement, 'Random',
         expectedPrefix: mathImport.prefix);
   }
 
@@ -324,7 +324,7 @@
     assertElementTypes(element.interfaces, ['int']);
 
     var typeRef = findNode.typeName('int {}');
-    assertTypeName(typeRef, intElement, 'int');
+    assertNamedType(typeRef, intElement, 'int');
   }
 
   test_error_implementsClause_nonClass_void() async {
@@ -339,7 +339,7 @@
     assertElementTypes(element.interfaces, []);
 
     var typeRef = findNode.typeName('void {}');
-    assertTypeName(typeRef, null, 'void');
+    assertNamedType(typeRef, null, 'void');
   }
 
   test_error_memberWithClassName_getter() async {
@@ -832,7 +832,7 @@
     assertElementTypes(element.superclassConstraints, ['Random']);
 
     var typeRef = findNode.typeName('Random {}');
-    assertTypeName(typeRef, randomElement, 'Random',
+    assertNamedType(typeRef, randomElement, 'Random',
         expectedPrefix: mathImport.prefix);
   }
 
@@ -848,7 +848,7 @@
     assertElementTypes(element.superclassConstraints, ['int']);
 
     var typeRef = findNode.typeName('int {}');
-    assertTypeName(typeRef, intElement, 'int');
+    assertNamedType(typeRef, intElement, 'int');
   }
 
   test_error_onClause_nonInterface_dynamic() async {
@@ -863,7 +863,7 @@
     assertElementTypes(element.superclassConstraints, ['Object']);
 
     var typeRef = findNode.typeName('dynamic {}');
-    assertTypeName(typeRef, dynamicElement, 'dynamic');
+    assertNamedType(typeRef, dynamicElement, 'dynamic');
   }
 
   test_error_onClause_nonInterface_enum() async {
@@ -879,7 +879,7 @@
     assertElementTypes(element.superclassConstraints, ['Object']);
 
     var typeRef = findNode.typeName('E {}');
-    assertTypeName(typeRef, findElement.enum_('E'), 'E');
+    assertNamedType(typeRef, findElement.enum_('E'), 'E');
   }
 
   test_error_onClause_nonInterface_void() async {
@@ -895,7 +895,7 @@
     assertElementTypes(element.superclassConstraints, ['Object']);
 
     var typeRef = findNode.typeName('void {}');
-    assertTypeName(typeRef, null, 'void');
+    assertNamedType(typeRef, null, 'void');
   }
 
   test_error_onClause_OK_mixin() async {
@@ -956,7 +956,7 @@
     var fNode = findNode.variableDeclaration('f;');
     assertElement(fNode.name, fElement);
 
-    assertTypeName(findNode.typeName('T f'), tElement, 'T');
+    assertNamedType(findNode.typeName('T f'), tElement, 'T');
 
     var accessors = element.accessors;
     expect(accessors, hasLength(2));
@@ -976,10 +976,10 @@
     assertElementTypes(element.interfaces, ['A', 'B']);
 
     var aRef = findNode.typeName('A, ');
-    assertTypeName(aRef, findElement.class_('A'), 'A');
+    assertNamedType(aRef, findElement.class_('A'), 'A');
 
     var bRef = findNode.typeName('B {} // M');
-    assertTypeName(bRef, findElement.class_('B'), 'B');
+    assertNamedType(bRef, findElement.class_('B'), 'B');
   }
 
   test_invalid_unresolved_before_mixin() async {
@@ -1064,10 +1064,10 @@
     assertElementTypes(element.superclassConstraints, ['A', 'B']);
 
     var aRef = findNode.typeName('A, ');
-    assertTypeName(aRef, findElement.class_('A'), 'A');
+    assertNamedType(aRef, findElement.class_('A'), 'A');
 
     var bRef = findNode.typeName('B {} // M');
-    assertTypeName(bRef, findElement.class_('B'), 'B');
+    assertNamedType(bRef, findElement.class_('B'), 'B');
   }
 
   test_recursiveInterfaceInheritance_implements() async {
diff --git a/pkg/analyzer/test/src/dart/resolution/resolution.dart b/pkg/analyzer/test/src/dart/resolution/resolution.dart
index 842b8022..98342e7 100644
--- a/pkg/analyzer/test/src/dart/resolution/resolution.dart
+++ b/pkg/analyzer/test/src/dart/resolution/resolution.dart
@@ -183,7 +183,7 @@
 
     var typeName = node.constructorName.type;
     expectedTypeNameElement ??= expectedClassElement;
-    assertTypeName(typeName, expectedTypeNameElement, null,
+    assertNamedType(typeName, expectedTypeNameElement, null,
         expectedPrefix: expectedPrefix);
   }
 
@@ -463,7 +463,7 @@
 
     var typeName = creation.constructorName.type;
     expectedTypeNameElement ??= expectedClassElement;
-    assertTypeName(typeName, expectedTypeNameElement, expectedType,
+    assertNamedType(typeName, expectedTypeNameElement, expectedType,
         expectedPrefix: expectedPrefix);
   }
 
@@ -572,6 +572,29 @@
     assertTypeNull(ref);
   }
 
+  void assertNamedType(
+      NamedType node, Element? expectedElement, String? expectedType,
+      {Element? expectedPrefix}) {
+    assertType(node, expectedType);
+
+    if (expectedPrefix == null) {
+      var name = node.name as SimpleIdentifier;
+      assertElement(name, expectedElement);
+      // TODO(scheglov) Should this be null?
+//      assertType(name, expectedType);
+    } else {
+      var name = node.name as PrefixedIdentifier;
+      assertImportPrefix(name.prefix, expectedPrefix);
+      assertElement(name.identifier, expectedElement);
+
+      // TODO(scheglov) This should be null, but it is not.
+      // ResolverVisitor sets the tpe for `Bar` in `new foo.Bar()`. This is
+      // probably wrong. It is fine for the TypeName `foo.Bar` to have a type,
+      // and for `foo.Bar()` to have a type. But not a name of a type? No.
+//      expect(name.identifier.staticType, isNull);
+    }
+  }
+
   void assertNamespaceDirectiveSelected(
     NamespaceDirective directive, {
     required String expectedRelativeUri,
@@ -805,33 +828,10 @@
       TypeLiteral node, Element? expectedElement, String expectedType,
       {Element? expectedPrefix}) {
     assertType(node, 'Type');
-    assertTypeName(node.typeName, expectedElement, expectedType,
+    assertNamedType(node.typeName, expectedElement, expectedType,
         expectedPrefix: expectedPrefix);
   }
 
-  void assertTypeName(
-      TypeName node, Element? expectedElement, String? expectedType,
-      {Element? expectedPrefix}) {
-    assertType(node, expectedType);
-
-    if (expectedPrefix == null) {
-      var name = node.name as SimpleIdentifier;
-      assertElement(name, expectedElement);
-      // TODO(scheglov) Should this be null?
-//      assertType(name, expectedType);
-    } else {
-      var name = node.name as PrefixedIdentifier;
-      assertImportPrefix(name.prefix, expectedPrefix);
-      assertElement(name.identifier, expectedElement);
-
-      // TODO(scheglov) This should be null, but it is not.
-      // ResolverVisitor sets the tpe for `Bar` in `new foo.Bar()`. This is
-      // probably wrong. It is fine for the TypeName `foo.Bar` to have a type,
-      // and for `foo.Bar()` to have a type. But not a name of a type? No.
-//      expect(name.identifier.staticType, isNull);
-    }
-  }
-
   void assertTypeNull(Expression node) {
     expect(node.staticType, isNull);
   }
diff --git a/pkg/analyzer/test/src/dart/resolution/type_name_test.dart b/pkg/analyzer/test/src/dart/resolution/type_name_test.dart
index 711acd8..d09e2dc 100644
--- a/pkg/analyzer/test/src/dart/resolution/type_name_test.dart
+++ b/pkg/analyzer/test/src/dart/resolution/type_name_test.dart
@@ -35,7 +35,7 @@
 f(A a) {}
 ''');
 
-    assertTypeName(
+    assertNamedType(
       findNode.typeName('A a'),
       import_a.class_('A'),
       'A*',
@@ -54,7 +54,7 @@
 f(A a) {}
 ''');
 
-    assertTypeName(
+    assertNamedType(
       findNode.typeName('A a'),
       import_a.class_('A'),
       'A<num*>*',
@@ -73,7 +73,7 @@
 f(A a) {}
 ''');
 
-    assertTypeName(
+    assertNamedType(
       findNode.typeName('A a'),
       import_a.class_('A'),
       'A<dynamic>*',
@@ -92,7 +92,7 @@
 f(A<int> a) {}
 ''');
 
-    assertTypeName(
+    assertNamedType(
       findNode.typeName('A<int> a'),
       import_a.class_('A'),
       'A<int*>*',
@@ -114,7 +114,7 @@
     var element = import_a.typeAlias('F');
 
     var typeName = findNode.typeName('F a');
-    assertTypeName(typeName, element, 'int* Function(bool*)*');
+    assertNamedType(typeName, element, 'int* Function(bool*)*');
 
     assertTypeAlias(
       typeName.typeOrThrow,
@@ -138,7 +138,7 @@
     var element = import_a.typeAlias('F');
 
     var typeName = findNode.typeName('F a');
-    assertTypeName(typeName, element, 'dynamic Function(bool*)*');
+    assertNamedType(typeName, element, 'dynamic Function(bool*)*');
 
     assertTypeAlias(
       typeName.typeOrThrow,
@@ -162,7 +162,7 @@
     var element = import_a.typeAlias('F');
 
     var typeName = findNode.typeName('F a');
-    assertTypeName(typeName, element, 'num* Function(bool*)*');
+    assertNamedType(typeName, element, 'num* Function(bool*)*');
 
     assertTypeAlias(
       typeName.typeOrThrow,
@@ -186,7 +186,7 @@
     var element = import_a.typeAlias('F');
 
     var typeName = findNode.typeName('F<int> a');
-    assertTypeName(typeName, element, 'int* Function(bool*)*');
+    assertNamedType(typeName, element, 'int* Function(bool*)*');
 
     assertTypeAlias(
       typeName.typeOrThrow,
@@ -209,7 +209,7 @@
       error(HintCode.IMPORT_OF_LEGACY_LIBRARY_INTO_NULL_SAFE, 7, 8),
     ]);
 
-    assertTypeName(
+    assertNamedType(
       findNode.typeName('A a'),
       import_a.class_('A'),
       'A',
@@ -230,7 +230,7 @@
       error(HintCode.IMPORT_OF_LEGACY_LIBRARY_INTO_NULL_SAFE, 7, 8),
     ]);
 
-    assertTypeName(
+    assertNamedType(
       findNode.typeName('A a'),
       import_a.class_('A'),
       'A<num*>',
@@ -251,7 +251,7 @@
       error(HintCode.IMPORT_OF_LEGACY_LIBRARY_INTO_NULL_SAFE, 7, 8),
     ]);
 
-    assertTypeName(
+    assertNamedType(
       findNode.typeName('A a'),
       import_a.class_('A'),
       'A<dynamic>',
@@ -272,7 +272,7 @@
       error(HintCode.IMPORT_OF_LEGACY_LIBRARY_INTO_NULL_SAFE, 7, 8),
     ]);
 
-    assertTypeName(
+    assertNamedType(
       findNode.typeName('A<int> a'),
       import_a.class_('A'),
       'A<int>',
@@ -293,7 +293,7 @@
       error(HintCode.IMPORT_OF_LEGACY_LIBRARY_INTO_NULL_SAFE, 7, 8),
     ]);
 
-    assertTypeName(
+    assertNamedType(
       findNode.typeName('F a'),
       import_a.typeAlias('F'),
       'int* Function()',
@@ -314,7 +314,7 @@
       error(HintCode.IMPORT_OF_LEGACY_LIBRARY_INTO_NULL_SAFE, 7, 8),
     ]);
 
-    assertTypeName(
+    assertNamedType(
       findNode.typeName('F a'),
       import_a.typeAlias('F'),
       'num* Function()',
@@ -335,7 +335,7 @@
       error(HintCode.IMPORT_OF_LEGACY_LIBRARY_INTO_NULL_SAFE, 7, 8),
     ]);
 
-    assertTypeName(
+    assertNamedType(
       findNode.typeName('F a'),
       import_a.typeAlias('F'),
       'dynamic Function()',
@@ -356,7 +356,7 @@
       error(HintCode.IMPORT_OF_LEGACY_LIBRARY_INTO_NULL_SAFE, 7, 8),
     ]);
 
-    assertTypeName(
+    assertNamedType(
       findNode.typeName('F<int> a'),
       import_a.typeAlias('F'),
       'int* Function()',
@@ -374,7 +374,7 @@
 }
 ''');
 
-    assertTypeName(
+    assertNamedType(
       findNode.typeName('X<int>()'),
       findElement.typeAlias('X'),
       'A<int>',
@@ -392,7 +392,7 @@
 }
 ''');
 
-    assertTypeName(
+    assertNamedType(
       findNode.typeName('X()'),
       findElement.typeAlias('X'),
       'A<int>',
@@ -410,7 +410,7 @@
 }
 ''');
 
-    assertTypeName(
+    assertNamedType(
       findNode.typeName('X<int>()'),
       findElement.typeAlias('X'),
       'A<int>',
@@ -423,13 +423,13 @@
 void f(X<String> a, X<String?> b) {}
 ''');
 
-    assertTypeName(
+    assertNamedType(
       findNode.typeName('X<String>'),
       findElement.typeAlias('X'),
       'Map<int, String>',
     );
 
-    assertTypeName(
+    assertNamedType(
       findNode.typeName('X<String?>'),
       findElement.typeAlias('X'),
       'Map<int, String?>',
@@ -446,7 +446,7 @@
 void f(X<String> a) {}
 ''');
 
-    assertTypeName(
+    assertNamedType(
       findNode.typeName('X<String>'),
       findElement.importFind('package:test/a.dart').typeAlias('X'),
       'Map<int*, String*>*',
@@ -459,13 +459,13 @@
 void f(X<int> a, X<int?> b) {}
 ''');
 
-    assertTypeName(
+    assertNamedType(
       findNode.typeName('X<int>'),
       findElement.typeAlias('X'),
       'List<int?>',
     );
 
-    assertTypeName(
+    assertNamedType(
       findNode.typeName('X<int?>'),
       findElement.typeAlias('X'),
       'List<int?>',
@@ -482,7 +482,7 @@
 void f(X<int> a) {}
 ''');
 
-    assertTypeName(
+    assertNamedType(
       findNode.typeName('X<int>'),
       findElement.importFind('package:test/a.dart').typeAlias('X'),
       'List<int*>*',
@@ -495,13 +495,13 @@
 void f(X a, X? b) {}
 ''');
 
-    assertTypeName(
+    assertNamedType(
       findNode.typeName('X a'),
       findElement.typeAlias('X'),
       'Never',
     );
 
-    assertTypeName(
+    assertNamedType(
       findNode.typeName('X? b'),
       findElement.typeAlias('X'),
       'Never?',
@@ -518,7 +518,7 @@
 void f(X a) {}
 ''');
 
-    assertTypeName(
+    assertNamedType(
       findNode.typeName('X a'),
       findElement.importFind('package:test/a.dart').typeAlias('X'),
       'Null*',
@@ -531,13 +531,13 @@
 void f(X a, X? b) {}
 ''');
 
-    assertTypeName(
+    assertNamedType(
       findNode.typeName('X a'),
       findElement.typeAlias('X'),
       'Never?',
     );
 
-    assertTypeName(
+    assertNamedType(
       findNode.typeName('X? b'),
       findElement.typeAlias('X'),
       'Never?',
@@ -550,7 +550,7 @@
 void f(X<int> a) {}
 ''');
 
-    assertTypeName(
+    assertNamedType(
       findNode.typeName('X<int>'),
       findElement.typeAlias('X'),
       'int?',
@@ -563,7 +563,7 @@
 X<String> f() => {};
 ''');
 
-    assertTypeName(
+    assertNamedType(
       findNode.typeName('X<String>'),
       findElement.typeAlias('X'),
       'Map<int, String>',
@@ -576,7 +576,7 @@
 Nothing f() {}
 ''');
 
-    assertTypeName(
+    assertNamedType(
       findNode.typeName('Nothing f()'),
       findElement.typeAlias('Nothing'),
       'void',
@@ -592,7 +592,7 @@
 f(A a) {}
 ''');
 
-    assertTypeName(
+    assertNamedType(
       findNode.typeName('A a'),
       findElement.class_('A'),
       typeStr('A', 'A*'),
@@ -606,7 +606,7 @@
 f(A a) {}
 ''');
 
-    assertTypeName(
+    assertNamedType(
       findNode.typeName('A a'),
       findElement.class_('A'),
       typeStr('A<num>', 'A<num*>*'),
@@ -620,7 +620,7 @@
 f(A a) {}
 ''');
 
-    assertTypeName(
+    assertNamedType(
       findNode.typeName('A a'),
       findElement.class_('A'),
       typeStr('A<dynamic>', 'A<dynamic>*'),
@@ -634,7 +634,7 @@
 f(A<int> a) {}
 ''');
 
-    assertTypeName(
+    assertNamedType(
       findNode.typeName('A<int> a'),
       findElement.class_('A'),
       typeStr('A<int>', 'A<int*>*'),
@@ -648,7 +648,7 @@
 dynamic a;
 ''');
 
-    assertTypeName(
+    assertNamedType(
       findNode.typeName('dynamic a;'),
       dynamicElement,
       'dynamic',
@@ -662,7 +662,7 @@
 mycore.dynamic a;
 ''');
 
-    assertTypeName(
+    assertNamedType(
       findNode.typeName('mycore.dynamic a;'),
       dynamicElement,
       'dynamic',
@@ -679,7 +679,7 @@
       error(CompileTimeErrorCode.UNDEFINED_CLASS, 31, 7),
     ]);
 
-    assertTypeName(
+    assertNamedType(
       findNode.typeName('dynamic a;'),
       null,
       'dynamic',
@@ -691,7 +691,7 @@
 dynamic a;
 ''');
 
-    assertTypeName(
+    assertNamedType(
       findNode.typeName('dynamic a;'),
       dynamicElement,
       'dynamic',
@@ -705,7 +705,7 @@
 f(F a) {}
 ''');
 
-    assertTypeName(
+    assertNamedType(
       findNode.typeName('F a'),
       findElement.typeAlias('F'),
       typeStr('int Function()', 'int* Function()*'),
@@ -719,7 +719,7 @@
 f(F a) {}
 ''');
 
-    assertTypeName(
+    assertNamedType(
       findNode.typeName('F a'),
       findElement.typeAlias('F'),
       typeStr('num Function()', 'num* Function()*'),
@@ -733,7 +733,7 @@
 f(F a) {}
 ''');
 
-    assertTypeName(
+    assertNamedType(
       findNode.typeName('F a'),
       findElement.typeAlias('F'),
       typeStr('dynamic Function()', 'dynamic Function()*'),
@@ -747,7 +747,7 @@
 f(F<int> a) {}
 ''');
 
-    assertTypeName(
+    assertNamedType(
       findNode.typeName('F<int> a'),
       findElement.typeAlias('F'),
       typeStr('int Function()', 'int* Function()*'),
@@ -765,7 +765,7 @@
       error(CompileTimeErrorCode.NEW_WITH_NON_TYPE, 49, 1),
     ]);
 
-    assertTypeName(
+    assertNamedType(
       findNode.typeName('A();'),
       null,
       'dynamic',
@@ -782,7 +782,7 @@
 }
 ''');
 
-    assertTypeName(
+    assertNamedType(
       findNode.typeName('A();'),
       findElement.class_('A'),
       typeStr('A', 'A*'),
@@ -798,7 +798,7 @@
       error(CompileTimeErrorCode.NEW_WITH_NON_TYPE, 15, 1),
     ]);
 
-    assertTypeName(
+    assertNamedType(
       findNode.typeName('A();'),
       null,
       'dynamic',
@@ -814,7 +814,7 @@
       error(CompileTimeErrorCode.NEW_WITH_NON_TYPE, 17, 10),
     ]);
 
-    assertTypeName(
+    assertNamedType(
       findNode.typeName('int.double'),
       null,
       'dynamic',
@@ -831,7 +831,7 @@
       error(CompileTimeErrorCode.NOT_A_TYPE, 18, 10),
     ]);
 
-    assertTypeName(
+    assertNamedType(
       findNode.typeName('int.double'),
       null,
       'dynamic',
@@ -844,7 +844,7 @@
 f(Never a) {}
 ''');
 
-    assertTypeName(
+    assertNamedType(
       findNode.typeName('Never a'),
       neverElement,
       typeStr('Never', 'Null*'),
diff --git a/pkg/analyzer/test/src/diagnostics/implements_repeated_test.dart b/pkg/analyzer/test/src/diagnostics/implements_repeated_test.dart
index 01da5dc..9df2f85 100644
--- a/pkg/analyzer/test/src/diagnostics/implements_repeated_test.dart
+++ b/pkg/analyzer/test/src/diagnostics/implements_repeated_test.dart
@@ -24,8 +24,8 @@
     ]);
 
     var A = findElement.class_('A');
-    assertTypeName(findNode.typeName('A, A {} // ref'), A, 'A');
-    assertTypeName(findNode.typeName('A {} // ref'), A, 'A');
+    assertNamedType(findNode.typeName('A, A {} // ref'), A, 'A');
+    assertNamedType(findNode.typeName('A {} // ref'), A, 'A');
   }
 
   test_class_implements_2times_viaTypeAlias() async {
@@ -37,13 +37,13 @@
       error(CompileTimeErrorCode.IMPLEMENTS_REPEATED, 48, 1),
     ]);
 
-    assertTypeName(
+    assertNamedType(
       findNode.typeName('A, B {} // ref'),
       findElement.class_('A'),
       'A',
     );
 
-    assertTypeName(
+    assertNamedType(
       findNode.typeName('B {} // ref'),
       findElement.typeAlias('B'),
       'A',
diff --git a/pkg/analyzer/test/src/diagnostics/void_with_type_arguments_test.dart b/pkg/analyzer/test/src/diagnostics/void_with_type_arguments_test.dart
index 7615279..e771072 100644
--- a/pkg/analyzer/test/src/diagnostics/void_with_type_arguments_test.dart
+++ b/pkg/analyzer/test/src/diagnostics/void_with_type_arguments_test.dart
@@ -27,6 +27,6 @@
 ''', [
       error(ParserErrorCode.VOID_WITH_TYPE_ARGUMENTS, 4, 1),
     ]);
-    assertTypeName(findNode.typeName('int>'), intElement, 'int');
+    assertNamedType(findNode.typeName('int>'), intElement, 'int');
   }
 }
diff --git a/pkg/analyzer/test/src/summary/resolved_ast_printer.dart b/pkg/analyzer/test/src/summary/resolved_ast_printer.dart
index 9b9051e..1921da7 100644
--- a/pkg/analyzer/test/src/summary/resolved_ast_printer.dart
+++ b/pkg/analyzer/test/src/summary/resolved_ast_printer.dart
@@ -1809,6 +1809,7 @@
     return '{$entriesStr}';
   }
 
+  /// TODO(scheglov) Make [type] non-nullable?
   String? _typeStr(DartType? type) {
     return type?.getDisplayString(withNullability: _withNullability);
   }
@@ -1989,7 +1990,8 @@
       _writelnWithIndent(name);
       _withIndent(() {
         for (var type in types) {
-          _writelnWithIndent('$type');
+          var typeStr = _typeStr(type);
+          _writelnWithIndent('$typeStr');
         }
       });
     }
diff --git a/pkg/analyzer/test/src/summary/resynthesize_common.dart b/pkg/analyzer/test/src/summary/resynthesize_common.dart
index 685f2f4..487ad9e 100644
--- a/pkg/analyzer/test/src/summary/resynthesize_common.dart
+++ b/pkg/analyzer/test/src/summary/resynthesize_common.dart
@@ -33836,7 +33836,7 @@
     expect(variable, isNotNull);
     expect(variable.isFinal, isFalse);
     expect(variable.getter, same(getter));
-    expect('${variable.type}', 'int');
+    _assertTypeStr(variable.type, 'int');
     expect(variable, same(_elementOfDefiningUnit(library, ['@variable', 'x'])));
   }
 
diff --git a/sdk/lib/_internal/fix_data.yaml b/sdk/lib/_internal/fix_data.yaml
index baf52a4..7f87843 100644
--- a/sdk/lib/_internal/fix_data.yaml
+++ b/sdk/lib/_internal/fix_data.yaml
@@ -489,3 +489,1690 @@
     changes:
       - kind: 'rename'
         newName: 'networkConnectTimeoutError'
+
+  - title: "Rename to 'invalidParams'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:developer' ]
+      field: 'kInvalidParams'
+      inClass: 'ServiceExtensionResponse'
+    changes:
+      - kind: 'rename'
+        newName: 'invalidParams'
+
+  - title: "Rename to 'extensionError'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:developer' ]
+      field: 'kExtensionError'
+      inClass: 'ServiceExtensionResponse'
+    changes:
+      - kind: 'rename'
+        newName: 'extensionError'
+
+  - title: "Rename to 'extensionErrorMax'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:developer' ]
+      field: 'kExtensionErrorMax'
+      inClass: 'ServiceExtensionResponse'
+    changes:
+      - kind: 'rename'
+        newName: 'extensionErrorMax'
+
+  - title: "Rename to 'extensionErrorMin'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:developer' ]
+      field: 'kExtensionErrorMin'
+      inClass: 'ServiceExtensionResponse'
+    changes:
+      - kind: 'rename'
+        newName: 'extensionErrorMin'
+
+  - title: "Rename to 'systemEncoding'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      variable: 'SYSTEM_ENCODING'
+    changes:
+      - kind: 'rename'
+        newName: 'systemEncoding'
+
+  - title: "Rename to 'terminal'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'TERMINAL'
+      inClass: 'StdioType'
+    changes:
+      - kind: 'rename'
+        newName: 'terminal'
+
+  - title: "Rename to 'pipe'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'PIPE'
+      inClass: 'StdioType'
+    changes:
+      - kind: 'rename'
+        newName: 'pipe'
+
+  - title: "Rename to 'file'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'FILE'
+      inClass: 'StdioType'
+    changes:
+      - kind: 'rename'
+        newName: 'file'
+
+  - title: "Rename to 'other'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'OTHER'
+      inClass: 'StdioType'
+    changes:
+      - kind: 'rename'
+        newName: 'other'
+
+  - title: "Rename to 'normal'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'NORMAL'
+      inClass: 'ProcessStartMode'
+    changes:
+      - kind: 'rename'
+        newName: 'normal'
+
+  - title: "Rename to 'inheritStdio'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'INHERIT_STDIO'
+      inClass: 'ProcessStartMode'
+    changes:
+      - kind: 'rename'
+        newName: 'inheritStdio'
+
+  - title: "Rename to 'detached'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'DETACHED'
+      inClass: 'ProcessStartMode'
+    changes:
+      - kind: 'rename'
+        newName: 'detached'
+
+  - title: "Rename to 'detachedWithStdio'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'DETACHED_WITH_STDIO'
+      inClass: 'ProcessStartMode'
+    changes:
+      - kind: 'rename'
+        newName: 'detachedWithStdio'
+
+  - title: "Rename to 'sighup'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'SIGHUP'
+      inClass: 'ProcessSignal'
+    changes:
+      - kind: 'rename'
+        newName: 'sighup'
+
+  - title: "Rename to 'sigint'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'SIGINT'
+      inClass: 'ProcessSignal'
+    changes:
+      - kind: 'rename'
+        newName: 'sigint'
+
+  - title: "Rename to 'sigquit'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'SIGQUIT'
+      inClass: 'ProcessSignal'
+    changes:
+      - kind: 'rename'
+        newName: 'sigquit'
+
+  - title: "Rename to 'sigill'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'SIGILL'
+      inClass: 'ProcessSignal'
+    changes:
+      - kind: 'rename'
+        newName: 'sigill'
+
+  - title: "Rename to 'sigtrap'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'SIGTRAP'
+      inClass: 'ProcessSignal'
+    changes:
+      - kind: 'rename'
+        newName: 'sigtrap'
+
+  - title: "Rename to 'sigabrt'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'SIGABRT'
+      inClass: 'ProcessSignal'
+    changes:
+      - kind: 'rename'
+        newName: 'sigabrt'
+
+  - title: "Rename to 'sigbus'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'SIGBUS'
+      inClass: 'ProcessSignal'
+    changes:
+      - kind: 'rename'
+        newName: 'sigbus'
+
+  - title: "Rename to 'sigfpe'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'SIGFPE'
+      inClass: 'ProcessSignal'
+    changes:
+      - kind: 'rename'
+        newName: 'sigfpe'
+
+  - title: "Rename to 'sigkill'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'SIGKILL'
+      inClass: 'ProcessSignal'
+    changes:
+      - kind: 'rename'
+        newName: 'sigkill'
+
+  - title: "Rename to 'sigusr1'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'SIGUSR1'
+      inClass: 'ProcessSignal'
+    changes:
+      - kind: 'rename'
+        newName: 'sigusr1'
+
+  - title: "Rename to 'sigsegv'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'SIGSEGV'
+      inClass: 'ProcessSignal'
+    changes:
+      - kind: 'rename'
+        newName: 'sigsegv'
+
+  - title: "Rename to 'sigusr2'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'SIGUSR2'
+      inClass: 'ProcessSignal'
+    changes:
+      - kind: 'rename'
+        newName: 'sigusr2'
+
+  - title: "Rename to 'sigpipe'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'SIGPIPE'
+      inClass: 'ProcessSignal'
+    changes:
+      - kind: 'rename'
+        newName: 'sigpipe'
+
+  - title: "Rename to 'sigalrm'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'SIGALRM'
+      inClass: 'ProcessSignal'
+    changes:
+      - kind: 'rename'
+        newName: 'sigalrm'
+
+  - title: "Rename to 'sigterm'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'SIGTERM'
+      inClass: 'ProcessSignal'
+    changes:
+      - kind: 'rename'
+        newName: 'sigterm'
+
+  - title: "Rename to 'sigchld'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'SIGCHLD'
+      inClass: 'ProcessSignal'
+    changes:
+      - kind: 'rename'
+        newName: 'sigchld'
+
+  - title: "Rename to 'sigcont'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'SIGCONT'
+      inClass: 'ProcessSignal'
+    changes:
+      - kind: 'rename'
+        newName: 'sigcont'
+
+  - title: "Rename to 'sigstop'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'SIGSTOP'
+      inClass: 'ProcessSignal'
+    changes:
+      - kind: 'rename'
+        newName: 'sigstop'
+
+  - title: "Rename to 'sigtstp'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'SIGTSTP'
+      inClass: 'ProcessSignal'
+    changes:
+      - kind: 'rename'
+        newName: 'sigtstp'
+
+  - title: "Rename to 'sigttin'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'SIGTTIN'
+      inClass: 'ProcessSignal'
+    changes:
+      - kind: 'rename'
+        newName: 'sigttin'
+
+  - title: "Rename to 'sigttou'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'SIGTTOU'
+      inClass: 'ProcessSignal'
+    changes:
+      - kind: 'rename'
+        newName: 'sigttou'
+
+  - title: "Rename to 'sigurg'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'SIGURG'
+      inClass: 'ProcessSignal'
+    changes:
+      - kind: 'rename'
+        newName: 'sigurg'
+
+  - title: "Rename to 'sigxcpu'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'SIGXCPU'
+      inClass: 'ProcessSignal'
+    changes:
+      - kind: 'rename'
+        newName: 'sigxcpu'
+
+  - title: "Rename to 'sigxfsz'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'SIGXFSZ'
+      inClass: 'ProcessSignal'
+    changes:
+      - kind: 'rename'
+        newName: 'sigxfsz'
+
+  - title: "Rename to 'sigvtalrm'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'SIGVTALRM'
+      inClass: 'ProcessSignal'
+    changes:
+      - kind: 'rename'
+        newName: 'sigvtalrm'
+
+  - title: "Rename to 'sigprof'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'SIGPROF'
+      inClass: 'ProcessSignal'
+    changes:
+      - kind: 'rename'
+        newName: 'sigprof'
+
+  - title: "Rename to 'sigwinch'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'SIGWINCH'
+      inClass: 'ProcessSignal'
+    changes:
+      - kind: 'rename'
+        newName: 'sigwinch'
+
+  - title: "Rename to 'sigpoll'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'SIGPOLL'
+      inClass: 'ProcessSignal'
+    changes:
+      - kind: 'rename'
+        newName: 'sigpoll'
+
+  - title: "Rename to 'sigsys'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'SIGSYS'
+      inClass: 'ProcessSignal'
+    changes:
+      - kind: 'rename'
+        newName: 'sigsys'
+
+  - title: "Rename to 'IPv4'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'IP_V4'
+      inClass: 'InternetAddressType'
+    changes:
+      - kind: 'rename'
+        newName: 'IPv4'
+
+  - title: "Rename to 'IPv6'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'IP_V6'
+      inClass: 'InternetAddressType'
+    changes:
+      - kind: 'rename'
+        newName: 'IPv6'
+
+  - title: "Rename to 'any'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'ANY'
+      inClass: 'InternetAddressType'
+    changes:
+      - kind: 'rename'
+        newName: 'any'
+
+  - title: "Rename to 'loopbackIPv4'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'LOOPBACK_IP_V4'
+      inClass: 'InternetAddress'
+    changes:
+      - kind: 'rename'
+        newName: 'loopbackIPv4'
+
+  - title: "Rename to 'loopbackIPv6'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'LOOPBACK_IP_V6'
+      inClass: 'InternetAddress'
+    changes:
+      - kind: 'rename'
+        newName: 'loopbackIPv6'
+
+  - title: "Rename to 'anyIPv4'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'ANY_IP_V4'
+      inClass: 'InternetAddress'
+    changes:
+      - kind: 'rename'
+        newName: 'anyIPv4'
+
+  - title: "Rename to 'anyIPv6'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'ANY_IP_V6'
+      inClass: 'InternetAddress'
+    changes:
+      - kind: 'rename'
+        newName: 'anyIPv6'
+
+  - title: "Rename to 'receive'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'RECEIVE'
+      inClass: 'SocketDirection'
+    changes:
+      - kind: 'rename'
+        newName: 'receive'
+
+  - title: "Rename to 'send'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'SEND'
+      inClass: 'SocketDirection'
+    changes:
+      - kind: 'rename'
+        newName: 'send'
+
+  - title: "Rename to 'both'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'BOTH'
+      inClass: 'SocketDirection'
+    changes:
+      - kind: 'rename'
+        newName: 'both'
+
+  - title: "Rename to 'tcpNoDelay'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'TCP_NODELAY'
+      inClass: 'SocketOption'
+    changes:
+      - kind: 'rename'
+        newName: 'tcpNoDelay'
+
+  - title: "Rename to 'read'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'READ'
+      inClass: 'RawSocketEvent'
+    changes:
+      - kind: 'rename'
+        newName: 'read'
+
+  - title: "Rename to 'write'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'WRITE'
+      inClass: 'RawSocketEvent'
+    changes:
+      - kind: 'rename'
+        newName: 'write'
+
+  - title: "Rename to 'readClosed'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'READ_CLOSED'
+      inClass: 'RawSocketEvent'
+    changes:
+      - kind: 'rename'
+        newName: 'readClosed'
+
+  - title: "Rename to 'closed'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'CLOSED'
+      inClass: 'RawSocketEvent'
+    changes:
+      - kind: 'rename'
+        newName: 'closed'
+
+  - title: "Rename to 'file'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'FILE'
+      inClass: 'FileSystemEntityType'
+    changes:
+      - kind: 'rename'
+        newName: 'file'
+
+  - title: "Rename to 'directory'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'DIRECTORY'
+      inClass: 'FileSystemEntityType'
+    changes:
+      - kind: 'rename'
+        newName: 'directory'
+
+  - title: "Rename to 'link'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'LINK'
+      inClass: 'FileSystemEntityType'
+    changes:
+      - kind: 'rename'
+        newName: 'link'
+
+  - title: "Rename to 'notFound'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'NOT_FOUND'
+      inClass: 'FileSystemEntityType'
+    changes:
+      - kind: 'rename'
+        newName: 'notFound'
+
+  - title: "Rename to 'create'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'CREATE'
+      inClass: 'FileSystemEvent'
+    changes:
+      - kind: 'rename'
+        newName: 'create'
+
+  - title: "Rename to 'modify'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'MODIFY'
+      inClass: 'FileSystemEvent'
+    changes:
+      - kind: 'rename'
+        newName: 'modify'
+
+  - title: "Rename to 'delete'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'DELETE'
+      inClass: 'FileSystemEvent'
+    changes:
+      - kind: 'rename'
+        newName: 'delete'
+
+  - title: "Rename to 'move'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'MOVE'
+      inClass: 'FileSystemEvent'
+    changes:
+      - kind: 'rename'
+        newName: 'move'
+
+  - title: "Rename to 'all'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'ALL'
+      inClass: 'FileSystemEvent'
+    changes:
+      - kind: 'rename'
+        newName: 'all'
+
+  - title: "Rename to 'minWindowBits'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'MIN_WINDOW_BITS'
+      inClass: 'ZLibOption'
+    changes:
+      - kind: 'rename'
+        newName: 'minWindowBits'
+
+  - title: "Rename to 'maxWindowBits'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'MAX_WINDOW_BITS'
+      inClass: 'ZLibOption'
+    changes:
+      - kind: 'rename'
+        newName: 'maxWindowBits'
+
+  - title: "Rename to 'defaultWindowBits'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'DEFAULT_WINDOW_BITS'
+      inClass: 'ZLibOption'
+    changes:
+      - kind: 'rename'
+        newName: 'defaultWindowBits'
+
+  - title: "Rename to 'minLevel'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'MIN_LEVEL'
+      inClass: 'ZLibOption'
+    changes:
+      - kind: 'rename'
+        newName: 'minLevel'
+
+  - title: "Rename to 'maxLevel'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'MAX_LEVEL'
+      inClass: 'ZLibOption'
+    changes:
+      - kind: 'rename'
+        newName: 'maxLevel'
+
+  - title: "Rename to 'defaultLevel'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'DEFAULT_LEVEL'
+      inClass: 'ZLibOption'
+    changes:
+      - kind: 'rename'
+        newName: 'defaultLevel'
+
+  - title: "Rename to 'minMemLevel'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'MIN_MEM_LEVEL'
+      inClass: 'ZLibOption'
+    changes:
+      - kind: 'rename'
+        newName: 'minMemLevel'
+
+  - title: "Rename to 'maxMemLevel'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'MAX_MEM_LEVEL'
+      inClass: 'ZLibOption'
+    changes:
+      - kind: 'rename'
+        newName: 'maxMemLevel'
+
+  - title: "Rename to 'defaultMemLevel'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'DEFAULT_MEM_LEVEL'
+      inClass: 'ZLibOption'
+    changes:
+      - kind: 'rename'
+        newName: 'defaultMemLevel'
+
+  - title: "Rename to 'strategyFiltered'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'STRATEGY_FILTERED'
+      inClass: 'ZLibOption'
+    changes:
+      - kind: 'rename'
+        newName: 'strategyFiltered'
+
+  - title: "Rename to 'strategyHuffmanOnly'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'STRATEGY_HUFFMAN_ONLY'
+      inClass: 'ZLibOption'
+    changes:
+      - kind: 'rename'
+        newName: 'strategyHuffmanOnly'
+
+  - title: "Rename to 'strategyRle'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'STRATEGY_RLE'
+      inClass: 'ZLibOption'
+    changes:
+      - kind: 'rename'
+        newName: 'strategyRle'
+
+  - title: "Rename to 'strategyFixed'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'STRATEGY_FIXED'
+      inClass: 'ZLibOption'
+    changes:
+      - kind: 'rename'
+        newName: 'strategyFixed'
+
+  - title: "Rename to 'strategyDefault'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'STRATEGY_DEFAULT'
+      inClass: 'ZLibOption'
+    changes:
+      - kind: 'rename'
+        newName: 'strategyDefault'
+
+  - title: "Rename to 'zlib'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      variable: 'ZLIB'
+    changes:
+      - kind: 'rename'
+        newName: 'zlib'
+
+  - title: "Rename to 'gzip'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      variable: 'GZIP'
+    changes:
+      - kind: 'rename'
+        newName: 'gzip'
+
+  - title: "Rename to 'read'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'READ'
+      inClass: 'FileMode'
+    changes:
+      - kind: 'rename'
+        newName: 'read'
+
+  - title: "Rename to 'write'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'WRITE'
+      inClass: 'FileMode'
+    changes:
+      - kind: 'rename'
+        newName: 'write'
+
+  - title: "Rename to 'append'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'APPEND'
+      inClass: 'FileMode'
+    changes:
+      - kind: 'rename'
+        newName: 'append'
+
+  - title: "Rename to 'writeOnly'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'WRITE_ONLY'
+      inClass: 'FileMode'
+    changes:
+      - kind: 'rename'
+        newName: 'writeOnly'
+
+  - title: "Rename to 'writeOnlyAppend'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'WRITE_ONLY_APPEND'
+      inClass: 'FileMode'
+    changes:
+      - kind: 'rename'
+        newName: 'writeOnlyAppend'
+
+  - title: "Rename to 'shared'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'SHARED'
+      inClass: 'FileLock'
+    changes:
+      - kind: 'rename'
+        newName: 'shared'
+
+  - title: "Rename to 'exclusive'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'EXCLUSIVE'
+      inClass: 'FileLock'
+    changes:
+      - kind: 'rename'
+        newName: 'exclusive'
+
+  - title: "Rename to 'blockingShared'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'BLOCKING_SHARED'
+      inClass: 'FileLock'
+    changes:
+      - kind: 'rename'
+        newName: 'blockingShared'
+
+  - title: "Rename to 'blockingExclusive'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'BLOCKING_EXCLUSIVE'
+      inClass: 'FileLock'
+    changes:
+      - kind: 'rename'
+        newName: 'blockingExclusive'
+
+  - title: "Rename to 'normalClosure'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'NORMAL_CLOSURE'
+      inClass: 'WebSocketStatus'
+    changes:
+      - kind: 'rename'
+        newName: 'normalClosure'
+
+  - title: "Rename to 'goingAway'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'GOING_AWAY'
+      inClass: 'WebSocketStatus'
+    changes:
+      - kind: 'rename'
+        newName: 'goingAway'
+
+  - title: "Rename to 'protocolError'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'PROTOCOL_ERROR'
+      inClass: 'WebSocketStatus'
+    changes:
+      - kind: 'rename'
+        newName: 'protocolError'
+
+  - title: "Rename to 'unsupportedData'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'UNSUPPORTED_DATA'
+      inClass: 'WebSocketStatus'
+    changes:
+      - kind: 'rename'
+        newName: 'unsupportedData'
+
+  - title: "Rename to 'reserved1004'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'RESERVED_1004'
+      inClass: 'WebSocketStatus'
+    changes:
+      - kind: 'rename'
+        newName: 'reserved1004'
+
+  - title: "Rename to 'noStatusReceived'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'NO_STATUS_RECEIVED'
+      inClass: 'WebSocketStatus'
+    changes:
+      - kind: 'rename'
+        newName: 'noStatusReceived'
+
+  - title: "Rename to 'abnormalClosure'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'ABNORMAL_CLOSURE'
+      inClass: 'WebSocketStatus'
+    changes:
+      - kind: 'rename'
+        newName: 'abnormalClosure'
+
+  - title: "Rename to 'invalidFramePayloadData'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'INVALID_FRAME_PAYLOAD_DATA'
+      inClass: 'WebSocketStatus'
+    changes:
+      - kind: 'rename'
+        newName: 'invalidFramePayloadData'
+
+  - title: "Rename to 'policyViolation'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'POLICY_VIOLATION'
+      inClass: 'WebSocketStatus'
+    changes:
+      - kind: 'rename'
+        newName: 'policyViolation'
+
+  - title: "Rename to 'messageTooBig'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'MESSAGE_TOO_BIG'
+      inClass: 'WebSocketStatus'
+    changes:
+      - kind: 'rename'
+        newName: 'messageTooBig'
+
+  - title: "Rename to 'missingMandatoryExtension'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'MISSING_MANDATORY_EXTENSION'
+      inClass: 'WebSocketStatus'
+    changes:
+      - kind: 'rename'
+        newName: 'missingMandatoryExtension'
+
+  - title: "Rename to 'internalServerError'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'INTERNAL_SERVER_ERROR'
+      inClass: 'WebSocketStatus'
+    changes:
+      - kind: 'rename'
+        newName: 'internalServerError'
+
+  - title: "Rename to 'reserved1015'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'RESERVED_1015'
+      inClass: 'WebSocketStatus'
+    changes:
+      - kind: 'rename'
+        newName: 'reserved1015'
+
+  - title: "Rename to 'compressionDefault'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'DEFAULT'
+      inClass: 'CompressionOptions'
+    changes:
+      - kind: 'rename'
+        newName: 'compressionDefault'
+
+  - title: "Rename to 'compressionOff'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'OFF'
+      inClass: 'CompressionOptions'
+    changes:
+      - kind: 'rename'
+        newName: 'compressionOff'
+
+  - title: "Rename to 'connecting'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'CONNECTING'
+      inClass: 'WebSocket'
+    changes:
+      - kind: 'rename'
+        newName: 'connecting'
+
+  - title: "Rename to 'open'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'OPEN'
+      inClass: 'WebSocket'
+    changes:
+      - kind: 'rename'
+        newName: 'open'
+
+  - title: "Rename to 'closing'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'CLOSING'
+      inClass: 'WebSocket'
+    changes:
+      - kind: 'rename'
+        newName: 'closing'
+
+  - title: "Rename to 'closed'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'CLOSED'
+      inClass: 'WebSocket'
+    changes:
+      - kind: 'rename'
+        newName: 'closed'
+
+  - title: "Rename to 'acceptHeader'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'ACCEPT'
+      inClass: 'HttpHeaders'
+    changes:
+      - kind: 'rename'
+        newName: 'acceptHeader'
+
+  - title: "Rename to 'acceptCharsetHeader'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'ACCEPT_CHARSET'
+      inClass: 'HttpHeaders'
+    changes:
+      - kind: 'rename'
+        newName: 'acceptCharsetHeader'
+
+  - title: "Rename to 'acceptEncodingHeader'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'ACCEPT_ENCODING'
+      inClass: 'HttpHeaders'
+    changes:
+      - kind: 'rename'
+        newName: 'acceptEncodingHeader'
+
+  - title: "Rename to 'acceptLanguageHeader'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'ACCEPT_LANGUAGE'
+      inClass: 'HttpHeaders'
+    changes:
+      - kind: 'rename'
+        newName: 'acceptLanguageHeader'
+
+  - title: "Rename to 'acceptRangesHeader'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'ACCEPT_RANGES'
+      inClass: 'HttpHeaders'
+    changes:
+      - kind: 'rename'
+        newName: 'acceptRangesHeader'
+
+  - title: "Rename to 'ageHeader'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'AGE'
+      inClass: 'HttpHeaders'
+    changes:
+      - kind: 'rename'
+        newName: 'ageHeader'
+
+  - title: "Rename to 'allowHeader'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'ALLOW'
+      inClass: 'HttpHeaders'
+    changes:
+      - kind: 'rename'
+        newName: 'allowHeader'
+
+  - title: "Rename to 'authorizationHeader'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'AUTHORIZATION'
+      inClass: 'HttpHeaders'
+    changes:
+      - kind: 'rename'
+        newName: 'authorizationHeader'
+
+  - title: "Rename to 'cacheControlHeader'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'CACHE_CONTROL'
+      inClass: 'HttpHeaders'
+    changes:
+      - kind: 'rename'
+        newName: 'cacheControlHeader'
+
+  - title: "Rename to 'connectionHeader'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'CONNECTION'
+      inClass: 'HttpHeaders'
+    changes:
+      - kind: 'rename'
+        newName: 'connectionHeader'
+
+  - title: "Rename to 'contentEncodingHeader'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'CONTENT_ENCODING'
+      inClass: 'HttpHeaders'
+    changes:
+      - kind: 'rename'
+        newName: 'contentEncodingHeader'
+
+  - title: "Rename to 'contentLanguageHeader'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'CONTENT_LANGUAGE'
+      inClass: 'HttpHeaders'
+    changes:
+      - kind: 'rename'
+        newName: 'contentLanguageHeader'
+
+  - title: "Rename to 'contentLengthHeader'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'CONTENT_LENGTH'
+      inClass: 'HttpHeaders'
+    changes:
+      - kind: 'rename'
+        newName: 'contentLengthHeader'
+
+  - title: "Rename to 'contentLocationHeader'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'CONTENT_LOCATION'
+      inClass: 'HttpHeaders'
+    changes:
+      - kind: 'rename'
+        newName: 'contentLocationHeader'
+
+  - title: "Rename to 'contentMD5Header'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'CONTENT_MD5'
+      inClass: 'HttpHeaders'
+    changes:
+      - kind: 'rename'
+        newName: 'contentMD5Header'
+
+  - title: "Rename to 'contentRangeHeader'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'CONTENT_RANGE'
+      inClass: 'HttpHeaders'
+    changes:
+      - kind: 'rename'
+        newName: 'contentRangeHeader'
+
+  - title: "Rename to 'contentTypeHeader'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'CONTENT_TYPE'
+      inClass: 'HttpHeaders'
+    changes:
+      - kind: 'rename'
+        newName: 'contentTypeHeader'
+
+  - title: "Rename to 'dateHeader'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'DATE'
+      inClass: 'HttpHeaders'
+    changes:
+      - kind: 'rename'
+        newName: 'dateHeader'
+
+  - title: "Rename to 'etagHeader'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'ETAG'
+      inClass: 'HttpHeaders'
+    changes:
+      - kind: 'rename'
+        newName: 'etagHeader'
+
+  - title: "Rename to 'expectHeader'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'EXPECT'
+      inClass: 'HttpHeaders'
+    changes:
+      - kind: 'rename'
+        newName: 'expectHeader'
+
+  - title: "Rename to 'expiresHeader'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'EXPIRES'
+      inClass: 'HttpHeaders'
+    changes:
+      - kind: 'rename'
+        newName: 'expiresHeader'
+
+  - title: "Rename to 'fromHeader'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'FROM'
+      inClass: 'HttpHeaders'
+    changes:
+      - kind: 'rename'
+        newName: 'fromHeader'
+
+  - title: "Rename to 'hostHeader'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'HOST'
+      inClass: 'HttpHeaders'
+    changes:
+      - kind: 'rename'
+        newName: 'hostHeader'
+
+  - title: "Rename to 'ifMatchHeader'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'IF_MATCH'
+      inClass: 'HttpHeaders'
+    changes:
+      - kind: 'rename'
+        newName: 'ifMatchHeader'
+
+  - title: "Rename to 'ifModifiedSinceHeader'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'IF_MODIFIED_SINCE'
+      inClass: 'HttpHeaders'
+    changes:
+      - kind: 'rename'
+        newName: 'ifModifiedSinceHeader'
+
+  - title: "Rename to 'ifNoneMatchHeader'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'IF_NONE_MATCH'
+      inClass: 'HttpHeaders'
+    changes:
+      - kind: 'rename'
+        newName: 'ifNoneMatchHeader'
+
+  - title: "Rename to 'ifRangeHeader'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'IF_RANGE'
+      inClass: 'HttpHeaders'
+    changes:
+      - kind: 'rename'
+        newName: 'ifRangeHeader'
+
+  - title: "Rename to 'ifUnmodifiedSinceHeader'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'IF_UNMODIFIED_SINCE'
+      inClass: 'HttpHeaders'
+    changes:
+      - kind: 'rename'
+        newName: 'ifUnmodifiedSinceHeader'
+
+  - title: "Rename to 'lastModifiedHeader'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'LAST_MODIFIED'
+      inClass: 'HttpHeaders'
+    changes:
+      - kind: 'rename'
+        newName: 'lastModifiedHeader'
+
+  - title: "Rename to 'locationHeader'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'LOCATION'
+      inClass: 'HttpHeaders'
+    changes:
+      - kind: 'rename'
+        newName: 'locationHeader'
+
+  - title: "Rename to 'maxForwardsHeader'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'MAX_FORWARDS'
+      inClass: 'HttpHeaders'
+    changes:
+      - kind: 'rename'
+        newName: 'maxForwardsHeader'
+
+  - title: "Rename to 'pragmaHeader'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'PRAGMA'
+      inClass: 'HttpHeaders'
+    changes:
+      - kind: 'rename'
+        newName: 'pragmaHeader'
+
+  - title: "Rename to 'proxyAuthenticateHeader'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'PROXY_AUTHENTICATE'
+      inClass: 'HttpHeaders'
+    changes:
+      - kind: 'rename'
+        newName: 'proxyAuthenticateHeader'
+
+  - title: "Rename to 'proxyAuthorizationHeader'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'PROXY_AUTHORIZATION'
+      inClass: 'HttpHeaders'
+    changes:
+      - kind: 'rename'
+        newName: 'proxyAuthorizationHeader'
+
+  - title: "Rename to 'rangeHeader'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'RANGE'
+      inClass: 'HttpHeaders'
+    changes:
+      - kind: 'rename'
+        newName: 'rangeHeader'
+
+  - title: "Rename to 'refererHeader'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'REFERER'
+      inClass: 'HttpHeaders'
+    changes:
+      - kind: 'rename'
+        newName: 'refererHeader'
+
+  - title: "Rename to 'retryAfterHeader'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'RETRY_AFTER'
+      inClass: 'HttpHeaders'
+    changes:
+      - kind: 'rename'
+        newName: 'retryAfterHeader'
+
+  - title: "Rename to 'serverHeader'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'SERVER'
+      inClass: 'HttpHeaders'
+    changes:
+      - kind: 'rename'
+        newName: 'serverHeader'
+
+  - title: "Rename to 'teHeader'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'TE'
+      inClass: 'HttpHeaders'
+    changes:
+      - kind: 'rename'
+        newName: 'teHeader'
+
+  - title: "Rename to 'trailerHeader'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'TRAILER'
+      inClass: 'HttpHeaders'
+    changes:
+      - kind: 'rename'
+        newName: 'trailerHeader'
+
+  - title: "Rename to 'transferEncodingHeader'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'TRANSFER_ENCODING'
+      inClass: 'HttpHeaders'
+    changes:
+      - kind: 'rename'
+        newName: 'transferEncodingHeader'
+
+  - title: "Rename to 'upgradeHeader'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'UPGRADE'
+      inClass: 'HttpHeaders'
+    changes:
+      - kind: 'rename'
+        newName: 'upgradeHeader'
+
+  - title: "Rename to 'userAgentHeader'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'USER_AGENT'
+      inClass: 'HttpHeaders'
+    changes:
+      - kind: 'rename'
+        newName: 'userAgentHeader'
+
+  - title: "Rename to 'varyHeader'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'VARY'
+      inClass: 'HttpHeaders'
+    changes:
+      - kind: 'rename'
+        newName: 'varyHeader'
+
+  - title: "Rename to 'viaHeader'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'VIA'
+      inClass: 'HttpHeaders'
+    changes:
+      - kind: 'rename'
+        newName: 'viaHeader'
+
+  - title: "Rename to 'warningHeader'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'WARNING'
+      inClass: 'HttpHeaders'
+    changes:
+      - kind: 'rename'
+        newName: 'warningHeader'
+
+  - title: "Rename to 'wwwAuthenticateHeader'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'WWW_AUTHENTICATE'
+      inClass: 'HttpHeaders'
+    changes:
+      - kind: 'rename'
+        newName: 'wwwAuthenticateHeader'
+
+  - title: "Rename to 'cookieHeader'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'COOKIE'
+      inClass: 'HttpHeaders'
+    changes:
+      - kind: 'rename'
+        newName: 'cookieHeader'
+
+  - title: "Rename to 'setCookieHeader'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'SET_COOKIE'
+      inClass: 'HttpHeaders'
+    changes:
+      - kind: 'rename'
+        newName: 'setCookieHeader'
+
+  - title: "Rename to 'generalHeaders'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'GENERAL_HEADERS'
+      inClass: 'HttpHeaders'
+    changes:
+      - kind: 'rename'
+        newName: 'generalHeaders'
+
+  - title: "Rename to 'entityHeaders'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'ENTITY_HEADERS'
+      inClass: 'HttpHeaders'
+    changes:
+      - kind: 'rename'
+        newName: 'entityHeaders'
+
+  - title: "Rename to 'responseHeaders'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'RESPONSE_HEADERS'
+      inClass: 'HttpHeaders'
+    changes:
+      - kind: 'rename'
+        newName: 'responseHeaders'
+
+  - title: "Rename to 'requestHeaders'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'REQUEST_HEADERS'
+      inClass: 'HttpHeaders'
+    changes:
+      - kind: 'rename'
+        newName: 'requestHeaders'
+
+  - title: "Rename to 'text'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'TEXT'
+      inClass: 'ContentType'
+    changes:
+      - kind: 'rename'
+        newName: 'text'
+
+  - title: "Rename to 'html'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'HTML'
+      inClass: 'ContentType'
+    changes:
+      - kind: 'rename'
+        newName: 'html'
+
+  - title: "Rename to 'json'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'JSON'
+      inClass: 'ContentType'
+    changes:
+      - kind: 'rename'
+        newName: 'json'
+
+  - title: "Rename to 'binary'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'BINARY'
+      inClass: 'ContentType'
+    changes:
+      - kind: 'rename'
+        newName: 'binary'
+
+  - title: "Rename to 'defaultHttpPort'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'DEFAULT_HTTP_PORT'
+      inClass: 'HttpClient'
+    changes:
+      - kind: 'rename'
+        newName: 'defaultHttpPort'
+
+  - title: "Rename to 'defaultHttpsPort'"
+    date: 2021-09-20
+    element:
+      uris: [ 'dart:io' ]
+      field: 'DEFAULT_HTTPS_PORT'
+      inClass: 'HttpClient'
+    changes:
+      - kind: 'rename'
+        newName: 'defaultHttpsPort'
diff --git a/tests/lib/fix_data_tests/developer.dart b/tests/lib/fix_data_tests/developer.dart
new file mode 100644
index 0000000..a9dc42b
--- /dev/null
+++ b/tests/lib/fix_data_tests/developer.dart
@@ -0,0 +1,12 @@
+// Copyright (c) 2021, the Dart project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+import 'dart:developer';
+
+void main() {
+  print(ServiceExtensionResponse.kInvalidParams);
+  print(ServiceExtensionResponse.kExtensionError);
+  print(ServiceExtensionResponse.kExtensionErrorMax);
+  print(ServiceExtensionResponse.kExtensionErrorMin);
+}
diff --git a/tests/lib/fix_data_tests/developer.dart.expect b/tests/lib/fix_data_tests/developer.dart.expect
new file mode 100644
index 0000000..6f4d9d5
--- /dev/null
+++ b/tests/lib/fix_data_tests/developer.dart.expect
@@ -0,0 +1,12 @@
+// Copyright (c) 2021, the Dart project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+import 'dart:developer';
+
+void main() {
+  print(ServiceExtensionResponse.invalidParams);
+  print(ServiceExtensionResponse.extensionError);
+  print(ServiceExtensionResponse.extensionErrorMax);
+  print(ServiceExtensionResponse.extensionErrorMin);
+}
diff --git a/tests/lib/fix_data_tests/io.dart b/tests/lib/fix_data_tests/io.dart
index c43ec21..7a29704 100644
--- a/tests/lib/fix_data_tests/io.dart
+++ b/tests/lib/fix_data_tests/io.dart
@@ -53,4 +53,169 @@
   print(HttpStatus.GATEWAY_TIMEOUT);
   print(HttpStatus.HTTP_VERSION_NOT_SUPPORTED);
   print(HttpStatus.NETWORK_CONNECT_TIMEOUT_ERROR);
+  print(SYSTEM_ENCODING);
+  print(StdioType.TERMINAL);
+  print(StdioType.PIPE);
+  print(StdioType.FILE);
+  print(StdioType.OTHER);
+  print(ProcessStartMode.NORMAL);
+  print(ProcessStartMode.INHERIT_STDIO);
+  print(ProcessStartMode.DETACHED);
+  print(ProcessStartMode.DETACHED_WITH_STDIO);
+  print(ProcessSignal.SIGHUP);
+  print(ProcessSignal.SIGINT);
+  print(ProcessSignal.SIGQUIT);
+  print(ProcessSignal.SIGILL);
+  print(ProcessSignal.SIGTRAP);
+  print(ProcessSignal.SIGABRT);
+  print(ProcessSignal.SIGBUS);
+  print(ProcessSignal.SIGFPE);
+  print(ProcessSignal.SIGKILL);
+  print(ProcessSignal.SIGUSR1);
+  print(ProcessSignal.SIGSEGV);
+  print(ProcessSignal.SIGUSR2);
+  print(ProcessSignal.SIGPIPE);
+  print(ProcessSignal.SIGALRM);
+  print(ProcessSignal.SIGTERM);
+  print(ProcessSignal.SIGCHLD);
+  print(ProcessSignal.SIGCONT);
+  print(ProcessSignal.SIGSTOP);
+  print(ProcessSignal.SIGTSTP);
+  print(ProcessSignal.SIGTTIN);
+  print(ProcessSignal.SIGTTOU);
+  print(ProcessSignal.SIGURG);
+  print(ProcessSignal.SIGXCPU);
+  print(ProcessSignal.SIGXFSZ);
+  print(ProcessSignal.SIGVTALRM);
+  print(ProcessSignal.SIGPROF);
+  print(ProcessSignal.SIGWINCH);
+  print(ProcessSignal.SIGPOLL);
+  print(ProcessSignal.SIGSYS);
+  print(InternetAddressType.IP_V4);
+  print(InternetAddressType.IP_V6);
+  print(InternetAddressType.ANY);
+  print(InternetAddress.LOOPBACK_IP_V4);
+  print(InternetAddress.LOOPBACK_IP_V6);
+  print(InternetAddress.ANY_IP_V4);
+  print(InternetAddress.ANY_IP_V6);
+  print(SocketDirection.RECEIVE);
+  print(SocketDirection.SEND);
+  print(SocketDirection.BOTH);
+  print(SocketOption.TCP_NODELAY);
+  print(RawSocketEvent.READ);
+  print(RawSocketEvent.WRITE);
+  print(RawSocketEvent.READ_CLOSED);
+  print(RawSocketEvent.CLOSED);
+  print(FileSystemEntityType.FILE);
+  print(FileSystemEntityType.DIRECTORY);
+  print(FileSystemEntityType.LINK);
+  print(FileSystemEntityType.NOT_FOUND);
+  print(FileSystemEvent.CREATE);
+  print(FileSystemEvent.MODIFY);
+  print(FileSystemEvent.DELETE);
+  print(FileSystemEvent.MOVE);
+  print(FileSystemEvent.ALL);
+  print(ZLibOption.MIN_WINDOW_BITS);
+  print(ZLibOption.MAX_WINDOW_BITS);
+  print(ZLibOption.DEFAULT_WINDOW_BITS);
+  print(ZLibOption.MIN_LEVEL);
+  print(ZLibOption.MAX_LEVEL);
+  print(ZLibOption.DEFAULT_LEVEL);
+  print(ZLibOption.MIN_MEM_LEVEL);
+  print(ZLibOption.MAX_MEM_LEVEL);
+  print(ZLibOption.DEFAULT_MEM_LEVEL);
+  print(ZLibOption.STRATEGY_FILTERED);
+  print(ZLibOption.STRATEGY_HUFFMAN_ONLY);
+  print(ZLibOption.STRATEGY_RLE);
+  print(ZLibOption.STRATEGY_FIXED);
+  print(ZLibOption.STRATEGY_DEFAULT);
+  print(ZLIB);
+  print(GZIP);
+  print(FileMode.READ);
+  print(FileMode.WRITE);
+  print(FileMode.APPEND);
+  print(FileMode.WRITE_ONLY);
+  print(FileMode.WRITE_ONLY_APPEND);
+  print(FileLock.SHARED);
+  print(FileLock.EXCLUSIVE);
+  print(FileLock.BLOCKING_SHARED);
+  print(FileLock.BLOCKING_EXCLUSIVE);
+  print(WebSocketStatus.NORMAL_CLOSURE);
+  print(WebSocketStatus.GOING_AWAY);
+  print(WebSocketStatus.PROTOCOL_ERROR);
+  print(WebSocketStatus.UNSUPPORTED_DATA);
+  print(WebSocketStatus.RESERVED_1004);
+  print(WebSocketStatus.NO_STATUS_RECEIVED);
+  print(WebSocketStatus.ABNORMAL_CLOSURE);
+  print(WebSocketStatus.INVALID_FRAME_PAYLOAD_DATA);
+  print(WebSocketStatus.POLICY_VIOLATION);
+  print(WebSocketStatus.MESSAGE_TOO_BIG);
+  print(WebSocketStatus.MISSING_MANDATORY_EXTENSION);
+  print(WebSocketStatus.INTERNAL_SERVER_ERROR);
+  print(WebSocketStatus.RESERVED_1015);
+  print(CompressionOptions.DEFAULT);
+  print(CompressionOptions.OFF);
+  print(WebSocket.CONNECTING);
+  print(WebSocket.OPEN);
+  print(WebSocket.CLOSING);
+  print(WebSocket.CLOSED);
+  print(HttpHeaders.ACCEPT);
+  print(HttpHeaders.ACCEPT_CHARSET);
+  print(HttpHeaders.ACCEPT_ENCODING);
+  print(HttpHeaders.ACCEPT_LANGUAGE);
+  print(HttpHeaders.ACCEPT_RANGES);
+  print(HttpHeaders.AGE);
+  print(HttpHeaders.ALLOW);
+  print(HttpHeaders.AUTHORIZATION);
+  print(HttpHeaders.CACHE_CONTROL);
+  print(HttpHeaders.CONNECTION);
+  print(HttpHeaders.CONTENT_ENCODING);
+  print(HttpHeaders.CONTENT_LANGUAGE);
+  print(HttpHeaders.CONTENT_LENGTH);
+  print(HttpHeaders.CONTENT_LOCATION);
+  print(HttpHeaders.CONTENT_MD5);
+  print(HttpHeaders.CONTENT_RANGE);
+  print(HttpHeaders.CONTENT_TYPE);
+  print(HttpHeaders.DATE);
+  print(HttpHeaders.ETAG);
+  print(HttpHeaders.EXPECT);
+  print(HttpHeaders.EXPIRES);
+  print(HttpHeaders.FROM);
+  print(HttpHeaders.HOST);
+  print(HttpHeaders.IF_MATCH);
+  print(HttpHeaders.IF_MODIFIED_SINCE);
+  print(HttpHeaders.IF_NONE_MATCH);
+  print(HttpHeaders.IF_RANGE);
+  print(HttpHeaders.IF_UNMODIFIED_SINCE);
+  print(HttpHeaders.LAST_MODIFIED);
+  print(HttpHeaders.LOCATION);
+  print(HttpHeaders.MAX_FORWARDS);
+  print(HttpHeaders.PRAGMA);
+  print(HttpHeaders.PROXY_AUTHENTICATE);
+  print(HttpHeaders.PROXY_AUTHORIZATION);
+  print(HttpHeaders.RANGE);
+  print(HttpHeaders.REFERER);
+  print(HttpHeaders.RETRY_AFTER);
+  print(HttpHeaders.SERVER);
+  print(HttpHeaders.TE);
+  print(HttpHeaders.TRAILER);
+  print(HttpHeaders.TRANSFER_ENCODING);
+  print(HttpHeaders.UPGRADE);
+  print(HttpHeaders.USER_AGENT);
+  print(HttpHeaders.VARY);
+  print(HttpHeaders.VIA);
+  print(HttpHeaders.WARNING);
+  print(HttpHeaders.WWW_AUTHENTICATE);
+  print(HttpHeaders.COOKIE);
+  print(HttpHeaders.SET_COOKIE);
+  print(HttpHeaders.GENERAL_HEADERS);
+  print(HttpHeaders.ENTITY_HEADERS);
+  print(HttpHeaders.RESPONSE_HEADERS);
+  print(HttpHeaders.REQUEST_HEADERS);
+  print(ContentType.TEXT);
+  print(ContentType.HTML);
+  print(ContentType.JSON);
+  print(ContentType.BINARY);
+  print(HttpClient.DEFAULT_HTTP_PORT);
+  print(HttpClient.DEFAULT_HTTPS_PORT);
 }
diff --git a/tests/lib/fix_data_tests/io.dart.expect b/tests/lib/fix_data_tests/io.dart.expect
index 8c95823..f26799a 100644
--- a/tests/lib/fix_data_tests/io.dart.expect
+++ b/tests/lib/fix_data_tests/io.dart.expect
@@ -53,4 +53,169 @@
   print(HttpStatus.gatewayTimeout);
   print(HttpStatus.httpVersionNotSupported);
   print(HttpStatus.networkConnectTimeoutError);
+  print(systemEncoding);
+  print(StdioType.terminal);
+  print(StdioType.pipe);
+  print(StdioType.file);
+  print(StdioType.other);
+  print(ProcessStartMode.normal);
+  print(ProcessStartMode.inheritStdio);
+  print(ProcessStartMode.detached);
+  print(ProcessStartMode.detachedWithStdio);
+  print(ProcessSignal.sighup);
+  print(ProcessSignal.sigint);
+  print(ProcessSignal.sigquit);
+  print(ProcessSignal.sigill);
+  print(ProcessSignal.sigtrap);
+  print(ProcessSignal.sigabrt);
+  print(ProcessSignal.sigbus);
+  print(ProcessSignal.sigfpe);
+  print(ProcessSignal.sigkill);
+  print(ProcessSignal.sigusr1);
+  print(ProcessSignal.sigsegv);
+  print(ProcessSignal.sigusr2);
+  print(ProcessSignal.sigpipe);
+  print(ProcessSignal.sigalrm);
+  print(ProcessSignal.sigterm);
+  print(ProcessSignal.sigchld);
+  print(ProcessSignal.sigcont);
+  print(ProcessSignal.sigstop);
+  print(ProcessSignal.sigtstp);
+  print(ProcessSignal.sigttin);
+  print(ProcessSignal.sigttou);
+  print(ProcessSignal.sigurg);
+  print(ProcessSignal.sigxcpu);
+  print(ProcessSignal.sigxfsz);
+  print(ProcessSignal.sigvtalrm);
+  print(ProcessSignal.sigprof);
+  print(ProcessSignal.sigwinch);
+  print(ProcessSignal.sigpoll);
+  print(ProcessSignal.sigsys);
+  print(InternetAddressType.IPv4);
+  print(InternetAddressType.IPv6);
+  print(InternetAddressType.any);
+  print(InternetAddress.loopbackIPv4);
+  print(InternetAddress.loopbackIPv6);
+  print(InternetAddress.anyIPv4);
+  print(InternetAddress.anyIPv6);
+  print(SocketDirection.receive);
+  print(SocketDirection.send);
+  print(SocketDirection.both);
+  print(SocketOption.tcpNoDelay);
+  print(RawSocketEvent.read);
+  print(RawSocketEvent.write);
+  print(RawSocketEvent.readClosed);
+  print(RawSocketEvent.closed);
+  print(FileSystemEntityType.file);
+  print(FileSystemEntityType.directory);
+  print(FileSystemEntityType.link);
+  print(FileSystemEntityType.notFound);
+  print(FileSystemEvent.create);
+  print(FileSystemEvent.modify);
+  print(FileSystemEvent.delete);
+  print(FileSystemEvent.move);
+  print(FileSystemEvent.all);
+  print(ZLibOption.minWindowBits);
+  print(ZLibOption.maxWindowBits);
+  print(ZLibOption.defaultWindowBits);
+  print(ZLibOption.minLevel);
+  print(ZLibOption.maxLevel);
+  print(ZLibOption.defaultLevel);
+  print(ZLibOption.minMemLevel);
+  print(ZLibOption.maxMemLevel);
+  print(ZLibOption.defaultMemLevel);
+  print(ZLibOption.strategyFiltered);
+  print(ZLibOption.strategyHuffmanOnly);
+  print(ZLibOption.strategyRle);
+  print(ZLibOption.strategyFixed);
+  print(ZLibOption.strategyDefault);
+  print(zlib);
+  print(gzip);
+  print(FileMode.read);
+  print(FileMode.write);
+  print(FileMode.append);
+  print(FileMode.writeOnly);
+  print(FileMode.writeOnlyAppend);
+  print(FileLock.shared);
+  print(FileLock.exclusive);
+  print(FileLock.blockingShared);
+  print(FileLock.blockingExclusive);
+  print(WebSocketStatus.normalClosure);
+  print(WebSocketStatus.goingAway);
+  print(WebSocketStatus.protocolError);
+  print(WebSocketStatus.unsupportedData);
+  print(WebSocketStatus.reserved1004);
+  print(WebSocketStatus.noStatusReceived);
+  print(WebSocketStatus.abnormalClosure);
+  print(WebSocketStatus.invalidFramePayloadData);
+  print(WebSocketStatus.policyViolation);
+  print(WebSocketStatus.messageTooBig);
+  print(WebSocketStatus.missingMandatoryExtension);
+  print(WebSocketStatus.internalServerError);
+  print(WebSocketStatus.reserved1015);
+  print(CompressionOptions.compressionDefault);
+  print(CompressionOptions.compressionOff);
+  print(WebSocket.connecting);
+  print(WebSocket.open);
+  print(WebSocket.closing);
+  print(WebSocket.closed);
+  print(HttpHeaders.acceptHeader);
+  print(HttpHeaders.acceptCharsetHeader);
+  print(HttpHeaders.acceptEncodingHeader);
+  print(HttpHeaders.acceptLanguageHeader);
+  print(HttpHeaders.acceptRangesHeader);
+  print(HttpHeaders.ageHeader);
+  print(HttpHeaders.allowHeader);
+  print(HttpHeaders.authorizationHeader);
+  print(HttpHeaders.cacheControlHeader);
+  print(HttpHeaders.connectionHeader);
+  print(HttpHeaders.contentEncodingHeader);
+  print(HttpHeaders.contentLanguageHeader);
+  print(HttpHeaders.contentLengthHeader);
+  print(HttpHeaders.contentLocationHeader);
+  print(HttpHeaders.contentMD5Header);
+  print(HttpHeaders.contentRangeHeader);
+  print(HttpHeaders.contentTypeHeader);
+  print(HttpHeaders.dateHeader);
+  print(HttpHeaders.etagHeader);
+  print(HttpHeaders.expectHeader);
+  print(HttpHeaders.expiresHeader);
+  print(HttpHeaders.fromHeader);
+  print(HttpHeaders.hostHeader);
+  print(HttpHeaders.ifMatchHeader);
+  print(HttpHeaders.ifModifiedSinceHeader);
+  print(HttpHeaders.ifNoneMatchHeader);
+  print(HttpHeaders.ifRangeHeader);
+  print(HttpHeaders.ifUnmodifiedSinceHeader);
+  print(HttpHeaders.lastModifiedHeader);
+  print(HttpHeaders.locationHeader);
+  print(HttpHeaders.maxForwardsHeader);
+  print(HttpHeaders.pragmaHeader);
+  print(HttpHeaders.proxyAuthenticateHeader);
+  print(HttpHeaders.proxyAuthorizationHeader);
+  print(HttpHeaders.rangeHeader);
+  print(HttpHeaders.refererHeader);
+  print(HttpHeaders.retryAfterHeader);
+  print(HttpHeaders.serverHeader);
+  print(HttpHeaders.teHeader);
+  print(HttpHeaders.trailerHeader);
+  print(HttpHeaders.transferEncodingHeader);
+  print(HttpHeaders.upgradeHeader);
+  print(HttpHeaders.userAgentHeader);
+  print(HttpHeaders.varyHeader);
+  print(HttpHeaders.viaHeader);
+  print(HttpHeaders.warningHeader);
+  print(HttpHeaders.wwwAuthenticateHeader);
+  print(HttpHeaders.cookieHeader);
+  print(HttpHeaders.setCookieHeader);
+  print(HttpHeaders.generalHeaders);
+  print(HttpHeaders.entityHeaders);
+  print(HttpHeaders.responseHeaders);
+  print(HttpHeaders.requestHeaders);
+  print(ContentType.text);
+  print(ContentType.html);
+  print(ContentType.json);
+  print(ContentType.binary);
+  print(HttpClient.defaultHttpPort);
+  print(HttpClient.defaultHttpsPort);
 }
diff --git a/tools/VERSION b/tools/VERSION
index f111647..1d8fac2 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -27,5 +27,5 @@
 MAJOR 2
 MINOR 15
 PATCH 0
-PRERELEASE 132
+PRERELEASE 133
 PRERELEASE_PATCH 0
\ No newline at end of file