diff --git a/test/libsolidity/smtCheckerTests/special/many.sol b/test/libsolidity/smtCheckerTests/special/many.sol
index 535615a6c..9e40708f0 100644
--- a/test/libsolidity/smtCheckerTests/special/many.sol
+++ b/test/libsolidity/smtCheckerTests/special/many.sol
@@ -15,12 +15,12 @@ contract C
 	}
 }
 // ----
-// Warning: (79-115): Assertion violation happens here
-// Warning: (119-161): Assertion violation happens here
-// Warning: (165-204): Assertion violation happens here
-// Warning: (208-240): Assertion violation happens here
-// Warning: (244-275): Assertion violation happens here
-// Warning: (311-316): Overflow (resulting value larger than 2**256 - 1) happens here
-// Warning: (304-332): Assertion violation happens here
-// Warning: (336-364): Assertion violation happens here
-// Warning: (368-391): Assertion violation happens here
+// Warning 4661: (79-115): Assertion violation happens here
+// Warning 4661: (119-161): Assertion violation happens here
+// Warning 4661: (165-204): Assertion violation happens here
+// Warning 4661: (208-240): Assertion violation happens here
+// Warning 4661: (244-275): Assertion violation happens here
+// Warning 2661: (311-316): Overflow (resulting value larger than 2**256 - 1) happens here
+// Warning 4661: (304-332): Assertion violation happens here
+// Warning 4661: (336-364): Assertion violation happens here
+// Warning 4661: (368-391): Assertion violation happens here
diff --git a/test/libsolidity/smtCheckerTests/types/function_type_members.sol b/test/libsolidity/smtCheckerTests/types/function_type_members.sol
index 4b116503c..7b9a0f44d 100644
--- a/test/libsolidity/smtCheckerTests/types/function_type_members.sol
+++ b/test/libsolidity/smtCheckerTests/types/function_type_members.sol
@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// Warning: (108-118): Assertion checker does not yet support this expression.
+// Warning 7650: (108-118): Assertion checker does not yet support this expression.
diff --git a/test/libsolidity/syntaxTests/functionCalls/calloptions_repeated.sol b/test/libsolidity/syntaxTests/functionCalls/calloptions_repeated.sol
index 460c2c51c..8185304d1 100644
--- a/test/libsolidity/syntaxTests/functionCalls/calloptions_repeated.sol
+++ b/test/libsolidity/syntaxTests/functionCalls/calloptions_repeated.sol
@@ -11,9 +11,9 @@ contract C {
 // ====
 // EVMVersion: >=constantinople
 // ----
-// TypeError: (78-110): Option "gas" has already been set.
-// TypeError: (120-154): Option "gas" has already been set.
-// TypeError: (164-198): Option "value" has already been set.
-// TypeError: (208-249): Option "value" has already been set.
-// TypeError: (208-249): Option "gas" has already been set.
-// TypeError: (259-286): Option "salt" has already been set.
+// TypeError 9886: (78-110): Option "gas" has already been set.
+// TypeError 9886: (120-154): Option "gas" has already been set.
+// TypeError 9886: (164-198): Option "value" has already been set.
+// TypeError 9886: (208-249): Option "value" has already been set.
+// TypeError 9886: (208-249): Option "gas" has already been set.
+// TypeError 9886: (259-286): Option "salt" has already been set.
diff --git a/test/libsolidity/syntaxTests/functionTypes/call_value_on_non_payable_function_type.sol b/test/libsolidity/syntaxTests/functionTypes/call_value_on_non_payable_function_type.sol
index 05ef696fb..ea88bac31 100644
--- a/test/libsolidity/syntaxTests/functionTypes/call_value_on_non_payable_function_type.sol
+++ b/test/libsolidity/syntaxTests/functionTypes/call_value_on_non_payable_function_type.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// TypeError: (94-105): Cannot set option "value" on a non-payable function type.
+// TypeError 7006: (94-105): Cannot set option "value" on a non-payable function type.
diff --git a/test/libsolidity/syntaxTests/functionTypes/error_deprecate_gas_function.sol b/test/libsolidity/syntaxTests/functionTypes/error_deprecate_gas_function.sol
index 6b49c2463..1141d532d 100644
--- a/test/libsolidity/syntaxTests/functionTypes/error_deprecate_gas_function.sol
+++ b/test/libsolidity/syntaxTests/functionTypes/error_deprecate_gas_function.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// TypeError: (102-107): Using ".gas(...)" is deprecated. Use "{gas: ...}" instead.
+// TypeError 1621: (102-107): Using ".gas(...)" is deprecated. Use "{gas: ...}" instead.
diff --git a/test/libsolidity/syntaxTests/functionTypes/error_deprecate_value_constructor.sol b/test/libsolidity/syntaxTests/functionTypes/error_deprecate_value_constructor.sol
index 49a8a1a60..f74d61f39 100644
--- a/test/libsolidity/syntaxTests/functionTypes/error_deprecate_value_constructor.sol
+++ b/test/libsolidity/syntaxTests/functionTypes/error_deprecate_value_constructor.sol
@@ -8,4 +8,4 @@ contract D {
     }
 }
 // ----
