diff --git a/test/fail_compilation/fail278.d b/test/fail_compilation/fail278.d
@@ -1,8 +1,8 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/fail278.d(11): Error: template instance NONEXISTENT!() template `NONEXISTENT` is not defined
-fail_compilation/fail278.d(12): Error: template instance fail278.F!() error instantiating
+fail_compilation/fail278.d(11): Error: template instance `NONEXISTENT!()` template `NONEXISTENT` is not defined
+fail_compilation/fail278.d(12): Error: template instance `fail278.F!()` error instantiating
 fail_compilation/fail278.d(13):        instantiated from here: `Bar!(Foo)`
 ---
 */

diff --git a/test/fail_compilation/fail2789.d b/test/fail_compilation/fail2789.d
@@ -1,8 +1,8 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/fail2789.d(15): Error: function fail2789.A2789.m () conflicts with previous declaration at fail_compilation/fail2789.d(10)
-fail_compilation/fail2789.d(25): Error: function fail2789.A2789.m () conflicts with previous declaration at fail_compilation/fail2789.d(10)
+fail_compilation/fail2789.d(15): Error: function `fail2789.A2789.m()` conflicts with previous declaration at fail_compilation/fail2789.d(10)
+fail_compilation/fail2789.d(25): Error: function `fail2789.A2789.m()` conflicts with previous declaration at fail_compilation/fail2789.d(10)
 ---
 */
 class A2789
@@ -30,10 +30,10 @@ class A2789
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/fail2789.d(46): Error: function fail2789.f3 () conflicts with previous declaration at fail_compilation/fail2789.d(45)
-fail_compilation/fail2789.d(49): Error: function fail2789.f4 () conflicts with previous declaration at fail_compilation/fail2789.d(48)
-fail_compilation/fail2789.d(52): Error: function fail2789.f5 () conflicts with previous declaration at fail_compilation/fail2789.d(51)
-fail_compilation/fail2789.d(55): Error: function fail2789.f6 () conflicts with previous declaration at fail_compilation/fail2789.d(54)
+fail_compilation/fail2789.d(46): Error: function `fail2789.f3()` conflicts with previous declaration at fail_compilation/fail2789.d(45)
+fail_compilation/fail2789.d(49): Error: function `fail2789.f4()` conflicts with previous declaration at fail_compilation/fail2789.d(48)
+fail_compilation/fail2789.d(52): Error: function `fail2789.f5()` conflicts with previous declaration at fail_compilation/fail2789.d(51)
+fail_compilation/fail2789.d(55): Error: function `fail2789.f6()` conflicts with previous declaration at fail_compilation/fail2789.d(54)
 ---
 */
 void f1();
@@ -57,10 +57,10 @@ auto f6() { return ""; }    // string(), conflict
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/fail2789.d(67): Error: function fail2789.f_ExternC1 () cannot be overloaded with another extern (C) function at fail_compilation/fail2789.d(66)
-fail_compilation/fail2789.d(70): Error: function fail2789.f_ExternC2 (int) cannot be overloaded with another extern (C) function at fail_compilation/fail2789.d(69)
-fail_compilation/fail2789.d(73): Error: function fail2789.f_ExternC3 () cannot be overloaded with another extern (C) function at fail_compilation/fail2789.d(72)
-fail_compilation/fail2789.d(76): Error: function fail2789.f_MixExtern1 () conflicts with previous declaration at fail_compilation/fail2789.d(75)
+fail_compilation/fail2789.d(67): Error: function `fail2789.f_ExternC1()` cannot be overloaded with another `extern(C)` function at fail_compilation/fail2789.d(66)
+fail_compilation/fail2789.d(70): Error: function `fail2789.f_ExternC2(int)` cannot be overloaded with another `extern(C)` function at fail_compilation/fail2789.d(69)
+fail_compilation/fail2789.d(73): Error: function `fail2789.f_ExternC3()` cannot be overloaded with another `extern(C)` function at fail_compilation/fail2789.d(72)
+fail_compilation/fail2789.d(76): Error: function `fail2789.f_MixExtern1()` conflicts with previous declaration at fail_compilation/fail2789.d(75)
 ---
 */
 extern(C) void f_ExternC1() {}
@@ -90,7 +90,7 @@ extern (C) void f_ExternC6(int sig) @nogc {}    // no error
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/fail2789.d(103): Error: function fail2789.mul14147 (const(int[]) left, const(int[]) right) conflicts with previous declaration at fail_compilation/fail2789.d(99)
+fail_compilation/fail2789.d(103): Error: function `fail2789.mul14147(const(int[]) left, const(int[]) right)` conflicts with previous declaration at fail_compilation/fail2789.d(99)
 ---
 */
 struct S14147(alias func)

diff --git a/test/fail_compilation/fail282.d b/test/fail_compilation/fail282.d
@@ -1,7 +1,7 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/fail282.d(13): Error: template instance fail282.Template!500 recursive expansion
+fail_compilation/fail282.d(13): Error: template instance `fail282.Template!500` recursive expansion
 ---
 */
 

diff --git a/test/fail_compilation/fail291.d b/test/fail_compilation/fail291.d
@@ -1,7 +1,7 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/fail291.d(9): Error: variable fail291.X cannot be declared to be a function
+fail_compilation/fail291.d(9): Error: variable `fail291.X` cannot be declared to be a function
 ---
 */
 

diff --git a/test/fail_compilation/fail2962.d b/test/fail_compilation/fail2962.d
@@ -6,7 +6,7 @@ TEST_OUTPUT:
 ---
 fail_compilation/fail2962.d(14): Error: variable `y` cannot be read at compile time
 fail_compilation/fail2962.d(14):        while looking for match for `baz6!(int, y)`
-fail_compilation/fail2962.d(22): Error: template instance fail2962.bar6!int error instantiating
+fail_compilation/fail2962.d(22): Error: template instance `fail2962.bar6!int` error instantiating
 ---
 */
 T bar6(T)(T y)
@@ -28,7 +28,7 @@ TEST_OUTPUT:
 ---
 fail_compilation/fail2962.d(36): Error: variable `x` cannot be read at compile time
 fail_compilation/fail2962.d(36):        while looking for match for `baz4!(int, x)`
-fail_compilation/imports/fail2962a.d(6): Error: template instance fail2962.bar4!int error instantiating
+fail_compilation/imports/fail2962a.d(6): Error: template instance `fail2962.bar4!int` error instantiating
 ---
 */
 T bar4(T)(T x)

diff --git a/test/fail_compilation/fail301.d b/test/fail_compilation/fail301.d
@@ -2,7 +2,7 @@
 TEST_OUTPUT:
 ---
 fail_compilation/fail301.d(11): Error: need `this` for `guard` of type `int`
-fail_compilation/fail301.d(22): Error: template instance fail301.bug3305!0 error instantiating
+fail_compilation/fail301.d(22): Error: template instance `fail301.bug3305!0` error instantiating
 ---
 */
 

diff --git a/test/fail_compilation/fail310.d b/test/fail_compilation/fail310.d
@@ -2,7 +2,7 @@
 TEST_OUTPUT:
 ---
 fail_compilation/fail310.d(10): Error: undefined identifier `Foo`, did you mean function `foo`?
-fail_compilation/fail310.d(14): Error: template instance fail310.foo!(1, 2) error instantiating
+fail_compilation/fail310.d(14): Error: template instance `fail310.foo!(1, 2)` error instantiating
 fail_compilation/fail310.d(14):        while evaluating: `static assert(foo!(1, 2)())`
 ---
 */

diff --git a/test/fail_compilation/fail311.d b/test/fail_compilation/fail311.d
@@ -2,7 +2,7 @@
 TEST_OUTPUT:
 ---
 fail_compilation/fail311.d(16): Error: undefined identifier `undefined`
-fail_compilation/fail311.d(25): Error: template instance fail311.foo!() error instantiating
+fail_compilation/fail311.d(25): Error: template instance `fail311.foo!()` error instantiating
 ---
 */
 

diff --git a/test/fail_compilation/fail313.d b/test/fail_compilation/fail313.d
@@ -2,11 +2,11 @@
 REQUIRED_ARGS: -de
 TEST_OUTPUT:
 ---
-fail_compilation/fail313.d(18): Deprecation: module imports.b313 is not accessible here, perhaps add 'static import imports.b313;'
-fail_compilation/fail313.d(25): Deprecation: imports.a313.core is not visible from module test313
-fail_compilation/fail313.d(25): Deprecation: package core.stdc is not accessible here
-fail_compilation/fail313.d(25): Deprecation: module core.stdc.stdio is not accessible here, perhaps add 'static import core.stdc.stdio;'
-fail_compilation/fail313.d(30): Deprecation: package imports.pkg313 is not accessible here, perhaps add 'static import imports.pkg313;'
+fail_compilation/fail313.d(18): Deprecation: module `imports.b313` is not accessible here, perhaps add `static import imports.b313;`
+fail_compilation/fail313.d(25): Deprecation: `imports.a313.core` is not visible from module `test313`
+fail_compilation/fail313.d(25): Deprecation: package `core.stdc` is not accessible here
+fail_compilation/fail313.d(25): Deprecation: module `core.stdc.stdio` is not accessible here, perhaps add `static import core.stdc.stdio;`
+fail_compilation/fail313.d(30): Deprecation: package `imports.pkg313` is not accessible here, perhaps add `static import imports.pkg313;`
 ---
 */
 module test313;

diff --git a/test/fail_compilation/fail315.d b/test/fail_compilation/fail315.d
@@ -7,7 +7,7 @@ fail_compilation/fail315.d-mixin-16(16): Error: found `EOF` when expecting `,`
 fail_compilation/fail315.d-mixin-16(16): Error: found `EOF` when expecting `]`
 fail_compilation/fail315.d-mixin-16(16): Error: found `EOF` when expecting `;` following `return` statement
 fail_compilation/fail315.d-mixin-16(16): Error: found `EOF` when expecting `}` following compound statement
-fail_compilation/fail315.d(21): Error: template instance fail315.foo!() error instantiating
+fail_compilation/fail315.d(21): Error: template instance `fail315.foo!()` error instantiating
 ---
 */
 

diff --git a/test/fail_compilation/fail317.d b/test/fail_compilation/fail317.d
@@ -1,7 +1,7 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/fail317.d(10): Error: function fail317.I.f has no function body with return type inference
+fail_compilation/fail317.d(10): Error: function `fail317.I.f` has no function body with return type inference
 ---
 */
 

diff --git a/test/fail_compilation/fail318.d b/test/fail_compilation/fail318.d
@@ -1,7 +1,7 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/fail318.d(8): Error: function D main must return int or void
+fail_compilation/fail318.d(8): Error: function `D main` must return `int` or `void`
 ---
 */
 

diff --git a/test/fail_compilation/fail319.d b/test/fail_compilation/fail319.d
@@ -1,7 +1,7 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/fail319.d(13): Error: template instance fail319.f!(int, int) does not match template declaration `f(T...)() if (T.length > 20)`
+fail_compilation/fail319.d(13): Error: template instance `fail319.f!(int, int)` does not match template declaration `f(T...)() if (T.length > 20)`
 ---
 */
 

diff --git a/test/fail_compilation/fail329.d b/test/fail_compilation/fail329.d
@@ -1,7 +1,7 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/fail329.d(28): Error: variable fail329.A.foo.__ensure.result cannot modify result `result` in contract
+fail_compilation/fail329.d(28): Error: variable `fail329.A.foo.__ensure.result` cannot modify result `result` in contract
 ---
 */
 

diff --git a/test/fail_compilation/fail330.d b/test/fail_compilation/fail330.d
@@ -1,7 +1,7 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/fail330.d(9): Error: variable fail330.fun.result cannot modify result `result` in contract
+fail_compilation/fail330.d(9): Error: variable `fail330.fun.result` cannot modify result `result` in contract
 ---
 */
 

diff --git a/test/fail_compilation/fail333.d b/test/fail_compilation/fail333.d
@@ -1,7 +1,7 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/fail333.d(8): Error: forward reference to 'test'
+fail_compilation/fail333.d(8): Error: forward reference to `test`
 ---
 */
 

diff --git a/test/fail_compilation/fail337.d b/test/fail_compilation/fail337.d
@@ -1,7 +1,7 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/fail337.d(13): Error: static assert  `0` is false
+fail_compilation/fail337.d(13): Error: static assert:  `0` is false
 fail_compilation/fail337.d(26):        instantiated from here: `bar!()`
 fail_compilation/fail337.d(33):        100 recursive instantiations from here: `foo!196`
 fail_compilation/fail337.d(41):        253 recursive instantiations from here: `baz!300`

diff --git a/test/fail_compilation/fail340.d b/test/fail_compilation/fail340.d
@@ -1,7 +1,7 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/fail340.d(18): Error: variable fail340.w of type struct `const(CopyTest)` uses `this(this)`, which is not allowed in static initialization
+fail_compilation/fail340.d(18): Error: variable `fail340.w` of type struct `const(CopyTest)` uses `this(this)`, which is not allowed in static initialization
 fail_compilation/fail340.d(19):        while evaluating: `static assert(w.x == 55.0000)`
 ---
 */

diff --git a/test/fail_compilation/fail341.d b/test/fail_compilation/fail341.d
@@ -1,8 +1,8 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/fail341.d(26): Error: struct fail341.S is not copyable because it is annotated with `@disable`
-fail_compilation/fail341.d(27): Error: function fail341.foo is not callable because it is annotated with `@disable`
+fail_compilation/fail341.d(26): Error: struct `fail341.S` is not copyable because it is annotated with `@disable`
+fail_compilation/fail341.d(27): Error: function `fail341.foo` is not callable because it is annotated with `@disable`
 ---
 */
 

diff --git a/test/fail_compilation/fail343.d b/test/fail_compilation/fail343.d
@@ -1,8 +1,8 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/fail343.d(22): Error: function fail343.TimedApp.run cannot override `final` function `I.fail343.Timer.run`
-fail_compilation/fail343.d(22): Error: function fail343.TimedApp.run cannot override `final` function `Application.fail343.Application.run`
+fail_compilation/fail343.d(22): Error: function `fail343.TimedApp.run` cannot override `final` function `I.fail343.Timer.run`
+fail_compilation/fail343.d(22): Error: function `fail343.TimedApp.run` cannot override `final` function `Application.fail343.Application.run`
 ---
 */
 

diff --git a/test/fail_compilation/fail354.d b/test/fail_compilation/fail354.d
@@ -1,8 +1,8 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/fail354.d(11): Error: template instance T!N template `T` is not defined
-fail_compilation/fail354.d(13): Error: template instance fail354.S!1 error instantiating
+fail_compilation/fail354.d(11): Error: template instance `T!N` template `T` is not defined
+fail_compilation/fail354.d(13): Error: template instance `fail354.S!1` error instantiating
 ---
 */
 

diff --git a/test/fail_compilation/fail355.d b/test/fail_compilation/fail355.d
@@ -1,7 +1,7 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/fail355.d(8): Error: module imports.fail355 import `nonexistent` not found
+fail_compilation/fail355.d(8): Error: module `imports.fail355` import `nonexistent` not found
 ---
 */
 

diff --git a/test/fail_compilation/fail36.d b/test/fail_compilation/fail36.d
@@ -2,7 +2,7 @@
 TEST_OUTPUT:
 ---
 fail_compilation/fail36.d(13): Error: template `t(int L)` does not have property `a`
-fail_compilation/fail36.d(18): Error: mixin fail36.func.t!10 error instantiating
+fail_compilation/fail36.d(18): Error: mixin `fail36.func.t!10` error instantiating
 ---
 */
 

