diff --git a/src/asm/warning.c b/src/asm/warning.c
index ae03465a..aa8920cc 100644
--- a/src/asm/warning.c
+++ b/src/asm/warning.c
@@ -240,7 +240,7 @@ void processWarningFlag(char *flag)
 			return;
 
 		case '=':
-			/* `-Werror=XXX */
+			/* `-Werror=XXX` */
 			setError = true;
 			processWarningFlag(errorFlag + 1); /* Skip the `=` */
 			setError = false;
@@ -336,7 +336,7 @@ void error(char const *fmt, ...)
 	va_list args;
 
 	va_start(args, fmt);
-	printDiag(fmt, args, "ERROR: ", ":\n    ", NULL);
+	printDiag(fmt, args, "error: ", ":\n    ", NULL);
 	va_end(args);
 	nbErrors++;
 }
@@ -364,7 +364,7 @@ void warning(enum WarningID id, char const *fmt, ...)
 		return;
 
 	case WARNING_ERROR:
-		printDiag(fmt, args, "ERROR: ", ": [-Werror=%s]\n    ", flag);
+		printDiag(fmt, args, "error: ", ": [-Werror=%s]\n    ", flag);
 		va_end(args);
 		return;
 
diff --git a/test/asm/align-large-ofs.err b/test/asm/align-large-ofs.err
index 7b31f54c..611d1c81 100644
--- a/test/asm/align-large-ofs.err
+++ b/test/asm/align-large-ofs.err
@@ -1,3 +1,3 @@
-ERROR: align-large-ofs.asm(2):
+error: align-large-ofs.asm(2):
     Alignment offset (2) must be smaller than alignment size (2)
 error: Assembly aborted (1 error)!
diff --git a/test/asm/align-pc-outside-section.err b/test/asm/align-pc-outside-section.err
index 1ff8013b..895edb9a 100644
--- a/test/asm/align-pc-outside-section.err
+++ b/test/asm/align-pc-outside-section.err
@@ -1,3 +1,3 @@
-ERROR: align-pc-outside-section.asm(1):
+error: align-pc-outside-section.asm(1):
     Cannot output data outside of a SECTION
 error: Assembly aborted (1 error)!
diff --git a/test/asm/align-unattainable.err b/test/asm/align-unattainable.err
index a6bfbf84..005fc7f3 100644
--- a/test/asm/align-unattainable.err
+++ b/test/asm/align-unattainable.err
@@ -1,3 +1,3 @@
-ERROR: align-unattainable.asm(3):
+error: align-unattainable.asm(3):
     Section "X"'s alignment cannot be attained in WRAM0
 error: Assembly aborted (1 error)!
diff --git a/test/asm/anon-label-bad.err b/test/asm/anon-label-bad.err
index 323dd1a6..c63b1734 100644
--- a/test/asm/anon-label-bad.err
+++ b/test/asm/anon-label-bad.err
@@ -1,7 +1,7 @@
-ERROR: anon-label-bad.asm(2):
+error: anon-label-bad.asm(2):
     Label "!0" created outside of a SECTION
-ERROR: anon-label-bad.asm(6):
+error: anon-label-bad.asm(6):
     Reference to anonymous label 2 before, when only 1 has been created so far
-ERROR: anon-label-bad.asm(18):
+error: anon-label-bad.asm(18):
     syntax error, unexpected :
 error: Assembly aborted (3 errors)!
diff --git a/test/asm/anon-label-bad.simple.err b/test/asm/anon-label-bad.simple.err
index 74828ed1..6cdd160c 100644
--- a/test/asm/anon-label-bad.simple.err
+++ b/test/asm/anon-label-bad.simple.err
@@ -1,7 +1,7 @@
-ERROR: anon-label-bad.asm(2):
+error: anon-label-bad.asm(2):
     Label "!0" created outside of a SECTION
-ERROR: anon-label-bad.asm(6):
+error: anon-label-bad.asm(6):
     Reference to anonymous label 2 before, when only 1 has been created so far
-ERROR: anon-label-bad.asm(18):
+error: anon-label-bad.asm(18):
     syntax error
 error: Assembly aborted (3 errors)!
diff --git a/test/asm/assert-nosect-bank.err b/test/asm/assert-nosect-bank.err
index 280a273e..dc428bf0 100644
--- a/test/asm/assert-nosect-bank.err
+++ b/test/asm/assert-nosect-bank.err
@@ -1,3 +1,3 @@
-ERROR: assert-nosect-bank.asm(1):
+error: assert-nosect-bank.asm(1):
     PC has no bank outside a section
 error: Assembly aborted (1 error)!
diff --git a/test/asm/assert.err b/test/asm/assert.err
index 8ce4402f..d44d1fd5 100644
--- a/test/asm/assert.err
+++ b/test/asm/assert.err
@@ -1,10 +1,10 @@
-ERROR: assert.asm(4):
+error: assert.asm(4):
     Assertion failed
 warning: assert.asm(10): [-Wassert]
     Assertion failed
-ERROR: assert.asm(18):
+error: assert.asm(18):
     Expected constant expression: 'FloatingBase' is not constant at assembly time
-ERROR: assert.asm(18):
+error: assert.asm(18):
     Assertion failed
 FATAL: assert.asm(21):
     Assertion failed
diff --git a/test/asm/assert@-no-sect.err b/test/asm/assert@-no-sect.err
index 7a5ca267..2032c41c 100644
--- a/test/asm/assert@-no-sect.err
+++ b/test/asm/assert@-no-sect.err
@@ -1,3 +1,3 @@
-ERROR: assert@-no-sect.asm(1):
+error: assert@-no-sect.asm(1):
     PC has no value outside a section
 error: Assembly aborted (1 error)!
diff --git a/test/asm/bank.err b/test/asm/bank.err
index 0a315b33..9eadde82 100644
--- a/test/asm/bank.err
+++ b/test/asm/bank.err
@@ -1,9 +1,9 @@
-ERROR: bank.asm(13) -> bank.asm::def_sect(8):
+error: bank.asm(13) -> bank.asm::def_sect(8):
     Expected constant expression: Section "ROMX_bad"'s bank is not known
-ERROR: bank.asm(15) -> bank.asm::def_sect(8):
+error: bank.asm(15) -> bank.asm::def_sect(8):
     Expected constant expression: Section "VRAM_bad"'s bank is not known
-ERROR: bank.asm(17) -> bank.asm::def_sect(8):
+error: bank.asm(17) -> bank.asm::def_sect(8):
     Expected constant expression: Section "SRAM_bad"'s bank is not known
-ERROR: bank.asm(20) -> bank.asm::def_sect(8):
+error: bank.asm(20) -> bank.asm::def_sect(8):
     Expected constant expression: Section "WRAMX_bad"'s bank is not known
 error: Assembly aborted (4 errors)!
diff --git a/test/asm/block-comment-termination-error.err b/test/asm/block-comment-termination-error.err
index dcad56d7..9ba882ea 100644
--- a/test/asm/block-comment-termination-error.err
+++ b/test/asm/block-comment-termination-error.err
@@ -1,5 +1,5 @@
-ERROR: block-comment-termination-error.asm(1):
+error: block-comment-termination-error.asm(1):
     Unterminated block comment
-ERROR: block-comment-termination-error.asm(1):
+error: block-comment-termination-error.asm(1):
     syntax error, unexpected end of buffer
 error: Assembly aborted (2 errors)!
diff --git a/test/asm/block-comment-termination-error.simple.err b/test/asm/block-comment-termination-error.simple.err
index 770bc9e9..2517422b 100644
--- a/test/asm/block-comment-termination-error.simple.err
+++ b/test/asm/block-comment-termination-error.simple.err
@@ -1,5 +1,5 @@
-ERROR: block-comment-termination-error.asm(1):
+error: block-comment-termination-error.asm(1):
     Unterminated block comment
-ERROR: block-comment-termination-error.asm(1):
+error: block-comment-termination-error.asm(1):
     syntax error
 error: Assembly aborted (2 errors)!
diff --git a/test/asm/bracketed-symbols.err b/test/asm/bracketed-symbols.err
index 06dbc153..9fdd7091 100644
--- a/test/asm/bracketed-symbols.err
+++ b/test/asm/bracketed-symbols.err
@@ -1,7 +1,7 @@
-ERROR: bracketed-symbols.asm(16):
+error: bracketed-symbols.asm(16):
     Formatting string as type 'X'
-ERROR: bracketed-symbols.asm(20):
+error: bracketed-symbols.asm(20):
     "Label" does not have a constant value
-ERROR: bracketed-symbols.asm(21):
+error: bracketed-symbols.asm(21):
     Expected constant PC but section is not fixed
 error: Assembly aborted (3 errors)!
diff --git a/test/asm/builtin-overwrite.err b/test/asm/builtin-overwrite.err
index e7d28293..e74a3bc3 100644
--- a/test/asm/builtin-overwrite.err
+++ b/test/asm/builtin-overwrite.err
@@ -1,57 +1,57 @@
-ERROR: builtin-overwrite.asm(42) -> builtin-overwrite.asm::tickle(7):
+error: builtin-overwrite.asm(42) -> builtin-overwrite.asm::tickle(7):
     '__LINE__' already defined as constant at <builtin>
-ERROR: builtin-overwrite.asm(42) -> builtin-overwrite.asm::tickle(8):
+error: builtin-overwrite.asm(42) -> builtin-overwrite.asm::tickle(8):
     '__LINE__' already defined as constant at <builtin>
-ERROR: builtin-overwrite.asm(42) -> builtin-overwrite.asm::tickle(11):
+error: builtin-overwrite.asm(42) -> builtin-overwrite.asm::tickle(11):
     '__LINE__' already defined at <builtin>
-ERROR: builtin-overwrite.asm(42) -> builtin-overwrite.asm::tickle(12):
+error: builtin-overwrite.asm(42) -> builtin-overwrite.asm::tickle(12):
     '__LINE__' already defined at <builtin>
-ERROR: builtin-overwrite.asm(42) -> builtin-overwrite.asm::tickle(16):
+error: builtin-overwrite.asm(42) -> builtin-overwrite.asm::tickle(16):
     Built-in symbol '__LINE__' cannot be purged
-ERROR: builtin-overwrite.asm(42) -> builtin-overwrite.asm::tickle(17):
+error: builtin-overwrite.asm(42) -> builtin-overwrite.asm::tickle(17):
     Built-in symbol '__LINE__' cannot be purged
-ERROR: builtin-overwrite.asm(42) -> builtin-overwrite.asm::tickle(20):
+error: builtin-overwrite.asm(42) -> builtin-overwrite.asm::tickle(20):
     '__LINE__' already defined at <builtin>
-ERROR: builtin-overwrite.asm(42) -> builtin-overwrite.asm::tickle(21):
+error: builtin-overwrite.asm(42) -> builtin-overwrite.asm::tickle(21):
     '__LINE__' already defined at <builtin>
-ERROR: builtin-overwrite.asm(42) -> builtin-overwrite.asm::tickle(24):
+error: builtin-overwrite.asm(42) -> builtin-overwrite.asm::tickle(24):
     '__LINE__' already defined as constant at <builtin>
-ERROR: builtin-overwrite.asm(42) -> builtin-overwrite.asm::tickle(25):
+error: builtin-overwrite.asm(42) -> builtin-overwrite.asm::tickle(25):
     '__LINE__' already defined as constant at <builtin>
-ERROR: builtin-overwrite.asm(42) -> builtin-overwrite.asm::tickle(28):
+error: builtin-overwrite.asm(42) -> builtin-overwrite.asm::tickle(28):
     '__LINE__' already defined at <builtin>
-ERROR: builtin-overwrite.asm(42) -> builtin-overwrite.asm::tickle(29):
+error: builtin-overwrite.asm(42) -> builtin-overwrite.asm::tickle(29):
     '__LINE__' already defined at <builtin>