-// TypeError: (122-135): Using ".value(...)" is deprecated. Use "{value: ...}" instead.
+// TypeError 1621: (122-135): Using ".value(...)" is deprecated. Use "{value: ...}" instead.
diff --git a/test/libsolidity/syntaxTests/functionTypes/error_deprecate_value_function.sol b/test/libsolidity/syntaxTests/functionTypes/error_deprecate_value_function.sol
index bc856e70a..44c4fd905 100644
--- a/test/libsolidity/syntaxTests/functionTypes/error_deprecate_value_function.sol
+++ b/test/libsolidity/syntaxTests/functionTypes/error_deprecate_value_function.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// TypeError: (102-109): Using ".value(...)" is deprecated. Use "{value: ...}" instead.
+// TypeError 1621: (102-109): Using ".value(...)" is deprecated. Use "{value: ...}" instead.
diff --git a/test/libsolidity/syntaxTests/globalFunctions/now_deprecate.sol b/test/libsolidity/syntaxTests/globalFunctions/now_deprecate.sol
index 5864b224e..d6d9b8e9f 100644
--- a/test/libsolidity/syntaxTests/globalFunctions/now_deprecate.sol
+++ b/test/libsolidity/syntaxTests/globalFunctions/now_deprecate.sol
@@ -4,4 +4,4 @@ contract C {
 	}
 }
 // ----
-// TypeError: (38-41): "now" has been deprecated. Use "block.timestamp" instead.
+// TypeError 7359: (38-41): "now" has been deprecated. Use "block.timestamp" instead.
diff --git a/test/libsolidity/syntaxTests/globalFunctions/now_override.sol b/test/libsolidity/syntaxTests/globalFunctions/now_override.sol
index c3db19f45..08d648f78 100644
--- a/test/libsolidity/syntaxTests/globalFunctions/now_override.sol
+++ b/test/libsolidity/syntaxTests/globalFunctions/now_override.sol
@@ -5,4 +5,4 @@ contract C {
 	}
 }
 // ----
-// Warning: (43-51): This declaration shadows a builtin symbol.
+// Warning 2319: (43-51): This declaration shadows a builtin symbol.
diff --git a/test/libsolidity/syntaxTests/inheritance/virtual/library_err.sol b/test/libsolidity/syntaxTests/inheritance/virtual/library_err.sol
index 627be82ff..7c2e1bbce 100644
--- a/test/libsolidity/syntaxTests/inheritance/virtual/library_err.sol
+++ b/test/libsolidity/syntaxTests/inheritance/virtual/library_err.sol
@@ -2,4 +2,4 @@ library L {
     function f() internal pure virtual returns (uint) { return 0; }
 }
 // ----
-// TypeError: (16-79): Library functions cannot be "virtual".
+// TypeError 7801: (16-79): Library functions cannot be "virtual".
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/pc.sol b/test/libsolidity/syntaxTests/inlineAssembly/pc.sol
index a3d4c31b1..816bb1c0d 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/pc.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/pc.sol
@@ -6,4 +6,4 @@ contract C {
 	}
 }
 // ----
-// SyntaxError: (61-63): PC instruction is a low-level EVM feature. Because of that PC is disallowed in strict assembly.
+// SyntaxError 2450: (61-63): PC instruction is a low-level EVM feature. Because of that PC is disallowed in strict assembly.
diff --git a/test/libsolidity/syntaxTests/missing_functions_duplicate_bug.sol b/test/libsolidity/syntaxTests/missing_functions_duplicate_bug.sol
index afc2b82d4..56c3eee40 100644
--- a/test/libsolidity/syntaxTests/missing_functions_duplicate_bug.sol
+++ b/test/libsolidity/syntaxTests/missing_functions_duplicate_bug.sol
@@ -23,4 +23,4 @@ contract Voting is Ownable {
     }
 }
 // ----