diff --git a/test/fail_compilation/fail42.d b/test/fail_compilation/fail42.d
@@ -1,7 +1,7 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/fail42.d(22): Error: struct fail42.Qwert no size because of forward reference
+fail_compilation/fail42.d(22): Error: struct `fail42.Qwert` no size because of forward reference
 ---
 */
 

diff --git a/test/fail_compilation/fail4421.d b/test/fail_compilation/fail4421.d
@@ -1,9 +1,9 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/fail4421.d(16): Error: function fail4421.U1.__postblit destructors, postblits and invariants are not allowed in union `U1`
-fail_compilation/fail4421.d(17): Error: destructor fail4421.U1.~this destructors, postblits and invariants are not allowed in union `U1`
-fail_compilation/fail4421.d(18): Error: function fail4421.U1.__invariant1 destructors, postblits and invariants are not allowed in union `U1`
+fail_compilation/fail4421.d(16): Error: function `fail4421.U1.__postblit` destructors, postblits and invariants are not allowed in union `U1`
+fail_compilation/fail4421.d(17): Error: destructor `fail4421.U1.~this` destructors, postblits and invariants are not allowed in union `U1`
+fail_compilation/fail4421.d(18): Error: function `fail4421.U1.__invariant1` destructors, postblits and invariants are not allowed in union `U1`
 ---
 
 

diff --git a/test/fail_compilation/fail45.d b/test/fail_compilation/fail45.d
@@ -1,7 +1,7 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/fail45.d(10): Error: variable fail45.main.O cannot be declared to be a function
+fail_compilation/fail45.d(10): Error: variable `fail45.main.O` cannot be declared to be a function
 ---
 */
 

diff --git a/test/fail_compilation/fail51.d b/test/fail_compilation/fail51.d
@@ -1,7 +1,7 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/fail51.d(11): Error: interface fail51.B circular inheritance of interface
+fail_compilation/fail51.d(11): Error: interface `fail51.B` circular inheritance of interface
 ---
 */
 

diff --git a/test/fail_compilation/fail52.d b/test/fail_compilation/fail52.d
@@ -1,7 +1,7 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/fail52.d(10): Error: class fail52.C circular inheritance
+fail_compilation/fail52.d(10): Error: class `fail52.C` circular inheritance
 ---
 */
 

diff --git a/test/fail_compilation/fail6107.d b/test/fail_compilation/fail6107.d
@@ -1,8 +1,8 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/fail6107.d(10): Error: variable fail6107.Foo.__ctor is not a constructor; identifiers starting with `__` are reserved for the implementation
-fail_compilation/fail6107.d(14): Error: variable fail6107.Bar.__ctor is not a constructor; identifiers starting with `__` are reserved for the implementation
+fail_compilation/fail6107.d(10): Error: variable `fail6107.Foo.__ctor` is not a constructor; identifiers starting with `__` are reserved for the implementation
+fail_compilation/fail6107.d(14): Error: variable `fail6107.Bar.__ctor` is not a constructor; identifiers starting with `__` are reserved for the implementation
 ---
 */
 struct Foo

diff --git a/test/fail_compilation/fail62.d b/test/fail_compilation/fail62.d
@@ -1,7 +1,7 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/fail62.d(11): Error: version Foo defined after use
+fail_compilation/fail62.d(11): Error: version `Foo` defined after use
 ---
 */
 

diff --git a/test/fail_compilation/fail63.d b/test/fail_compilation/fail63.d
@@ -1,7 +1,7 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/fail63.d(11): Error: debug Foo defined after use
+fail_compilation/fail63.d(11): Error: debug `Foo` defined after use
 ---
 */
 

diff --git a/test/fail_compilation/fail6334.d b/test/fail_compilation/fail6334.d
@@ -1,7 +1,7 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/fail6334.d(12): Error: static assert  `0` is false
+fail_compilation/fail6334.d(12): Error: static assert:  `0` is false
 ---
 */
 

diff --git a/test/fail_compilation/fail6453.d b/test/fail_compilation/fail6453.d
@@ -1,9 +1,9 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/fail6453.d(13): Error: struct fail6453.S6453x mixing invariants with different `shared`/`synchronized` qualifiers is not supported
-fail_compilation/fail6453.d(18): Error: class fail6453.C6453y mixing invariants with different `shared`/`synchronized` qualifiers is not supported
-fail_compilation/fail6453.d(23): Error: class fail6453.C6453z mixing invariants with different `shared`/`synchronized` qualifiers is not supported
+fail_compilation/fail6453.d(13): Error: struct `fail6453.S6453x` mixing invariants with different `shared`/`synchronized` qualifiers is not supported
+fail_compilation/fail6453.d(18): Error: class `fail6453.C6453y` mixing invariants with different `shared`/`synchronized` qualifiers is not supported
+fail_compilation/fail6453.d(23): Error: class `fail6453.C6453z` mixing invariants with different `shared`/`synchronized` qualifiers is not supported
 ---
 */
 

diff --git a/test/fail_compilation/fail66.d b/test/fail_compilation/fail66.d
@@ -1,7 +1,7 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/fail66.d(11): Error: constructor fail66.C1.this missing initializer for const field `y`
+fail_compilation/fail66.d(11): Error: constructor `fail66.C1.this` missing initializer for const field `y`
 ---
 */
 

diff --git a/test/fail_compilation/fail76.d b/test/fail_compilation/fail76.d
@@ -1,7 +1,7 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/fail76.d(9): Error: alias fail76.a conflicts with alias `fail76.a` at fail_compilation/fail76.d(8)
+fail_compilation/fail76.d(9): Error: alias `fail76.a` conflicts with alias `fail76.a` at fail_compilation/fail76.d(8)
 ---
 */
 

diff --git a/test/fail_compilation/fail7862.d b/test/fail_compilation/fail7862.d
@@ -3,8 +3,8 @@ TEST_OUTPUT:
 ---
 A: false
 A: false
-fail_compilation/fail7862.d(26): Error: template instance nonExistent!() template `nonExistent` is not defined
-fail_compilation/fail7862.d(25): Error: template instance fail7862.B!(A) error instantiating
+fail_compilation/fail7862.d(26): Error: template instance `nonExistent!()` template `nonExistent` is not defined
+fail_compilation/fail7862.d(25): Error: template instance `fail7862.B!(A)` error instantiating
 ---
 */
 

diff --git a/test/fail_compilation/fail7903.d b/test/fail_compilation/fail7903.d
@@ -1,9 +1,9 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/fail7903.d(21): Error: variable fail7903.F1.x Field members of a `synchronized` class cannot be `public`
-fail_compilation/fail7903.d(22): Error: variable fail7903.F1.y Field members of a `synchronized` class cannot be `export`
-fail_compilation/fail7903.d(27): Error: variable fail7903.F2.x Field members of a `synchronized` class cannot be `public`
+fail_compilation/fail7903.d(21): Error: variable `fail7903.F1.x` Field members of a `synchronized` class cannot be `public`
+fail_compilation/fail7903.d(22): Error: variable `fail7903.F1.y` Field members of a `synchronized` class cannot be `export`
+fail_compilation/fail7903.d(27): Error: variable `fail7903.F2.x` Field members of a `synchronized` class cannot be `public`
 ---
 */
 synchronized class K1

diff --git a/test/fail_compilation/fail8262.d b/test/fail_compilation/fail8262.d
@@ -1,7 +1,7 @@
 /* TEST_OUTPUT:
 ---
 fail_compilation/fail8262.d(32): Error: cannot interpret `Tuple8262!1` at compile time
-fail_compilation/fail8262.d(27): Error: template instance fail8262.T8262!(Tuple8262!1) error instantiating
+fail_compilation/fail8262.d(27): Error: template instance `fail8262.T8262!(Tuple8262!1)` error instantiating
 fail_compilation/fail8262.d(19): Error: cannot implicitly convert expression `S(0)` of type `S` to `int`
 ---
  * https://issues.dlang.org/show_bug.cgi?id=8262

diff --git a/test/fail_compilation/fail86.d b/test/fail_compilation/fail86.d
@@ -1,7 +1,7 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/fail86.d(12): Error: alias Foo recursive alias declaration
+fail_compilation/fail86.d(12): Error: alias `Foo` recursive alias declaration
 ---
 */
 

diff --git a/test/fail_compilation/fail8631.d b/test/fail_compilation/fail8631.d
@@ -1,7 +1,7 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/fail8631.d(14): Error: function fail8631.D.foo does not override any function, did you mean to override `fail8631.B.foo`?
+fail_compilation/fail8631.d(14): Error: function `fail8631.D.foo` does not override any function, did you mean to override `fail8631.B.foo`?
 ---
 */
 

diff --git a/test/fail_compilation/fail9063.d b/test/fail_compilation/fail9063.d
@@ -1,7 +1,7 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/fail9063.d(9): Error: static assert  "msg"
+fail_compilation/fail9063.d(9): Error: static assert:  "msg"
 ---
 */
 

diff --git a/test/fail_compilation/fail91.d b/test/fail_compilation/fail91.d
@@ -1,7 +1,7 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/fail91.d(12): Error: struct fail91.S unknown size
+fail_compilation/fail91.d(12): Error: struct `fail91.S` unknown size
 ---
 */
 

diff --git a/test/fail_compilation/fail9199.d b/test/fail_compilation/fail9199.d
@@ -2,12 +2,12 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/fail9199.d(13): Error: function fail9199.fc without `this` cannot be `const`
-fail_compilation/fail9199.d(14): Error: function fail9199.fi without `this` cannot be `immutable`
-fail_compilation/fail9199.d(15): Error: function fail9199.fw without `this` cannot be `inout`
-fail_compilation/fail9199.d(16): Error: function fail9199.fs without `this` cannot be `shared`
-fail_compilation/fail9199.d(17): Error: function fail9199.fsc without `this` cannot be `shared const`
-fail_compilation/fail9199.d(18): Error: function fail9199.fsw without `this` cannot be `shared inout`
+fail_compilation/fail9199.d(13): Error: function `fail9199.fc` without `this` cannot be `const`
+fail_compilation/fail9199.d(14): Error: function `fail9199.fi` without `this` cannot be `immutable`
+fail_compilation/fail9199.d(15): Error: function `fail9199.fw` without `this` cannot be `inout`
+fail_compilation/fail9199.d(16): Error: function `fail9199.fs` without `this` cannot be `shared`
+fail_compilation/fail9199.d(17): Error: function `fail9199.fsc` without `this` cannot be `shared const`
+fail_compilation/fail9199.d(18): Error: function `fail9199.fsw` without `this` cannot be `shared inout`
 ---
 */
 void fc() const {}
@@ -20,12 +20,12 @@ void fsw() shared inout {}
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/fail9199.d(33): Error: function fail9199.C.fc without `this` cannot be `const`
-fail_compilation/fail9199.d(34): Error: function fail9199.C.fi without `this` cannot be `immutable`
-fail_compilation/fail9199.d(35): Error: function fail9199.C.fw without `this` cannot be `inout`
-fail_compilation/fail9199.d(36): Error: function fail9199.C.fs without `this` cannot be `shared`
-fail_compilation/fail9199.d(37): Error: function fail9199.C.fsc without `this` cannot be `shared const`
-fail_compilation/fail9199.d(38): Error: function fail9199.C.fsw without `this` cannot be `shared inout`
+fail_compilation/fail9199.d(33): Error: function `fail9199.C.fc` without `this` cannot be `const`
+fail_compilation/fail9199.d(34): Error: function `fail9199.C.fi` without `this` cannot be `immutable`
+fail_compilation/fail9199.d(35): Error: function `fail9199.C.fw` without `this` cannot be `inout`
+fail_compilation/fail9199.d(36): Error: function `fail9199.C.fs` without `this` cannot be `shared`
+fail_compilation/fail9199.d(37): Error: function `fail9199.C.fsc` without `this` cannot be `shared const`
+fail_compilation/fail9199.d(38): Error: function `fail9199.C.fsw` without `this` cannot be `shared inout`
 ---
 */
 class C

diff --git a/test/fail_compilation/fail92.d b/test/fail_compilation/fail92.d
@@ -2,7 +2,7 @@
 TEST_OUTPUT:
 ---
 fail_compilation/fail92.d(15): Error: invalid `foreach` aggregate `t`
-fail_compilation/fail92.d(23): Error: template instance fail92.crash!(typeof(null)) error instantiating
+fail_compilation/fail92.d(23): Error: template instance `fail92.crash!(typeof(null))` error instantiating
 ---
 */
 

diff --git a/test/fail_compilation/fail9346.d b/test/fail_compilation/fail9346.d
@@ -1,8 +1,8 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/fail9346.d(26): Error: struct fail9346.S is not copyable because it is annotated with `@disable`
-fail_compilation/fail9346.d(27): Error: struct fail9346.S is not copyable because it is annotated with `@disable`
+fail_compilation/fail9346.d(26): Error: struct `fail9346.S` is not copyable because it is annotated with `@disable`
+fail_compilation/fail9346.d(27): Error: struct `fail9346.S` is not copyable because it is annotated with `@disable`
 ---
 */
 

diff --git a/test/fail_compilation/fail9413.d b/test/fail_compilation/fail9413.d
@@ -1,24 +1,24 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/fail9413.d(45): Error: variable fail9413.foo.x cannot modify parameter `x` in contract
-fail_compilation/fail9413.d(32): Error: variable fail9413.foo.x cannot modify parameter `x` in contract
-fail_compilation/fail9413.d(33): Error: variable fail9413.foo.bar.y cannot modify parameter `y` in contract
-fail_compilation/fail9413.d(38): Error: variable fail9413.foo.x cannot modify parameter `x` in contract
-fail_compilation/fail9413.d(39): Error: variable fail9413.foo.bar.y cannot modify parameter `y` in contract
-fail_compilation/fail9413.d(40): Error: variable fail9413.foo.bar.s cannot modify result `s` in contract
-fail_compilation/fail9413.d(50): Error: variable fail9413.foo.x cannot modify parameter `x` in contract
-fail_compilation/fail9413.d(73): Error: variable fail9413.foo.x cannot modify parameter `x` in contract
-fail_compilation/fail9413.d(74): Error: variable fail9413.foo.r cannot modify result `r` in contract
-fail_compilation/fail9413.d(58): Error: variable fail9413.foo.x cannot modify parameter `x` in contract
-fail_compilation/fail9413.d(59): Error: variable fail9413.foo.r cannot modify result `r` in contract
-fail_compilation/fail9413.d(60): Error: variable fail9413.foo.baz.y cannot modify parameter `y` in contract
-fail_compilation/fail9413.d(65): Error: variable fail9413.foo.x cannot modify parameter `x` in contract
-fail_compilation/fail9413.d(66): Error: variable fail9413.foo.r cannot modify result `r` in contract
-fail_compilation/fail9413.d(67): Error: variable fail9413.foo.baz.y cannot modify parameter `y` in contract
-fail_compilation/fail9413.d(68): Error: variable fail9413.foo.baz.s cannot modify result `s` in contract
-fail_compilation/fail9413.d(79): Error: variable fail9413.foo.x cannot modify parameter `x` in contract
-fail_compilation/fail9413.d(80): Error: variable fail9413.foo.r cannot modify result `r` in contract
+fail_compilation/fail9413.d(45): Error: variable `fail9413.foo.x` cannot modify parameter `x` in contract
+fail_compilation/fail9413.d(32): Error: variable `fail9413.foo.x` cannot modify parameter `x` in contract
+fail_compilation/fail9413.d(33): Error: variable `fail9413.foo.bar.y` cannot modify parameter `y` in contract
+fail_compilation/fail9413.d(38): Error: variable `fail9413.foo.x` cannot modify parameter `x` in contract
+fail_compilation/fail9413.d(39): Error: variable `fail9413.foo.bar.y` cannot modify parameter `y` in contract
+fail_compilation/fail9413.d(40): Error: variable `fail9413.foo.bar.s` cannot modify result `s` in contract
+fail_compilation/fail9413.d(50): Error: variable `fail9413.foo.x` cannot modify parameter `x` in contract
+fail_compilation/fail9413.d(73): Error: variable `fail9413.foo.x` cannot modify parameter `x` in contract
+fail_compilation/fail9413.d(74): Error: variable `fail9413.foo.r` cannot modify result `r` in contract
+fail_compilation/fail9413.d(58): Error: variable `fail9413.foo.x` cannot modify parameter `x` in contract
+fail_compilation/fail9413.d(59): Error: variable `fail9413.foo.r` cannot modify result `r` in contract
+fail_compilation/fail9413.d(60): Error: variable `fail9413.foo.baz.y` cannot modify parameter `y` in contract
+fail_compilation/fail9413.d(65): Error: variable `fail9413.foo.x` cannot modify parameter `x` in contract
+fail_compilation/fail9413.d(66): Error: variable `fail9413.foo.r` cannot modify result `r` in contract
+fail_compilation/fail9413.d(67): Error: variable `fail9413.foo.baz.y` cannot modify parameter `y` in contract
+fail_compilation/fail9413.d(68): Error: variable `fail9413.foo.baz.s` cannot modify result `s` in contract
+fail_compilation/fail9413.d(79): Error: variable `fail9413.foo.x` cannot modify parameter `x` in contract
+fail_compilation/fail9413.d(80): Error: variable `fail9413.foo.r` cannot modify result `r` in contract
 ---
 */
 

