diff --git a/tests/baselines/reference/decoratorOnClassMethod8.errors.txt b/tests/baselines/reference/decoratorOnClassMethod8.errors.txt
index e5bca959997a9..ab20c94e5bd8f 100644
--- a/tests/baselines/reference/decoratorOnClassMethod8.errors.txt
+++ b/tests/baselines/reference/decoratorOnClassMethod8.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/conformance/decorators/class/method/decoratorOnClassMethod8.ts(4,5): error TS1241: Unable to resolve signature of method decorator when called as an expression.
-tests/cases/conformance/decorators/class/method/decoratorOnClassMethod8.ts(4,5): error TS1269: Decorator function return type 'C' is not assignable to type 'void | TypedPropertyDescriptor<() => void>'.
+tests/cases/conformance/decorators/class/method/decoratorOnClassMethod8.ts(4,5): error TS1270: Decorator function return type 'C' is not assignable to type 'void | TypedPropertyDescriptor<() => void>'.
 
 
 ==== tests/cases/conformance/decorators/class/method/decoratorOnClassMethod8.ts (2 errors) ====
@@ -10,5 +10,5 @@ tests/cases/conformance/decorators/class/method/decoratorOnClassMethod8.ts(4,5):
         ~~~~
 !!! error TS1241: Unable to resolve signature of method decorator when called as an expression.
         ~~~~
-!!! error TS1269: Decorator function return type 'C' is not assignable to type 'void | TypedPropertyDescriptor<() => void>'.
+!!! error TS1270: Decorator function return type 'C' is not assignable to type 'void | TypedPropertyDescriptor<() => void>'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/potentiallyUncalledDecorators.errors.txt b/tests/baselines/reference/potentiallyUncalledDecorators.errors.txt
index 40b9d52ba8d85..4fd7d52c64c1a 100644
--- a/tests/baselines/reference/potentiallyUncalledDecorators.errors.txt
+++ b/tests/baselines/reference/potentiallyUncalledDecorators.errors.txt
@@ -2,21 +2,21 @@ tests/cases/compiler/potentiallyUncalledDecorators.ts(4,5): error TS1329: 'Input
 tests/cases/compiler/potentiallyUncalledDecorators.ts(35,1): error TS1329: 'noArgs' accepts too few arguments to be used as a decorator here. Did you mean to call it first and write '@noArgs()'?
 tests/cases/compiler/potentiallyUncalledDecorators.ts(37,5): error TS1329: 'noArgs' accepts too few arguments to be used as a decorator here. Did you mean to call it first and write '@noArgs()'?
 tests/cases/compiler/potentiallyUncalledDecorators.ts(38,5): error TS1329: 'noArgs' accepts too few arguments to be used as a decorator here. Did you mean to call it first and write '@noArgs()'?
-tests/cases/compiler/potentiallyUncalledDecorators.ts(41,1): error TS1269: Decorator function return type 'OmniDecorator' is not assignable to type 'void | typeof B'.
-tests/cases/compiler/potentiallyUncalledDecorators.ts(43,5): error TS1270: Decorator function return type is 'OmniDecorator' but is expected to be 'void' or 'any'.
-tests/cases/compiler/potentiallyUncalledDecorators.ts(44,5): error TS1269: Decorator function return type 'OmniDecorator' is not assignable to type 'void | TypedPropertyDescriptor<() => void>'.
-tests/cases/compiler/potentiallyUncalledDecorators.ts(47,1): error TS1269: Decorator function return type 'OmniDecorator' is not assignable to type 'void | typeof C'.
+tests/cases/compiler/potentiallyUncalledDecorators.ts(41,1): error TS1270: Decorator function return type 'OmniDecorator' is not assignable to type 'void | typeof B'.
+tests/cases/compiler/potentiallyUncalledDecorators.ts(43,5): error TS1271: Decorator function return type is 'OmniDecorator' but is expected to be 'void' or 'any'.
+tests/cases/compiler/potentiallyUncalledDecorators.ts(44,5): error TS1270: Decorator function return type 'OmniDecorator' is not assignable to type 'void | TypedPropertyDescriptor<() => void>'.
+tests/cases/compiler/potentiallyUncalledDecorators.ts(47,1): error TS1270: Decorator function return type 'OmniDecorator' is not assignable to type 'void | typeof C'.
 tests/cases/compiler/potentiallyUncalledDecorators.ts(49,5): error TS1329: 'oneOptional' accepts too few arguments to be used as a decorator here. Did you mean to call it first and write '@oneOptional()'?
 tests/cases/compiler/potentiallyUncalledDecorators.ts(50,5): error TS1329: 'oneOptional' accepts too few arguments to be used as a decorator here. Did you mean to call it first and write '@oneOptional()'?
