diff --git a/tests/baselines/reference/exportNestedNamespaces.types b/tests/baselines/reference/exportNestedNamespaces.types
index 4bc7568885e..aae9e30a535 100644
--- a/tests/baselines/reference/exportNestedNamespaces.types
+++ b/tests/baselines/reference/exportNestedNamespaces.types
@@ -68,7 +68,7 @@ var classic = new s.Classic()
 /** @param {s.n.K} c
     @param {s.Classic} classic */
 function f(c, classic) {
->f : (c: s.n.K, classic: s.Classic) => void
+>f : (c: K, classic: s.Classic) => void
 >c : K
 >classic : Classic
 
diff --git a/tests/baselines/reference/jsDeclarationsClassStatic.js b/tests/baselines/reference/jsDeclarationsClassStatic.js
index 1498b8bd6bd..4af5f3fd83e 100644
--- a/tests/baselines/reference/jsDeclarationsClassStatic.js
+++ b/tests/baselines/reference/jsDeclarationsClassStatic.js
@@ -70,5 +70,5 @@ type HandlerOptions = {
     /**
      * Should be able to export a type alias at the same time.
      */
-    name: String;
+    name: string;
 };
diff --git a/tests/baselines/reference/jsdocArrayObjectPromiseImplicitAny.types b/tests/baselines/reference/jsdocArrayObjectPromiseImplicitAny.types
index 19affd29ffa..3fab5033c23 100644
--- a/tests/baselines/reference/jsdocArrayObjectPromiseImplicitAny.types
+++ b/tests/baselines/reference/jsdocArrayObjectPromiseImplicitAny.types
@@ -72,7 +72,7 @@ var paramedObject = {valueOf: 1};
  * @return {Object}
  */
 function returnAnyObject(obj) {
->returnAnyObject : (obj: Object) => Object
+>returnAnyObject : (obj: any) => any
 >obj : any
 
   return obj;
diff --git a/tests/baselines/reference/jsdocTemplateTag.types b/tests/baselines/reference/jsdocTemplateTag.types
index 860244c6315..7b5a2f5da71 100644
--- a/tests/baselines/reference/jsdocTemplateTag.types
+++ b/tests/baselines/reference/jsdocTemplateTag.types
@@ -42,12 +42,12 @@ let s = g('hi')()
  * @param {Array.<Object>} keyframes - Can't look up types on Element since it's a global in another file. (But it shouldn't crash).
  */
 Element.prototype.animate = function(keyframes) {};
->Element.prototype.animate = function(keyframes) {} : (keyframes: Array<Object>) => void
+>Element.prototype.animate = function(keyframes) {} : (keyframes: Array<any>) => void
 >Element.prototype.animate : (keyframes: Keyframe[] | PropertyIndexedKeyframes, options?: number | KeyframeAnimationOptions) => Animation
 >Element.prototype : Element
 >Element : { new (): Element; prototype: Element; }
 >prototype : Element
 >animate : (keyframes: Keyframe[] | PropertyIndexedKeyframes, options?: number | KeyframeAnimationOptions) => Animation
->function(keyframes) {} : (keyframes: Array<Object>) => void
+>function(keyframes) {} : (keyframes: Array<any>) => void
 >keyframes : any[]
 
diff --git a/tests/baselines/reference/jsdocTypeNongenericInstantiationAttempt.types b/tests/baselines/reference/jsdocTypeNongenericInstantiationAttempt.types
index 1549c560583..21dc8d546ce 100644
--- a/tests/baselines/reference/jsdocTypeNongenericInstantiationAttempt.types
+++ b/tests/baselines/reference/jsdocTypeNongenericInstantiationAttempt.types
@@ -109,6 +109,6 @@ function fn() {}
  * @param {fn<T>} somebody
  */
 function sayHello8(somebody) { }
->sayHello8 : (somebody: fn<T>) => void
+>sayHello8 : (somebody: () => void) => void
 >somebody : () => void
 
diff --git a/tests/baselines/reference/jsdocTypeReferenceToValue.types b/tests/baselines/reference/jsdocTypeReferenceToValue.types
index 4db6664b84d..91f8e26d35d 100644
--- a/tests/baselines/reference/jsdocTypeReferenceToValue.types
+++ b/tests/baselines/reference/jsdocTypeReferenceToValue.types
@@ -1,7 +1,7 @@
 === tests/cases/conformance/jsdoc/foo.js ===
 /** @param {Image} image */
 function process(image) {
->process : (image: Image) => HTMLImageElement
+>process : (image: new (width?: number, height?: number) => HTMLImageElement) => HTMLImageElement
 >image : new (width?: number, height?: number) => HTMLImageElement
 
     return new image(1, 1)
diff --git a/tests/baselines/reference/moduleExportNestedNamespaces.types b/tests/baselines/reference/moduleExportNestedNamespaces.types
index a1fc39b723c..5a266b23277 100644
--- a/tests/baselines/reference/moduleExportNestedNamespaces.types
+++ b/tests/baselines/reference/moduleExportNestedNamespaces.types
@@ -75,7 +75,7 @@ var classic = new s.Classic()
 /** @param {s.n.K} c
     @param {s.Classic} classic */
 function f(c, classic) {
->f : (c: s.n.K, classic: s.Classic) => void
+>f : (c: C, classic: s.Classic) => void
 >c : C
 >classic : Classic
 
diff --git a/tests/baselines/reference/prototypePropertyAssignmentMergeWithInterfaceMethod.types b/tests/baselines/reference/prototypePropertyAssignmentMergeWithInterfaceMethod.types
index b61471495b1..1a4d86e89cd 100644
--- a/tests/baselines/reference/prototypePropertyAssignmentMergeWithInterfaceMethod.types
+++ b/tests/baselines/reference/prototypePropertyAssignmentMergeWithInterfaceMethod.types
@@ -40,7 +40,7 @@ lf.Transaction = function() {};
  * @return {!IThenable}
  */
 lf.Transaction.prototype.begin = function(scope) {};
->lf.Transaction.prototype.begin = function(scope) {} : (scope: Array<lf.schema.Table>) => any
+>lf.Transaction.prototype.begin = function(scope) {} : (scope: Array<any>) => any
 >lf.Transaction.prototype.begin : any
 >lf.Transaction.prototype : any
 >lf.Transaction : typeof Transaction
@@ -48,6 +48,6 @@ lf.Transaction.prototype.begin = function(scope) {};
 >Transaction : typeof Transaction
 >prototype : any
 >begin : any
->function(scope) {} : (scope: Array<lf.schema.Table>) => any
+>function(scope) {} : (scope: Array<any>) => any
 >scope : any[]
 
diff --git a/tests/baselines/reference/typeFromPropertyAssignment35.types b/tests/baselines/reference/typeFromPropertyAssignment35.types
index 78f1dfd6224..df9db2d8a5e 100644
--- a/tests/baselines/reference/typeFromPropertyAssignment35.types
+++ b/tests/baselines/reference/typeFromPropertyAssignment35.types
@@ -1,7 +1,7 @@
 === tests/cases/conformance/salsa/bug26877.js ===
 /** @param {Emu.D} x */
 function ollKorrect(x) {
->ollKorrect : (x: Emu.D) => void
+>ollKorrect : (x: D) => void
 >x : D
 
     x._model
diff --git a/tests/baselines/reference/typeFromPropertyAssignment6.types b/tests/baselines/reference/typeFromPropertyAssignment6.types
index 7bcbddebe73..2649b817155 100644
--- a/tests/baselines/reference/typeFromPropertyAssignment6.types
+++ b/tests/baselines/reference/typeFromPropertyAssignment6.types
@@ -33,7 +33,7 @@ var msgs = Outer.i.messages()
 
 /** @param {Outer.Inner} inner */
 function x(inner) {
->x : (inner: Outer.Inner) => void
+>x : (inner: I) => void
 >inner : I
 }
 
diff --git a/tests/baselines/reference/varRequireFromJavascript.types b/tests/baselines/reference/varRequireFromJavascript.types
index f6ef20d1a15..84fef5df259 100644
--- a/tests/baselines/reference/varRequireFromJavascript.types
+++ b/tests/baselines/reference/varRequireFromJavascript.types
@@ -25,7 +25,7 @@ crunch.n
  * @param {ex.Crunch} wrap
  */
 function f(wrap) {
->f : (wrap: ex.Crunch) => void
+>f : (wrap: import("tests/cases/conformance/salsa/ex").Crunch) => void
 >wrap : import("tests/cases/conformance/salsa/ex").Crunch
 
     wrap.n
diff --git a/tests/baselines/reference/varRequireFromTypescript.types b/tests/baselines/reference/varRequireFromTypescript.types
index cb7c44cfc84..7010bfaf1a8 100644
--- a/tests/baselines/reference/varRequireFromTypescript.types
+++ b/tests/baselines/reference/varRequireFromTypescript.types
@@ -26,7 +26,7 @@ crunch.n
  * @param {ex.Crunch} wrap
  */
 function f(greatest, wrap) {
->f : (greatest: ex.Greatest, wrap: ex.Crunch) => void
+>f : (greatest: import("tests/cases/conformance/salsa/ex").Greatest, wrap: import("tests/cases/conformance/salsa/ex").Crunch) => void
 >greatest : import("tests/cases/conformance/salsa/ex").Greatest
 >wrap : import("tests/cases/conformance/salsa/ex").Crunch