diff --git a/packages/core/src/util/stringify.ts b/packages/core/src/util/stringify.ts
index 916ddeaeb49..64cca9475a0 100644
--- a/packages/core/src/util/stringify.ts
+++ b/packages/core/src/util/stringify.ts
@@ -12,29 +12,26 @@ export function stringify(token: any): string {
   }
 
   if (Array.isArray(token)) {
-    return '[' + token.map(stringify).join(', ') + ']';
+    return `[${token.map(stringify).join(', ')}]`;
   }
 
   if (token == null) {
     return '' + token;
   }
 
-  if (token.overriddenName) {
-    return `${token.overriddenName}`;
+  const name = token.overriddenName || token.name;
+  if (name) {
+    return `${name}`;
   }
 
-  if (token.name) {
-    return `${token.name}`;
+  const result = token.toString();
+
+  if (result == null) {
+    return '' + result;
   }
 
-  const res = token.toString();
-
-  if (res == null) {
-    return '' + res;
-  }
-
-  const newLineIndex = res.indexOf('\n');
-  return newLineIndex === -1 ? res : res.substring(0, newLineIndex);
+  const newLineIndex = result.indexOf('\n');
+  return newLineIndex >= 0 ? result.slice(0, newLineIndex) : result;
 }
 
 /**