diff --git a/test/fail_compilation/fail9414a.d b/test/fail_compilation/fail9414a.d
@@ -1,24 +1,24 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/fail9414a.d(47): Error: variable fail9414a.C.foo.x cannot modify parameter `x` in contract
-fail_compilation/fail9414a.d(34): Error: variable fail9414a.C.foo.x cannot modify parameter `x` in contract
-fail_compilation/fail9414a.d(35): Error: variable fail9414a.C.foo.__require.bar.y cannot modify parameter `y` in contract
-fail_compilation/fail9414a.d(40): Error: variable fail9414a.C.foo.x cannot modify parameter `x` in contract
-fail_compilation/fail9414a.d(41): Error: variable fail9414a.C.foo.__require.bar.y cannot modify parameter `y` in contract
-fail_compilation/fail9414a.d(42): Error: variable fail9414a.C.foo.__require.bar.s cannot modify result `s` in contract
-fail_compilation/fail9414a.d(52): Error: variable fail9414a.C.foo.x cannot modify parameter `x` in contract
-fail_compilation/fail9414a.d(75): Error: variable fail9414a.C.foo.x cannot modify parameter `x` in contract
-fail_compilation/fail9414a.d(76): Error: variable fail9414a.C.foo.__ensure.r cannot modify result `r` in contract
-fail_compilation/fail9414a.d(60): Error: variable fail9414a.C.foo.x cannot modify parameter `x` in contract
-fail_compilation/fail9414a.d(61): Error: variable fail9414a.C.foo.__ensure.r cannot modify result `r` in contract
-fail_compilation/fail9414a.d(62): Error: variable fail9414a.C.foo.__ensure.baz.y cannot modify parameter `y` in contract
-fail_compilation/fail9414a.d(67): Error: variable fail9414a.C.foo.x cannot modify parameter `x` in contract
-fail_compilation/fail9414a.d(68): Error: variable fail9414a.C.foo.__ensure.r cannot modify result `r` in contract
-fail_compilation/fail9414a.d(69): Error: variable fail9414a.C.foo.__ensure.baz.y cannot modify parameter `y` in contract
-fail_compilation/fail9414a.d(70): Error: variable fail9414a.C.foo.__ensure.baz.s cannot modify result `s` in contract
-fail_compilation/fail9414a.d(81): Error: variable fail9414a.C.foo.x cannot modify parameter `x` in contract
-fail_compilation/fail9414a.d(82): Error: variable fail9414a.C.foo.__ensure.r cannot modify result `r` in contract
+fail_compilation/fail9414a.d(47): Error: variable `fail9414a.C.foo.x` cannot modify parameter `x` in contract
+fail_compilation/fail9414a.d(34): Error: variable `fail9414a.C.foo.x` cannot modify parameter `x` in contract
+fail_compilation/fail9414a.d(35): Error: variable `fail9414a.C.foo.__require.bar.y` cannot modify parameter `y` in contract
+fail_compilation/fail9414a.d(40): Error: variable `fail9414a.C.foo.x` cannot modify parameter `x` in contract
+fail_compilation/fail9414a.d(41): Error: variable `fail9414a.C.foo.__require.bar.y` cannot modify parameter `y` in contract
+fail_compilation/fail9414a.d(42): Error: variable `fail9414a.C.foo.__require.bar.s` cannot modify result `s` in contract
+fail_compilation/fail9414a.d(52): Error: variable `fail9414a.C.foo.x` cannot modify parameter `x` in contract
+fail_compilation/fail9414a.d(75): Error: variable `fail9414a.C.foo.x` cannot modify parameter `x` in contract
+fail_compilation/fail9414a.d(76): Error: variable `fail9414a.C.foo.__ensure.r` cannot modify result `r` in contract
+fail_compilation/fail9414a.d(60): Error: variable `fail9414a.C.foo.x` cannot modify parameter `x` in contract
+fail_compilation/fail9414a.d(61): Error: variable `fail9414a.C.foo.__ensure.r` cannot modify result `r` in contract
+fail_compilation/fail9414a.d(62): Error: variable `fail9414a.C.foo.__ensure.baz.y` cannot modify parameter `y` in contract
+fail_compilation/fail9414a.d(67): Error: variable `fail9414a.C.foo.x` cannot modify parameter `x` in contract
+fail_compilation/fail9414a.d(68): Error: variable `fail9414a.C.foo.__ensure.r` cannot modify result `r` in contract
+fail_compilation/fail9414a.d(69): Error: variable `fail9414a.C.foo.__ensure.baz.y` cannot modify parameter `y` in contract
+fail_compilation/fail9414a.d(70): Error: variable `fail9414a.C.foo.__ensure.baz.s` cannot modify result `s` in contract
+fail_compilation/fail9414a.d(81): Error: variable `fail9414a.C.foo.x` cannot modify parameter `x` in contract
+fail_compilation/fail9414a.d(82): Error: variable `fail9414a.C.foo.__ensure.r` cannot modify result `r` in contract
 ---
 */
 

diff --git a/test/fail_compilation/fail9414b.d b/test/fail_compilation/fail9414b.d
@@ -1,24 +1,24 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/fail9414b.d(47): Error: variable fail9414b.C.foo.x cannot modify parameter `x` in contract
-fail_compilation/fail9414b.d(34): Error: variable fail9414b.C.foo.x cannot modify parameter `x` in contract
-fail_compilation/fail9414b.d(35): Error: variable fail9414b.C.foo.__require.bar.y cannot modify parameter `y` in contract
-fail_compilation/fail9414b.d(40): Error: variable fail9414b.C.foo.x cannot modify parameter `x` in contract
-fail_compilation/fail9414b.d(41): Error: variable fail9414b.C.foo.__require.bar.y cannot modify parameter `y` in contract
-fail_compilation/fail9414b.d(42): Error: variable fail9414b.C.foo.__require.bar.s cannot modify result `s` in contract
-fail_compilation/fail9414b.d(52): Error: variable fail9414b.C.foo.x cannot modify parameter `x` in contract
-fail_compilation/fail9414b.d(75): Error: variable fail9414b.C.foo.x cannot modify parameter `x` in contract
-fail_compilation/fail9414b.d(76): Error: variable fail9414b.C.foo.__ensure.r cannot modify result `r` in contract
-fail_compilation/fail9414b.d(60): Error: variable fail9414b.C.foo.x cannot modify parameter `x` in contract
-fail_compilation/fail9414b.d(61): Error: variable fail9414b.C.foo.__ensure.r cannot modify result `r` in contract
-fail_compilation/fail9414b.d(62): Error: variable fail9414b.C.foo.__ensure.baz.y cannot modify parameter `y` in contract
-fail_compilation/fail9414b.d(67): Error: variable fail9414b.C.foo.x cannot modify parameter `x` in contract
-fail_compilation/fail9414b.d(68): Error: variable fail9414b.C.foo.__ensure.r cannot modify result `r` in contract
-fail_compilation/fail9414b.d(69): Error: variable fail9414b.C.foo.__ensure.baz.y cannot modify parameter `y` in contract
-fail_compilation/fail9414b.d(70): Error: variable fail9414b.C.foo.__ensure.baz.s cannot modify result `s` in contract
-fail_compilation/fail9414b.d(81): Error: variable fail9414b.C.foo.x cannot modify parameter `x` in contract
-fail_compilation/fail9414b.d(82): Error: variable fail9414b.C.foo.__ensure.r cannot modify result `r` in contract
+fail_compilation/fail9414b.d(47): Error: variable `fail9414b.C.foo.x` cannot modify parameter `x` in contract
+fail_compilation/fail9414b.d(34): Error: variable `fail9414b.C.foo.x` cannot modify parameter `x` in contract
+fail_compilation/fail9414b.d(35): Error: variable `fail9414b.C.foo.__require.bar.y` cannot modify parameter `y` in contract
+fail_compilation/fail9414b.d(40): Error: variable `fail9414b.C.foo.x` cannot modify parameter `x` in contract
+fail_compilation/fail9414b.d(41): Error: variable `fail9414b.C.foo.__require.bar.y` cannot modify parameter `y` in contract
+fail_compilation/fail9414b.d(42): Error: variable `fail9414b.C.foo.__require.bar.s` cannot modify result `s` in contract
+fail_compilation/fail9414b.d(52): Error: variable `fail9414b.C.foo.x` cannot modify parameter `x` in contract
+fail_compilation/fail9414b.d(75): Error: variable `fail9414b.C.foo.x` cannot modify parameter `x` in contract
+fail_compilation/fail9414b.d(76): Error: variable `fail9414b.C.foo.__ensure.r` cannot modify result `r` in contract
+fail_compilation/fail9414b.d(60): Error: variable `fail9414b.C.foo.x` cannot modify parameter `x` in contract
+fail_compilation/fail9414b.d(61): Error: variable `fail9414b.C.foo.__ensure.r` cannot modify result `r` in contract
+fail_compilation/fail9414b.d(62): Error: variable `fail9414b.C.foo.__ensure.baz.y` cannot modify parameter `y` in contract
+fail_compilation/fail9414b.d(67): Error: variable `fail9414b.C.foo.x` cannot modify parameter `x` in contract
+fail_compilation/fail9414b.d(68): Error: variable `fail9414b.C.foo.__ensure.r` cannot modify result `r` in contract
+fail_compilation/fail9414b.d(69): Error: variable `fail9414b.C.foo.__ensure.baz.y` cannot modify parameter `y` in contract
+fail_compilation/fail9414b.d(70): Error: variable `fail9414b.C.foo.__ensure.baz.s` cannot modify result `s` in contract
+fail_compilation/fail9414b.d(81): Error: variable `fail9414b.C.foo.x` cannot modify parameter `x` in contract
+fail_compilation/fail9414b.d(82): Error: variable `fail9414b.C.foo.__ensure.r` cannot modify result `r` in contract
 ---
 */
 

diff --git a/test/fail_compilation/fail9414c.d b/test/fail_compilation/fail9414c.d
@@ -1,24 +1,24 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/fail9414c.d(47): Error: variable fail9414c.C.foo.x cannot modify parameter `x` in contract
-fail_compilation/fail9414c.d(34): Error: variable fail9414c.C.foo.x cannot modify parameter `x` in contract
-fail_compilation/fail9414c.d(35): Error: variable fail9414c.C.foo.bar.y cannot modify parameter `y` in contract
-fail_compilation/fail9414c.d(40): Error: variable fail9414c.C.foo.x cannot modify parameter `x` in contract
-fail_compilation/fail9414c.d(41): Error: variable fail9414c.C.foo.bar.y cannot modify parameter `y` in contract
-fail_compilation/fail9414c.d(42): Error: variable fail9414c.C.foo.bar.s cannot modify result `s` in contract
-fail_compilation/fail9414c.d(52): Error: variable fail9414c.C.foo.x cannot modify parameter `x` in contract
-fail_compilation/fail9414c.d(75): Error: variable fail9414c.C.foo.x cannot modify parameter `x` in contract
-fail_compilation/fail9414c.d(76): Error: variable fail9414c.C.foo.r cannot modify result `r` in contract
-fail_compilation/fail9414c.d(60): Error: variable fail9414c.C.foo.x cannot modify parameter `x` in contract
-fail_compilation/fail9414c.d(61): Error: variable fail9414c.C.foo.r cannot modify result `r` in contract
-fail_compilation/fail9414c.d(62): Error: variable fail9414c.C.foo.baz.y cannot modify parameter `y` in contract
-fail_compilation/fail9414c.d(67): Error: variable fail9414c.C.foo.x cannot modify parameter `x` in contract
-fail_compilation/fail9414c.d(68): Error: variable fail9414c.C.foo.r cannot modify result `r` in contract
-fail_compilation/fail9414c.d(69): Error: variable fail9414c.C.foo.baz.y cannot modify parameter `y` in contract
-fail_compilation/fail9414c.d(70): Error: variable fail9414c.C.foo.baz.s cannot modify result `s` in contract
-fail_compilation/fail9414c.d(81): Error: variable fail9414c.C.foo.x cannot modify parameter `x` in contract
-fail_compilation/fail9414c.d(82): Error: variable fail9414c.C.foo.r cannot modify result `r` in contract
+fail_compilation/fail9414c.d(47): Error: variable `fail9414c.C.foo.x` cannot modify parameter `x` in contract
+fail_compilation/fail9414c.d(34): Error: variable `fail9414c.C.foo.x` cannot modify parameter `x` in contract
+fail_compilation/fail9414c.d(35): Error: variable `fail9414c.C.foo.bar.y` cannot modify parameter `y` in contract
+fail_compilation/fail9414c.d(40): Error: variable `fail9414c.C.foo.x` cannot modify parameter `x` in contract
+fail_compilation/fail9414c.d(41): Error: variable `fail9414c.C.foo.bar.y` cannot modify parameter `y` in contract
+fail_compilation/fail9414c.d(42): Error: variable `fail9414c.C.foo.bar.s` cannot modify result `s` in contract
+fail_compilation/fail9414c.d(52): Error: variable `fail9414c.C.foo.x` cannot modify parameter `x` in contract
+fail_compilation/fail9414c.d(75): Error: variable `fail9414c.C.foo.x` cannot modify parameter `x` in contract
+fail_compilation/fail9414c.d(76): Error: variable `fail9414c.C.foo.r` cannot modify result `r` in contract
+fail_compilation/fail9414c.d(60): Error: variable `fail9414c.C.foo.x` cannot modify parameter `x` in contract
+fail_compilation/fail9414c.d(61): Error: variable `fail9414c.C.foo.r` cannot modify result `r` in contract
+fail_compilation/fail9414c.d(62): Error: variable `fail9414c.C.foo.baz.y` cannot modify parameter `y` in contract
+fail_compilation/fail9414c.d(67): Error: variable `fail9414c.C.foo.x` cannot modify parameter `x` in contract
+fail_compilation/fail9414c.d(68): Error: variable `fail9414c.C.foo.r` cannot modify result `r` in contract
+fail_compilation/fail9414c.d(69): Error: variable `fail9414c.C.foo.baz.y` cannot modify parameter `y` in contract
+fail_compilation/fail9414c.d(70): Error: variable `fail9414c.C.foo.baz.s` cannot modify result `s` in contract
+fail_compilation/fail9414c.d(81): Error: variable `fail9414c.C.foo.x` cannot modify parameter `x` in contract
+fail_compilation/fail9414c.d(82): Error: variable `fail9414c.C.foo.r` cannot modify result `r` in contract
 ---
 */
 