-ERROR: builtin-overwrite.asm(42) -> builtin-overwrite.asm::tickle(32):
+error: builtin-overwrite.asm(42) -> builtin-overwrite.asm::tickle(32):
     '__LINE__' already defined as constant at <builtin>
-ERROR: builtin-overwrite.asm(42) -> builtin-overwrite.asm::tickle(33):
+error: builtin-overwrite.asm(42) -> builtin-overwrite.asm::tickle(33):
     '__LINE__' already defined as constant at <builtin>
-ERROR: builtin-overwrite.asm(42) -> builtin-overwrite.asm::tickle(36):
+error: builtin-overwrite.asm(42) -> builtin-overwrite.asm::tickle(36):
     '__LINE__' already defined as non-EQUS at <builtin>
-ERROR: builtin-overwrite.asm(42) -> builtin-overwrite.asm::tickle(37):
+error: builtin-overwrite.asm(42) -> builtin-overwrite.asm::tickle(37):
     '__LINE__' already defined as non-EQUS at <builtin>
-ERROR: builtin-overwrite.asm(43) -> builtin-overwrite.asm::tickle(16):
+error: builtin-overwrite.asm(43) -> builtin-overwrite.asm::tickle(16):
     Built-in symbol '__FILE__' cannot be purged
-ERROR: builtin-overwrite.asm(43) -> builtin-overwrite.asm::tickle(17):
+error: builtin-overwrite.asm(43) -> builtin-overwrite.asm::tickle(17):
     Built-in symbol '__FILE__' cannot be purged
-ERROR: builtin-overwrite.asm(43) -> builtin-overwrite.asm::tickle(20):
+error: builtin-overwrite.asm(43) -> builtin-overwrite.asm::tickle(20):
     '__FILE__' already defined at <builtin>
-ERROR: builtin-overwrite.asm(43) -> builtin-overwrite.asm::tickle(21):
+error: builtin-overwrite.asm(43) -> builtin-overwrite.asm::tickle(21):
     '__FILE__' already defined at <builtin>
-ERROR: builtin-overwrite.asm(43) -> builtin-overwrite.asm::tickle(24):
+error: builtin-overwrite.asm(43) -> builtin-overwrite.asm::tickle(24):
     '__FILE__' already defined as constant at <builtin>
-ERROR: builtin-overwrite.asm(43) -> builtin-overwrite.asm::tickle(25):
+error: builtin-overwrite.asm(43) -> builtin-overwrite.asm::tickle(25):
     '__FILE__' already defined as constant at <builtin>
-ERROR: builtin-overwrite.asm(43) -> builtin-overwrite.asm::tickle(28):
+error: builtin-overwrite.asm(43) -> builtin-overwrite.asm::tickle(28):
     '__FILE__' already defined at <builtin>
-ERROR: builtin-overwrite.asm(43) -> builtin-overwrite.asm::tickle(29):
+error: builtin-overwrite.asm(43) -> builtin-overwrite.asm::tickle(29):
     '__FILE__' already defined at <builtin>
-ERROR: builtin-overwrite.asm(43) -> builtin-overwrite.asm::tickle(32):
+error: builtin-overwrite.asm(43) -> builtin-overwrite.asm::tickle(32):
     '__FILE__' already defined as constant at <builtin>
-ERROR: builtin-overwrite.asm(43) -> builtin-overwrite.asm::tickle(33):
+error: builtin-overwrite.asm(43) -> builtin-overwrite.asm::tickle(33):
     '__FILE__' already defined as constant at <builtin>
-ERROR: builtin-overwrite.asm(43) -> builtin-overwrite.asm::tickle(36):
+error: builtin-overwrite.asm(43) -> builtin-overwrite.asm::tickle(36):
     Built-in symbol '__FILE__' cannot be redefined
-ERROR: builtin-overwrite.asm(43) -> builtin-overwrite.asm::tickle(37):
+error: builtin-overwrite.asm(43) -> builtin-overwrite.asm::tickle(37):
     Built-in symbol '__FILE__' cannot be redefined
 error: Assembly aborted (28 errors)!
diff --git a/test/asm/code-after-endm-endr-endc.err b/test/asm/code-after-endm-endr-endc.err
index d06c5d72..1152bd1d 100644
--- a/test/asm/code-after-endm-endr-endc.err
+++ b/test/asm/code-after-endm-endr-endc.err
@@ -1,15 +1,15 @@
-ERROR: code-after-endm-endr-endc.asm(6):
+error: code-after-endm-endr-endc.asm(6):
     syntax error, unexpected PRINTLN, expecting newline or end of buffer
-ERROR: code-after-endm-endr-endc.asm(7):
+error: code-after-endm-endr-endc.asm(7):
     Macro "mac" not defined
-ERROR: code-after-endm-endr-endc.asm(12):
+error: code-after-endm-endr-endc.asm(12):
     syntax error, unexpected PRINTLN, expecting newline or end of buffer
-ERROR: code-after-endm-endr-endc.asm(17):
+error: code-after-endm-endr-endc.asm(17):
     syntax error, unexpected PRINTLN, expecting newline
-ERROR: code-after-endm-endr-endc.asm(19):
+error: code-after-endm-endr-endc.asm(19):
     syntax error, unexpected PRINTLN, expecting newline or end of buffer
-ERROR: code-after-endm-endr-endc.asm(23):
+error: code-after-endm-endr-endc.asm(23):
     syntax error, unexpected PRINTLN, expecting newline
-ERROR: code-after-endm-endr-endc.asm(25):
+error: code-after-endm-endr-endc.asm(25):
     syntax error, unexpected PRINTLN, expecting newline or end of buffer
 error: Assembly aborted (7 errors)!
diff --git a/test/asm/compound-assignment.err b/test/asm/compound-assignment.err
index cb707f95..a606ecc0 100644
--- a/test/asm/compound-assignment.err
+++ b/test/asm/compound-assignment.err
@@ -1,5 +1,5 @@
-ERROR: compound-assignment.asm(36):
+error: compound-assignment.asm(36):
     '__LINE__' already defined as constant at <builtin>
-ERROR: compound-assignment.asm(39):
+error: compound-assignment.asm(39):
     Expected constant expression: 'UnDeFiNeD' is not constant at assembly time
 error: Assembly aborted (2 errors)!
diff --git a/test/asm/def.err b/test/asm/def.err
index 29812c30..e2e1e978 100644
--- a/test/asm/def.err
+++ b/test/asm/def.err
@@ -1,3 +1,3 @@
-ERROR: def.asm(23):
+error: def.asm(23):
     'constant' already defined at def.asm(10)
 error: Assembly aborted (1 error)!
diff --git a/test/asm/def.simple.err b/test/asm/def.simple.err
index f61faed7..a503bb5d 100644
--- a/test/asm/def.simple.err
+++ b/test/asm/def.simple.err
@@ -1,5 +1,5 @@
-ERROR: def.asm(23):
+error: def.asm(23):
     'constant' already defined at def.asm(10)
-ERROR: def.asm(29):
+error: def.asm(29):
     syntax error
 error: Assembly aborted (2 errors)!
diff --git a/test/asm/deprecated-pi.err b/test/asm/deprecated-pi.err
index ffddcce0..25063833 100644
--- a/test/asm/deprecated-pi.err
+++ b/test/asm/deprecated-pi.err
@@ -1,5 +1,5 @@
 warning: deprecated-pi.asm(2): [-Wobsolete]
     `_PI` is deprecated; use 3.14159
-ERROR: deprecated-pi.asm(3):
+error: deprecated-pi.asm(3):
     Built-in symbol '_PI' cannot be purged
 error: Assembly aborted (1 error)!
diff --git a/test/asm/ds-bad.err b/test/asm/ds-bad.err
index 1ec092a0..e573845a 100644
--- a/test/asm/ds-bad.err
+++ b/test/asm/ds-bad.err
@@ -1,4 +1,4 @@
-ERROR: ds-bad.asm(3):
+error: ds-bad.asm(3):
     Expected constant expression: 'unknown' is not constant at assembly time
 warning: ds-bad.asm(4): [-Wtruncation]
     Expression must be 8-bit
diff --git a/test/asm/duplicate-section.err b/test/asm/duplicate-section.err
index 3ee901d5..cb19f910 100644
--- a/test/asm/duplicate-section.err
+++ b/test/asm/duplicate-section.err
@@ -1,4 +1,4 @@
-ERROR: duplicate-section.asm(4):
+error: duplicate-section.asm(4):
     Section already defined previously at duplicate-section.asm(2)
 FATAL: duplicate-section.asm(4):
     Cannot create section "sec" (1 error)
diff --git a/test/asm/error-recovery.err b/test/asm/error-recovery.err
index f3c64cd6..c3fdd914 100644
--- a/test/asm/error-recovery.err
+++ b/test/asm/error-recovery.err
@@ -1,5 +1,5 @@
-ERROR: error-recovery.asm(3):
+error: error-recovery.asm(3):
     syntax error, unexpected number
-ERROR: error-recovery.asm(5) -> error-recovery.asm::REPT~1(7):
+error: error-recovery.asm(5) -> error-recovery.asm::REPT~1(7):
     syntax error, unexpected identifier
 error: Assembly aborted (2 errors)!
diff --git a/test/asm/error-recovery.simple.err b/test/asm/error-recovery.simple.err
index b9582e68..3f270237 100644
--- a/test/asm/error-recovery.simple.err
+++ b/test/asm/error-recovery.simple.err
@@ -1,5 +1,5 @@
-ERROR: error-recovery.asm(3):
+error: error-recovery.asm(3):
     syntax error
-ERROR: error-recovery.asm(5) -> error-recovery.asm::REPT~1(7):
+error: error-recovery.asm(5) -> error-recovery.asm::REPT~1(7):
     syntax error
 error: Assembly aborted (2 errors)!
diff --git a/test/asm/expand-empty-string.err b/test/asm/expand-empty-string.err
index e7b79c7a..fd285b10 100644
--- a/test/asm/expand-empty-string.err
+++ b/test/asm/expand-empty-string.err
@@ -1,3 +1,3 @@
-ERROR: expand-empty-string.asm(6) -> expand-empty-string.asm::test(4):
+error: expand-empty-string.asm(6) -> expand-empty-string.asm::test(4):
     syntax error, unexpected number
 error: Assembly aborted (1 error)!
diff --git a/test/asm/expand-empty-string.simple.err b/test/asm/expand-empty-string.simple.err
index 6eb2978c..be33f0b9 100644
--- a/test/asm/expand-empty-string.simple.err
+++ b/test/asm/expand-empty-string.simple.err
@@ -1,3 +1,3 @@
-ERROR: expand-empty-string.asm(6) -> expand-empty-string.asm::test(4):
+error: expand-empty-string.asm(6) -> expand-empty-string.asm::test(4):
     syntax error
 error: Assembly aborted (1 error)!
diff --git a/test/asm/ff00+c-bad.err b/test/asm/ff00+c-bad.err
index 3589cd45..6371eff8 100644
--- a/test/asm/ff00+c-bad.err
+++ b/test/asm/ff00+c-bad.err
@@ -1,5 +1,5 @@
-ERROR: ff00+c-bad.asm(8):
+error: ff00+c-bad.asm(8):
     Expected constant expression equal to $FF00 for "$ff00+c"
-ERROR: ff00+c-bad.asm(9):
+error: ff00+c-bad.asm(9):
     Expected constant expression equal to $FF00 for "$ff00+c"
 error: Assembly aborted (2 errors)!
diff --git a/test/asm/fixed-oob.err b/test/asm/fixed-oob.err
index eac02cf2..873c63a3 100644
--- a/test/asm/fixed-oob.err
+++ b/test/asm/fixed-oob.err
@@ -1,15 +1,15 @@
-ERROR: fixed-oob.asm(1):
+error: fixed-oob.asm(1):
     Section "ROM0"'s fixed address 0xbabe is outside of range [0; 0x7fff]