-tests/cases/compiler/potentiallyUncalledDecorators.ts(53,1): error TS1269: Decorator function return type 'OmniDecorator' is not assignable to type 'void | typeof D'.
-tests/cases/compiler/potentiallyUncalledDecorators.ts(55,5): error TS1270: Decorator function return type is 'OmniDecorator' but is expected to be 'void' or 'any'.
-tests/cases/compiler/potentiallyUncalledDecorators.ts(56,5): error TS1269: Decorator function return type 'OmniDecorator' is not assignable to type 'void | TypedPropertyDescriptor<() => void>'.
-tests/cases/compiler/potentiallyUncalledDecorators.ts(59,1): error TS1269: Decorator function return type 'OmniDecorator' is not assignable to type 'void | typeof E'.
-tests/cases/compiler/potentiallyUncalledDecorators.ts(61,5): error TS1270: Decorator function return type is 'OmniDecorator' but is expected to be 'void' or 'any'.
-tests/cases/compiler/potentiallyUncalledDecorators.ts(62,5): error TS1269: Decorator function return type 'OmniDecorator' is not assignable to type 'void | TypedPropertyDescriptor<() => void>'.
-tests/cases/compiler/potentiallyUncalledDecorators.ts(65,1): error TS1269: Decorator function return type 'OmniDecorator' is not assignable to type 'void | typeof F'.
-tests/cases/compiler/potentiallyUncalledDecorators.ts(67,5): error TS1270: Decorator function return type is 'OmniDecorator' but is expected to be 'void' or 'any'.
-tests/cases/compiler/potentiallyUncalledDecorators.ts(68,5): error TS1269: Decorator function return type 'OmniDecorator' is not assignable to type 'void | TypedPropertyDescriptor<() => void>'.
+tests/cases/compiler/potentiallyUncalledDecorators.ts(53,1): error TS1270: Decorator function return type 'OmniDecorator' is not assignable to type 'void | typeof D'.
+tests/cases/compiler/potentiallyUncalledDecorators.ts(55,5): error TS1271: Decorator function return type is 'OmniDecorator' but is expected to be 'void' or 'any'.
+tests/cases/compiler/potentiallyUncalledDecorators.ts(56,5): error TS1270: Decorator function return type 'OmniDecorator' is not assignable to type 'void | TypedPropertyDescriptor<() => void>'.
+tests/cases/compiler/potentiallyUncalledDecorators.ts(59,1): error TS1270: Decorator function return type 'OmniDecorator' is not assignable to type 'void | typeof E'.
+tests/cases/compiler/potentiallyUncalledDecorators.ts(61,5): error TS1271: Decorator function return type is 'OmniDecorator' but is expected to be 'void' or 'any'.
+tests/cases/compiler/potentiallyUncalledDecorators.ts(62,5): error TS1270: Decorator function return type 'OmniDecorator' is not assignable to type 'void | TypedPropertyDescriptor<() => void>'.
+tests/cases/compiler/potentiallyUncalledDecorators.ts(65,1): error TS1270: Decorator function return type 'OmniDecorator' is not assignable to type 'void | typeof F'.
+tests/cases/compiler/potentiallyUncalledDecorators.ts(67,5): error TS1271: Decorator function return type is 'OmniDecorator' but is expected to be 'void' or 'any'.
+tests/cases/compiler/potentiallyUncalledDecorators.ts(68,5): error TS1270: Decorator function return type 'OmniDecorator' is not assignable to type 'void | TypedPropertyDescriptor<() => void>'.
 
 
 ==== tests/cases/compiler/potentiallyUncalledDecorators.ts (19 errors) ====
@@ -70,19 +70,19 @@ tests/cases/compiler/potentiallyUncalledDecorators.ts(68,5): error TS1269: Decor
     
     @allRest
     ~~~~~~~~