diff --git a/test/fail_compilation/fail9414d.d b/test/fail_compilation/fail9414d.d
@@ -1,24 +1,24 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/fail9414d.d(47): Error: variable fail9414d.C.foo.x cannot modify parameter `x` in contract
-fail_compilation/fail9414d.d(34): Error: variable fail9414d.C.foo.x cannot modify parameter `x` in contract
-fail_compilation/fail9414d.d(35): Error: variable fail9414d.C.foo.bar.y cannot modify parameter `y` in contract
-fail_compilation/fail9414d.d(40): Error: variable fail9414d.C.foo.x cannot modify parameter `x` in contract
-fail_compilation/fail9414d.d(41): Error: variable fail9414d.C.foo.bar.y cannot modify parameter `y` in contract
-fail_compilation/fail9414d.d(42): Error: variable fail9414d.C.foo.bar.s cannot modify result `s` in contract
-fail_compilation/fail9414d.d(52): Error: variable fail9414d.C.foo.x cannot modify parameter `x` in contract
-fail_compilation/fail9414d.d(75): Error: variable fail9414d.C.foo.x cannot modify parameter `x` in contract
-fail_compilation/fail9414d.d(76): Error: variable fail9414d.C.foo.r cannot modify result `r` in contract
-fail_compilation/fail9414d.d(60): Error: variable fail9414d.C.foo.x cannot modify parameter `x` in contract
-fail_compilation/fail9414d.d(61): Error: variable fail9414d.C.foo.r cannot modify result `r` in contract
-fail_compilation/fail9414d.d(62): Error: variable fail9414d.C.foo.baz.y cannot modify parameter `y` in contract
-fail_compilation/fail9414d.d(67): Error: variable fail9414d.C.foo.x cannot modify parameter `x` in contract
-fail_compilation/fail9414d.d(68): Error: variable fail9414d.C.foo.r cannot modify result `r` in contract
-fail_compilation/fail9414d.d(69): Error: variable fail9414d.C.foo.baz.y cannot modify parameter `y` in contract
-fail_compilation/fail9414d.d(70): Error: variable fail9414d.C.foo.baz.s cannot modify result `s` in contract
-fail_compilation/fail9414d.d(81): Error: variable fail9414d.C.foo.x cannot modify parameter `x` in contract
-fail_compilation/fail9414d.d(82): Error: variable fail9414d.C.foo.r cannot modify result `r` in contract
+fail_compilation/fail9414d.d(47): Error: variable `fail9414d.C.foo.x` cannot modify parameter `x` in contract
+fail_compilation/fail9414d.d(34): Error: variable `fail9414d.C.foo.x` cannot modify parameter `x` in contract
+fail_compilation/fail9414d.d(35): Error: variable `fail9414d.C.foo.bar.y` cannot modify parameter `y` in contract
+fail_compilation/fail9414d.d(40): Error: variable `fail9414d.C.foo.x` cannot modify parameter `x` in contract
+fail_compilation/fail9414d.d(41): Error: variable `fail9414d.C.foo.bar.y` cannot modify parameter `y` in contract
+fail_compilation/fail9414d.d(42): Error: variable `fail9414d.C.foo.bar.s` cannot modify result `s` in contract
+fail_compilation/fail9414d.d(52): Error: variable `fail9414d.C.foo.x` cannot modify parameter `x` in contract
+fail_compilation/fail9414d.d(75): Error: variable `fail9414d.C.foo.x` cannot modify parameter `x` in contract
+fail_compilation/fail9414d.d(76): Error: variable `fail9414d.C.foo.r` cannot modify result `r` in contract
+fail_compilation/fail9414d.d(60): Error: variable `fail9414d.C.foo.x` cannot modify parameter `x` in contract
+fail_compilation/fail9414d.d(61): Error: variable `fail9414d.C.foo.r` cannot modify result `r` in contract
+fail_compilation/fail9414d.d(62): Error: variable `fail9414d.C.foo.baz.y` cannot modify parameter `y` in contract
+fail_compilation/fail9414d.d(67): Error: variable `fail9414d.C.foo.x` cannot modify parameter `x` in contract
+fail_compilation/fail9414d.d(68): Error: variable `fail9414d.C.foo.r` cannot modify result `r` in contract
+fail_compilation/fail9414d.d(69): Error: variable `fail9414d.C.foo.baz.y` cannot modify parameter `y` in contract
+fail_compilation/fail9414d.d(70): Error: variable `fail9414d.C.foo.baz.s` cannot modify result `s` in contract
+fail_compilation/fail9414d.d(81): Error: variable `fail9414d.C.foo.x` cannot modify parameter `x` in contract
+fail_compilation/fail9414d.d(82): Error: variable `fail9414d.C.foo.r` cannot modify result `r` in contract
 ---
 */
 

diff --git a/test/fail_compilation/fail96.d b/test/fail_compilation/fail96.d
@@ -1,7 +1,7 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/fail96.d(21): Error: template instance foo!long `foo` is not a template declaration, it is a function alias
+fail_compilation/fail96.d(21): Error: template instance `foo!long` `foo` is not a template declaration, it is a function alias
 ---
 */
 

diff --git a/test/fail_compilation/fail9665a.d b/test/fail_compilation/fail9665a.d
@@ -150,7 +150,7 @@ struct S3
 /+
 TEST_OUTPUT:
 ---
-fail_compilation/fail9665a.d(163): Error: static assert  `__traits(compiles, this.v = 1)` is false
+fail_compilation/fail9665a.d(163): Error: static assert:  `__traits(compiles, this.v = 1)` is false
 ---
 +/
 struct S4

diff --git a/test/fail_compilation/fail9665b.d b/test/fail_compilation/fail9665b.d
@@ -49,7 +49,7 @@ fail_compilation/fail9665b.d(68): Error: one path skips field `x5`
 fail_compilation/fail9665b.d(69): Error: one path skips field `x6`
 fail_compilation/fail9665b.d(63): Error: field `x1` must be initialized in constructor, because it is nested struct
 fail_compilation/fail9665b.d(63): Error: field `x4` must be initialized in constructor, because it is nested struct
-fail_compilation/fail9665b.d(76): Error: template instance fail9665b.S2!(X) error instantiating
+fail_compilation/fail9665b.d(76): Error: template instance `fail9665b.S2!(X)` error instantiating
 ---
 +/
 struct S2(X)

diff --git a/test/fail_compilation/fail97.d b/test/fail_compilation/fail97.d
@@ -1,7 +1,7 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/fail97.d(11): Error: pragma lib is missing a terminating `;`
+fail_compilation/fail97.d(11): Error: pragma `lib` is missing a terminating `;`
 ---
 */
 

diff --git a/test/fail_compilation/fail9790.d b/test/fail_compilation/fail9790.d
@@ -2,9 +2,9 @@
 TEST_OUTPUT:
 ---
 fail_compilation/fail9790.d(13): Error: undefined identifier `_Unused_`
-fail_compilation/fail9790.d(20): Error: template instance fail9790.foo!() error instantiating
+fail_compilation/fail9790.d(20): Error: template instance `fail9790.foo!()` error instantiating
 fail_compilation/fail9790.d(18): Error: undefined identifier `_Unused_`
-fail_compilation/fail9790.d(21): Error: template instance fail9790.bar!() error instantiating
+fail_compilation/fail9790.d(21): Error: template instance `fail9790.bar!()` error instantiating
 ---
 */
 

diff --git a/test/fail_compilation/fail9892.d b/test/fail_compilation/fail9892.d
@@ -2,7 +2,7 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/fail9892.d(11): Error: enum member fail9892.a circular reference to `enum` member
+fail_compilation/fail9892.d(11): Error: enum member `fail9892.a` circular reference to `enum` member
 ---
 */
 

diff --git a/test/fail_compilation/failattr.d b/test/fail_compilation/failattr.d
@@ -3,12 +3,12 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/failattr.d(16): Error: variable failattr.C2901.v1 cannot be `synchronized`
-fail_compilation/failattr.d(17): Error: variable failattr.C2901.v2 cannot be `override`
-fail_compilation/failattr.d(18): Error: variable failattr.C2901.v3 cannot be `abstract`
-fail_compilation/failattr.d(19): Error: variable failattr.C2901.v4 cannot be `final`, perhaps you meant `const`?
-fail_compilation/failattr.d(31): Error: variable failattr.C2901.v13 cannot be `final abstract synchronized override`
-fail_compilation/failattr.d(33): Error: variable failattr.C2901.v14 cannot be `final`, perhaps you meant `const`?
+fail_compilation/failattr.d(16): Error: variable `failattr.C2901.v1` cannot be `synchronized`
+fail_compilation/failattr.d(17): Error: variable `failattr.C2901.v2` cannot be `override`
+fail_compilation/failattr.d(18): Error: variable `failattr.C2901.v3` cannot be `abstract`
+fail_compilation/failattr.d(19): Error: variable `failattr.C2901.v4` cannot be `final`, perhaps you meant `const`?
+fail_compilation/failattr.d(31): Error: variable `failattr.C2901.v13` cannot be `final abstract synchronized override`
+fail_compilation/failattr.d(33): Error: variable `failattr.C2901.v14` cannot be `final`, perhaps you meant `const`?
 ---
 */
 class C2901

diff --git a/test/fail_compilation/gag4269f.d b/test/fail_compilation/gag4269f.d
@@ -3,7 +3,7 @@
 TEST_OUTPUT:
 ---
 fail_compilation/gag4269f.d(11): Error: undefined identifier `Y9`, did you mean interface `X9`?
-fail_compilation/gag4269f.d(11): Error: variable gag4269f.X9.y field not allowed in interface
+fail_compilation/gag4269f.d(11): Error: variable `gag4269f.X9.y` field not allowed in interface
 ---
 */
 

diff --git a/test/fail_compilation/ice10016.d b/test/fail_compilation/ice10016.d
@@ -2,7 +2,7 @@
 TEST_OUTPUT:
 ---
 fail_compilation/ice10016.d(33): Error: undefined identifier `unknownIdentifier`
-fail_compilation/ice10016.d(47): Error: template instance ice10016.RefCounted!(S) error instantiating
+fail_compilation/ice10016.d(47): Error: template instance `ice10016.RefCounted!(S)` error instantiating
 ---
 */
 

diff --git a/test/fail_compilation/ice10076.d b/test/fail_compilation/ice10076.d
@@ -1,8 +1,8 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/ice10076.d(18): Error: template instance getMembersAndAttributesWhere!() template `getMembersAndAttributesWhere` is not defined
-fail_compilation/ice10076.d(23): Error: template instance ice10076.getValidaterAttrs!string error instantiating
+fail_compilation/ice10076.d(18): Error: template instance `getMembersAndAttributesWhere!()` template `getMembersAndAttributesWhere` is not defined
+fail_compilation/ice10076.d(23): Error: template instance `ice10076.getValidaterAttrs!string` error instantiating
 fail_compilation/ice10076.d(13):        instantiated from here: `validate!string`
 ---
 */

diff --git a/test/fail_compilation/ice10600.d b/test/fail_compilation/ice10600.d
@@ -1,7 +1,7 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/ice10600.d(30): Error: template instance to!(int, double) does not match template declaration `to(T)`
+fail_compilation/ice10600.d(30): Error: template instance `to!(int, double)` does not match template declaration `to(T)`
 ---
 */
 

diff --git a/test/fail_compilation/ice10616.d b/test/fail_compilation/ice10616.d
@@ -1,7 +1,7 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/ice10616.d(8): Error: class ice10616.A is forward referenced when looking for `B`
+fail_compilation/ice10616.d(8): Error: class `ice10616.A` is forward referenced when looking for `B`
 ---
 */
 

diff --git a/test/fail_compilation/ice10624.d b/test/fail_compilation/ice10624.d
@@ -2,7 +2,7 @@
 TEST_OUTPUT:
 ---
 fail_compilation/ice10624.d(38): Error: need member function `opCmp()` for struct `Tuple!(Msg)` to compare
-fail_compilation/ice10624.d(48): Error: template instance ice10624.Variant.handler!(Tuple!(Msg)) error instantiating
+fail_compilation/ice10624.d(48): Error: template instance `ice10624.Variant.handler!(Tuple!(Msg))` error instantiating
 fail_compilation/ice10624.d(21):        instantiated from here: `opAssign!(Tuple!(Msg))`
 ---
 */

diff --git a/test/fail_compilation/ice10770.d b/test/fail_compilation/ice10770.d
@@ -1,7 +1,7 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/ice10770.d(13): Error: enum ice10770.E2 is forward referenced looking for base type
+fail_compilation/ice10770.d(13): Error: enum `ice10770.E2` is forward referenced looking for base type
 fail_compilation/ice10770.d(13):        while evaluating: `static assert(is(E2 e == enum))`
 ---
 */

diff --git a/test/fail_compilation/ice11086.d b/test/fail_compilation/ice11086.d
@@ -1,7 +1,7 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/ice11086.d(10): Error: template instance foo!A template `foo` is not defined
+fail_compilation/ice11086.d(10): Error: template instance `foo!A` template `foo` is not defined
 ---
 */
 

diff --git a/test/fail_compilation/ice1144.d b/test/fail_compilation/ice1144.d
@@ -2,7 +2,7 @@
 TEST_OUTPUT:
 ---
 fail_compilation/ice1144.d(14): Error: undefined identifier `a`
-fail_compilation/ice1144.d(23): Error: template instance ice1144.testHelper!("hello", "world") error instantiating
+fail_compilation/ice1144.d(23): Error: template instance `ice1144.testHelper!("hello", "world")` error instantiating
 ---
 */
 

diff --git a/test/fail_compilation/ice11472.d b/test/fail_compilation/ice11472.d
@@ -1,8 +1,8 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/ice11472.d(13): Error: template instance fun2!fun `fun2` is not a template declaration, it is a function
-fail_compilation/ice11472.d(18): Error: template instance ice11472.fun1!(fun3) error instantiating
+fail_compilation/ice11472.d(13): Error: template instance `fun2!fun` `fun2` is not a template declaration, it is a function
+fail_compilation/ice11472.d(18): Error: template instance `ice11472.fun1!(fun3)` error instantiating
 ---
 */
 

diff --git a/test/fail_compilation/ice11822.d b/test/fail_compilation/ice11822.d
@@ -4,7 +4,7 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/ice11822.d(32): Deprecation: function ice11822.d is deprecated
+fail_compilation/ice11822.d(32): Deprecation: function `ice11822.d` is deprecated
 fail_compilation/ice11822.d(21):        instantiated from here: `S!(__lambda1)`
 fail_compilation/ice11822.d(32):        instantiated from here: `g!((n) => d(i))`
 ---

