diff --git a/nashorn/src/jdk/nashorn/internal/parser/TokenType.java b/nashorn/src/jdk/nashorn/internal/parser/TokenType.java
index 6a0f564486b..a976215b08a 100644
--- a/nashorn/src/jdk/nashorn/internal/parser/TokenType.java
+++ b/nashorn/src/jdk/nashorn/internal/parser/TokenType.java
@@ -284,7 +284,7 @@ public enum TokenType {
 
     @Override
     public String toString() {
-        return name;
+        return getNameOrType();
     }
 
     static {