-!!! error TS1269: Decorator function return type 'OmniDecorator' is not assignable to type 'void | typeof B'.
+!!! error TS1270: Decorator function return type 'OmniDecorator' is not assignable to type 'void | typeof B'.
     class B {
         @allRest foo: any;
         ~~~~~~~~
-!!! error TS1270: Decorator function return type is 'OmniDecorator' but is expected to be 'void' or 'any'.
+!!! error TS1271: Decorator function return type is 'OmniDecorator' but is expected to be 'void' or 'any'.
         @allRest bar() { }
         ~~~~~~~~
-!!! error TS1269: Decorator function return type 'OmniDecorator' is not assignable to type 'void | TypedPropertyDescriptor<() => void>'.
+!!! error TS1270: Decorator function return type 'OmniDecorator' is not assignable to type 'void | TypedPropertyDescriptor<() => void>'.
     }
     
     @oneOptional
     ~~~~~~~~~~~~
-!!! error TS1269: Decorator function return type 'OmniDecorator' is not assignable to type 'void | typeof C'.
+!!! error TS1270: Decorator function return type 'OmniDecorator' is not assignable to type 'void | typeof C'.
     class C {
         @oneOptional foo: any;
         ~~~~~~~~~~~~
@@ -94,38 +94,38 @@ tests/cases/compiler/potentiallyUncalledDecorators.ts(68,5): error TS1269: Decor
     
     @twoOptional
     ~~~~~~~~~~~~
-!!! error TS1269: Decorator function return type 'OmniDecorator' is not assignable to type 'void | typeof D'.
+!!! error TS1270: Decorator function return type 'OmniDecorator' is not assignable to type 'void | typeof D'.
     class D {
         @twoOptional foo: any;
         ~~~~~~~~~~~~
-!!! error TS1270: Decorator function return type is 'OmniDecorator' but is expected to be 'void' or 'any'.
+!!! error TS1271: Decorator function return type is 'OmniDecorator' but is expected to be 'void' or 'any'.
         @twoOptional bar() { }
         ~~~~~~~~~~~~
-!!! error TS1269: Decorator function return type 'OmniDecorator' is not assignable to type 'void | TypedPropertyDescriptor<() => void>'.
+!!! error TS1270: Decorator function return type 'OmniDecorator' is not assignable to type 'void | TypedPropertyDescriptor<() => void>'.
     }
     
     @threeOptional
     ~~~~~~~~~~~~~~
-!!! error TS1269: Decorator function return type 'OmniDecorator' is not assignable to type 'void | typeof E'.
+!!! error TS1270: Decorator function return type 'OmniDecorator' is not assignable to type 'void | typeof E'.
     class E {
         @threeOptional foo: any;
         ~~~~~~~~~~~~~~
-!!! error TS1270: Decorator function return type is 'OmniDecorator' but is expected to be 'void' or 'any'.
+!!! error TS1271: Decorator function return type is 'OmniDecorator' but is expected to be 'void' or 'any'.
         @threeOptional bar() { }
         ~~~~~~~~~~~~~~
-!!! error TS1269: Decorator function return type 'OmniDecorator' is not assignable to type 'void | TypedPropertyDescriptor<() => void>'.
+!!! error TS1270: Decorator function return type 'OmniDecorator' is not assignable to type 'void | TypedPropertyDescriptor<() => void>'.
     }
     
     @oneOptionalWithRest
     ~~~~~~~~~~~~~~~~~~~~
-!!! error TS1269: Decorator function return type 'OmniDecorator' is not assignable to type 'void | typeof F'.
+!!! error TS1270: Decorator function return type 'OmniDecorator' is not assignable to type 'void | typeof F'.
     class F {
         @oneOptionalWithRest foo: any;
         ~~~~~~~~~~~~~~~~~~~~
-!!! error TS1270: Decorator function return type is 'OmniDecorator' but is expected to be 'void' or 'any'.
+!!! error TS1271: Decorator function return type is 'OmniDecorator' but is expected to be 'void' or 'any'.
         @oneOptionalWithRest bar() { }
         ~~~~~~~~~~~~~~~~~~~~
-!!! error TS1269: Decorator function return type 'OmniDecorator' is not assignable to type 'void | TypedPropertyDescriptor<() => void>'.
+!!! error TS1270: Decorator function return type 'OmniDecorator' is not assignable to type 'void | TypedPropertyDescriptor<() => void>'.
     }
     
     @anyDec