-ERROR: fixed-oob.asm(3):
+error: fixed-oob.asm(3):
     Section "ROMX"'s fixed address 0xbeef is outside of range [0x4000; 0x7fff]
-ERROR: fixed-oob.asm(5):
+error: fixed-oob.asm(5):
     Section "VRAM"'s fixed address 0xc0de is outside of range [0x8000; 0x9fff]
-ERROR: fixed-oob.asm(7):
+error: fixed-oob.asm(7):
     Section "SRAM"'s fixed address 0xcafe is outside of range [0xa000; 0xbfff]
-ERROR: fixed-oob.asm(11):
+error: fixed-oob.asm(11):
     Section "WRAMX"'s fixed address 0xdad is outside of range [0xd000; 0xdfff]
-ERROR: fixed-oob.asm(13):
+error: fixed-oob.asm(13):
     Section "OAM"'s fixed address 0xcab is outside of range [0xfe00; 0xfe9f]
-ERROR: fixed-oob.asm(15):
+error: fixed-oob.asm(15):
     Section "HRAM"'s fixed address 0xbad is outside of range [0xff80; 0xfffe]
 error: Assembly aborted (7 errors)!
diff --git a/test/asm/for.err b/test/asm/for.err
index c5fd62b4..6e9cc7bd 100644
--- a/test/asm/for.err
+++ b/test/asm/for.err
@@ -1,10 +1,10 @@
 warning: for.asm(12): [-Wbackwards-for]
     FOR goes backwards from 2 to 1 by 1
-ERROR: for.asm(16):
+error: for.asm(16):
     FOR cannot have a step value of 0
 warning: for.asm(20): [-Wbackwards-for]
     FOR goes backwards from 1 to 2 by -1
-ERROR: for.asm(45) -> for.asm::REPT~4(51):
+error: for.asm(45) -> for.asm::REPT~4(51):
     'v' already defined as constant at for.asm(45) -> for.asm::REPT~4(49)
 FATAL: for.asm(45) -> for.asm::REPT~4(51):
     Failed to update FOR symbol value
diff --git a/test/asm/format-truncation.err b/test/asm/format-truncation.err
index 01ee8689..41d3ee5c 100644
--- a/test/asm/format-truncation.err
+++ b/test/asm/format-truncation.err
@@ -1,34 +1,34 @@
-ERROR: format-truncation.asm(5):
+error: format-truncation.asm(5):
     Formatted numeric value too long
-ERROR: format-truncation.asm(6):
+error: format-truncation.asm(6):
     Formatted numeric value too long
-ERROR: format-truncation.asm(7):
+error: format-truncation.asm(7):
     Fractional width 260 too long, limiting to 255
-ERROR: format-truncation.asm(7):
+error: format-truncation.asm(7):
     Formatted numeric value too long
-ERROR: format-truncation.asm(8):
+error: format-truncation.asm(8):
     Formatted string value too long
-ERROR: format-truncation.asm(9):
+error: format-truncation.asm(9):
     Formatted string value too long
-ERROR: format-truncation.asm(11):
+error: format-truncation.asm(11):
     Formatted numeric value too long
 warning: format-truncation.asm(11): [-Wlong-string]
     String constant too long
-ERROR: format-truncation.asm(12):
+error: format-truncation.asm(12):
     Formatted numeric value too long
 warning: format-truncation.asm(12): [-Wlong-string]
     String constant too long
-ERROR: format-truncation.asm(13):
+error: format-truncation.asm(13):
     Fractional width 260 too long, limiting to 255
-ERROR: format-truncation.asm(13):
+error: format-truncation.asm(13):
     Formatted numeric value too long
 warning: format-truncation.asm(13): [-Wlong-string]
     String constant too long
-ERROR: format-truncation.asm(14):
+error: format-truncation.asm(14):
     Formatted string value too long
 warning: format-truncation.asm(14): [-Wlong-string]
     String constant too long
-ERROR: format-truncation.asm(15):
+error: format-truncation.asm(15):
     Formatted string value too long
 warning: format-truncation.asm(15): [-Wlong-string]
     String constant too long
diff --git a/test/asm/fragment-align.err b/test/asm/fragment-align.err
index 0c3f8e2d..7377752c 100644
--- a/test/asm/fragment-align.err
+++ b/test/asm/fragment-align.err
@@ -1,3 +1,3 @@
-ERROR: fragment-align.asm(25):
+error: fragment-align.asm(25):
     Section's alignment fails required alignment (offset from section start = $0004)
 error: Assembly aborted (1 error)!
diff --git a/test/asm/garbage_char.err b/test/asm/garbage_char.err
index d7bb40f3..c9506e34 100644
--- a/test/asm/garbage_char.err
+++ b/test/asm/garbage_char.err
@@ -1,3 +1,3 @@
-ERROR: garbage_char.asm(1):
+error: garbage_char.asm(1):
     Unknown character 0xFF
 error: Assembly aborted (1 error)!
diff --git a/test/asm/if@-no-sect.err b/test/asm/if@-no-sect.err
index d95a0a8b..8e7a281e 100644
--- a/test/asm/if@-no-sect.err
+++ b/test/asm/if@-no-sect.err
@@ -1,4 +1,4 @@
-ERROR: if@-no-sect.asm(1):
+error: if@-no-sect.asm(1):
     PC has no value outside a section
 warning: if@-no-sect.asm(1): [-Wnumeric-string]
     Treating 2-character string as a number
diff --git a/test/asm/incbin-empty-bad.err b/test/asm/incbin-empty-bad.err
index 59c05f97..65bad213 100644
--- a/test/asm/incbin-empty-bad.err
+++ b/test/asm/incbin-empty-bad.err
@@ -1,3 +1,3 @@
-ERROR: incbin-empty-bad.asm(3):
+error: incbin-empty-bad.asm(3):
     Specified range in INCBIN is out of bounds (0 + 1 > 0)
 error: Assembly aborted (1 error)!
diff --git a/test/asm/incbin-end-0.err b/test/asm/incbin-end-0.err
index 7f94ea24..d64f9531 100644
--- a/test/asm/incbin-end-0.err
+++ b/test/asm/incbin-end-0.err
@@ -1,3 +1,3 @@
-ERROR: incbin-end-0.asm(1):
+error: incbin-end-0.asm(1):
     Cannot output data outside of a SECTION
 error: Assembly aborted (1 error)!
diff --git a/test/asm/incbin-end-bad.err b/test/asm/incbin-end-bad.err
index 7d3ebb63..3f29b02f 100644
--- a/test/asm/incbin-end-bad.err
+++ b/test/asm/incbin-end-bad.err
@@ -1,3 +1,3 @@
-ERROR: incbin-end-bad.asm(3):
+error: incbin-end-bad.asm(3):
     Specified range in INCBIN is out of bounds (123 + 1 > 123)
 error: Assembly aborted (1 error)!
diff --git a/test/asm/incompatible-alignment.err b/test/asm/incompatible-alignment.err
index c9e5f064..e2bb4e53 100644
--- a/test/asm/incompatible-alignment.err
+++ b/test/asm/incompatible-alignment.err
@@ -1,4 +1,4 @@
-ERROR: incompatible-alignment.asm(8):
+error: incompatible-alignment.asm(8):
     Section already declared with incompatible 256-byte alignment (offset 0)
 FATAL: incompatible-alignment.asm(8):
     Cannot create section "Test" (1 error)
diff --git a/test/asm/interpolation-overflow.err b/test/asm/interpolation-overflow.err
index 70541a13..8c5af27f 100644
--- a/test/asm/interpolation-overflow.err
+++ b/test/asm/interpolation-overflow.err
@@ -1,12 +1,12 @@
-ERROR: interpolation-overflow.asm(4):
+error: interpolation-overflow.asm(4):
     Fractional width 99999999 too long, limiting to 255
-ERROR: interpolation-overflow.asm(4):
+error: interpolation-overflow.asm(4):
     Formatted numeric value too long
 warning: interpolation-overflow.asm(4): [-Wlarge-constant]
     Precision of fixed-point constant is too large
 while expanding symbol "0.0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
-ERROR: interpolation-overflow.asm(4):
+error: interpolation-overflow.asm(4):
     Macro argument '\1' not defined
-ERROR: interpolation-overflow.asm(4):
+error: interpolation-overflow.asm(4):
     syntax error, unexpected number
 error: Assembly aborted (4 errors)!
diff --git a/test/asm/invalid-empty-macro-arg.err b/test/asm/invalid-empty-macro-arg.err
index dee514a4..6f300ad8 100644
--- a/test/asm/invalid-empty-macro-arg.err
+++ b/test/asm/invalid-empty-macro-arg.err
@@ -1,3 +1,3 @@
-ERROR: invalid-empty-macro-arg.asm(1):
+error: invalid-empty-macro-arg.asm(1):
     Empty bracketed macro argument
 error: Assembly aborted (1 error)!
diff --git a/test/asm/invalid-macro-arg-character.err b/test/asm/invalid-macro-arg-character.err
index f11f6487..b81cca3f 100644
--- a/test/asm/invalid-macro-arg-character.err
+++ b/test/asm/invalid-macro-arg-character.err
@@ -1,5 +1,5 @@
-ERROR: invalid-macro-arg-character.asm(1):
+error: invalid-macro-arg-character.asm(1):
     Invalid character in bracketed macro argument '!'
-ERROR: invalid-macro-arg-character.asm(1):
+error: invalid-macro-arg-character.asm(1):
     syntax error, unexpected >
 error: Assembly aborted (2 errors)!
diff --git a/test/asm/invalid-macro-arg-symbol.err b/test/asm/invalid-macro-arg-symbol.err
index 4c74dcfa..76a780cb 100644
--- a/test/asm/invalid-macro-arg-symbol.err
+++ b/test/asm/invalid-macro-arg-symbol.err
@@ -1,3 +1,3 @@
-ERROR: invalid-macro-arg-symbol.asm(1):
+error: invalid-macro-arg-symbol.asm(1):
     Bracketed symbol "foo" does not exist
 error: Assembly aborted (1 error)!
diff --git a/test/asm/invalid-utf-8-strings.err b/test/asm/invalid-utf-8-strings.err
index 46f6e8e7..6d9cdee9 100644
--- a/test/asm/invalid-utf-8-strings.err
+++ b/test/asm/invalid-utf-8-strings.err
@@ -1,45 +1,45 @@
-ERROR: invalid-utf-8-strings.asm(16):
+error: invalid-utf-8-strings.asm(16):
     STRLEN: Invalid UTF-8 byte 0xA3
-ERROR: invalid-utf-8-strings.asm(16):
+error: invalid-utf-8-strings.asm(16):
     STRLEN: Invalid UTF-8 byte 0xA4
-ERROR: invalid-utf-8-strings.asm(16):
+error: invalid-utf-8-strings.asm(16):
     STRLEN: Invalid UTF-8 byte 0xF0
-ERROR: invalid-utf-8-strings.asm(16):
+error: invalid-utf-8-strings.asm(16):
     STRLEN: Invalid UTF-8 byte 0xA2
-ERROR: invalid-utf-8-strings.asm(17):
+error: invalid-utf-8-strings.asm(17):
     STRLEN: Invalid UTF-8 byte 0xA3
-ERROR: invalid-utf-8-strings.asm(17):
+error: invalid-utf-8-strings.asm(17):
     STRLEN: Invalid UTF-8 byte 0xA4
-ERROR: invalid-utf-8-strings.asm(17):
+error: invalid-utf-8-strings.asm(17):
     STRLEN: Invalid UTF-8 byte 0xF0
-ERROR: invalid-utf-8-strings.asm(17):
+error: invalid-utf-8-strings.asm(17):
     STRLEN: Invalid UTF-8 byte 0xA2
-ERROR: invalid-utf-8-strings.asm(17):
+error: invalid-utf-8-strings.asm(17):
     STRSUB: Invalid UTF-8 byte 0xA3
