diff --git a/tests/cases/fourslash/codeFixClassExprUnImplementedClassMissingFunctionVoidInferred.ts b/tests/cases/fourslash/codeFixClassExprClassImplementClassFunctionVoidInferred.ts
similarity index 100%
rename from tests/cases/fourslash/codeFixClassExprUnImplementedClassMissingFunctionVoidInferred.ts
rename to tests/cases/fourslash/codeFixClassExprClassImplementClassFunctionVoidInferred.ts
diff --git a/tests/cases/fourslash/codeFixClassExtendsAbstractExpressionWithTypeArgs.ts b/tests/cases/fourslash/codeFixClassExtendAbstractExpressionWithTypeArgs.ts
similarity index 100%
rename from tests/cases/fourslash/codeFixClassExtendsAbstractExpressionWithTypeArgs.ts
rename to tests/cases/fourslash/codeFixClassExtendAbstractExpressionWithTypeArgs.ts
diff --git a/tests/cases/fourslash/codeFixClassExtendsAbstractGetter.ts b/tests/cases/fourslash/codeFixClassExtendAbstractGetter.ts
similarity index 100%
rename from tests/cases/fourslash/codeFixClassExtendsAbstractGetter.ts
rename to tests/cases/fourslash/codeFixClassExtendAbstractGetter.ts
diff --git a/tests/cases/fourslash/codeFixClassExtendsAbstractGetterSetter.ts b/tests/cases/fourslash/codeFixClassExtendAbstractGetterSetter.ts
similarity index 100%
rename from tests/cases/fourslash/codeFixClassExtendsAbstractGetterSetter.ts
rename to tests/cases/fourslash/codeFixClassExtendAbstractGetterSetter.ts
diff --git a/tests/cases/fourslash/codeFixClassExtendsAbstractMethod.ts b/tests/cases/fourslash/codeFixClassExtendAbstractMethod.ts
similarity index 100%
rename from tests/cases/fourslash/codeFixClassExtendsAbstractMethod.ts
rename to tests/cases/fourslash/codeFixClassExtendAbstractMethod.ts
diff --git a/tests/cases/fourslash/codeFixClassExtendsAbstractMethodTypeParamsInstantiateNumber.ts b/tests/cases/fourslash/codeFixClassExtendAbstractMethodTypeParamsInstantiateNumber.ts
similarity index 100%
rename from tests/cases/fourslash/codeFixClassExtendsAbstractMethodTypeParamsInstantiateNumber.ts
rename to tests/cases/fourslash/codeFixClassExtendAbstractMethodTypeParamsInstantiateNumber.ts
diff --git a/tests/cases/fourslash/codeFixClassExtendsAbstractMethodTypeParamsInstantiateU.ts b/tests/cases/fourslash/codeFixClassExtendAbstractMethodTypeParamsInstantiateU.ts
similarity index 100%
rename from tests/cases/fourslash/codeFixClassExtendsAbstractMethodTypeParamsInstantiateU.ts
rename to tests/cases/fourslash/codeFixClassExtendAbstractMethodTypeParamsInstantiateU.ts
diff --git a/tests/cases/fourslash/codeFixClassExtendsAbstractPrivateProperty.ts b/tests/cases/fourslash/codeFixClassExtendAbstractPrivateProperty.ts
similarity index 100%
rename from tests/cases/fourslash/codeFixClassExtendsAbstractPrivateProperty.ts
rename to tests/cases/fourslash/codeFixClassExtendAbstractPrivateProperty.ts
diff --git a/tests/cases/fourslash/codeFixClassExtendsAbstractProperty.ts b/tests/cases/fourslash/codeFixClassExtendAbstractProperty.ts
similarity index 100%
rename from tests/cases/fourslash/codeFixClassExtendsAbstractProperty.ts
rename to tests/cases/fourslash/codeFixClassExtendAbstractProperty.ts
diff --git a/tests/cases/fourslash/codeFixClassExtendsAbstractProtectedProperty.ts b/tests/cases/fourslash/codeFixClassExtendAbstractProtectedProperty.ts
similarity index 100%
rename from tests/cases/fourslash/codeFixClassExtendsAbstractProtectedProperty.ts
rename to tests/cases/fourslash/codeFixClassExtendAbstractProtectedProperty.ts
diff --git a/tests/cases/fourslash/codeFixClassExtendsAbstractPublicProperty.ts b/tests/cases/fourslash/codeFixClassExtendAbstractPublicProperty.ts
similarity index 100%
rename from tests/cases/fourslash/codeFixClassExtendsAbstractPublicProperty.ts
rename to tests/cases/fourslash/codeFixClassExtendAbstractPublicProperty.ts
diff --git a/tests/cases/fourslash/codeFixClassExtendsAbstractSetter.ts b/tests/cases/fourslash/codeFixClassExtendAbstractSetter.ts
similarity index 100%
rename from tests/cases/fourslash/codeFixClassExtendsAbstractSetter.ts
rename to tests/cases/fourslash/codeFixClassExtendAbstractSetter.ts
diff --git a/tests/cases/fourslash/codeFixClassExtendsAbstractSomePropertiesPresent.ts b/tests/cases/fourslash/codeFixClassExtendAbstractSomePropertiesPresent.ts
similarity index 100%
rename from tests/cases/fourslash/codeFixClassExtendsAbstractSomePropertiesPresent.ts
rename to tests/cases/fourslash/codeFixClassExtendAbstractSomePropertiesPresent.ts
diff --git a/tests/cases/fourslash/codeFixUnImplementedClassMissingAbstractGettersAndSetters.ts b/tests/cases/fourslash/codeFixClassImplementClassAbstractGettersAndSetters.ts
similarity index 100%
rename from tests/cases/fourslash/codeFixUnImplementedClassMissingAbstractGettersAndSetters.ts
rename to tests/cases/fourslash/codeFixClassImplementClassAbstractGettersAndSetters.ts
diff --git a/tests/cases/fourslash/codeFixUnImplementedClassMissingFunctionVoidInferred.ts b/tests/cases/fourslash/codeFixClassImplementClassFunctionVoidInferred.ts
similarity index 100%
rename from tests/cases/fourslash/codeFixUnImplementedClassMissingFunctionVoidInferred.ts
rename to tests/cases/fourslash/codeFixClassImplementClassFunctionVoidInferred.ts
diff --git a/tests/cases/fourslash/codeFixUnImplementedClassMissingMethodViaHeritage.ts b/tests/cases/fourslash/codeFixClassImplementClassMethodViaHeritage.ts
similarity index 100%
rename from tests/cases/fourslash/codeFixUnImplementedClassMissingMethodViaHeritage.ts
rename to tests/cases/fourslash/codeFixClassImplementClassMethodViaHeritage.ts
diff --git a/tests/cases/fourslash/codeFixUnImplementedClassMultipleSignatures1.ts b/tests/cases/fourslash/codeFixClassImplementClassMultipleSignatures1.ts
similarity index 100%
rename from tests/cases/fourslash/codeFixUnImplementedClassMultipleSignatures1.ts
rename to tests/cases/fourslash/codeFixClassImplementClassMultipleSignatures1.ts
diff --git a/tests/cases/fourslash/codeFixUnImplementedClassMultipleSignatures2.ts b/tests/cases/fourslash/codeFixClassImplementClassMultipleSignatures2.ts
similarity index 100%
rename from tests/cases/fourslash/codeFixUnImplementedClassMultipleSignatures2.ts
rename to tests/cases/fourslash/codeFixClassImplementClassMultipleSignatures2.ts
diff --git a/tests/cases/fourslash/codeFixUnImplementedClassMissingPropertyModifiers.ts b/tests/cases/fourslash/codeFixClassImplementClassPropertyModifiers.ts
similarity index 100%
rename from tests/cases/fourslash/codeFixUnImplementedClassMissingPropertyModifiers.ts
rename to tests/cases/fourslash/codeFixClassImplementClassPropertyModifiers.ts
diff --git a/tests/cases/fourslash/codeFixUnimplementedDeepInheritance.ts b/tests/cases/fourslash/codeFixClassImplementDeepInheritance.ts
similarity index 100%
rename from tests/cases/fourslash/codeFixUnimplementedDeepInheritance.ts
rename to tests/cases/fourslash/codeFixClassImplementDeepInheritance.ts
diff --git a/tests/cases/fourslash/codeFixUnImplementedDefaultClass.ts b/tests/cases/fourslash/codeFixClassImplementDefaultClass.ts
similarity index 100%
rename from tests/cases/fourslash/codeFixUnImplementedDefaultClass.ts
rename to tests/cases/fourslash/codeFixClassImplementDefaultClass.ts
diff --git a/tests/cases/fourslash/codeFixUnImplementedInterface36.ts b/tests/cases/fourslash/codeFixClassImplementInterface36.ts
similarity index 100%
rename from tests/cases/fourslash/codeFixUnImplementedInterface36.ts
rename to tests/cases/fourslash/codeFixClassImplementInterface36.ts
diff --git a/tests/cases/fourslash/codeFixUnImplementedInterface39.ts b/tests/cases/fourslash/codeFixClassImplementInterface39.ts
similarity index 100%
rename from tests/cases/fourslash/codeFixUnImplementedInterface39.ts
rename to tests/cases/fourslash/codeFixClassImplementInterface39.ts
diff --git a/tests/cases/fourslash/codeFixUnImplementedInterfaceClassExpression.ts b/tests/cases/fourslash/codeFixClassImplementInterfaceClassExpression.ts
similarity index 100%
rename from tests/cases/fourslash/codeFixUnImplementedInterfaceClassExpression.ts
rename to tests/cases/fourslash/codeFixClassImplementInterfaceClassExpression.ts
diff --git a/tests/cases/fourslash/codeFixUnImplementedInterfaceComputedPropertyLiterals.ts b/tests/cases/fourslash/codeFixClassImplementInterfaceComputedPropertyLiterals.ts
similarity index 100%
rename from tests/cases/fourslash/codeFixUnImplementedInterfaceComputedPropertyLiterals.ts
rename to tests/cases/fourslash/codeFixClassImplementInterfaceComputedPropertyLiterals.ts
diff --git a/tests/cases/fourslash/codeFixUnImplementedInterfaceComputedPropertyNameWellKnownSymbols.ts b/tests/cases/fourslash/codeFixClassImplementInterfaceComputedPropertyNameWellKnownSymbols.ts
similarity index 100%
rename from tests/cases/fourslash/codeFixUnImplementedInterfaceComputedPropertyNameWellKnownSymbols.ts
rename to tests/cases/fourslash/codeFixClassImplementInterfaceComputedPropertyNameWellKnownSymbols.ts
diff --git a/tests/cases/fourslash/codeFixUnImplementedInterfaceDuplicateMember1.ts b/tests/cases/fourslash/codeFixClassImplementInterfaceDuplicateMember1.ts
similarity index 100%
rename from tests/cases/fourslash/codeFixUnImplementedInterfaceDuplicateMember1.ts
rename to tests/cases/fourslash/codeFixClassImplementInterfaceDuplicateMember1.ts
diff --git a/tests/cases/fourslash/codeFixUnImplementedInterfaceDuplicateMember2.ts b/tests/cases/fourslash/codeFixClassImplementInterfaceDuplicateMember2.ts
similarity index 100%
rename from tests/cases/fourslash/codeFixUnImplementedInterfaceDuplicateMember2.ts
rename to tests/cases/fourslash/codeFixClassImplementInterfaceDuplicateMember2.ts
diff --git a/tests/cases/fourslash/codeFixUnImplementedInterfaceIndexSignaturesBoth.ts b/tests/cases/fourslash/codeFixClassImplementInterfaceIndexSignaturesBoth.ts
similarity index 100%
rename from tests/cases/fourslash/codeFixUnImplementedInterfaceIndexSignaturesBoth.ts
rename to tests/cases/fourslash/codeFixClassImplementInterfaceIndexSignaturesBoth.ts
diff --git a/tests/cases/fourslash/codeFixUnImplementedInterfaceIndexSignaturesNoFix.ts b/tests/cases/fourslash/codeFixClassImplementInterfaceIndexSignaturesNoFix.ts
similarity index 100%
rename from tests/cases/fourslash/codeFixUnImplementedInterfaceIndexSignaturesNoFix.ts
rename to tests/cases/fourslash/codeFixClassImplementInterfaceIndexSignaturesNoFix.ts
diff --git a/tests/cases/fourslash/codeFixUnImplementedInterfaceIndexSignaturesNumber.ts b/tests/cases/fourslash/codeFixClassImplementInterfaceIndexSignaturesNumber.ts
similarity index 100%
rename from tests/cases/fourslash/codeFixUnImplementedInterfaceIndexSignaturesNumber.ts
rename to tests/cases/fourslash/codeFixClassImplementInterfaceIndexSignaturesNumber.ts
diff --git a/tests/cases/fourslash/codeFixUnImplementedInterfaceIndexSignaturesString.ts b/tests/cases/fourslash/codeFixClassImplementInterfaceIndexSignaturesString.ts
similarity index 100%
rename from tests/cases/fourslash/codeFixUnImplementedInterfaceIndexSignaturesString.ts
rename to tests/cases/fourslash/codeFixClassImplementInterfaceIndexSignaturesString.ts
diff --git a/tests/cases/fourslash/codeFixUnImplementedInterfaceMethodWithParams.ts b/tests/cases/fourslash/codeFixClassImplementInterfaceMethodWithParams.ts
similarity index 100%
rename from tests/cases/fourslash/codeFixUnImplementedInterfaceMethodWithParams.ts
rename to tests/cases/fourslash/codeFixClassImplementInterfaceMethodWithParams.ts
diff --git a/tests/cases/fourslash/codeFixUnimplementedInterfaceMultipleImplements1.ts b/tests/cases/fourslash/codeFixClassImplementInterfaceMultipleImplements1.ts
similarity index 100%
rename from tests/cases/fourslash/codeFixUnimplementedInterfaceMultipleImplements1.ts
rename to tests/cases/fourslash/codeFixClassImplementInterfaceMultipleImplements1.ts
diff --git a/tests/cases/fourslash/codeFixUnimplementedInterfaceMultipleImplements2.ts b/tests/cases/fourslash/codeFixClassImplementInterfaceMultipleImplements2.ts
similarity index 100%
rename from tests/cases/fourslash/codeFixUnimplementedInterfaceMultipleImplements2.ts
rename to tests/cases/fourslash/codeFixClassImplementInterfaceMultipleImplements2.ts
diff --git a/tests/cases/fourslash/codeFixUnimplementedInterfaceMultipleImplementsIntersection1.ts b/tests/cases/fourslash/codeFixClassImplementInterfaceMultipleImplementsIntersection1.ts
similarity index 100%
rename from tests/cases/fourslash/codeFixUnimplementedInterfaceMultipleImplementsIntersection1.ts
rename to tests/cases/fourslash/codeFixClassImplementInterfaceMultipleImplementsIntersection1.ts
diff --git a/tests/cases/fourslash/codeFixUnimplementedInterfaceMultipleImplementsIntersection2.ts b/tests/cases/fourslash/codeFixClassImplementInterfaceMultipleImplementsIntersection2.ts
similarity index 100%
rename from tests/cases/fourslash/codeFixUnimplementedInterfaceMultipleImplementsIntersection2.ts
rename to tests/cases/fourslash/codeFixClassImplementInterfaceMultipleImplementsIntersection2.ts
diff --git a/tests/cases/fourslash/codeFixUnimplementedInterfaceMultipleMembersAndPunctuation.ts b/tests/cases/fourslash/codeFixClassImplementInterfaceMultipleMembersAndPunctuation.ts
similarity index 100%
rename from tests/cases/fourslash/codeFixUnimplementedInterfaceMultipleMembersAndPunctuation.ts
rename to tests/cases/fourslash/codeFixClassImplementInterfaceMultipleMembersAndPunctuation.ts
diff --git a/tests/cases/fourslash/codeFixUnImplementedInterfaceMultipleSignatures.ts b/tests/cases/fourslash/codeFixClassImplementInterfaceMultipleSignatures.ts
similarity index 100%
rename from tests/cases/fourslash/codeFixUnImplementedInterfaceMultipleSignatures.ts
rename to tests/cases/fourslash/codeFixClassImplementInterfaceMultipleSignatures.ts
diff --git a/tests/cases/fourslash/codeFixUnImplementedInterfaceMultipleSignaturesRest1.ts b/tests/cases/fourslash/codeFixClassImplementInterfaceMultipleSignaturesRest1.ts
similarity index 100%
rename from tests/cases/fourslash/codeFixUnImplementedInterfaceMultipleSignaturesRest1.ts
rename to tests/cases/fourslash/codeFixClassImplementInterfaceMultipleSignaturesRest1.ts
diff --git a/tests/cases/fourslash/codeFixUnImplementedInterfaceMultipleSignaturesRest2.ts b/tests/cases/fourslash/codeFixClassImplementInterfaceMultipleSignaturesRest2.ts
similarity index 100%
rename from tests/cases/fourslash/codeFixUnImplementedInterfaceMultipleSignaturesRest2.ts
rename to tests/cases/fourslash/codeFixClassImplementInterfaceMultipleSignaturesRest2.ts
diff --git a/tests/cases/fourslash/codeFixUnImplementedInterfaceNamespaceConflict.ts b/tests/cases/fourslash/codeFixClassImplementInterfaceNamespaceConflict.ts
similarity index 100%
rename from tests/cases/fourslash/codeFixUnImplementedInterfaceNamespaceConflict.ts
rename to tests/cases/fourslash/codeFixClassImplementInterfaceNamespaceConflict.ts
diff --git a/tests/cases/fourslash/codeFixUnImplementedInterfacePropertyFromParentConstructorFunction.ts b/tests/cases/fourslash/codeFixClassImplementInterfacePropertyFromParentConstructorFunction.ts
similarity index 100%
rename from tests/cases/fourslash/codeFixUnImplementedInterfacePropertyFromParentConstructorFunction.ts
rename to tests/cases/fourslash/codeFixClassImplementInterfacePropertyFromParentConstructorFunction.ts
diff --git a/tests/cases/fourslash/codeFixUnImplementedInterfaceSomePropertiesPresent.ts b/tests/cases/fourslash/codeFixClassImplementInterfaceSomePropertiesPresent.ts
similarity index 100%
rename from tests/cases/fourslash/codeFixUnImplementedInterfaceSomePropertiesPresent.ts
rename to tests/cases/fourslash/codeFixClassImplementInterfaceSomePropertiesPresent.ts
diff --git a/tests/cases/fourslash/codeFixUnimplementedInterfaceTypeParamInstantiateDeeply.ts b/tests/cases/fourslash/codeFixClassImplementInterfaceTypeParamInstantiateDeeply.ts
similarity index 100%
rename from tests/cases/fourslash/codeFixUnimplementedInterfaceTypeParamInstantiateDeeply.ts
rename to tests/cases/fourslash/codeFixClassImplementInterfaceTypeParamInstantiateDeeply.ts
diff --git a/tests/cases/fourslash/codeFixUnimplementedInterfaceTypeParamInstantiateError.ts b/tests/cases/fourslash/codeFixClassImplementInterfaceTypeParamInstantiateError.ts
similarity index 100%
rename from tests/cases/fourslash/codeFixUnimplementedInterfaceTypeParamInstantiateError.ts
rename to tests/cases/fourslash/codeFixClassImplementInterfaceTypeParamInstantiateError.ts
diff --git a/tests/cases/fourslash/codeFixUnimplementedInterfaceTypeParamInstantiateNumber.ts b/tests/cases/fourslash/codeFixClassImplementInterfaceTypeParamInstantiateNumber.ts
similarity index 100%
rename from tests/cases/fourslash/codeFixUnimplementedInterfaceTypeParamInstantiateNumber.ts
rename to tests/cases/fourslash/codeFixClassImplementInterfaceTypeParamInstantiateNumber.ts
diff --git a/tests/cases/fourslash/codeFixUnimplementedInterfaceTypeParamInstantiateT.ts b/tests/cases/fourslash/codeFixClassImplementInterfaceTypeParamInstantiateT.ts
similarity index 100%
rename from tests/cases/fourslash/codeFixUnimplementedInterfaceTypeParamInstantiateT.ts
rename to tests/cases/fourslash/codeFixClassImplementInterfaceTypeParamInstantiateT.ts
diff --git a/tests/cases/fourslash/codeFixUnimplementedInterfaceTypeParamInstantiateU.ts b/tests/cases/fourslash/codeFixClassImplementInterfaceTypeParamInstantiateU.ts
similarity index 100%
rename from tests/cases/fourslash/codeFixUnimplementedInterfaceTypeParamInstantiateU.ts
rename to tests/cases/fourslash/codeFixClassImplementInterfaceTypeParamInstantiateU.ts
diff --git a/tests/cases/fourslash/codeFixUnimplementedInterfaceTypeParamInstantiationMissing.ts b/tests/cases/fourslash/codeFixClassImplementInterfaceTypeParamInstantiation.ts
similarity index 100%
rename from tests/cases/fourslash/codeFixUnimplementedInterfaceTypeParamInstantiationMissing.ts
rename to tests/cases/fourslash/codeFixClassImplementInterfaceTypeParamInstantiation.ts
diff --git a/tests/cases/fourslash/codeFixUnImplementedInterfaceTypeParamMethod.ts b/tests/cases/fourslash/codeFixClassImplementInterfaceTypeParamMethod.ts
similarity index 100%
rename from tests/cases/fourslash/codeFixUnImplementedInterfaceTypeParamMethod.ts
rename to tests/cases/fourslash/codeFixClassImplementInterfaceTypeParamMethod.ts
diff --git a/tests/cases/fourslash/codeFixUnimplementedInterfaceUndeclaredSymbol.ts b/tests/cases/fourslash/codeFixClassImplementInterfaceUndeclaredSymbol.ts
similarity index 100%
rename from tests/cases/fourslash/codeFixUnimplementedInterfaceUndeclaredSymbol.ts
rename to tests/cases/fourslash/codeFixClassImplementInterfaceUndeclaredSymbol.ts
diff --git a/tests/cases/fourslash/codeFixSuperCallMissing.ts b/tests/cases/fourslash/codeFixSuperCall.ts
similarity index 100%
rename from tests/cases/fourslash/codeFixSuperCallMissing.ts
rename to tests/cases/fourslash/codeFixSuperCall.ts