-// Warning: (299-315): Unused function parameter. Remove or comment out the variable name to silence this warning.
+// Warning 5667: (299-315): Unused function parameter. Remove or comment out the variable name to silence this warning.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/333_fixed_point_casting_exponents_15.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/333_fixed_point_casting_exponents_15.sol
index 91454ff24..f988745ea 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/333_fixed_point_casting_exponents_15.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/333_fixed_point_casting_exponents_15.sol
@@ -4,4 +4,4 @@ contract test {
     }
 }
 // ----
-// TypeError: (61-77): Operator ** not compatible with types int_const 3 and ufixed128x18. Exponent is fractional.
+// TypeError 2271: (61-77): Operator ** not compatible with types int_const 3 and ufixed128x18. Exponent is fractional.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/334_fixed_point_casting_exponents_neg.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/334_fixed_point_casting_exponents_neg.sol
index 57dc845f4..68e80e635 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/334_fixed_point_casting_exponents_neg.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/334_fixed_point_casting_exponents_neg.sol
@@ -4,4 +4,4 @@ contract test {
     }
 }
 // ----
-// TypeError: (61-78): Operator ** not compatible with types int_const 42 and fixed128x18. Exponent is fractional.
+// TypeError 2271: (61-78): Operator ** not compatible with types int_const 42 and fixed128x18. Exponent is fractional.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/348_unused_return_value_call_value.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/348_unused_return_value_call_value.sol
index 15da6802f..e837a6e66 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/348_unused_return_value_call_value.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/348_unused_return_value_call_value.sol
@@ -4,4 +4,4 @@ contract test {
     }
 }
 // ----
-// Warning: (50-85): Return value of low-level calls not used.
+// Warning 9302: (50-85): Return value of low-level calls not used.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/363_non_payable_constructor.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/363_non_payable_constructor.sol
index 850e9d690..e3101fc8d 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/363_non_payable_constructor.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/363_non_payable_constructor.sol
@@ -8,4 +8,4 @@ contract D {
     }
 }
 // ----
-// TypeError: (106-123): Cannot set option "value", since the constructor of contract C is not payable.
+// TypeError 7006: (106-123): Cannot set option "value", since the constructor of contract C is not payable.
diff --git a/test/libsolidity/syntaxTests/natspec/docstring_author_title_state_variable.sol b/test/libsolidity/syntaxTests/natspec/docstring_author_title_state_variable.sol
index d7e52608c..e861d31ce 100644
--- a/test/libsolidity/syntaxTests/natspec/docstring_author_title_state_variable.sol
+++ b/test/libsolidity/syntaxTests/natspec/docstring_author_title_state_variable.sol
@@ -4,5 +4,5 @@ contract C {
     uint private state;
 }
 // ----
-// DocstringParsingError: (17-56): Documentation tag @author not valid for non-public state variables.
-// DocstringParsingError: (17-56): Documentation tag @title not valid for non-public state variables.
+// DocstringParsingError 6546: (17-56): Documentation tag @author not valid for non-public state variables.
+// DocstringParsingError 6546: (17-56): Documentation tag @title not valid for non-public state variables.
diff --git a/test/libsolidity/syntaxTests/natspec/docstring_non_public_state_variable_with_return.sol b/test/libsolidity/syntaxTests/natspec/docstring_non_public_state_variable_with_return.sol
index d8f70ebd8..da2d75fe8 100644
--- a/test/libsolidity/syntaxTests/natspec/docstring_non_public_state_variable_with_return.sol
+++ b/test/libsolidity/syntaxTests/natspec/docstring_non_public_state_variable_with_return.sol
@@ -3,4 +3,4 @@ contract test {
   uint private state;
 }
 // ----
-// DocstringParsingError: (18-47): Documentation tag @return not valid for non-public state variables.
+// DocstringParsingError 6546: (18-47): Documentation tag @return not valid for non-public state variables.
diff --git a/test/libsolidity/syntaxTests/natspec/docstring_private_state_variable.sol b/test/libsolidity/syntaxTests/natspec/docstring_private_state_variable.sol
index dbc5c9a0b..548669442 100644
--- a/test/libsolidity/syntaxTests/natspec/docstring_private_state_variable.sol
+++ b/test/libsolidity/syntaxTests/natspec/docstring_private_state_variable.sol
@@ -4,4 +4,4 @@ contract C {
     uint private state;
 }
 // ----
-// DocstringParsingError: (17-74): Documentation tag @notice not valid for non-public state variables.
+// DocstringParsingError 6546: (17-74): Documentation tag @notice not valid for non-public state variables.
diff --git a/test/libsolidity/syntaxTests/natspec/docstring_variable.sol b/test/libsolidity/syntaxTests/natspec/docstring_variable.sol
index f1becfb5e..a126ca940 100644
--- a/test/libsolidity/syntaxTests/natspec/docstring_variable.sol
+++ b/test/libsolidity/syntaxTests/natspec/docstring_variable.sol
@@ -11,4 +11,4 @@ contract C {
     }
 }
 // ----