-ERROR: invalid-utf-8-strings.asm(17):
+error: invalid-utf-8-strings.asm(17):
     STRSUB: Invalid UTF-8 byte 0xA4
-ERROR: invalid-utf-8-strings.asm(17):
+error: invalid-utf-8-strings.asm(17):
     STRSUB: Invalid UTF-8 byte 0xF0
-ERROR: invalid-utf-8-strings.asm(17):
+error: invalid-utf-8-strings.asm(17):
     STRSUB: Invalid UTF-8 byte 0xA2
-ERROR: invalid-utf-8-strings.asm(21):
+error: invalid-utf-8-strings.asm(21):
     STRLEN: Invalid UTF-8 byte 0xA3
-ERROR: invalid-utf-8-strings.asm(21):
+error: invalid-utf-8-strings.asm(21):
     STRLEN: Invalid UTF-8 byte 0xA4
-ERROR: invalid-utf-8-strings.asm(21):
+error: invalid-utf-8-strings.asm(21):
     STRLEN: Invalid UTF-8 byte 0xF0
-ERROR: invalid-utf-8-strings.asm(21):
+error: invalid-utf-8-strings.asm(21):
     STRLEN: Invalid UTF-8 byte 0xA2
-ERROR: invalid-utf-8-strings.asm(22):
+error: invalid-utf-8-strings.asm(22):
     STRLEN: Invalid UTF-8 byte 0xA3
-ERROR: invalid-utf-8-strings.asm(22):
+error: invalid-utf-8-strings.asm(22):
     STRLEN: Invalid UTF-8 byte 0xA4
-ERROR: invalid-utf-8-strings.asm(22):
+error: invalid-utf-8-strings.asm(22):
     STRLEN: Invalid UTF-8 byte 0xF0
-ERROR: invalid-utf-8-strings.asm(22):
+error: invalid-utf-8-strings.asm(22):
     STRLEN: Invalid UTF-8 byte 0xA2
-ERROR: invalid-utf-8-strings.asm(22):
+error: invalid-utf-8-strings.asm(22):
     STRSUB: Invalid UTF-8 byte 0xA3
-ERROR: invalid-utf-8-strings.asm(22):
+error: invalid-utf-8-strings.asm(22):
     STRSUB: Invalid UTF-8 byte 0xA4
 error: Assembly aborted (22 errors)!
diff --git a/test/asm/invalid-utf-8.err b/test/asm/invalid-utf-8.err
index 25352e6e..4eed4726 100644
--- a/test/asm/invalid-utf-8.err
+++ b/test/asm/invalid-utf-8.err
@@ -1,5 +1,5 @@
-ERROR: invalid-utf-8.asm(6) -> invalid-utf-8.asm::m(4):
+error: invalid-utf-8.asm(6) -> invalid-utf-8.asm::m(4):
     Unknown character 0xCF
-ERROR: invalid-utf-8.asm(6) -> invalid-utf-8.asm::m(4):
+error: invalid-utf-8.asm(6) -> invalid-utf-8.asm::m(4):
     Unknown character 0xD3
 error: Assembly aborted (2 errors)!
diff --git a/test/asm/isconst.err b/test/asm/isconst.err
index f18704d1..261d849f 100644
--- a/test/asm/isconst.err
+++ b/test/asm/isconst.err
@@ -1,12 +1,12 @@
 warning: isconst.asm(14) -> isconst.asm::test_expr(10): [-Wuser]
     Test #1: Compile-time constant
-ERROR: isconst.asm(15) -> isconst.asm::test_expr(9):
+error: isconst.asm(15) -> isconst.asm::test_expr(9):
     Expected constant expression: 'UnknownLabel' is not constant at assembly time
 warning: isconst.asm(21) -> isconst.asm::test_expr(10): [-Wuser]
     Test #3: Compile-time constant
 warning: isconst.asm(22) -> isconst.asm::test_expr(10): [-Wuser]
     Test #4: Compile-time constant
-ERROR: isconst.asm(28) -> isconst.asm::test_expr(9):
+error: isconst.asm(28) -> isconst.asm::test_expr(9):
     Expected constant expression: 'FloatingLabel' is not constant at assembly time
 warning: isconst.asm(29) -> isconst.asm::test_expr(10): [-Wuser]
     Test #6: Compile-time constant
diff --git a/test/asm/label-diff.err b/test/asm/label-diff.err
index e8ee6b2d..279b040b 100644
--- a/test/asm/label-diff.err
+++ b/test/asm/label-diff.err
@@ -1,37 +1,37 @@
-ERROR: label-diff.asm(32) -> label-diff.asm::print_diff(20):
+error: label-diff.asm(32) -> label-diff.asm::print_diff(20):
     Expected constant expression: 'Known' is not constant at assembly time
-ERROR: label-diff.asm(32) -> label-diff.asm::print_diff(21):
+error: label-diff.asm(32) -> label-diff.asm::print_diff(21):
     Expected constant expression: 'Known' is not constant at assembly time
-ERROR: label-diff.asm(34) -> label-diff.asm::print_diff(20):
+error: label-diff.asm(34) -> label-diff.asm::print_diff(20):
     Expected constant expression: 'Unknown' is not constant at assembly time
-ERROR: label-diff.asm(34) -> label-diff.asm::print_diff(21):
+error: label-diff.asm(34) -> label-diff.asm::print_diff(21):
     Expected constant expression: 'Unknown' is not constant at assembly time
-ERROR: label-diff.asm(36) -> label-diff.asm::print_diff(20):
+error: label-diff.asm(36) -> label-diff.asm::print_diff(20):
     Expected constant expression: 'Known' is not constant at assembly time
-ERROR: label-diff.asm(36) -> label-diff.asm::print_diff(21):
+error: label-diff.asm(36) -> label-diff.asm::print_diff(21):
     Expected constant expression: 'Unknown' is not constant at assembly time
-ERROR: label-diff.asm(38) -> label-diff.asm::print_diff(20):
+error: label-diff.asm(38) -> label-diff.asm::print_diff(20):
     Expected constant expression: 'Unknown' is not constant at assembly time
-ERROR: label-diff.asm(38) -> label-diff.asm::print_diff(21):
+error: label-diff.asm(38) -> label-diff.asm::print_diff(21):
     Expected constant expression: 'Unknown2' is not constant at assembly time
-ERROR: label-diff.asm(45) -> label-diff.asm::print_diff(20):
+error: label-diff.asm(45) -> label-diff.asm::print_diff(20):
     Expected constant expression: 'Known' is not constant at assembly time
-ERROR: label-diff.asm(45) -> label-diff.asm::print_diff(21):
+error: label-diff.asm(45) -> label-diff.asm::print_diff(21):
     Expected constant expression: 'Known' is not constant at assembly time
-ERROR: label-diff.asm(47) -> label-diff.asm::print_diff(20):
+error: label-diff.asm(47) -> label-diff.asm::print_diff(20):
     Expected constant expression: 'Unknown' is not constant at assembly time
-ERROR: label-diff.asm(47) -> label-diff.asm::print_diff(21):
+error: label-diff.asm(47) -> label-diff.asm::print_diff(21):
     Expected constant expression: 'Unknown' is not constant at assembly time
-ERROR: label-diff.asm(58) -> label-diff.asm::print_diff(20):
+error: label-diff.asm(58) -> label-diff.asm::print_diff(20):
     Expected constant expression: PC is not constant at assembly time
-ERROR: label-diff.asm(58) -> label-diff.asm::print_diff(21):
+error: label-diff.asm(58) -> label-diff.asm::print_diff(21):
     Expected constant expression: PC is not constant at assembly time
-ERROR: label-diff.asm(60) -> label-diff.asm::print_diff(20):
+error: label-diff.asm(60) -> label-diff.asm::print_diff(20):
     Expected constant expression: 'Known' is not constant at assembly time
-ERROR: label-diff.asm(60) -> label-diff.asm::print_diff(21):
+error: label-diff.asm(60) -> label-diff.asm::print_diff(21):
     Expected constant expression: PC is not constant at assembly time
-ERROR: label-diff.asm(62) -> label-diff.asm::print_diff(20):
+error: label-diff.asm(62) -> label-diff.asm::print_diff(20):
     Expected constant expression: 'Unknown' is not constant at assembly time
-ERROR: label-diff.asm(62) -> label-diff.asm::print_diff(21):
+error: label-diff.asm(62) -> label-diff.asm::print_diff(21):
     Expected constant expression: PC is not constant at assembly time
 error: Assembly aborted (18 errors)!
diff --git a/test/asm/label-macro-arg.err b/test/asm/label-macro-arg.err
index 0153739a..0b3fd3bb 100644
--- a/test/asm/label-macro-arg.err
+++ b/test/asm/label-macro-arg.err
@@ -1,21 +1,21 @@
-ERROR: label-macro-arg.asm(38) -> label-macro-arg.asm::test_char(25):
+error: label-macro-arg.asm(38) -> label-macro-arg.asm::test_char(25):
     syntax error, unexpected =
 while expanding symbol "VAR_DEF"
-ERROR: label-macro-arg.asm(38) -> label-macro-arg.asm::test_char(26):
+error: label-macro-arg.asm(38) -> label-macro-arg.asm::test_char(26):
     syntax error, unexpected =
-ERROR: label-macro-arg.asm(38) -> label-macro-arg.asm::test_char(29):
+error: label-macro-arg.asm(38) -> label-macro-arg.asm::test_char(29):
     Interpolated symbol "sizeof_.something" does not exist
-ERROR: label-macro-arg.asm(39) -> label-macro-arg.asm::test_char(25):
+error: label-macro-arg.asm(39) -> label-macro-arg.asm::test_char(25):
     Label "sizeof_" created outside of a SECTION
 while expanding symbol "VAR_DEF"
-ERROR: label-macro-arg.asm(39) -> label-macro-arg.asm::test_char(25):
+error: label-macro-arg.asm(39) -> label-macro-arg.asm::test_char(25):
     Macro "something" not defined
-ERROR: label-macro-arg.asm(39) -> label-macro-arg.asm::test_char(26):
+error: label-macro-arg.asm(39) -> label-macro-arg.asm::test_char(26):
     'sizeof_' already defined at label-macro-arg.asm(39) -> label-macro-arg.asm::test_char(25)
-ERROR: label-macro-arg.asm(39) -> label-macro-arg.asm::test_char(26):
+error: label-macro-arg.asm(39) -> label-macro-arg.asm::test_char(26):
     Macro "something" not defined
-ERROR: label-macro-arg.asm(39) -> label-macro-arg.asm::test_char(29):
+error: label-macro-arg.asm(39) -> label-macro-arg.asm::test_char(29):
     Invalid format spec 'sizeof_'
-ERROR: label-macro-arg.asm(39) -> label-macro-arg.asm::test_char(29):
+error: label-macro-arg.asm(39) -> label-macro-arg.asm::test_char(29):
     Interpolated symbol "something" does not exist
 error: Assembly aborted (9 errors)!
diff --git a/test/asm/label-macro-arg.simple.err b/test/asm/label-macro-arg.simple.err
index ba199e93..7c35be8e 100644
--- a/test/asm/label-macro-arg.simple.err
+++ b/test/asm/label-macro-arg.simple.err
@@ -1,24 +1,24 @@
-ERROR: label-macro-arg.asm(38) -> label-macro-arg.asm::test_char(25):
+error: label-macro-arg.asm(38) -> label-macro-arg.asm::test_char(25):
     Local label 'sizeof_.something' in main scope
 while expanding symbol "VAR_DEF"
-ERROR: label-macro-arg.asm(38) -> label-macro-arg.asm::test_char(25):
+error: label-macro-arg.asm(38) -> label-macro-arg.asm::test_char(25):
     syntax error
 while expanding symbol "VAR_DEF"
-ERROR: label-macro-arg.asm(38) -> label-macro-arg.asm::test_char(26):
+error: label-macro-arg.asm(38) -> label-macro-arg.asm::test_char(26):
     Local label 'sizeof_.something' in main scope