diff --git a/test/fail_compilation/ice11919.d b/test/fail_compilation/ice11919.d
@@ -2,7 +2,7 @@
 TEST_OUTPUT:
 ---
 fail_compilation/ice11919.d(17): Error: cannot interpret `foo` at compile time
-fail_compilation/imports/a11919.d(4): Error: template instance a11919.doBar!(Foo).doBar.zoo!(t) error instantiating
+fail_compilation/imports/a11919.d(4): Error: template instance `a11919.doBar!(Foo).doBar.zoo!(t)` error instantiating
 fail_compilation/imports/a11919.d(11):        instantiated from here: `doBar!(Foo)`
 fail_compilation/ice11919.d(25):        instantiated from here: `doBar!(Bar)`
 ---

diff --git a/test/fail_compilation/ice11922.d b/test/fail_compilation/ice11922.d
@@ -2,7 +2,7 @@
 TEST_OUTPUT:
 ---
 fail_compilation/ice11922.d(11): Error: undefined identifier `a`
-fail_compilation/ice11922.d(17): Error: template instance ice11922.S.f!int error instantiating
+fail_compilation/ice11922.d(17): Error: template instance `ice11922.S.f!int` error instantiating
 ---
 */
 

diff --git a/test/fail_compilation/ice11944.d b/test/fail_compilation/ice11944.d
@@ -1,7 +1,7 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/ice11944.d(12): Error: template instance doCommand!(func) does not match template declaration `doCommand(f, T)(f, T arg)`
+fail_compilation/ice11944.d(12): Error: template instance `doCommand!(func)` does not match template declaration `doCommand(f, T)(f, T arg)`
 ---
 */
 

diff --git a/test/fail_compilation/ice12158.d b/test/fail_compilation/ice12158.d
@@ -1,7 +1,7 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/ice12158.d(7): Error: module object import `nonexisting` not found
+fail_compilation/ice12158.d(7): Error: module `object` import `nonexisting` not found
 ---
 */
 import object : nonexisting;

diff --git a/test/fail_compilation/ice12235.d b/test/fail_compilation/ice12235.d
@@ -1,8 +1,8 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/ice12235.d(14): Error: forward reference to inferred return type of function '__lambda1'
-fail_compilation/ice12235.d(15): Error: forward reference to inferred return type of function '__lambda1'
+fail_compilation/ice12235.d(14): Error: forward reference to inferred return type of function `__lambda1`
+fail_compilation/ice12235.d(15): Error: forward reference to inferred return type of function `__lambda1`
 fail_compilation/ice12235.d(15):        while evaluating `pragma(msg, __lambda1.mangleof)`
 ---
 */

diff --git a/test/fail_compilation/ice12350.d b/test/fail_compilation/ice12350.d
@@ -2,7 +2,7 @@
 TEST_OUTPUT:
 ---
 fail_compilation/ice12350.d(15): Error: type `MyUDC` has no value
-fail_compilation/ice12350.d(30): Error: template instance ice12350.testAttrs!(MyStruct) error instantiating
+fail_compilation/ice12350.d(30): Error: template instance `ice12350.testAttrs!(MyStruct)` error instantiating
 ---
 */
 

diff --git a/test/fail_compilation/ice12501.d b/test/fail_compilation/ice12501.d
@@ -3,7 +3,7 @@ TEST_OUTPUT:
 ---
 fail_compilation/ice12501.d(29): Error: function `ice12501.foo(int value)` is not callable using argument types `(int, int)`
 fail_compilation/ice12501.d(29): Error: function `ice12501.foo(int value)` is not callable using argument types `(int, int)`
-fail_compilation/ice12501.d(43): Error: template instance ice12501.reduce!(foo, foo).reduce!(Tuple!(int, int), int[]) error instantiating
+fail_compilation/ice12501.d(43): Error: template instance `ice12501.reduce!(foo, foo).reduce!(Tuple!(int, int), int[])` error instantiating
 ---
 */
 

diff --git a/test/fail_compilation/ice12534.d b/test/fail_compilation/ice12534.d
@@ -1,7 +1,7 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/ice12534.d(14): Error: static assert  `is(exprs[0 .. 0])` is false
+fail_compilation/ice12534.d(14): Error: static assert:  `is(exprs[0 .. 0])` is false
 ---
 */
 

diff --git a/test/fail_compilation/ice12574.d b/test/fail_compilation/ice12574.d
@@ -2,7 +2,7 @@
 TEST_OUTPUT:
 ---
 fail_compilation/ice12574.d(40): Error: tuple index `2` exceeds length 2
-fail_compilation/ice12574.d(53): Error: template instance ice12574.reduce!("a", "a").reduce!(Tuple!(int, int, int)) error instantiating
+fail_compilation/ice12574.d(53): Error: template instance `ice12574.reduce!("a", "a").reduce!(Tuple!(int, int, int))` error instantiating
 ---
 */
 

diff --git a/test/fail_compilation/ice12727.d b/test/fail_compilation/ice12727.d
@@ -1,8 +1,8 @@
 /*
 TEST_OUTPUT:
 ----
-fail_compilation/ice12727.d(16): Error: alias ice12727.IndexTuple!(1, 0).IndexTuple recursive alias declaration
-fail_compilation/ice12727.d(23): Error: template instance ice12727.IndexTuple!(1, 0) error instantiating
+fail_compilation/ice12727.d(16): Error: alias `ice12727.IndexTuple!(1, 0).IndexTuple` recursive alias declaration
+fail_compilation/ice12727.d(23): Error: template instance `ice12727.IndexTuple!(1, 0)` error instantiating
 fail_compilation/ice12727.d(27):        instantiated from here: `Matrix!(float, 3)`
 fail_compilation/ice12727.d(28):        instantiated from here: `Vector!(float, 3)`
 ----

diff --git a/test/fail_compilation/ice12902.d b/test/fail_compilation/ice12902.d
@@ -1,7 +1,7 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/ice12902.d(20): Error: variable ice12902.main.__dollar type `void` is inferred from initializer `s.opDollar()`, and variables cannot be of type `void`
+fail_compilation/ice12902.d(20): Error: variable `ice12902.main.__dollar` type `void` is inferred from initializer `s.opDollar()`, and variables cannot be of type `void`
 fail_compilation/ice12902.d(20): Error: expression `s.opDollar()` is `void` and has no value
 ---
 */

diff --git a/test/fail_compilation/ice13027.d b/test/fail_compilation/ice13027.d
@@ -1,7 +1,7 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/ice13027.d(9): Error: template instance b!"c" template `b` is not defined
+fail_compilation/ice13027.d(9): Error: template instance `b!"c"` template `b` is not defined
 ---
 */
 void main()

diff --git a/test/fail_compilation/ice13081.d b/test/fail_compilation/ice13081.d
@@ -4,7 +4,7 @@ TEST_OUTPUT:
 fail_compilation/ice13081.d(17): Error: undefined identifier `node`
 fail_compilation/ice13081.d(17): Error: undefined identifier `data`
 fail_compilation/ice13081.d(17): Error: undefined identifier `node`
-fail_compilation/ice13081.d(28): Error: template instance ice13081.Cube!(SparseDataStore) error instantiating
+fail_compilation/ice13081.d(28): Error: template instance `ice13081.Cube!(SparseDataStore)` error instantiating
 ---
 */
 

diff --git a/test/fail_compilation/ice13131.d b/test/fail_compilation/ice13131.d
@@ -4,7 +4,7 @@ TEST_OUTPUT:
 ---
 +A
 +B
-fail_compilation/imports/a13131elec.d(10): Error: template instance elecConnOf!gconn template `elecConnOf` is not defined
+fail_compilation/imports/a13131elec.d(10): Error: template instance `elecConnOf!gconn` template `elecConnOf` is not defined
 -B
 -A
 ---

diff --git a/test/fail_compilation/ice13220.d b/test/fail_compilation/ice13220.d
@@ -1,7 +1,7 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/ice13220.d(22): Error: template instance test!0 does not match template declaration `test(T)()`
+fail_compilation/ice13220.d(22): Error: template instance `test!0` does not match template declaration `test(T)()`
 ---
 */
 

diff --git a/test/fail_compilation/ice13225.d b/test/fail_compilation/ice13225.d
@@ -1,7 +1,7 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/ice13225.d(12): Error: mixin ice13225.S.M!(function (S _param_0) => 0) does not match template declaration `M(T)`
+fail_compilation/ice13225.d(12): Error: mixin `ice13225.S.M!(function (S _param_0) => 0)` does not match template declaration `M(T)`
 fail_compilation/ice13225.d(16): Error: undefined identifier `undefined`
 ---
 */

diff --git a/test/fail_compilation/ice13356.d b/test/fail_compilation/ice13356.d
@@ -1,8 +1,8 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/ice13356.d(32): Error: template instance Algebraic!(Tuple!(List)) recursive template expansion
-fail_compilation/ice13356.d(15): Error: template instance ice13356.isPrintable!(List) error instantiating
+fail_compilation/ice13356.d(32): Error: template instance `Algebraic!(Tuple!(List))` recursive template expansion
+fail_compilation/ice13356.d(15): Error: template instance `ice13356.isPrintable!(List)` error instantiating
 fail_compilation/ice13356.d(33):        instantiated from here: `Tuple!(List)`
 ---
 */

diff --git a/test/fail_compilation/ice13385.d b/test/fail_compilation/ice13385.d
@@ -1,7 +1,7 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/ice13385.d(9): Error: protection attribute 'package(a)' does not bind to one of ancestor packages of module `ice13385`
+fail_compilation/ice13385.d(9): Error: protection attribute `package(a)` does not bind to one of ancestor packages of module `ice13385`
 ---
 */
 module ice13385;

diff --git a/test/fail_compilation/ice13465a.d b/test/fail_compilation/ice13465a.d
@@ -4,7 +4,7 @@
 TEST_OUTPUT:
 ---
 fail_compilation/imports/a13465.d(10): Error: cannot infer type from template instance `isMaskField!()`
-fail_compilation/ice13465a.d(17): Error: template instance imports.a13465.isMatchingMaskField!() error instantiating
+fail_compilation/ice13465a.d(17): Error: template instance `imports.a13465.isMatchingMaskField!()` error instantiating
 ---
 */
 

diff --git a/test/fail_compilation/ice13465b.d b/test/fail_compilation/ice13465b.d
@@ -4,7 +4,7 @@
 TEST_OUTPUT:
 ---
 fail_compilation/imports/b13465.d(10): Error: cannot infer type from template instance `isMaskField!()`
-fail_compilation/ice13465b.d(17): Error: template instance imports.b13465.isMatchingMaskField!() error instantiating
+fail_compilation/ice13465b.d(17): Error: template instance `imports.b13465.isMatchingMaskField!()` error instantiating
 ---
 */
 

diff --git a/test/fail_compilation/ice13788.d b/test/fail_compilation/ice13788.d
@@ -1,10 +1,10 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/ice13788.d(11): Error: pragma mangle string expected for mangled name
+fail_compilation/ice13788.d(11): Error: pragma `mangle` string expected for mangled name
 fail_compilation/ice13788.d(12): Error: `string` expected for mangled name, not `(1)` of type `int`
-fail_compilation/ice13788.d(13): Error: pragma mangle zero-length string not allowed for mangled name
-fail_compilation/ice13788.d(14): Error: pragma mangle mangled name characters can only be of type `char`
+fail_compilation/ice13788.d(13): Error: pragma `mangle` zero-length string not allowed for mangled name
+fail_compilation/ice13788.d(14): Error: pragma `mangle` mangled name characters can only be of type `char`
 ---
 */
 

diff --git a/test/fail_compilation/ice13816.d b/test/fail_compilation/ice13816.d
@@ -1,8 +1,8 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/ice13816.d(15): Error: alias ice13816.ItemProperty!().ItemProperty recursive alias declaration
-fail_compilation/ice13816.d(20): Error: template instance ice13816.ItemProperty!() error instantiating
+fail_compilation/ice13816.d(15): Error: alias `ice13816.ItemProperty!().ItemProperty` recursive alias declaration
+fail_compilation/ice13816.d(20): Error: template instance `ice13816.ItemProperty!()` error instantiating
 ---
 */
 

diff --git a/test/fail_compilation/ice13835.d b/test/fail_compilation/ice13835.d
@@ -2,7 +2,7 @@
 TEST_OUTPUT:
 ---
 fail_compilation/ice13835.d(15): Error: value of `this` is not known at compile time
-fail_compilation/ice13835.d(21): Error: template instance ice13835.Foo!int error instantiating
+fail_compilation/ice13835.d(21): Error: template instance `ice13835.Foo!int` error instantiating
 ---
 */
 

diff --git a/test/fail_compilation/ice13921.d b/test/fail_compilation/ice13921.d
@@ -2,7 +2,7 @@
 TEST_OUTPUT:
 ---
 fail_compilation/ice13921.d(13): Error: undefined identifier `undefined_identifier`
-fail_compilation/ice13921.d(25): Error: template instance ice13921.S!string error instantiating
+fail_compilation/ice13921.d(25): Error: template instance `ice13921.S!string` error instantiating
 ---
 */
 

diff --git a/test/fail_compilation/ice14096.d b/test/fail_compilation/ice14096.d
@@ -2,7 +2,7 @@
 TEST_OUTPUT:
 ---
 fail_compilation/ice14096.d(29): Error: cannot access frame pointer of `ice14096.main.Baz!((i) => i).Baz`
-fail_compilation/ice14096.d(23): Error: template instance ice14096.foo!(Tuple!(Baz!((i) => i))).foo.bar!(t) error instantiating
+fail_compilation/ice14096.d(23): Error: template instance `ice14096.foo!(Tuple!(Baz!((i) => i))).foo.bar!(t)` error instantiating
 fail_compilation/ice14096.d(40):        instantiated from here: `foo!(Tuple!(Baz!((i) => i)))`
 ---
 */

diff --git a/test/fail_compilation/ice14116.d b/test/fail_compilation/ice14116.d
@@ -2,7 +2,7 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/imports/a14116.d(3): Error: module ice14116.ice14116 from file fail_compilation/ice14116.d must be imported with 'import ice14116.ice14116;'
+fail_compilation/imports/a14116.d(3): Error: module `ice14116.ice14116` from file fail_compilation/ice14116.d must be imported with 'import ice14116.ice14116;'
 ---
 */
 

diff --git a/test/fail_compilation/ice14146.d b/test/fail_compilation/ice14146.d
@@ -1,7 +1,7 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/ice14146.d(15): Error: constructor ice14146.Array.this default constructor for structs only allowed with `@disable`, no body, and no parameters
+fail_compilation/ice14146.d(15): Error: constructor `ice14146.Array.this` default constructor for structs only allowed with `@disable`, no body, and no parameters
 ---
 */
 

diff --git a/test/fail_compilation/ice14177.d b/test/fail_compilation/ice14177.d
@@ -1,7 +1,7 @@
 /*
 TEST_OUTPUT:
 ----
-fail_compilation/ice14177.d(8): Error: alias ice14177.Primitive recursive alias declaration
+fail_compilation/ice14177.d(8): Error: alias `ice14177.Primitive` recursive alias declaration
 ----
 */
 

diff --git a/test/fail_compilation/ice14272.d b/test/fail_compilation/ice14272.d
@@ -2,7 +2,7 @@
 TEST_OUTPUT:
 ---
 fail_compilation/ice14272.d(11): Error: circular initialization of variable `ice14272.A14272!1.A14272.tag`
