diff --git a/src/asm/parser.y b/src/asm/parser.y
index 3de4922d..bae2cf4d 100644
--- a/src/asm/parser.y
+++ b/src/asm/parser.y
@@ -103,7 +103,7 @@
 /******************** Tokens ********************/
 
 %token YYEOF 0 "end of file"
-%token NEWLINE "newline"
+%token NEWLINE "end of line"
 %token EOB "end of buffer"
 
 // General punctuation
diff --git a/src/link/script.y b/src/link/script.y
index 10e6fdc2..09b52e74 100644
--- a/src/link/script.y
+++ b/src/link/script.y
@@ -55,7 +55,7 @@
 /******************** Tokens and data types ********************/
 
 %token YYEOF 0 "end of file"
-%token newline
+%token newline "end of line"
 %token COMMA ","
 %token ORG "ORG"
        FLOATING "FLOATING"
diff --git a/test/asm/charmap-empty.err b/test/asm/charmap-empty.err
index fcef645f..2ec188aa 100644
--- a/test/asm/charmap-empty.err
+++ b/test/asm/charmap-empty.err
@@ -1,5 +1,5 @@
 error: charmap-empty.asm(1):
     Cannot map an empty string
 error: charmap-empty.asm(2):
-    syntax error, unexpected newline
+    syntax error, unexpected end of line
 error: Assembly aborted (2 errors)!
diff --git a/test/asm/code-after-endm-endr-endc.err b/test/asm/code-after-endm-endr-endc.err
index 1152bd1d..0220c1a5 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):
-    syntax error, unexpected PRINTLN, expecting newline or end of buffer
+    syntax error, unexpected PRINTLN, expecting end of line or end of buffer
 error: code-after-endm-endr-endc.asm(7):
     Macro "mac" not defined
 error: code-after-endm-endr-endc.asm(12):
-    syntax error, unexpected PRINTLN, expecting newline or end of buffer
+    syntax error, unexpected PRINTLN, expecting end of line or end of buffer
 error: code-after-endm-endr-endc.asm(17):
-    syntax error, unexpected PRINTLN, expecting newline
+    syntax error, unexpected PRINTLN, expecting end of line
 error: code-after-endm-endr-endc.asm(19):
-    syntax error, unexpected PRINTLN, expecting newline or end of buffer
+    syntax error, unexpected PRINTLN, expecting end of line or end of buffer
 error: code-after-endm-endr-endc.asm(23):
-    syntax error, unexpected PRINTLN, expecting newline
+    syntax error, unexpected PRINTLN, expecting end of line
 error: code-after-endm-endr-endc.asm(25):
-    syntax error, unexpected PRINTLN, expecting newline or end of buffer
+    syntax error, unexpected PRINTLN, expecting end of line or end of buffer
 error: Assembly aborted (7 errors)!
diff --git a/test/asm/invalid-opt.err b/test/asm/invalid-opt.err
index 0a736032..f857728f 100644
--- a/test/asm/invalid-opt.err
+++ b/test/asm/invalid-opt.err
@@ -17,7 +17,7 @@ error: invalid-opt.asm(8):
 error: invalid-opt.asm(9):
     Must specify an argument for option 'W'
 error: invalid-opt.asm(10):
-    syntax error, unexpected newline, expecting string
+    syntax error, unexpected end of line, expecting string
 error: invalid-opt.asm(11):
     No entries in the option stack
 error: Assembly aborted (11 errors)!
diff --git a/test/asm/syntax-error-after-syntax-error.err b/test/asm/syntax-error-after-syntax-error.err
index b5262ed9..a41f723a 100644
--- a/test/asm/syntax-error-after-syntax-error.err
+++ b/test/asm/syntax-error-after-syntax-error.err
@@ -7,5 +7,5 @@ error: syntax-error-after-syntax-error.asm(6):
 error: syntax-error-after-syntax-error.asm(9):
     syntax error, unexpected :
 error: syntax-error-after-syntax-error.asm(10):
-    syntax error, unexpected stop, expecting newline or end of buffer or ::
+    syntax error, unexpected stop, expecting end of line or end of buffer or ::
 error: Assembly aborted (5 errors)!
diff --git a/test/asm/syntax-error-eof-newline.err b/test/asm/syntax-error-eof-newline.err
index 15943534..ab3b6f04 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):
-    syntax error, unexpected newline
+    syntax error, unexpected end of line
 error: Assembly aborted (1 error)!
diff --git a/test/link/script-syntax-error.out b/test/link/script-syntax-error.out
index 7ec4e680..80230875 100644
--- a/test/link/script-syntax-error.out
+++ b/test/link/script-syntax-error.out
@@ -1,3 +1,3 @@
-error: script-syntax-error.link(2): syntax error, unexpected ORG, expecting newline or OPTIONAL
-error: script-syntax-error.link(5): syntax error, unexpected string, expecting newline or FLOATING or number
+error: script-syntax-error.link(2): syntax error, unexpected ORG, expecting end of line or OPTIONAL
+error: script-syntax-error.link(5): syntax error, unexpected string, expecting end of line or FLOATING or number
 Linking failed with 2 errors