-ERROR: label-macro-arg.asm(38) -> label-macro-arg.asm::test_char(29):
+error: label-macro-arg.asm(38) -> label-macro-arg.asm::test_char(29):
     Interpolated symbol "sizeof_.something" does not exist
-ERROR: label-macro-arg.asm(39) -> label-macro-arg.asm::test_char(25):
+error: label-macro-arg.asm(39) -> label-macro-arg.asm::test_char(25):
     Label "sizeof_" created outside of a SECTION
 while expanding symbol "VAR_DEF"
-ERROR: label-macro-arg.asm(39) -> label-macro-arg.asm::test_char(25):
+error: label-macro-arg.asm(39) -> label-macro-arg.asm::test_char(25):
     Macro "something" not defined
-ERROR: label-macro-arg.asm(39) -> label-macro-arg.asm::test_char(26):
+error: label-macro-arg.asm(39) -> label-macro-arg.asm::test_char(26):
     'sizeof_' already defined at label-macro-arg.asm(39) -> label-macro-arg.asm::test_char(25)
-ERROR: label-macro-arg.asm(39) -> label-macro-arg.asm::test_char(26):
+error: label-macro-arg.asm(39) -> label-macro-arg.asm::test_char(26):
     Macro "something" not defined
-ERROR: label-macro-arg.asm(39) -> label-macro-arg.asm::test_char(29):
+error: label-macro-arg.asm(39) -> label-macro-arg.asm::test_char(29):
     Invalid format spec 'sizeof_'
-ERROR: label-macro-arg.asm(39) -> label-macro-arg.asm::test_char(29):
+error: label-macro-arg.asm(39) -> label-macro-arg.asm::test_char(29):
     Interpolated symbol "something" does not exist
 error: Assembly aborted (10 errors)!
diff --git a/test/asm/label-outside-section.err b/test/asm/label-outside-section.err
index 904bf3bb..71ab7e3f 100644
--- a/test/asm/label-outside-section.err
+++ b/test/asm/label-outside-section.err
@@ -1,3 +1,3 @@
-ERROR: label-outside-section.asm(1):
+error: label-outside-section.asm(1):
     Label "bad" created outside of a SECTION
 error: Assembly aborted (1 error)!
diff --git a/test/asm/label-redefinition.err b/test/asm/label-redefinition.err
index 6f3fc268..74733c78 100644
--- a/test/asm/label-redefinition.err
+++ b/test/asm/label-redefinition.err
@@ -1,3 +1,3 @@
-ERROR: label-redefinition.asm(7):
+error: label-redefinition.asm(7):
     'Sym' already defined at label-redefinition.asm(6) -> label-redefinition.asm::m(4)
 error: Assembly aborted (1 error)!
diff --git a/test/asm/line-continuation-whitespace.err b/test/asm/line-continuation-whitespace.err
index 978cddf6..6989fd03 100644
--- a/test/asm/line-continuation-whitespace.err
+++ b/test/asm/line-continuation-whitespace.err
@@ -1,3 +1,3 @@
-ERROR: line-continuation-whitespace.asm(7):
+error: line-continuation-whitespace.asm(7):
     Label "foo" created outside of a SECTION
 error: Assembly aborted (1 error)!
diff --git a/test/asm/line-continuation.err b/test/asm/line-continuation.err
index 249a5300..d16ad5d2 100644
--- a/test/asm/line-continuation.err
+++ b/test/asm/line-continuation.err
@@ -1,3 +1,3 @@
-ERROR: line-continuation.asm(7):
+error: line-continuation.asm(7):
     Label "foo" created outside of a SECTION
 error: Assembly aborted (1 error)!
diff --git a/test/asm/load-fragment.err b/test/asm/load-fragment.err
index 9f338d5f..9d3a68e8 100644
--- a/test/asm/load-fragment.err
+++ b/test/asm/load-fragment.err
@@ -1,3 +1,3 @@
-ERROR: load-fragment.asm(2):
+error: load-fragment.asm(2):
     `LOAD FRAGMENT` is not allowed
 error: Assembly aborted (1 error)!
diff --git a/test/asm/load-overflow.err b/test/asm/load-overflow.err
index 05e43a6c..9a2662be 100644
--- a/test/asm/load-overflow.err
+++ b/test/asm/load-overflow.err
@@ -1,11 +1,11 @@
-ERROR: load-overflow.asm(5):
+error: load-overflow.asm(5):
     Section 'Overflow' grew too big (max size = 0x8000 bytes, reached 0x8001).
-ERROR: load-overflow.asm(5):
+error: load-overflow.asm(5):
     Section 'oops' grew too big (max size = 0x2000 bytes, reached 0x2001).
-ERROR: load-overflow.asm(13):
+error: load-overflow.asm(13):
     Section 'Moar overflow' grew too big (max size = 0x8000 bytes, reached 0x8001).
-ERROR: load-overflow.asm(22):
+error: load-overflow.asm(22):
     Section 'lol' grew too big (max size = 0x2000 bytes, reached 0x2001).
-ERROR: load-overflow.asm(25):
+error: load-overflow.asm(25):
     Section 'Not overflowing' grew too big (max size = 0x8000 bytes, reached 0x8001).
 error: Assembly aborted (5 errors)!
diff --git a/test/asm/load-rom.err b/test/asm/load-rom.err
index bc2b8093..9f60321a 100644
--- a/test/asm/load-rom.err
+++ b/test/asm/load-rom.err
@@ -1,5 +1,5 @@
-ERROR: load-rom.asm(3):
+error: load-rom.asm(3):
     `LOAD` blocks cannot create a ROM section
-ERROR: load-rom.asm(5):
+error: load-rom.asm(5):
     Found `ENDL` outside of a `LOAD` block
 error: Assembly aborted (2 errors)!
diff --git a/test/asm/local-purge.err b/test/asm/local-purge.err
index 930431dc..2eff165c 100644
--- a/test/asm/local-purge.err
+++ b/test/asm/local-purge.err
@@ -1,3 +1,3 @@
-ERROR: local-purge.asm(8):
+error: local-purge.asm(8):
     Interpolated symbol ".loc" does not exist
 error: Assembly aborted (1 error)!
diff --git a/test/asm/local-truncated.err b/test/asm/local-truncated.err
index 6473118f..2710cfe8 100644
--- a/test/asm/local-truncated.err
+++ b/test/asm/local-truncated.err
@@ -1,6 +1,6 @@
 warning: local-truncated.asm(10): [-Wlong-string]
     Symbol name too long, got truncated
-ERROR: local-truncated.asm(10):
+error: local-truncated.asm(10):
     'a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001' already defined at local-truncated.asm(3)
 warning: local-truncated.asm(11): [-Wlong-string]
     Symbol name too long, got truncated
diff --git a/test/asm/local-without-parent.err b/test/asm/local-without-parent.err
index 63dfadc7..4f1db1e3 100644
--- a/test/asm/local-without-parent.err
+++ b/test/asm/local-without-parent.err
@@ -1,3 +1,3 @@
-ERROR: local-without-parent.asm(2):
+error: local-without-parent.asm(2):
     Local label '.test' in main scope
 error: Assembly aborted (1 error)!
diff --git a/test/asm/local-wrong-parent.err b/test/asm/local-wrong-parent.err
index a8d829dd..2b12513d 100644
--- a/test/asm/local-wrong-parent.err
+++ b/test/asm/local-wrong-parent.err
@@ -1,3 +1,3 @@
-ERROR: local-wrong-parent.asm(5):
+error: local-wrong-parent.asm(5):
     Not currently in the scope of 'WrongParent'
 error: Assembly aborted (1 error)!
diff --git a/test/asm/macro-@.err b/test/asm/macro-@.err
index 09a94705..653fce1f 100644
--- a/test/asm/macro-@.err
+++ b/test/asm/macro-@.err
@@ -1,5 +1,5 @@
-ERROR: macro-@.asm(1):
+error: macro-@.asm(1):
     Label "foo" created outside of a SECTION
-ERROR: macro-@.asm(1):
+error: macro-@.asm(1):
     "@" is not a macro
 error: Assembly aborted (2 errors)!
diff --git a/test/asm/macro-arg-in-string.err b/test/asm/macro-arg-in-string.err
index 22a24c2e..c64b6fbe 100644
--- a/test/asm/macro-arg-in-string.err
+++ b/test/asm/macro-arg-in-string.err
@@ -1,3 +1,3 @@
-ERROR: macro-arg-in-string.asm(12):
+error: macro-arg-in-string.asm(12):
     Illegal character escape '!'
 error: Assembly aborted (1 error)!
diff --git a/test/asm/macro-syntax.err b/test/asm/macro-syntax.err
index c16e669a..0db45a76 100644
--- a/test/asm/macro-syntax.err
+++ b/test/asm/macro-syntax.err
@@ -1,5 +1,5 @@
-ERROR: macro-syntax.asm(13):
+error: macro-syntax.asm(13):
     syntax error, unexpected identifier, expecting newline
-ERROR: macro-syntax.asm(15):
+error: macro-syntax.asm(15):
     syntax error, unexpected ENDM
 error: Assembly aborted (2 errors)!
diff --git a/test/asm/macro-syntax.simple.err b/test/asm/macro-syntax.simple.err
index e4930729..a33a2745 100644
--- a/test/asm/macro-syntax.simple.err
+++ b/test/asm/macro-syntax.simple.err
@@ -1,5 +1,5 @@
-ERROR: macro-syntax.asm(13):
+error: macro-syntax.asm(13):
     syntax error
-ERROR: macro-syntax.asm(15):
+error: macro-syntax.asm(15):
     syntax error
 error: Assembly aborted (2 errors)!
diff --git a/test/asm/multi-line-strings.err b/test/asm/multi-line-strings.err
index d0740b6e..a1983e91 100644
--- a/test/asm/multi-line-strings.err
+++ b/test/asm/multi-line-strings.err
@@ -1,4 +1,4 @@
-ERROR: multi-line-strings.asm(23):
+error: multi-line-strings.asm(23):
     Unterminated string
 warning: multi-line-strings.asm(35): [-Wuser]
     check the line number
diff --git a/test/asm/multiple-charmaps.err b/test/asm/multiple-charmaps.err
index 23a53c97..22d25d28 100644
--- a/test/asm/multiple-charmaps.err
+++ b/test/asm/multiple-charmaps.err
@@ -10,10 +10,10 @@ warning: multiple-charmaps.asm(90) -> multiple-charmaps.asm::print_mapped(27): [
     Treating 2-character string as a number
 warning: multiple-charmaps.asm(98) -> multiple-charmaps.asm::print_mapped(27): [-Wnumeric-string]
     Treating 2-character string as a number
-ERROR: multiple-charmaps.asm(100) -> multiple-charmaps.asm::new_(7):
+error: multiple-charmaps.asm(100) -> multiple-charmaps.asm::new_(7):
     Charmap 'map1' already exists
-ERROR: multiple-charmaps.asm(102) -> multiple-charmaps.asm::set_(13):
+error: multiple-charmaps.asm(102) -> multiple-charmaps.asm::set_(13):
     Charmap 'map5' doesn't exist
-ERROR: multiple-charmaps.asm(104) -> multiple-charmaps.asm::pop_(23):
+error: multiple-charmaps.asm(104) -> multiple-charmaps.asm::pop_(23):
     No entries in the charmap stack
 error: Assembly aborted (3 errors)!
diff --git a/test/asm/narg-nosect.err b/test/asm/narg-nosect.err
index e0c42a3c..aa8b0c69 100644
--- a/test/asm/narg-nosect.err
+++ b/test/asm/narg-nosect.err
@@ -1,3 +1,3 @@
-ERROR: narg-nosect.asm(1):
+error: narg-nosect.asm(1):
     _NARG does not make sense outside of a macro
 error: Assembly aborted (1 error)!
diff --git a/test/asm/nested-brackets.err b/test/asm/nested-brackets.err
index ca93680c..10de1799 100644
--- a/test/asm/nested-brackets.err
+++ b/test/asm/nested-brackets.err
@@ -1,3 +1,3 @@
-ERROR: nested-brackets.asm(5):
+error: nested-brackets.asm(5):
     Missing }
 error: Assembly aborted (1 error)!
