diff --git a/pkg/analysis_server/lib/src/services/correction/fix/data_driven/add_type_parameter_change.dart b/pkg/analysis_server/lib/src/services/correction/fix/data_driven/add_type_parameter.dart
similarity index 98%
rename from pkg/analysis_server/lib/src/services/correction/fix/data_driven/add_type_parameter_change.dart
rename to pkg/analysis_server/lib/src/services/correction/fix/data_driven/add_type_parameter.dart
index c195e5052eb..e40be747817 100644
--- a/pkg/analysis_server/lib/src/services/correction/fix/data_driven/add_type_parameter_change.dart
+++ b/pkg/analysis_server/lib/src/services/correction/fix/data_driven/add_type_parameter.dart
@@ -11,7 +11,7 @@ import 'package:meta/meta.dart';
 
 /// The data related to a type parameter that was added to either a function or
 /// a type.
-class AddTypeParameterChange extends Change<_Data> {
+class AddTypeParameter extends Change<_Data> {
   /// The index of the type parameter that was added.
   final int index;
 
@@ -28,7 +28,7 @@ class AddTypeParameterChange extends Change<_Data> {
   /// Initialize a newly created change to describe adding a type parameter to a
   /// type or a function.
   // TODO(brianwilkerson) Support adding multiple type parameters.
-  AddTypeParameterChange(
+  AddTypeParameter(
       {@required this.index,
       @required this.name,
       @required this.value,
diff --git a/pkg/analysis_server/lib/src/services/correction/fix/data_driven/rename_change.dart b/pkg/analysis_server/lib/src/services/correction/fix/data_driven/rename.dart
similarity index 92%
rename from pkg/analysis_server/lib/src/services/correction/fix/data_driven/rename_change.dart
rename to pkg/analysis_server/lib/src/services/correction/fix/data_driven/rename.dart
index 9f761fd14f9..46135f0337e 100644
--- a/pkg/analysis_server/lib/src/services/correction/fix/data_driven/rename_change.dart
+++ b/pkg/analysis_server/lib/src/services/correction/fix/data_driven/rename.dart
@@ -10,13 +10,13 @@ import 'package:analyzer_plugin/utilities/range_factory.dart';
 import 'package:meta/meta.dart';
 
 /// The data related to an element that has been renamed.
-class RenameChange extends Change<SimpleIdentifier> {
+class Rename extends Change<SimpleIdentifier> {
   /// The new name of the element.
   final String newName;
 
   /// Initialize a newly created transform to describe a renaming of an element
   /// to the [newName].
-  RenameChange({@required this.newName});
+  Rename({@required this.newName});
 
   @override
   void apply(DartFileEditBuilder builder, DataDrivenFix fix,
diff --git a/pkg/analysis_server/test/src/services/correction/fix/data_driven/add_type_parameter_change_test.dart b/pkg/analysis_server/test/src/services/correction/fix/data_driven/add_type_parameter_test.dart
similarity index 89%
rename from pkg/analysis_server/test/src/services/correction/fix/data_driven/add_type_parameter_change_test.dart
rename to pkg/analysis_server/test/src/services/correction/fix/data_driven/add_type_parameter_test.dart
index 9b13ab01e43..07cd4931f7d 100644
--- a/pkg/analysis_server/test/src/services/correction/fix/data_driven/add_type_parameter_change_test.dart
+++ b/pkg/analysis_server/test/src/services/correction/fix/data_driven/add_type_parameter_test.dart
@@ -2,7 +2,7 @@
 // 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 'package:analysis_server/src/services/correction/fix/data_driven/add_type_parameter_change.dart';
+import 'package:analysis_server/src/services/correction/fix/data_driven/add_type_parameter.dart';
 import 'package:analysis_server/src/services/correction/fix/data_driven/element_descriptor.dart';
 import 'package:analysis_server/src/services/correction/fix/data_driven/transform.dart';
 import 'package:analysis_server/src/services/correction/fix/data_driven/value_extractor.dart';
@@ -12,16 +12,14 @@ import 'data_driven_test_support.dart';
 
 void main() {
   defineReflectiveSuite(() {
-    defineReflectiveTests(AddTypeParameterChange_DeprecatedMemberUseTest);
-    defineReflectiveTests(AddTypeParameterChange_InvalidOverrideTest);
-    defineReflectiveTests(
-        AddTypeParameterChange_WrongNumberOfTypeArgumentsTest);
+    defineReflectiveTests(AddTypeParameter_DeprecatedMemberUseTest);
+    defineReflectiveTests(AddTypeParameter_InvalidOverrideTest);
+    defineReflectiveTests(AddTypeParameter_WrongNumberOfTypeArgumentsTest);
   });
 }
 
 @reflectiveTest
-class AddTypeParameterChange_DeprecatedMemberUseTest
-    extends _AddTypeParameterChange {
+class AddTypeParameter_DeprecatedMemberUseTest extends _AddTypeParameterChange {
   Future<void> test_method_first() async {
     setPackageContent('''
 class C {
@@ -120,8 +118,7 @@ void f(C c) {
 }
 
 @reflectiveTest
-class AddTypeParameterChange_InvalidOverrideTest
-    extends _AddTypeParameterChange {
+class AddTypeParameter_InvalidOverrideTest extends _AddTypeParameterChange {
   Future<void> test_method_bound() async {
     setPackageContent('''
 class C {
@@ -174,7 +171,7 @@ class D extends C {
 }
 
 @reflectiveTest
-class AddTypeParameterChange_WrongNumberOfTypeArgumentsTest
+class AddTypeParameter_WrongNumberOfTypeArgumentsTest
     extends _AddTypeParameterChange {
   Future<void> test_class() async {
     setPackageContent('''
@@ -271,7 +268,7 @@ abstract class _AddTypeParameterChange extends DataDrivenFixProcessorTest {
           element: ElementDescriptor(
               libraryUris: [importUri], components: components ?? ['C', 'm']),
           changes: [
-            AddTypeParameterChange(
+            AddTypeParameter(
                 extendedType: extendedType,
                 index: index,
                 name: 'T',
diff --git a/pkg/analysis_server/test/src/services/correction/fix/data_driven/modify_parameters_test.dart b/pkg/analysis_server/test/src/services/correction/fix/data_driven/modify_parameters_test.dart
index 9ad44354f24..a124245442d 100644
--- a/pkg/analysis_server/test/src/services/correction/fix/data_driven/modify_parameters_test.dart
+++ b/pkg/analysis_server/test/src/services/correction/fix/data_driven/modify_parameters_test.dart
@@ -5,7 +5,7 @@
 import 'package:analysis_server/src/services/correction/fix/data_driven/element_descriptor.dart';
 import 'package:analysis_server/src/services/correction/fix/data_driven/modify_parameters.dart';
 import 'package:analysis_server/src/services/correction/fix/data_driven/parameter_reference.dart';
-import 'package:analysis_server/src/services/correction/fix/data_driven/rename_change.dart';
+import 'package:analysis_server/src/services/correction/fix/data_driven/rename.dart';
 import 'package:analysis_server/src/services/correction/fix/data_driven/transform.dart';
 import 'package:analysis_server/src/services/correction/fix/data_driven/value_extractor.dart';
 import 'package:test_reflective_loader/test_reflective_loader.dart';
@@ -844,6 +844,6 @@ abstract class _ModifyParameters extends DataDrivenFixProcessorTest {
               libraryUris: [importUri], components: originalComponents),
           changes: [
             ModifyParameters(modifications: modifications),
-            if (newName != null) RenameChange(newName: newName),
+            if (newName != null) Rename(newName: newName),
           ]);
 }
diff --git a/pkg/analysis_server/test/src/services/correction/fix/data_driven/rename_change_test.dart b/pkg/analysis_server/test/src/services/correction/fix/data_driven/rename_test.dart
similarity index 94%
rename from pkg/analysis_server/test/src/services/correction/fix/data_driven/rename_change_test.dart
rename to pkg/analysis_server/test/src/services/correction/fix/data_driven/rename_test.dart
index 8d628e2201b..8cd7bdbe583 100644
--- a/pkg/analysis_server/test/src/services/correction/fix/data_driven/rename_change_test.dart
+++ b/pkg/analysis_server/test/src/services/correction/fix/data_driven/rename_test.dart
@@ -3,7 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:analysis_server/src/services/correction/fix/data_driven/element_descriptor.dart';
-import 'package:analysis_server/src/services/correction/fix/data_driven/rename_change.dart';
+import 'package:analysis_server/src/services/correction/fix/data_driven/rename.dart';
 import 'package:analysis_server/src/services/correction/fix/data_driven/transform.dart';
 import 'package:test_reflective_loader/test_reflective_loader.dart';
 
@@ -11,12 +11,12 @@ import 'data_driven_test_support.dart';
 
 void main() {
   defineReflectiveSuite(() {
-    defineReflectiveTests(RenameChange_DeprecatedMemberUseTest);
+    defineReflectiveTests(Rename_DeprecatedMemberUseTest);
   });
 }
 
 @reflectiveTest
-class RenameChange_DeprecatedMemberUseTest extends DataDrivenFixProcessorTest {
+class Rename_DeprecatedMemberUseTest extends DataDrivenFixProcessorTest {
   Future<void> test_class() async {
     addMetaPackage();
     setPackageContent('''
@@ -240,6 +240,6 @@ void f() {
           element: ElementDescriptor(
               libraryUris: [importUri], components: components),
           changes: [
-            RenameChange(newName: newName),
+            Rename(newName: newName),
           ]);
 }
diff --git a/pkg/analysis_server/test/src/services/correction/fix/data_driven/test_all.dart b/pkg/analysis_server/test/src/services/correction/fix/data_driven/test_all.dart
index 8773441449a..1a39ea99d45 100644
--- a/pkg/analysis_server/test/src/services/correction/fix/data_driven/test_all.dart
+++ b/pkg/analysis_server/test/src/services/correction/fix/data_driven/test_all.dart
@@ -4,9 +4,9 @@
 
 import 'package:test_reflective_loader/test_reflective_loader.dart';
 
-import 'add_type_parameter_change_test.dart' as add_type_parameter_change;
+import 'add_type_parameter_test.dart' as add_type_parameter_change;
 import 'modify_parameters_test.dart' as modify_parameters;
-import 'rename_change_test.dart' as rename_change;
+import 'rename_test.dart' as rename_change;
 
 void main() {
   defineReflectiveSuite(() {