-// ParserError: (290-295): Only state variables can have a docstring.
+// ParserError 2837: (290-295): Only state variables can have a docstring.
diff --git a/test/libsolidity/syntaxTests/shifts/shift_singed_rvalue.sol b/test/libsolidity/syntaxTests/shifts/shift_singed_rvalue.sol
index 73b49f3df..adca80cc4 100644
--- a/test/libsolidity/syntaxTests/shifts/shift_singed_rvalue.sol
+++ b/test/libsolidity/syntaxTests/shifts/shift_singed_rvalue.sol
@@ -7,5 +7,5 @@ contract C {
     }
 }
 // ----
-// TypeError: (89-95): Operator >> not compatible with types int256 and int256
-// TypeError: (179-193): Operator >> not compatible with types int256 and int256
+// TypeError 2271: (89-95): Operator >> not compatible with types int256 and int256
+// TypeError 2271: (179-193): Operator >> not compatible with types int256 and int256
diff --git a/test/libsolidity/syntaxTests/signed_rational_modulus.sol b/test/libsolidity/syntaxTests/signed_rational_modulus.sol
index f7f5cf138..999086ae1 100644
--- a/test/libsolidity/syntaxTests/signed_rational_modulus.sol
+++ b/test/libsolidity/syntaxTests/signed_rational_modulus.sol
@@ -7,4 +7,4 @@ contract test {
     }
 }
 // ----
-// TypeError: (117-123): Operator % not compatible with types rational_const 1 / 2 and fixed128x18. Fractional literals not supported.
+// TypeError 2271: (117-123): Operator % not compatible with types rational_const 1 / 2 and fixed128x18. Fractional literals not supported.
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/gas_with_call_nonpayable.sol b/test/libsolidity/syntaxTests/viewPureChecker/gas_with_call_nonpayable.sol
index d302ad454..be8a5aeb8 100644
--- a/test/libsolidity/syntaxTests/viewPureChecker/gas_with_call_nonpayable.sol
+++ b/test/libsolidity/syntaxTests/viewPureChecker/gas_with_call_nonpayable.sol
@@ -8,5 +8,5 @@ contract C {
 	}
 }
 // ----
-// TypeError: (90-109): Function declared as view, but this expression (potentially) modifies the state and thus requires non-payable (the default) or payable.
-// TypeError: (180-197): Function declared as view, but this expression (potentially) modifies the state and thus requires non-payable (the default) or payable.
+// TypeError 8961: (90-109): Function declared as view, but this expression (potentially) modifies the state and thus requires non-payable (the default) or payable.
+// TypeError 8961: (180-197): Function declared as view, but this expression (potentially) modifies the state and thus requires non-payable (the default) or payable.
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/value_with_call_nonpayable.sol b/test/libsolidity/syntaxTests/viewPureChecker/value_with_call_nonpayable.sol
index 3b39c95ea..af95cbe49 100644
--- a/test/libsolidity/syntaxTests/viewPureChecker/value_with_call_nonpayable.sol
+++ b/test/libsolidity/syntaxTests/viewPureChecker/value_with_call_nonpayable.sol
@@ -8,5 +8,5 @@ contract C {
 	}
 }
 // ----
-// TypeError: (90-111): Function declared as view, but this expression (potentially) modifies the state and thus requires non-payable (the default) or payable.
-// TypeError: (182-201): Function declared as view, but this expression (potentially) modifies the state and thus requires non-payable (the default) or payable.
+// TypeError 8961: (90-111): Function declared as view, but this expression (potentially) modifies the state and thus requires non-payable (the default) or payable.
+// TypeError 8961: (182-201): Function declared as view, but this expression (potentially) modifies the state and thus requires non-payable (the default) or payable.
diff --git a/test/libyul/yulSyntaxTests/pc.yul b/test/libyul/yulSyntaxTests/pc.yul
index e818e926b..e43d7a141 100644
--- a/test/libyul/yulSyntaxTests/pc.yul
+++ b/test/libyul/yulSyntaxTests/pc.yul
@@ -4,4 +4,4 @@
 // ====
 // dialect: evmTyped
 // ----
-// SyntaxError: (10-12): PC instruction is a low-level EVM feature. Because of that PC is disallowed in strict assembly.
+// SyntaxError 2450: (10-12): PC instruction is a low-level EVM feature. Because of that PC is disallowed in strict assembly.