diff --git a/test/asm/nested-expansions.err b/test/asm/nested-expansions.err
index cd2a9b85..067e2111 100644
--- a/test/asm/nested-expansions.err
+++ b/test/asm/nested-expansions.err
@@ -1,3 +1,3 @@
-ERROR: nested-expansions.asm(6) -> nested-expansions.asm::test(4):
+error: nested-expansions.asm(6) -> nested-expansions.asm::test(4):
     Macro "qux" not defined
 error: Assembly aborted (1 error)!
diff --git a/test/asm/nested-macrodef.err b/test/asm/nested-macrodef.err
index 885287a9..89514893 100644
--- a/test/asm/nested-macrodef.err
+++ b/test/asm/nested-macrodef.err
@@ -1,7 +1,7 @@
 warning: nested-macrodef.asm(26) -> nested-macrodef.asm::outer(22): [-Wuser]
     Nested macros shouldn't work, whose argument would be \1?
-ERROR: nested-macrodef.asm(26) -> nested-macrodef.asm::outer(24):
+error: nested-macrodef.asm(26) -> nested-macrodef.asm::outer(24):
     Unterminated macro definition
-ERROR: nested-macrodef.asm(27):
+error: nested-macrodef.asm(27):
     Macro "inner" not defined
 error: Assembly aborted (2 errors)!
diff --git a/test/asm/nested-macrodef.simple.err b/test/asm/nested-macrodef.simple.err
index 8f797ded..7df121d6 100644
--- a/test/asm/nested-macrodef.simple.err
+++ b/test/asm/nested-macrodef.simple.err
@@ -1,7 +1,7 @@
 warning: nested-macrodef.asm(26) -> nested-macrodef.asm::outer(22): [-Wuser]
     Nested macros shouldn't work, whose argument would be \1?
-ERROR: nested-macrodef.asm(26) -> nested-macrodef.asm::outer(24):
+error: nested-macrodef.asm(26) -> nested-macrodef.asm::outer(24):
     Unterminated macro definition
-ERROR: nested-macrodef.asm(27):
+error: nested-macrodef.asm(27):
     syntax error
 error: Assembly aborted (2 errors)!
diff --git a/test/asm/null-in-macro.err b/test/asm/null-in-macro.err
index c9148b8a..789176ce 100644
--- a/test/asm/null-in-macro.err
+++ b/test/asm/null-in-macro.err
@@ -1,3 +1,3 @@
-ERROR: null-in-macro.asm(4) -> null-in-macro.asm::foo(2):
+error: null-in-macro.asm(4) -> null-in-macro.asm::foo(2):
     Unknown character 0x00
 error: Assembly aborted (1 error)!
diff --git a/test/asm/pc-bank.err b/test/asm/pc-bank.err
index 2b8a1c85..f3560c04 100644
--- a/test/asm/pc-bank.err
+++ b/test/asm/pc-bank.err
@@ -1,5 +1,5 @@
-ERROR: pc-bank.asm(2):
+error: pc-bank.asm(2):
     Source address $2a00 not between $FF00 to $FFFF
-ERROR: pc-bank.asm(11):
+error: pc-bank.asm(11):
     Expected constant expression: Current section's bank is not known
 error: Assembly aborted (2 errors)!
diff --git a/test/asm/period.err b/test/asm/period.err
index bcbd00b7..5727b90f 100644
--- a/test/asm/period.err
+++ b/test/asm/period.err
@@ -1,3 +1,3 @@
-ERROR: period.asm(5):
+error: period.asm(5):
     syntax error, unexpected .
 error: Assembly aborted (1 error)!
diff --git a/test/asm/period.simple.err b/test/asm/period.simple.err
index e7abb68c..22a4095e 100644
--- a/test/asm/period.simple.err
+++ b/test/asm/period.simple.err
@@ -1,3 +1,3 @@
-ERROR: period.asm(5):
+error: period.asm(5):
     syntax error
 error: Assembly aborted (1 error)!
diff --git a/test/asm/pops-restore-no-section.err b/test/asm/pops-restore-no-section.err
index b606a260..3cd2925f 100644
--- a/test/asm/pops-restore-no-section.err
+++ b/test/asm/pops-restore-no-section.err
@@ -1,5 +1,5 @@
-ERROR: pops-restore-no-section.asm(9):
+error: pops-restore-no-section.asm(9):
     Label "DisallowedContent" created outside of a SECTION
-ERROR: pops-restore-no-section.asm(10):
+error: pops-restore-no-section.asm(10):
     Cannot output data outside of a SECTION
 error: Assembly aborted (2 errors)!
diff --git a/test/asm/purge-ref.err b/test/asm/purge-ref.err
index d9974bcf..6ef4bb99 100644
--- a/test/asm/purge-ref.err
+++ b/test/asm/purge-ref.err
@@ -1,7 +1,7 @@
-ERROR: purge-ref.asm(4):
+error: purge-ref.asm(4):
     Symbol "ref" is referenced and thus cannot be purged
-ERROR: purge-ref.asm(11):
+error: purge-ref.asm(11):
     Symbol "NotOK" is referenced and thus cannot be purged
-ERROR: purge-ref.asm(15):
+error: purge-ref.asm(15):
     Symbol "EvenLessOK" is referenced and thus cannot be purged
 error: Assembly aborted (3 errors)!
diff --git a/test/asm/purge-refs.err b/test/asm/purge-refs.err
index e7a98df0..d4761445 100644
--- a/test/asm/purge-refs.err
+++ b/test/asm/purge-refs.err
@@ -1,3 +1,3 @@
-ERROR: purge-refs.asm(6):
+error: purge-refs.asm(6):
     Symbol "Floating" is referenced and thus cannot be purged
 error: Assembly aborted (1 error)!
diff --git a/test/asm/purge.err b/test/asm/purge.err
index daaf2c58..3228a909 100644
--- a/test/asm/purge.err
+++ b/test/asm/purge.err
@@ -1,3 +1,3 @@
-ERROR: purge.asm(9):
+error: purge.asm(9):
     Symbol "Referenced" is referenced and thus cannot be purged
 error: Assembly aborted (1 error)!
diff --git a/test/asm/pushs.err b/test/asm/pushs.err
index 9bcefc83..6b5bdce2 100644
--- a/test/asm/pushs.err
+++ b/test/asm/pushs.err
@@ -1,3 +1,3 @@
-ERROR: pushs.asm(5):
+error: pushs.asm(5):
     Cannot output data outside of a SECTION
 error: Assembly aborted (1 error)!
diff --git a/test/asm/raw-macro-args.err b/test/asm/raw-macro-args.err
index 3a68773e..b9da9770 100644
--- a/test/asm/raw-macro-args.err
+++ b/test/asm/raw-macro-args.err
@@ -1,9 +1,9 @@
-ERROR: raw-macro-args.asm(26):
+error: raw-macro-args.asm(26):
     Unterminated string
-ERROR: raw-macro-args.asm(26) -> raw-macro-args.asm::printargs(2) -> raw-macro-args.asm::printargs::REPT~1(3):
+error: raw-macro-args.asm(26) -> raw-macro-args.asm::printargs(2) -> raw-macro-args.asm::printargs::REPT~1(3):
     Unterminated string
-ERROR: raw-macro-args.asm(37):
+error: raw-macro-args.asm(37):
     Unterminated string
-ERROR: raw-macro-args.asm(38):
+error: raw-macro-args.asm(38):
     Unterminated string
 error: Assembly aborted (4 errors)!
diff --git a/test/asm/redef-equ.err b/test/asm/redef-equ.err
index 5dce5356..6ad6aff0 100644
--- a/test/asm/redef-equ.err
+++ b/test/asm/redef-equ.err
@@ -1,3 +1,3 @@
-ERROR: redef-equ.asm(23):
+error: redef-equ.asm(23):
     'N' already defined as non-EQU at redef-equ.asm(22)
 error: Assembly aborted (1 error)!
diff --git a/test/asm/redef-equs.err b/test/asm/redef-equs.err
index a0945214..22b981b6 100644
--- a/test/asm/redef-equs.err
+++ b/test/asm/redef-equs.err
@@ -1,3 +1,3 @@
-ERROR: redef-equs.asm(23):
+error: redef-equs.asm(23):
     'N' already defined as non-EQUS at redef-equs.asm(22)
 error: Assembly aborted (1 error)!
diff --git a/test/asm/ref-override-bad.err b/test/asm/ref-override-bad.err
index 10354d92..3f0417f6 100644
--- a/test/asm/ref-override-bad.err
+++ b/test/asm/ref-override-bad.err
@@ -1,5 +1,5 @@
-ERROR: ref-override-bad.asm(8):
+error: ref-override-bad.asm(8):
     'X' already referenced at ref-override-bad.asm(7)
-ERROR: ref-override-bad.asm(13):
+error: ref-override-bad.asm(13):
     'Y' already referenced at ref-override-bad.asm(10)
 error: Assembly aborted (2 errors)!
diff --git a/test/asm/reference-undefined-equs.err b/test/asm/reference-undefined-equs.err
index b2657d06..f495b859 100644
--- a/test/asm/reference-undefined-equs.err
+++ b/test/asm/reference-undefined-equs.err
@@ -1,5 +1,5 @@
-ERROR: reference-undefined-equs.asm(4):
+error: reference-undefined-equs.asm(4):
     's1' already referenced at reference-undefined-equs.asm(2)
-ERROR: reference-undefined-equs.asm(5):
+error: reference-undefined-equs.asm(5):
     's2' already referenced at reference-undefined-equs.asm(2)
 error: Assembly aborted (2 errors)!
diff --git a/test/asm/rept-shift.err b/test/asm/rept-shift.err
index 50ae29e6..5a75f25c 100644
--- a/test/asm/rept-shift.err
+++ b/test/asm/rept-shift.err
@@ -2,6 +2,6 @@ warning: rept-shift.asm(15) -> rept-shift.asm::m(10): [-Wmacro-shift]
     Cannot shift macro arguments past their end
 warning: rept-shift.asm(15) -> rept-shift.asm::m(11): [-Wmacro-shift]
     Cannot shift macro arguments past their end
-ERROR: rept-shift.asm(15) -> rept-shift.asm::m(12):
+error: rept-shift.asm(15) -> rept-shift.asm::m(12):
     Macro argument '\1' not defined
 error: Assembly aborted (1 error)!
diff --git a/test/asm/section-sizeof-startof.err b/test/asm/section-sizeof-startof.err
index ca9d923a..954c9cf3 100644
--- a/test/asm/section-sizeof-startof.err
+++ b/test/asm/section-sizeof-startof.err
@@ -1,11 +1,11 @@
-ERROR: section-sizeof-startof.asm(5):
+error: section-sizeof-startof.asm(5):
     Expected constant expression: Section "sect"'s size is not known
-ERROR: section-sizeof-startof.asm(21):
+error: section-sizeof-startof.asm(21):
     Expected constant expression: Section "sect2"'s bank is not known
-ERROR: section-sizeof-startof.asm(22):
+error: section-sizeof-startof.asm(22):
     Expected constant expression: Section "sect2"'s size is not known
-ERROR: section-sizeof-startof.asm(23):
+error: section-sizeof-startof.asm(23):
     Expected constant expression: Section "sect2"'s start is not known
-ERROR: section-sizeof-startof.asm(30):
+error: section-sizeof-startof.asm(30):
     Expected constant expression: Section "sect3"'s size is not known
 error: Assembly aborted (5 errors)!