-fail_compilation/ice14272.d(14): Error: template instance ice14272.A14272!1 error instantiating
+fail_compilation/ice14272.d(14): Error: template instance `ice14272.A14272!1` error instantiating
 ---
 */
 

diff --git a/test/fail_compilation/ice14446.d b/test/fail_compilation/ice14446.d
@@ -5,7 +5,7 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/extra-files/a14446.d(5): Error: module x14446 from file fail_compilation/ice14446.d must be imported with 'import x14446;'
+fail_compilation/extra-files/a14446.d(5): Error: module `x14446` from file fail_compilation/ice14446.d must be imported with 'import x14446;'
 ---
 */
 

diff --git a/test/fail_compilation/ice14621.d b/test/fail_compilation/ice14621.d
@@ -1,7 +1,7 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/ice14621.d(22): Error: static assert  `false` is false
+fail_compilation/ice14621.d(22): Error: static assert:  `false` is false
 fail_compilation/ice14621.d(28):        instantiated from here: `erroneousTemplateInstantiation!()`
 ---
 */

diff --git a/test/fail_compilation/ice14642.d b/test/fail_compilation/ice14642.d
@@ -2,7 +2,7 @@
 TEST_OUTPUT:
 ---
 fail_compilation/ice14642.d(47): Error: undefined identifier `errorValue`
-fail_compilation/ice14642.d(23): Error: template instance ice14642.X.NA!() error instantiating
+fail_compilation/ice14642.d(23): Error: template instance `ice14642.X.NA!()` error instantiating
 ---
 */
 

diff --git a/test/fail_compilation/ice14907.d b/test/fail_compilation/ice14907.d
@@ -1,11 +1,11 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/ice14907.d(14): Error: struct ice14907.S(int v = S) recursive template expansion
+fail_compilation/ice14907.d(14): Error: struct `ice14907.S(int v = S)` recursive template expansion
 fail_compilation/ice14907.d(19):        while looking for match for `S!()`
-fail_compilation/ice14907.d(15): Error: template ice14907.f(int v = f)() recursive template expansion
+fail_compilation/ice14907.d(15): Error: template `ice14907.f(int v = f)()` recursive template expansion
 fail_compilation/ice14907.d(20):        while looking for match for `f!()`
-fail_compilation/ice14907.d(15): Error: template ice14907.f(int v = f)() recursive template expansion
+fail_compilation/ice14907.d(15): Error: template `ice14907.f(int v = f)()` recursive template expansion
 fail_compilation/ice14907.d(21): Error: template `ice14907.f` cannot deduce function from argument types `!()()`, candidates are:
 fail_compilation/ice14907.d(15):        `ice14907.f(int v = f)()`
 ---

diff --git a/test/fail_compilation/ice14929.d b/test/fail_compilation/ice14929.d
@@ -2,9 +2,9 @@
 TEST_OUTPUT:
 ---
 fail_compilation/ice14929.d(45): Error: `cast(Node)(*this.current).items[this.index]` is not an lvalue
-fail_compilation/ice14929.d(88): Error: template instance ice14929.HashMap!(ulong, int).HashMap.opBinaryRight!"in" error instantiating
+fail_compilation/ice14929.d(88): Error: template instance `ice14929.HashMap!(ulong, int).HashMap.opBinaryRight!"in"` error instantiating
 fail_compilation/ice14929.d(92):        instantiated from here: `HashmapComponentStorage!int`
-fail_compilation/ice14929.d(92): Error: template instance ice14929.isComponentStorage!(HashmapComponentStorage!int, int) error instantiating
+fail_compilation/ice14929.d(92): Error: template instance `ice14929.isComponentStorage!(HashmapComponentStorage!int, int)` error instantiating
 fail_compilation/ice14929.d(92):        while evaluating: `static assert(isComponentStorage!(HashmapComponentStorage!int, int))`
 ---
 */

diff --git a/test/fail_compilation/ice15092.d b/test/fail_compilation/ice15092.d
@@ -1,9 +1,9 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/ice15092.d(13): Error: struct ice15092.A.S conflicts with struct `ice15092.A.S` at fail_compilation/ice15092.d(12)
-fail_compilation/ice15092.d(16): Error: class ice15092.A.C conflicts with class `ice15092.A.C` at fail_compilation/ice15092.d(15)
-fail_compilation/ice15092.d(19): Error: interface ice15092.A.I conflicts with interface `ice15092.A.I` at fail_compilation/ice15092.d(18)
+fail_compilation/ice15092.d(13): Error: struct `ice15092.A.S` conflicts with struct `ice15092.A.S` at fail_compilation/ice15092.d(12)
+fail_compilation/ice15092.d(16): Error: class `ice15092.A.C` conflicts with class `ice15092.A.C` at fail_compilation/ice15092.d(15)
+fail_compilation/ice15092.d(19): Error: interface `ice15092.A.I` conflicts with interface `ice15092.A.I` at fail_compilation/ice15092.d(18)
 ---
 */
 

diff --git a/test/fail_compilation/ice15172.d b/test/fail_compilation/ice15172.d
@@ -1,7 +1,7 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/ice15172.d(14): Error: constructor ice15172.ThreadError.this no match for implicit `super()` call in constructor
+fail_compilation/ice15172.d(14): Error: constructor `ice15172.ThreadError.this` no match for implicit `super()` call in constructor
 ---
 */
 

diff --git a/test/fail_compilation/ice15441.d b/test/fail_compilation/ice15441.d
@@ -1,7 +1,7 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/ice15441.d(24): Error: variable ice15441.main.__front$n$ type `void` is inferred from initializer `__r$n$.front()`, and variables cannot be of type `void`
+fail_compilation/ice15441.d(24): Error: variable `ice15441.main.__front$n$` type `void` is inferred from initializer `__r$n$.front()`, and variables cannot be of type `void`
 fail_compilation/ice15441.d(24): Error: expression `__r$n$.front()` is `void` and has no value
 fail_compilation/ice15441.d(24): Error: `s1.front` is `void` and has no value
 fail_compilation/ice15441.d(27): Error: cannot infer argument types, expected 1 argument, not 2

diff --git a/test/fail_compilation/ice15922.d b/test/fail_compilation/ice15922.d
@@ -1,11 +1,11 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/ice15922.d(23): Error: function ice15922.ValidSparseDataStore!int.ValidSparseDataStore.correctedInsert!false.correctedInsert has no return statement, but is expected to return a value of type `int`
-fail_compilation/ice15922.d(21): Error: template instance ice15922.ValidSparseDataStore!int.ValidSparseDataStore.correctedInsert!false error instantiating
+fail_compilation/ice15922.d(23): Error: function `ice15922.ValidSparseDataStore!int.ValidSparseDataStore.correctedInsert!false.correctedInsert` has no `return` statement, but is expected to return a value of type `int`
+fail_compilation/ice15922.d(21): Error: template instance `ice15922.ValidSparseDataStore!int.ValidSparseDataStore.correctedInsert!false` error instantiating
 fail_compilation/ice15922.d(26):        instantiated from here: `ValidSparseDataStore!int`
 fail_compilation/ice15922.d(14): Error: need `this` for `insert` of type `pure nothrow @nogc @safe int()`
-fail_compilation/ice15922.d(26): Error: template instance ice15922.StorageAttributes!(ValidSparseDataStore!int) error instantiating
+fail_compilation/ice15922.d(26): Error: template instance `ice15922.StorageAttributes!(ValidSparseDataStore!int)` error instantiating
 ---
 */
 

diff --git a/test/fail_compilation/ice16035.d b/test/fail_compilation/ice16035.d
@@ -2,7 +2,7 @@
 TEST_OUTPUT:
 ---
 fail_compilation/ice16035.d(18): Error: forward reference to inferred return type of function call `this.a[0].toString()`
-fail_compilation/ice16035.d(13): Error: template instance ice16035.Value.get!string error instantiating
+fail_compilation/ice16035.d(13): Error: template instance `ice16035.Value.get!string` error instantiating
 ---
 */
 

diff --git a/test/fail_compilation/ice4094.d b/test/fail_compilation/ice4094.d
@@ -2,7 +2,7 @@
 TEST_OUTPUT:
 ---
 fail_compilation/ice4094.d(11): Error: circular reference to variable `ice4094.Zug!0.Zug.bahn`
-fail_compilation/ice4094.d(19): Error: template instance ice4094.Zug!0 error instantiating
+fail_compilation/ice4094.d(19): Error: template instance `ice4094.Zug!0` error instantiating
 ---
 */
 // REQUIRED_ARGS: -d

diff --git a/test/fail_compilation/ice8100.d b/test/fail_compilation/ice8100.d
@@ -2,7 +2,7 @@
 TEST_OUTPUT:
 ---
 fail_compilation/ice8100.d(10): Error: no property `Q` for type `ice8100.Bar!bool`
-fail_compilation/ice8100.d(11): Error: template instance ice8100.Foo!(Bar!bool) error instantiating
+fail_compilation/ice8100.d(11): Error: template instance `ice8100.Foo!(Bar!bool)` error instantiating
 fail_compilation/ice8100.d(12):        instantiated from here: `Bar!bool`
 ---
 */

diff --git a/test/fail_compilation/ice8511.d b/test/fail_compilation/ice8511.d
@@ -1,7 +1,7 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/ice8511.d(11): Error: enum ice8511.hypot.SQRTMAX is forward referenced looking for base type
+fail_compilation/ice8511.d(11): Error: enum `ice8511.hypot.SQRTMAX` is forward referenced looking for base type
 fail_compilation/ice8511.d(12): Error: incompatible types for `(SQRTMAX) / (2)`: cannot use `/` with types
 ---
 */

diff --git a/test/fail_compilation/ice9273a.d b/test/fail_compilation/ice9273a.d
@@ -1,8 +1,8 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/ice9273a.d(19): Error: constructor ice9273a.C.__ctor!().this no match for implicit `super()` call in constructor
-fail_compilation/ice9273a.d(23): Error: template instance ice9273a.C.__ctor!() error instantiating
+fail_compilation/ice9273a.d(19): Error: constructor `ice9273a.C.__ctor!().this` no match for implicit `super()` call in constructor
+fail_compilation/ice9273a.d(23): Error: template instance `ice9273a.C.__ctor!()` error instantiating
 ---
 */
 

diff --git a/test/fail_compilation/ice9273b.d b/test/fail_compilation/ice9273b.d
@@ -1,7 +1,7 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/ice9273b.d(14): Error: constructor ice9273b.B.this no match for implicit `super()` call in constructor
+fail_compilation/ice9273b.d(14): Error: constructor `ice9273b.B.this` no match for implicit `super()` call in constructor
 ---
 */
 

diff --git a/test/fail_compilation/ice9284.d b/test/fail_compilation/ice9284.d
@@ -3,7 +3,7 @@ TEST_OUTPUT:
 ---
 fail_compilation/ice9284.d(14): Error: template `ice9284.C.__ctor` cannot deduce function from argument types `!()(int)`, candidates are:
 fail_compilation/ice9284.d(12):        `ice9284.C.__ctor()(string)`
-fail_compilation/ice9284.d(20): Error: template instance ice9284.C.__ctor!() error instantiating
+fail_compilation/ice9284.d(20): Error: template instance `ice9284.C.__ctor!()` error instantiating
 ---
 */
 

diff --git a/test/fail_compilation/ice9439.d b/test/fail_compilation/ice9439.d
@@ -3,7 +3,7 @@ TEST_OUTPUT:
 ---
 fail_compilation/ice9439.d(12): Error: `this` for `foo` needs to be type `Derived` not type `ice9439.Base`
 fail_compilation/ice9439.d(12):        while evaluating: `static assert((__error).foo())`
-fail_compilation/ice9439.d(19): Error: template instance ice9439.Base.boo!(foo) error instantiating
+fail_compilation/ice9439.d(19): Error: template instance `ice9439.Base.boo!(foo)` error instantiating
 ---
 */
 

diff --git a/test/fail_compilation/ice9540.d b/test/fail_compilation/ice9540.d
@@ -2,7 +2,7 @@
 TEST_OUTPUT:
 ---
 fail_compilation/ice9540.d(34): Error: function `ice9540.A.test.AddFront!(this, f).AddFront.dg(int _param_0)` is not callable using argument types `()`
-fail_compilation/ice9540.d(25): Error: template instance ice9540.A.test.AddFront!(this, f) error instantiating
+fail_compilation/ice9540.d(25): Error: template instance `ice9540.A.test.AddFront!(this, f)` error instantiating
 ---
 */
 

diff --git a/test/fail_compilation/ice9806.d b/test/fail_compilation/ice9806.d
@@ -2,11 +2,11 @@
 TEST_OUTPUT:
 ---
 fail_compilation/ice9806.d(12): Error: undefined identifier `undefined_expr`
-fail_compilation/ice9806.d(17): Error: template instance ice9806.S1!() error instantiating
+fail_compilation/ice9806.d(17): Error: template instance `ice9806.S1!()` error instantiating
 fail_compilation/ice9806.d(13): Error: undefined identifier `undefined_expr`
-fail_compilation/ice9806.d(19): Error: template instance ice9806.C1!() error instantiating
+fail_compilation/ice9806.d(19): Error: template instance `ice9806.C1!()` error instantiating
 fail_compilation/ice9806.d(14): Error: undefined identifier `undefined_expr`
-fail_compilation/ice9806.d(21): Error: template instance ice9806.I1!() error instantiating
+fail_compilation/ice9806.d(21): Error: template instance `ice9806.I1!()` error instantiating
 ---
 */
 struct S1() { enum x = undefined_expr; }