diff --git a/test/asm/section-union.err b/test/asm/section-union.err
index d5dce270..86e0c0ab 100644
--- a/test/asm/section-union.err
+++ b/test/asm/section-union.err
@@ -1,4 +1,4 @@
-ERROR: section-union.asm(37):
+error: section-union.asm(37):
     Section already declared as union section
 FATAL: section-union.asm(37):
     Cannot create section "test" (1 error)
diff --git a/test/asm/shift-outside-macro.err b/test/asm/shift-outside-macro.err
index 42cf6c9b..2eba2b14 100644
--- a/test/asm/shift-outside-macro.err
+++ b/test/asm/shift-outside-macro.err
@@ -1,5 +1,5 @@
-ERROR: shift-outside-macro.asm(1):
+error: shift-outside-macro.asm(1):
     Cannot shift macro arguments outside of a macro
-ERROR: shift-outside-macro.asm(2):
+error: shift-outside-macro.asm(2):
     Cannot shift macro arguments outside of a macro
 error: Assembly aborted (2 errors)!
diff --git a/test/asm/strfmt.err b/test/asm/strfmt.err
index d453835d..c8947eb2 100644
--- a/test/asm/strfmt.err
+++ b/test/asm/strfmt.err
@@ -1,11 +1,11 @@
-ERROR: strfmt.asm(14):
+error: strfmt.asm(14):
     Formatting number as type 's'
-ERROR: strfmt.asm(14):
+error: strfmt.asm(14):
     STRFMT: 1 unformatted argument(s)
-ERROR: strfmt.asm(22):
+error: strfmt.asm(22):
     STRFMT: Illegal '%' at end of format string
-ERROR: strfmt.asm(24):
+error: strfmt.asm(24):
     STRFMT: Invalid format spec for argument 1
-ERROR: strfmt.asm(26):
+error: strfmt.asm(26):
     STRFMT: Not enough arguments for format spec, got: 1, need: 3
 error: Assembly aborted (5 errors)!
diff --git a/test/asm/string-formatting.err b/test/asm/string-formatting.err
index 99e09761..033fd367 100644
--- a/test/asm/string-formatting.err
+++ b/test/asm/string-formatting.err
@@ -1,3 +1,3 @@
-ERROR: string-formatting.asm(10):
+error: string-formatting.asm(10):
     Formatting string with prefix flag '#'
 error: Assembly aborted (1 error)!
diff --git a/test/asm/sym-collision.err b/test/asm/sym-collision.err
index 68a6dde0..89ff0cbe 100644
--- a/test/asm/sym-collision.err
+++ b/test/asm/sym-collision.err
@@ -1,3 +1,3 @@
-ERROR: sym-collision.asm(26):
+error: sym-collision.asm(26):
     Interpolated symbol "dork" does not exist
 error: Assembly aborted (1 error)!
diff --git a/test/asm/sym-scope.err b/test/asm/sym-scope.err
index 561491d8..0ff9a0a7 100644
--- a/test/asm/sym-scope.err
+++ b/test/asm/sym-scope.err
@@ -1,9 +1,9 @@
-ERROR: sym-scope.asm(4):
+error: sym-scope.asm(4):
     Local label '.tooSoon' in main scope
-ERROR: sym-scope.asm(5):
+error: sym-scope.asm(5):
     Local label 'Nice.try' in main scope
-ERROR: sym-scope.asm(17):
+error: sym-scope.asm(17):
     Not currently in the scope of 'Parentheses'
-ERROR: sym-scope.asm(21):
+error: sym-scope.asm(21):
     Not currently in the scope of 'Parent'
 error: Assembly aborted (4 errors)!
diff --git a/test/asm/symbol-invalid-macro-arg.err b/test/asm/symbol-invalid-macro-arg.err
index e0e8dad7..02c1d8b2 100644
--- a/test/asm/symbol-invalid-macro-arg.err
+++ b/test/asm/symbol-invalid-macro-arg.err
@@ -1,3 +1,3 @@
-ERROR: symbol-invalid-macro-arg.asm(1):
+error: symbol-invalid-macro-arg.asm(1):
     Invalid macro argument '\0'
 error: Assembly aborted (1 error)!
diff --git a/test/asm/symbol-override.err b/test/asm/symbol-override.err
index 9dce916d..9b08067a 100644
--- a/test/asm/symbol-override.err
+++ b/test/asm/symbol-override.err
@@ -1,7 +1,7 @@
-ERROR: symbol-override.asm(6):
+error: symbol-override.asm(6):
     'W' already defined as constant at symbol-override.asm(5)
-ERROR: symbol-override.asm(10):
+error: symbol-override.asm(10):
     'X' already defined as constant at symbol-override.asm(9)
-ERROR: symbol-override.asm(14):
+error: symbol-override.asm(14):
     'Y' already defined as label at symbol-override.asm(13)
 error: Assembly aborted (3 errors)!
diff --git a/test/asm/syntax-error-after-syntax-error.err b/test/asm/syntax-error-after-syntax-error.err
index 088bd7b1..d7865a38 100644
--- a/test/asm/syntax-error-after-syntax-error.err
+++ b/test/asm/syntax-error-after-syntax-error.err
@@ -1,13 +1,13 @@
-ERROR: syntax-error-after-syntax-error.asm(6):
+error: syntax-error-after-syntax-error.asm(6):
     syntax error, unexpected newline
-ERROR: syntax-error-after-syntax-error.asm(7):
+error: syntax-error-after-syntax-error.asm(7):
     syntax error, unexpected newline
     To invoke `mac` as a macro it must be indented
-ERROR: syntax-error-after-syntax-error.asm(8):
+error: syntax-error-after-syntax-error.asm(8):
     syntax error, unexpected number
     To invoke `mac` as a macro it must be indented
-ERROR: syntax-error-after-syntax-error.asm(9):
+error: syntax-error-after-syntax-error.asm(9):
     'mac' already defined at syntax-error-after-syntax-error.asm(1)
-ERROR: syntax-error-after-syntax-error.asm(10):
+error: syntax-error-after-syntax-error.asm(10):
     'mac' already defined at syntax-error-after-syntax-error.asm(1)
 error: Assembly aborted (5 errors)!
diff --git a/test/asm/syntax-error-after-syntax-error.simple.err b/test/asm/syntax-error-after-syntax-error.simple.err
index 78a252ac..66caa7f9 100644
--- a/test/asm/syntax-error-after-syntax-error.simple.err
+++ b/test/asm/syntax-error-after-syntax-error.simple.err
@@ -1,13 +1,13 @@
-ERROR: syntax-error-after-syntax-error.asm(6):
+error: syntax-error-after-syntax-error.asm(6):
     syntax error
-ERROR: syntax-error-after-syntax-error.asm(7):
+error: syntax-error-after-syntax-error.asm(7):
     syntax error
     To invoke `mac` as a macro it must be indented
-ERROR: syntax-error-after-syntax-error.asm(8):
+error: syntax-error-after-syntax-error.asm(8):
     syntax error
     To invoke `mac` as a macro it must be indented
-ERROR: syntax-error-after-syntax-error.asm(9):
+error: syntax-error-after-syntax-error.asm(9):
     'mac' already defined at syntax-error-after-syntax-error.asm(1)
-ERROR: syntax-error-after-syntax-error.asm(10):
+error: syntax-error-after-syntax-error.asm(10):
     'mac' already defined at syntax-error-after-syntax-error.asm(1)
 error: Assembly aborted (5 errors)!
diff --git a/test/asm/syntax-error-eof-newline.err b/test/asm/syntax-error-eof-newline.err
index fdb4616f..15943534 100644
--- a/test/asm/syntax-error-eof-newline.err
+++ b/test/asm/syntax-error-eof-newline.err
@@ -1,3 +1,3 @@
-ERROR: syntax-error-eof-newline.asm(5) -> syntax-error-eof-newline.inc(1):
+error: syntax-error-eof-newline.asm(5) -> syntax-error-eof-newline.inc(1):
     syntax error, unexpected newline
 error: Assembly aborted (1 error)!
diff --git a/test/asm/syntax-error-eof-newline.simple.err b/test/asm/syntax-error-eof-newline.simple.err
index 1a50d4cc..7a5f4a63 100644
--- a/test/asm/syntax-error-eof-newline.simple.err
+++ b/test/asm/syntax-error-eof-newline.simple.err
@@ -1,3 +1,3 @@
-ERROR: syntax-error-eof-newline.asm(5) -> syntax-error-eof-newline.inc(1):
+error: syntax-error-eof-newline.asm(5) -> syntax-error-eof-newline.inc(1):
     syntax error
 error: Assembly aborted (1 error)!
diff --git a/test/asm/syntax-error-lexer-mode.err b/test/asm/syntax-error-lexer-mode.err
index 9b9c1233..9f18a14e 100644
--- a/test/asm/syntax-error-lexer-mode.err
+++ b/test/asm/syntax-error-lexer-mode.err
@@ -1,5 +1,5 @@
-ERROR: syntax-error-lexer-mode.asm(7):
+error: syntax-error-lexer-mode.asm(7):
     syntax error, unexpected af
-ERROR: syntax-error-lexer-mode.asm(11):
+error: syntax-error-lexer-mode.asm(11):
     syntax error, unexpected af, expecting identifier
 error: Assembly aborted (2 errors)!
diff --git a/test/asm/syntax-error.err b/test/asm/syntax-error.err
index c3502a83..6035315a 100644
--- a/test/asm/syntax-error.err
+++ b/test/asm/syntax-error.err
@@ -1,3 +1,3 @@
-ERROR: syntax-error.asm(2):
+error: syntax-error.asm(2):
     syntax error, unexpected a
 error: Assembly aborted (1 error)!
diff --git a/test/asm/syntax-error.simple.err b/test/asm/syntax-error.simple.err
index 49094a8f..0d72e0ba 100644
--- a/test/asm/syntax-error.simple.err
+++ b/test/asm/syntax-error.simple.err
@@ -1,3 +1,3 @@
-ERROR: syntax-error.asm(2):
+error: syntax-error.asm(2):
     syntax error
 error: Assembly aborted (1 error)!
diff --git a/test/asm/unique-id.err b/test/asm/unique-id.err
index bdc2b6d2..aacac297 100644
--- a/test/asm/unique-id.err
+++ b/test/asm/unique-id.err
@@ -22,7 +22,7 @@ while expanding symbol "warn_unique"
 warning: unique-id.asm(14) -> unique-id.asm::m(8): [-Wuser]
     _u4!
 while expanding symbol "warn_unique"
-ERROR: unique-id.asm(15):
+error: unique-id.asm(15):
     Macro argument '\@' not defined
 while expanding symbol "warn_unique"
 warning: unique-id.asm(15): [-Wuser]
diff --git a/test/asm/use-label-outside-section.err b/test/asm/use-label-outside-section.err
index 893a7012..6f3c55f6 100644
--- a/test/asm/use-label-outside-section.err
+++ b/test/asm/use-label-outside-section.err
@@ -1,5 +1,5 @@
-ERROR: use-label-outside-section.asm(1):
+error: use-label-outside-section.asm(1):
     Label "lab" created outside of a SECTION
-ERROR: use-label-outside-section.asm(2):
+error: use-label-outside-section.asm(2):
     Expected constant expression: 'lab' is not constant at assembly time
 error: Assembly aborted (2 errors)!
diff --git a/test/asm/warn-numeric-string.err b/test/asm/warn-numeric-string.err
index 0fee15c9..7c0d1079 100644
--- a/test/asm/warn-numeric-string.err
+++ b/test/asm/warn-numeric-string.err
@@ -20,19 +20,19 @@ warning: warn-numeric-string.asm(23) -> warn-numeric-string.asm::try(15): [-Wnum
     Treating 2-character string as a number
 warning: warn-numeric-string.asm(23) -> warn-numeric-string.asm::try(16): [-Wnumeric-string]
     Treating 3-character string as a number
-ERROR: warn-numeric-string.asm(24) -> warn-numeric-string.asm::try(12): [-Werror=numeric-string]
+error: warn-numeric-string.asm(24) -> warn-numeric-string.asm::try(12): [-Werror=numeric-string]
     Treating string as a number ignores first 1 character
-ERROR: warn-numeric-string.asm(24) -> warn-numeric-string.asm::try(13): [-Werror=numeric-string]
+error: warn-numeric-string.asm(24) -> warn-numeric-string.asm::try(13): [-Werror=numeric-string]
     Treating string as a number ignores first 1 character
-ERROR: warn-numeric-string.asm(24) -> warn-numeric-string.asm::try(13): [-Werror=numeric-string]
+error: warn-numeric-string.asm(24) -> warn-numeric-string.asm::try(13): [-Werror=numeric-string]
     Treating string as a number ignores first 2 characters
-ERROR: warn-numeric-string.asm(25) -> warn-numeric-string.asm::try(12): [-Werror=numeric-string]
+error: warn-numeric-string.asm(25) -> warn-numeric-string.asm::try(12): [-Werror=numeric-string]
     Treating string as a number ignores first 1 character
-ERROR: warn-numeric-string.asm(25) -> warn-numeric-string.asm::try(13): [-Werror=numeric-string]
+error: warn-numeric-string.asm(25) -> warn-numeric-string.asm::try(13): [-Werror=numeric-string]
     Treating string as a number ignores first 1 character
-ERROR: warn-numeric-string.asm(25) -> warn-numeric-string.asm::try(13): [-Werror=numeric-string]
+error: warn-numeric-string.asm(25) -> warn-numeric-string.asm::try(13): [-Werror=numeric-string]
     Treating string as a number ignores first 2 characters
-ERROR: warn-numeric-string.asm(25) -> warn-numeric-string.asm::try(15): [-Werror=numeric-string]
+error: warn-numeric-string.asm(25) -> warn-numeric-string.asm::try(15): [-Werror=numeric-string]
     Treating 2-character string as a number
-ERROR: warn-numeric-string.asm(25) -> warn-numeric-string.asm::try(16): [-Werror=numeric-string]
+error: warn-numeric-string.asm(25) -> warn-numeric-string.asm::try(16): [-Werror=numeric-string]
     Treating 3-character string as a number
diff --git a/test/asm/warn-truncation.err b/test/asm/warn-truncation.err
index 291ec2ca..1cfefe8c 100644
--- a/test/asm/warn-truncation.err
+++ b/test/asm/warn-truncation.err
@@ -30,23 +30,23 @@ warning: warn-truncation.asm(36) -> warn-truncation.asm::try(28): [-Wtruncation]
     Expression must be 8-bit
 warning: warn-truncation.asm(36) -> warn-truncation.asm::try(29): [-Wtruncation]
     Expression must be 16-bit
-ERROR: warn-truncation.asm(37) -> warn-truncation.asm::try(23): [-Werror=truncation]
+error: warn-truncation.asm(37) -> warn-truncation.asm::try(23): [-Werror=truncation]
     Expression must be 8-bit
-ERROR: warn-truncation.asm(37) -> warn-truncation.asm::try(24): [-Werror=truncation]
+error: warn-truncation.asm(37) -> warn-truncation.asm::try(24): [-Werror=truncation]
     Expression must be 8-bit
-ERROR: warn-truncation.asm(37) -> warn-truncation.asm::try(25): [-Werror=truncation]
+error: warn-truncation.asm(37) -> warn-truncation.asm::try(25): [-Werror=truncation]
     Expression must be 16-bit
-ERROR: warn-truncation.asm(37) -> warn-truncation.asm::try(26): [-Werror=truncation]
+error: warn-truncation.asm(37) -> warn-truncation.asm::try(26): [-Werror=truncation]
     Expression must be 16-bit
-ERROR: warn-truncation.asm(38) -> warn-truncation.asm::try(23): [-Werror=truncation]
+error: warn-truncation.asm(38) -> warn-truncation.asm::try(23): [-Werror=truncation]
     Expression must be 8-bit
-ERROR: warn-truncation.asm(38) -> warn-truncation.asm::try(24): [-Werror=truncation]
+error: warn-truncation.asm(38) -> warn-truncation.asm::try(24): [-Werror=truncation]
     Expression must be 8-bit
-ERROR: warn-truncation.asm(38) -> warn-truncation.asm::try(25): [-Werror=truncation]
+error: warn-truncation.asm(38) -> warn-truncation.asm::try(25): [-Werror=truncation]
     Expression must be 16-bit
-ERROR: warn-truncation.asm(38) -> warn-truncation.asm::try(26): [-Werror=truncation]
+error: warn-truncation.asm(38) -> warn-truncation.asm::try(26): [-Werror=truncation]
     Expression must be 16-bit
-ERROR: warn-truncation.asm(38) -> warn-truncation.asm::try(28): [-Werror=truncation]
+error: warn-truncation.asm(38) -> warn-truncation.asm::try(28): [-Werror=truncation]
     Expression must be 8-bit
-ERROR: warn-truncation.asm(38) -> warn-truncation.asm::try(29): [-Werror=truncation]
+error: warn-truncation.asm(38) -> warn-truncation.asm::try(29): [-Werror=truncation]
     Expression must be 16-bit
diff --git a/test/link/section-union/align-conflict.out b/test/link/section-union/align-conflict.out
index 3c76cee4..d0cc366a 100644
--- a/test/link/section-union/align-conflict.out
+++ b/test/link/section-union/align-conflict.out
@@ -1,6 +1,6 @@
 error: Section "conflicting alignment" is defined with conflicting 4-byte alignment (offset 0) and address $cafe
 ---
-ERROR: <stdin>(18):
+error: <stdin>(18):
     Section already declared as aligned to 4 bytes (offset 0)
 FATAL: <stdin>(18):
     Cannot create section "conflicting alignment" (1 error)
diff --git a/test/link/section-union/align-ofs-conflict.out b/test/link/section-union/align-ofs-conflict.out
index 5aa6bd47..a09960a8 100644
--- a/test/link/section-union/align-ofs-conflict.out
+++ b/test/link/section-union/align-ofs-conflict.out
@@ -1,6 +1,6 @@
 error: Section "conflicting alignment" is defined with conflicting 8-byte alignment (offset 7) and 16-byte alignment (offset 14)
 ---
-ERROR: <stdin>(18):
+error: <stdin>(18):
     Section already declared with incompatible 8-byte alignment (offset 7)
 FATAL: <stdin>(18):
     Cannot create section "conflicting alignment" (1 error)
diff --git a/test/link/section-union/assert.out b/test/link/section-union/assert.out
index 0bef2cb6..f79e64b4 100644
--- a/test/link/section-union/assert.out
+++ b/test/link/section-union/assert.out
@@ -1,6 +1,6 @@
 error: section-union/assert.asm(11): Force failing the build
 Linking failed with 1 error
 ---
-ERROR: <stdin>(30):
+error: <stdin>(30):
     Assertion failed: Force failing the build
 error: Assembly aborted (1 error)!
diff --git a/test/link/section-union/bad-types.out b/test/link/section-union/bad-types.out
index c08a50fa..6f3b0451 100644
--- a/test/link/section-union/bad-types.out
+++ b/test/link/section-union/bad-types.out
@@ -1,6 +1,6 @@
 error: Section "conflicting types" is defined with conflicting types HRAM and WRAM0
 ---
-ERROR: <stdin>(18):
+error: <stdin>(18):
     Section already exists but with type HRAM
 FATAL: <stdin>(18):
     Cannot create section "conflicting types" (1 error)
diff --git a/test/link/section-union/bank-conflict.out b/test/link/section-union/bank-conflict.out
index 594cf47a..60587c53 100644
--- a/test/link/section-union/bank-conflict.out
+++ b/test/link/section-union/bank-conflict.out
@@ -1,6 +1,6 @@
 error: Section "conflicting banks" is defined with conflicting banks 4 and 1
 ---
-ERROR: <stdin>(14):
+error: <stdin>(14):
     Section already declared with different bank 4
 FATAL: <stdin>(14):
     Cannot create section "conflicting banks" (1 error)
diff --git a/test/link/section-union/data-overlay.out b/test/link/section-union/data-overlay.out
index 834c1976..46ca4fd7 100644
--- a/test/link/section-union/data-overlay.out
+++ b/test/link/section-union/data-overlay.out
@@ -1,6 +1,6 @@
 error: Section "overlaid data" is of type ROM0, which cannot be unionized
 ---
-ERROR: <stdin>(18):
+error: <stdin>(18):
     Cannot declare ROM sections as UNION
 FATAL: <stdin>(18):
     Cannot create section "overlaid data" (1 error)
diff --git a/test/link/section-union/different-data.out b/test/link/section-union/different-data.out
index 8fe52c62..f35f2598 100644
--- a/test/link/section-union/different-data.out
+++ b/test/link/section-union/different-data.out
@@ -1,6 +1,6 @@
 error: Section "different data" is of type ROM0, which cannot be unionized
 ---
-ERROR: <stdin>(16):
+error: <stdin>(16):
     Cannot declare ROM sections as UNION
 FATAL: <stdin>(16):
     Cannot create section "different data" (1 error)
diff --git a/test/link/section-union/different-ofs.out b/test/link/section-union/different-ofs.out
index 494d315a..ef259e1a 100644
--- a/test/link/section-union/different-ofs.out
+++ b/test/link/section-union/different-ofs.out
@@ -1,6 +1,6 @@
 error: Section "conflicting alignment" is defined with conflicting 8-byte alignment (offset 7) and 8-byte alignment (offset 6)
 ---
-ERROR: <stdin>(18):
+error: <stdin>(18):
     Section already declared with incompatible 8-byte alignment (offset 7)
 FATAL: <stdin>(18):
     Cannot create section "conflicting alignment" (1 error)
diff --git a/test/link/section-union/different-size.out b/test/link/section-union/different-size.out
index 747d263f..00e604c7 100644
--- a/test/link/section-union/different-size.out
+++ b/test/link/section-union/different-size.out
@@ -1,6 +1,6 @@
 error: Section "different section sizes" is of type ROM0, which cannot be unionized
 ---
-ERROR: <stdin>(16):
+error: <stdin>(16):
     Cannot declare ROM sections as UNION
 FATAL: <stdin>(16):
     Cannot create section "different section sizes" (1 error)
diff --git a/test/link/section-union/different-syntaxes.out b/test/link/section-union/different-syntaxes.out
index 3e83dd6f..00ca4b47 100644
--- a/test/link/section-union/different-syntaxes.out
+++ b/test/link/section-union/different-syntaxes.out
@@ -1,6 +1,6 @@
 error: Section "different syntaxes" is of type ROM0, which cannot be unionized
 ---
-ERROR: <stdin>(18):
+error: <stdin>(18):
     Cannot declare ROM sections as UNION
 FATAL: <stdin>(18):
     Cannot create section "different syntaxes" (1 error)
diff --git a/test/link/section-union/org-conflict.out b/test/link/section-union/org-conflict.out
index 13dfcae4..7e0e3767 100644
--- a/test/link/section-union/org-conflict.out
+++ b/test/link/section-union/org-conflict.out
@@ -1,6 +1,6 @@
 error: Section "conflicting address" is defined with conflicting addresses $beef and $babe
 ---
-ERROR: <stdin>(16):
+error: <stdin>(16):
     Section already declared as fixed at different address $beef
 FATAL: <stdin>(16):
     Cannot create section "conflicting address" (1 error)
diff --git a/test/link/section-union/split-data.out b/test/link/section-union/split-data.out
index f5821fd6..ddceb8fd 100644
--- a/test/link/section-union/split-data.out
+++ b/test/link/section-union/split-data.out
@@ -1,6 +1,6 @@
 error: Section "mutually-overlaid data" is of type ROM0, which cannot be unionized
 ---
-ERROR: <stdin>(18):
+error: <stdin>(18):
     Cannot declare ROM sections as UNION
 FATAL: <stdin>(18):
     Cannot create section "mutually-overlaid data" (1 error)