@@ -26,11 +26,11 @@ void test1() {
 TEST_OUTPUT:
 ---
 fail_compilation/ice9806.d(36): Error: undefined identifier `undefined_expr`
-fail_compilation/ice9806.d(44): Error: template instance ice9806.S2!() error instantiating
+fail_compilation/ice9806.d(44): Error: template instance `ice9806.S2!()` error instantiating
 fail_compilation/ice9806.d(37): Error: undefined identifier `undefined_expr`
-fail_compilation/ice9806.d(46): Error: template instance ice9806.C2!() error instantiating
+fail_compilation/ice9806.d(46): Error: template instance `ice9806.C2!()` error instantiating
 fail_compilation/ice9806.d(38): Error: undefined identifier `undefined_expr`
-fail_compilation/ice9806.d(48): Error: template instance ice9806.I2!() error instantiating
+fail_compilation/ice9806.d(48): Error: template instance `ice9806.I2!()` error instantiating
 ---
 */
 int foo2()() { return undefined_expr; }

diff --git a/test/fail_compilation/ice9865.d b/test/fail_compilation/ice9865.d
@@ -1,7 +1,7 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/ice9865.d(8): Error: alias ice9865.Baz recursive alias declaration
+fail_compilation/ice9865.d(8): Error: alias `ice9865.Baz` recursive alias declaration
 ---
 */
 

diff --git a/test/fail_compilation/mangle1.d b/test/fail_compilation/mangle1.d
@@ -1,7 +1,7 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/mangle1.d(8): Error: pragma mangle can only apply to a single declaration
+fail_compilation/mangle1.d(8): Error: pragma `mangle` can only apply to a single declaration
 ---
 */
 

diff --git a/test/fail_compilation/mangle2.d b/test/fail_compilation/mangle2.d
@@ -1,18 +1,18 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/mangle2.d(20): Error: pragma mangle char 0x20 not allowed in mangled name
-fail_compilation/mangle2.d(21): Error: pragma mangle char 0x20 not allowed in mangled name
-fail_compilation/mangle2.d(24): Error: pragma mangle char 0x0a not allowed in mangled name
-fail_compilation/mangle2.d(25): Error: pragma mangle char 0x0a not allowed in mangled name
-fail_compilation/mangle2.d(28): Error: pragma mangle char 0x07 not allowed in mangled name
-fail_compilation/mangle2.d(29): Error: pragma mangle char 0x07 not allowed in mangled name
-fail_compilation/mangle2.d(32): Error: pragma mangle char 0x01 not allowed in mangled name
-fail_compilation/mangle2.d(33): Error: pragma mangle char 0x01 not allowed in mangled name
-fail_compilation/mangle2.d(36): Error: pragma mangle char 0x00 not allowed in mangled name
-fail_compilation/mangle2.d(37): Error: pragma mangle char 0x00 not allowed in mangled name
-fail_compilation/mangle2.d(40): Error: pragma mangle Outside Unicode code space
-fail_compilation/mangle2.d(41): Error: pragma mangle Outside Unicode code space
+fail_compilation/mangle2.d(20): Error: pragma `mangle` char 0x20 not allowed in mangled name
+fail_compilation/mangle2.d(21): Error: pragma `mangle` char 0x20 not allowed in mangled name
+fail_compilation/mangle2.d(24): Error: pragma `mangle` char 0x0a not allowed in mangled name
+fail_compilation/mangle2.d(25): Error: pragma `mangle` char 0x0a not allowed in mangled name
+fail_compilation/mangle2.d(28): Error: pragma `mangle` char 0x07 not allowed in mangled name
+fail_compilation/mangle2.d(29): Error: pragma `mangle` char 0x07 not allowed in mangled name
+fail_compilation/mangle2.d(32): Error: pragma `mangle` char 0x01 not allowed in mangled name
+fail_compilation/mangle2.d(33): Error: pragma `mangle` char 0x01 not allowed in mangled name
+fail_compilation/mangle2.d(36): Error: pragma `mangle` char 0x00 not allowed in mangled name
+fail_compilation/mangle2.d(37): Error: pragma `mangle` char 0x00 not allowed in mangled name
+fail_compilation/mangle2.d(40): Error: pragma `mangle` Outside Unicode code space
+fail_compilation/mangle2.d(41): Error: pragma `mangle` Outside Unicode code space
 ---
 */
 

diff --git a/test/fail_compilation/nogc3.d b/test/fail_compilation/nogc3.d
@@ -44,9 +44,9 @@ fail_compilation/nogc3.d(36): Error: `@nogc` function `nogc3.testCall` cannot ca
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/nogc3.d(53): Error: function nogc3.testClosure1 is @nogc yet allocates closures with the GC
+fail_compilation/nogc3.d(53): Error: function `nogc3.testClosure1` is `@nogc` yet allocates closures with the GC
 fail_compilation/nogc3.d(56):        nogc3.testClosure1.bar closes over variable x at fail_compilation/nogc3.d(55)
-fail_compilation/nogc3.d(65): Error: function nogc3.testClosure3 is @nogc yet allocates closures with the GC
+fail_compilation/nogc3.d(65): Error: function `nogc3.testClosure3` is `@nogc` yet allocates closures with the GC
 fail_compilation/nogc3.d(68):        nogc3.testClosure3.bar closes over variable x at fail_compilation/nogc3.d(67)
 ---
 */

diff --git a/test/fail_compilation/objc_interface1.d b/test/fail_compilation/objc_interface1.d
@@ -2,7 +2,7 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/objc_interface1.d(11): Error: function objc_interface1.A.oneTwo must have Objective-C linkage to attach a selector
+fail_compilation/objc_interface1.d(11): Error: function `objc_interface1.A.oneTwo` must have Objective-C linkage to attach a selector
 ---
 */
 

diff --git a/test/fail_compilation/objc_interface2.d b/test/fail_compilation/objc_interface2.d
@@ -2,7 +2,7 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/objc_interface2.d(12): Error: function objc_interface2.A.test number of colons in Objective-C selector must match number of parameters
+fail_compilation/objc_interface2.d(12): Error: function `objc_interface2.A.test` number of colons in Objective-C selector must match number of parameters
 ---
 */
 

diff --git a/test/fail_compilation/objc_interface3.d b/test/fail_compilation/objc_interface3.d
@@ -2,8 +2,8 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/objc_interface3.d(13): Error: function objc_interface3.A.test!int.test template cannot have an Objective-C selector attached
-fail_compilation/objc_interface3.d(19): Error: template instance objc_interface3.A.test!int error instantiating
+fail_compilation/objc_interface3.d(13): Error: function `objc_interface3.A.test!int.test` template cannot have an Objective-C selector attached
+fail_compilation/objc_interface3.d(19): Error: template instance `objc_interface3.A.test!int` error instantiating
 ---
 */
 

diff --git a/test/fail_compilation/parse12967a.d b/test/fail_compilation/parse12967a.d
@@ -1,14 +1,14 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/parse12967a.d(14): Error: function parse12967a.pre_i1 without `this` cannot be `immutable`
-fail_compilation/parse12967a.d(15): Error: function parse12967a.pre_i2 without `this` cannot be `immutable`
-fail_compilation/parse12967a.d(16): Error: function parse12967a.pre_c1 without `this` cannot be `const`
-fail_compilation/parse12967a.d(17): Error: function parse12967a.pre_c2 without `this` cannot be `const`
-fail_compilation/parse12967a.d(18): Error: function parse12967a.pre_w1 without `this` cannot be `inout`
-fail_compilation/parse12967a.d(19): Error: function parse12967a.pre_w2 without `this` cannot be `inout`
-fail_compilation/parse12967a.d(20): Error: function parse12967a.pre_s1 without `this` cannot be `shared`
-fail_compilation/parse12967a.d(21): Error: function parse12967a.pre_s2 without `this` cannot be `shared`
+fail_compilation/parse12967a.d(14): Error: function `parse12967a.pre_i1` without `this` cannot be `immutable`
+fail_compilation/parse12967a.d(15): Error: function `parse12967a.pre_i2` without `this` cannot be `immutable`
+fail_compilation/parse12967a.d(16): Error: function `parse12967a.pre_c1` without `this` cannot be `const`
+fail_compilation/parse12967a.d(17): Error: function `parse12967a.pre_c2` without `this` cannot be `const`
+fail_compilation/parse12967a.d(18): Error: function `parse12967a.pre_w1` without `this` cannot be `inout`
+fail_compilation/parse12967a.d(19): Error: function `parse12967a.pre_w2` without `this` cannot be `inout`
+fail_compilation/parse12967a.d(20): Error: function `parse12967a.pre_s1` without `this` cannot be `shared`
+fail_compilation/parse12967a.d(21): Error: function `parse12967a.pre_s2` without `this` cannot be `shared`
 ---
 */
 immutable      pre_i1() {}
@@ -23,14 +23,14 @@ shared    void pre_s2() {}
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/parse12967a.d(36): Error: function parse12967a.post_i1 without `this` cannot be `immutable`
-fail_compilation/parse12967a.d(37): Error: function parse12967a.post_i2 without `this` cannot be `immutable`
-fail_compilation/parse12967a.d(38): Error: function parse12967a.post_c1 without `this` cannot be `const`
-fail_compilation/parse12967a.d(39): Error: function parse12967a.post_c2 without `this` cannot be `const`
-fail_compilation/parse12967a.d(40): Error: function parse12967a.post_w1 without `this` cannot be `inout`
-fail_compilation/parse12967a.d(41): Error: function parse12967a.post_w2 without `this` cannot be `inout`
-fail_compilation/parse12967a.d(42): Error: function parse12967a.post_s1 without `this` cannot be `shared`
-fail_compilation/parse12967a.d(43): Error: function parse12967a.post_s2 without `this` cannot be `shared`
+fail_compilation/parse12967a.d(36): Error: function `parse12967a.post_i1` without `this` cannot be `immutable`
+fail_compilation/parse12967a.d(37): Error: function `parse12967a.post_i2` without `this` cannot be `immutable`
+fail_compilation/parse12967a.d(38): Error: function `parse12967a.post_c1` without `this` cannot be `const`
+fail_compilation/parse12967a.d(39): Error: function `parse12967a.post_c2` without `this` cannot be `const`
+fail_compilation/parse12967a.d(40): Error: function `parse12967a.post_w1` without `this` cannot be `inout`
+fail_compilation/parse12967a.d(41): Error: function `parse12967a.post_w2` without `this` cannot be `inout`
+fail_compilation/parse12967a.d(42): Error: function `parse12967a.post_s1` without `this` cannot be `shared`
+fail_compilation/parse12967a.d(43): Error: function `parse12967a.post_s2` without `this` cannot be `shared`
 ---
 */
 auto post_i1() immutable {}

diff --git a/test/fail_compilation/parse12967b.d b/test/fail_compilation/parse12967b.d
@@ -1,22 +1,22 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/parse12967b.d(24): Error: function parse12967b.C.pre_c without `this` cannot be `const`
-fail_compilation/parse12967b.d(25): Error: function parse12967b.C.pre_i without `this` cannot be `immutable`
-fail_compilation/parse12967b.d(26): Error: function parse12967b.C.pre_w without `this` cannot be `inout`
-fail_compilation/parse12967b.d(27): Error: function parse12967b.C.pre_s without `this` cannot be `shared`
-fail_compilation/parse12967b.d(29): Error: function parse12967b.C.post_c without `this` cannot be `const`
-fail_compilation/parse12967b.d(30): Error: function parse12967b.C.post_i without `this` cannot be `immutable`
-fail_compilation/parse12967b.d(31): Error: function parse12967b.C.post_w without `this` cannot be `inout`
-fail_compilation/parse12967b.d(32): Error: function parse12967b.C.post_s without `this` cannot be `shared`
-fail_compilation/parse12967b.d(37): Error: function parse12967b.D.pre_c without `this` cannot be `const`
-fail_compilation/parse12967b.d(38): Error: function parse12967b.D.pre_i without `this` cannot be `immutable`
-fail_compilation/parse12967b.d(39): Error: function parse12967b.D.pre_w without `this` cannot be `inout`
-fail_compilation/parse12967b.d(40): Error: function parse12967b.D.pre_s without `this` cannot be `shared`
-fail_compilation/parse12967b.d(41): Error: function parse12967b.D.post_c without `this` cannot be `const`
-fail_compilation/parse12967b.d(42): Error: function parse12967b.D.post_i without `this` cannot be `immutable`
-fail_compilation/parse12967b.d(43): Error: function parse12967b.D.post_w without `this` cannot be `inout`
-fail_compilation/parse12967b.d(44): Error: function parse12967b.D.post_s without `this` cannot be `shared`
+fail_compilation/parse12967b.d(24): Error: function `parse12967b.C.pre_c` without `this` cannot be `const`
+fail_compilation/parse12967b.d(25): Error: function `parse12967b.C.pre_i` without `this` cannot be `immutable`
+fail_compilation/parse12967b.d(26): Error: function `parse12967b.C.pre_w` without `this` cannot be `inout`
+fail_compilation/parse12967b.d(27): Error: function `parse12967b.C.pre_s` without `this` cannot be `shared`
+fail_compilation/parse12967b.d(29): Error: function `parse12967b.C.post_c` without `this` cannot be `const`
+fail_compilation/parse12967b.d(30): Error: function `parse12967b.C.post_i` without `this` cannot be `immutable`
+fail_compilation/parse12967b.d(31): Error: function `parse12967b.C.post_w` without `this` cannot be `inout`
+fail_compilation/parse12967b.d(32): Error: function `parse12967b.C.post_s` without `this` cannot be `shared`
+fail_compilation/parse12967b.d(37): Error: function `parse12967b.D.pre_c` without `this` cannot be `const`
+fail_compilation/parse12967b.d(38): Error: function `parse12967b.D.pre_i` without `this` cannot be `immutable`
+fail_compilation/parse12967b.d(39): Error: function `parse12967b.D.pre_w` without `this` cannot be `inout`
+fail_compilation/parse12967b.d(40): Error: function `parse12967b.D.pre_s` without `this` cannot be `shared`
+fail_compilation/parse12967b.d(41): Error: function `parse12967b.D.post_c` without `this` cannot be `const`
+fail_compilation/parse12967b.d(42): Error: function `parse12967b.D.post_i` without `this` cannot be `immutable`
+fail_compilation/parse12967b.d(43): Error: function `parse12967b.D.post_w` without `this` cannot be `inout`
+fail_compilation/parse12967b.d(44): Error: function `parse12967b.D.post_s` without `this` cannot be `shared`
 ---
 */
 class C

diff --git a/test/fail_compilation/pragmainline.d b/test/fail_compilation/pragmainline.d
@@ -1,8 +1,8 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/pragmainline.d(9): Error: pragma inline one boolean expression expected for `pragma(inline)`, not 3
-fail_compilation/pragmainline.d(10): Error: pragma inline pragma(`inline`, `true` or `false`) expected, not `"string"`
+fail_compilation/pragmainline.d(9): Error: pragma `inline` one boolean expression expected for `pragma(inline)`, not 3
+fail_compilation/pragmainline.d(10): Error: pragma `inline` pragma(`inline`, `true` or `false`) expected, not `"string"`
 ---
 */
 

diff --git a/test/fail_compilation/pragmainline2.d b/test/fail_compilation/pragmainline2.d
@@ -2,9 +2,9 @@
 REQUIRED_ARGS: -inline
 TEST_OUTPUT:
 ---
-fail_compilation/pragmainline2.d(14): Error: function pragmainline2.foo cannot inline function
-fail_compilation/pragmainline2.d(22): Error: function pragmainline2.f1t cannot inline function
-fail_compilation/pragmainline2.d(25): Error: function pragmainline2.f2t cannot inline function
+fail_compilation/pragmainline2.d(14): Error: function `pragmainline2.foo` cannot inline function
+fail_compilation/pragmainline2.d(22): Error: function `pragmainline2.f1t` cannot inline function
+fail_compilation/pragmainline2.d(25): Error: function `pragmainline2.f2t` cannot inline function
 ---
 */
 

diff --git a/test/fail_compilation/protattr1.d b/test/fail_compilation/protattr1.d
@@ -1,7 +1,7 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/protection/subpkg/test1.d(3): Error: protection attribute 'package(undefined)' does not bind to one of ancestor packages of module `protection.subpkg.test1`
+fail_compilation/protection/subpkg/test1.d(3): Error: protection attribute `package(undefined)` does not bind to one of ancestor packages of module `protection.subpkg.test1`
 ---
 */
 import protection.subpkg.test1;
diff --git a/test/fail_compilation/protattr2.d b/test/fail_compilation/protattr2.d
@@ -1,7 +1,7 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/protection/subpkg/test2.d(3): Error: protection attribute 'package(protection.subpkg2)' does not bind to one of ancestor packages of module `protection.subpkg.test2`
+fail_compilation/protection/subpkg/test2.d(3): Error: protection attribute `package(protection.subpkg2)` does not bind to one of ancestor packages of module `protection.subpkg.test2`
 ---
 */
 import protection.subpkg.test2;
diff --git a/test/fail_compilation/retref2.d b/test/fail_compilation/retref2.d
@@ -4,8 +4,8 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/retref2.d(21): Error: function retref2.D.foo does not override any function, did you mean to override `retref2.C.foo`?
-fail_compilation/retref2.d(22): Error: function retref2.D.bar does not override any function, did you mean to override `retref2.C.bar`?
+fail_compilation/retref2.d(21): Error: function `retref2.D.foo` does not override any function, did you mean to override `retref2.C.foo`?
+fail_compilation/retref2.d(22): Error: function `retref2.D.bar` does not override any function, did you mean to override `retref2.C.bar`?
 ---
 */
 

diff --git a/test/fail_compilation/retscope.d b/test/fail_compilation/retscope.d
@@ -55,7 +55,7 @@ void test2(scope int* p, int[] a ...) @safe
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/retscope.d(76): Error: function retscope.HTTP.Impl.onReceive is @nogc yet allocates closures with the GC
+fail_compilation/retscope.d(76): Error: function `retscope.HTTP.Impl.onReceive` is `@nogc` yet allocates closures with the GC
 fail_compilation/retscope.d(78):        retscope.HTTP.Impl.onReceive.__lambda1 closes over variable this at fail_compilation/retscope.d(76)
 ---
 */
@@ -129,7 +129,7 @@ char[] bar9() @safe
 /*
 //
 //
-//fail_compilation/retscope.d(143): To enforce @safe compiler allocates a closure unless the opApply() uses 'scope'
+//fail_compilation/retscope.d(143): To enforce `@safe`, the compiler allocates a closure unless `opApply()` uses `scope`
 //
 */
 

diff --git a/test/fail_compilation/retscope2.d b/test/fail_compilation/retscope2.d
@@ -89,7 +89,7 @@ TEST_OUTPUT:
 ---
 fail_compilation/retscope2.d(604): Error: scope variable `_param_0` assigned to non-scope parameter `unnamed` calling retscope2.foo600
 fail_compilation/retscope2.d(604): Error: scope variable `_param_1` assigned to non-scope parameter `unnamed` calling retscope2.foo600
-fail_compilation/retscope2.d(614): Error: template instance retscope2.test600!(int*, int*) error instantiating
+fail_compilation/retscope2.d(614): Error: template instance `retscope2.test600!(int*, int*)` error instantiating
 ---
 */
 

diff --git a/test/fail_compilation/staticforeach3.d b/test/fail_compilation/staticforeach3.d
@@ -1,7 +1,7 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/staticforeach3.d(7): Error: variable staticforeach3.__anonymous.i conflicts with variable `staticforeach3.__anonymous.i` at fail_compilation/staticforeach3.d(7)
+fail_compilation/staticforeach3.d(7): Error: variable `staticforeach3.__anonymous.i` conflicts with variable `staticforeach3.__anonymous.i` at fail_compilation/staticforeach3.d(7)
 ---
 */
 static foreach(i,i;[0]){}
diff --git a/test/fail_compilation/test13786.d b/test/fail_compilation/test13786.d
@@ -1,11 +1,11 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/test13786.d(14): Error: debug 123 level declaration must be at module level
-fail_compilation/test13786.d(15): Error: debug abc declaration must be at module level
-fail_compilation/test13786.d(16): Error: version 123 level declaration must be at module level
-fail_compilation/test13786.d(17): Error: version abc declaration must be at module level
-fail_compilation/test13786.d(20): Error: template instance test13786.T!() error instantiating
+fail_compilation/test13786.d(14): Error: debug `123` level declaration must be at module level
+fail_compilation/test13786.d(15): Error: debug `abc` declaration must be at module level
+fail_compilation/test13786.d(16): Error: version `123` level declaration must be at module level
+fail_compilation/test13786.d(17): Error: version `abc` declaration must be at module level
+fail_compilation/test13786.d(20): Error: template instance `test13786.T!()` error instantiating
 ---
 */
 

diff --git a/test/fail_compilation/test13867.d b/test/fail_compilation/test13867.d
@@ -1,8 +1,8 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/test13867.d(12): Error: function test13867.X.blah does not override any function, did you mean to override `extern (C++) test13867.Base.blah`?
-fail_compilation/test13867.d(19): Error: function test13867.Z.blah does not override any function, did you mean to override `extern (C++) test13867.Base.blah`?
+fail_compilation/test13867.d(12): Error: function `test13867.X.blah` does not override any function, did you mean to override `extern (C++) test13867.Base.blah`?
+fail_compilation/test13867.d(19): Error: function `test13867.Z.blah` does not override any function, did you mean to override `extern (C++) test13867.Base.blah`?
 ---
 */
 extern (C++) class Base {

diff --git a/test/fail_compilation/test14496.d b/test/fail_compilation/test14496.d
@@ -1,11 +1,11 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/test14496.d(21): Error: variable test14496.foo.f `void` initializers for pointers not allowed in safe functions
-fail_compilation/test14496.d(24): Error: variable test14496.foo.Bar.foo `void` initializers for pointers not allowed in safe functions
-fail_compilation/test14496.d(28): Error: variable test14496.foo.Baz.x `void` initializers for pointers not allowed in safe functions
-fail_compilation/test14496.d(48): Error: variable test14496.sinister.bar `void` initializers for pointers not allowed in safe functions
-fail_compilation/test14496.d(49): Error: variable test14496.sinister.baz `void` initializers for pointers not allowed in safe functions
+fail_compilation/test14496.d(21): Error: variable `test14496.foo.f` `void` initializers for pointers not allowed in safe functions
+fail_compilation/test14496.d(24): Error: variable `test14496.foo.Bar.foo` `void` initializers for pointers not allowed in safe functions
+fail_compilation/test14496.d(28): Error: variable `test14496.foo.Baz.x` `void` initializers for pointers not allowed in safe functions
+fail_compilation/test14496.d(48): Error: variable `test14496.sinister.bar` `void` initializers for pointers not allowed in safe functions
+fail_compilation/test14496.d(49): Error: variable `test14496.sinister.baz` `void` initializers for pointers not allowed in safe functions
 ---
 */
 // https://issues.dlang.org/show_bug.cgi?id=14496

diff --git a/test/fail_compilation/test15785.d b/test/fail_compilation/test15785.d
@@ -3,9 +3,9 @@
 TEST_OUTPUT:
 ---
 fail_compilation/test15785.d(17): Deprecation: `imports.test15785.Base.foo` is not visible from module `test15785`
-fail_compilation/test15785.d(17): Error: class test15785.Derived member `foo` is not accessible
-fail_compilation/test15785.d(18): Deprecation: imports.test15785.Base.bar is not visible from module test15785
-fail_compilation/test15785.d(18): Error: class test15785.Derived member `bar` is not accessible
+fail_compilation/test15785.d(17): Error: class `test15785.Derived` member `foo` is not accessible
+fail_compilation/test15785.d(18): Deprecation: `imports.test15785.Base.bar` is not visible from module `test15785`
+fail_compilation/test15785.d(18): Error: class `test15785.Derived` member `bar` is not accessible
 ---
 */
 import imports.test15785;

diff --git a/test/fail_compilation/test15989.d b/test/fail_compilation/test15989.d
@@ -2,8 +2,8 @@
 PERMUTE_ARGS:
 TEST_OUTPUT:
 ---
-fail_compilation/test15989.d(40): Error: variable test15989.main.ctRegex : Unable to initialize enum with class or pointer to struct. Use static const variable instead.
-fail_compilation/test15989.d(49): Error: variable test15989.test.c : Unable to initialize enum with class or pointer to struct. Use static const variable instead.
+fail_compilation/test15989.d(40): Error: variable `test15989.main.ctRegex` : Unable to initialize enum with class or pointer to struct. Use static const variable instead.
+fail_compilation/test15989.d(49): Error: variable `test15989.test.c` : Unable to initialize enum with class or pointer to struct. Use static const variable instead.
 fail_compilation/test15989.d(50): Error: cannot use non-constant CTFE pointer in an initializer `&[3][0]`
 ---
 */

diff --git a/test/fail_compilation/test16193.d b/test/fail_compilation/test16193.d
@@ -3,13 +3,13 @@ REQUIRED_ARGS: -dip1000
 PERMUTE_ARGS:
 TEST_OUTPUT:
 ---
-fail_compilation/test16193.d(39): Error: function test16193.abc is @nogc yet allocates closures with the GC
+fail_compilation/test16193.d(39): Error: function `test16193.abc` is `@nogc` yet allocates closures with the GC
 fail_compilation/test16193.d(41):        test16193.abc.__foreachbody1 closes over variable x at fail_compilation/test16193.d(40)
 ---
 */
-//fail_compilation/test16193.d(22): To enforce @safe compiler allocates a closure unless the opApply() uses 'scope'
-//fail_compilation/test16193.d(34): To enforce @safe compiler allocates a closure unless the opApply() uses 'scope'
-//fail_compilation/test16193.d(41): To enforce @safe compiler allocates a closure unless the opApply() uses 'scope'
+//fail_compilation/test16193.d(22): To enforce `@safe`, the compiler allocates a closure unless `opApply()` uses `scope`
+//fail_compilation/test16193.d(34): To enforce `@safe`, the compiler allocates a closure unless `opApply()` uses `scope`
+//fail_compilation/test16193.d(41): To enforce `@safe`, the compiler allocates a closure unless `opApply()` uses `scope`
 
 // https://issues.dlang.org/show_bug.cgi?id=16193
 

diff --git a/test/fail_compilation/test16228.d b/test/fail_compilation/test16228.d
@@ -2,7 +2,7 @@
    TEST_OUTPUT:
 ---
 fail_compilation/test16228.d(22): Error: function type `return int()` has `return` but does not return any indirections
-fail_compilation/test16228.d(23): Error: function test16228.S.bar `static` member has no `this` to which `return` can apply
+fail_compilation/test16228.d(23): Error: function `test16228.S.bar` `static` member has no `this` to which `return` can apply
 ---
 */
 

diff --git a/test/fail_compilation/test17451.d b/test/fail_compilation/test17451.d
@@ -2,8 +2,8 @@
 ---
 fail_compilation/test17451.d(22): Error: undefined identifier `allocator`
 fail_compilation/test17451.d(23): Error: `false` has no effect
-fail_compilation/test17451.d(30): Error: variable test17451.HashMap!(ThreadSlot).HashMap.__lambda2.v size of type `ThreadSlot` is invalid
-fail_compilation/test17451.d(44): Error: template instance test17451.HashMap!(ThreadSlot) error instantiating
+fail_compilation/test17451.d(30): Error: variable `test17451.HashMap!(ThreadSlot).HashMap.__lambda2.v` size of type `ThreadSlot` is invalid
+fail_compilation/test17451.d(44): Error: template instance `test17451.HashMap!(ThreadSlot)` error instantiating
 ---
 */
 

diff --git a/test/fail_compilation/test17868.d b/test/fail_compilation/test17868.d
@@ -1,10 +1,10 @@
 /*
 TEST_OUTPUT:
 ----
-fail_compilation/test17868.d(10): Error: pragma crt_constructor takes no argument
-fail_compilation/test17868.d(11): Error: pragma crt_constructor takes no argument
-fail_compilation/test17868.d(12): Error: pragma crt_constructor takes no argument
-fail_compilation/test17868.d(13): Error: pragma crt_constructor takes no argument
+fail_compilation/test17868.d(10): Error: pragma `crt_constructor` takes no argument
+fail_compilation/test17868.d(11): Error: pragma `crt_constructor` takes no argument
+fail_compilation/test17868.d(12): Error: pragma `crt_constructor` takes no argument
+fail_compilation/test17868.d(13): Error: pragma `crt_constructor` takes no argument
 ----
  */
 pragma(crt_constructor, ctfe())

diff --git a/test/fail_compilation/test17868b.d b/test/fail_compilation/test17868b.d
@@ -1,9 +1,9 @@
 /*
 TEST_OUTPUT:
 ----
-fail_compilation/test17868b.d(10): Error: function test17868b.foo must be `extern(C)` for `pragma(crt_constructor)`
-fail_compilation/test17868b.d(14): Error: function test17868b.bar must be `extern(C)` for `pragma(crt_constructor)`
-fail_compilation/test17868b.d(9): Error: pragma crt_constructor can only apply to a single declaration
+fail_compilation/test17868b.d(10): Error: function `test17868b.foo` must be `extern(C)` for `pragma(crt_constructor)`
+fail_compilation/test17868b.d(14): Error: function `test17868b.bar` must be `extern(C)` for `pragma(crt_constructor)`
+fail_compilation/test17868b.d(9): Error: pragma `crt_constructor` can only apply to a single declaration
 ----
  */
 pragma(crt_constructor):

diff --git a/test/fail_compilation/test17908a.d b/test/fail_compilation/test17908a.d
@@ -1,7 +1,7 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/test17908a.d(10): Error: function test17908a.foo is not callable because it is annotated with `@disable`
+fail_compilation/test17908a.d(10): Error: function `test17908a.foo` is not callable because it is annotated with `@disable`
 ---
 */
 

diff --git a/test/fail_compilation/test17908b.d b/test/fail_compilation/test17908b.d
@@ -1,7 +1,7 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/test17908b.d(13): Error: function test17908b.foobar is not callable because it is annotated with `@disable`
+fail_compilation/test17908b.d(13): Error: function `test17908b.foobar` is not callable because it is annotated with `@disable`
 ---
 */
 void foobar() {}

diff --git a/test/fail_compilation/test314.d b/test/fail_compilation/test314.d
@@ -2,10 +2,10 @@
 REQUIRED_ARGS: -de
 TEST_OUTPUT:
 ---
-fail_compilation/test314.d(19): Deprecation: imports.a314.renamed is not visible from module test314
-fail_compilation/test314.d(20): Deprecation: imports.a314.bug is not visible from module test314
-fail_compilation/test314.d(22): Deprecation: imports.b314.renamedpkg is not visible from module test314
-fail_compilation/test314.d(23): Deprecation: imports.b314.bugpkg is not visible from module test314
+fail_compilation/test314.d(19): Deprecation: `imports.a314.renamed` is not visible from module `test314`
+fail_compilation/test314.d(20): Deprecation: `imports.a314.bug` is not visible from module `test314`
+fail_compilation/test314.d(22): Deprecation: `imports.b314.renamedpkg` is not visible from module `test314`
+fail_compilation/test314.d(23): Deprecation: `imports.b314.bugpkg` is not visible from module `test314`
 ---
 */
 

diff --git a/test/fail_compilation/test64.d b/test/fail_compilation/test64.d
@@ -1,7 +1,7 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/imports/test64a.d(1): Error: module imports from file fail_compilation/imports/test64a.d conflicts with package name imports
+fail_compilation/imports/test64a.d(1): Error: module `imports` from file fail_compilation/imports/test64a.d conflicts with package name imports
 ---
 */
 

diff --git a/test/fail_compilation/test8556.d b/test/fail_compilation/test8556.d
@@ -1,8 +1,8 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/test8556.d(21): Error: template instance test8556.Grab!(Circle!(uint[])) does not match template declaration `Grab(Range) if (!isSliceable!Range)`
-fail_compilation/test8556.d(52): Error: template instance test8556.grab!(Circle!(uint[])) error instantiating
+fail_compilation/test8556.d(21): Error: template instance `test8556.Grab!(Circle!(uint[]))` does not match template declaration `Grab(Range) if (!isSliceable!Range)`
+fail_compilation/test8556.d(52): Error: template instance `test8556.grab!(Circle!(uint[]))` error instantiating
 ---
 */
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,7 @@ @@
     /*
     TEST_OUTPUT:
     ---
-    fail_compilation/fail9892.d(11): Error: enum member fail9892.a circular reference to `enum` member
+    fail_compilation/fail9892.d(11): Error: enum member `fail9892.a` circular reference to `enum` member
     ---
     */
@@ Expand Down @@