diff --git a/crates/rome_formatter/src/format_json.rs b/crates/rome_formatter/src/format_json.rs
index b894cb886b6e..da4ade330f92 100644
--- a/crates/rome_formatter/src/format_json.rs
+++ b/crates/rome_formatter/src/format_json.rs
@@ -16,8 +16,8 @@ fn tokenize_token(syntax_token: SyntaxToken) -> FormatElement {
 		SyntaxKind::NULL_KW => token("null"),
 		SyntaxKind::TRUE_KW => token("true"),
 		SyntaxKind::FALSE_KW => token("false"),
-		SyntaxKind::JS_STRING_LITERAL_TOKEN => token(syntax_token.text_trimmed()),
-		SyntaxKind::JS_NUMBER_LITERAL_TOKEN => token(syntax_token.text_trimmed()),
+		SyntaxKind::JS_STRING_LITERAL => token(syntax_token.text_trimmed()),
+		SyntaxKind::JS_NUMBER_LITERAL => token(syntax_token.text_trimmed()),
 		SyntaxKind::MINUS => token("-"),
 		_ => panic!("Unsupported JSON token {:?}", syntax_token),
 	}
diff --git a/crates/rome_formatter/src/formatter.rs b/crates/rome_formatter/src/formatter.rs
index 4ad1c29c51da..80658d04a4a3 100644
--- a/crates/rome_formatter/src/formatter.rs
+++ b/crates/rome_formatter/src/formatter.rs
@@ -88,7 +88,7 @@ impl Formatter {
 	///
 	/// let mut builder = TreeBuilder::<'_, JsLanguage>::new();
 	/// builder.start_node(SyntaxKind::JS_STRING_LITERAL_EXPRESSION);
-	/// builder.token(SyntaxKind::JS_STRING_LITERAL_TOKEN, "'abc'");
+	/// builder.token(SyntaxKind::JS_STRING_LITERAL, "'abc'");
 	/// builder.finish_node();
 	/// let node = builder.finish();
 	///
diff --git a/crates/rslint_lexer/src/highlight.rs b/crates/rslint_lexer/src/highlight.rs
index c21407e988d3..5d9e16cc8838 100644
--- a/crates/rslint_lexer/src/highlight.rs
+++ b/crates/rslint_lexer/src/highlight.rs
@@ -120,12 +120,10 @@ impl<'s> Iterator for Highlighter<'s> {
 			}
 			t if t.is_punct() => rgb![86, 182, 194],
 			t if t.is_keyword() => rgb![198, 120, 221],
-			SyntaxKind::JS_STRING_LITERAL_TOKEN
-			| SyntaxKind::BACKTICK
-			| SyntaxKind::TEMPLATE_CHUNK => {
+			SyntaxKind::JS_STRING_LITERAL | SyntaxKind::BACKTICK | SyntaxKind::TEMPLATE_CHUNK => {
 				rgb![152, 195, 121]
 			}
-			SyntaxKind::JS_NUMBER_LITERAL_TOKEN => rgb![209, 154, 102],
+			SyntaxKind::JS_NUMBER_LITERAL => rgb![209, 154, 102],
 			SyntaxKind::DOLLARCURLY => rgb![198, 120, 221],
 			SyntaxKind::ERROR_TOKEN => rgb![244, 71, 71],
 			SyntaxKind::COMMENT => rgb![127, 132, 142],
diff --git a/crates/rslint_lexer/src/lib.rs b/crates/rslint_lexer/src/lib.rs
index 1db1d3a936dc..8be719201afe 100644
--- a/crates/rslint_lexer/src/lib.rs
+++ b/crates/rslint_lexer/src/lib.rs
@@ -862,7 +862,7 @@ impl<'src> Lexer<'src> {
 				Some(err),
 			)
 		} else {
-			tok!(JS_NUMBER_LITERAL_TOKEN, self.cur - start)
+			tok!(JS_NUMBER_LITERAL, self.cur - start)
 		}
 	}
 
@@ -1009,7 +1009,7 @@ impl<'src> Lexer<'src> {
 									}
 								},
 								_ => {
-									return (Token::new(SyntaxKind::JS_REGEX_LITERAL_TOKEN, self.cur - start), diagnostic)
+									return (Token::new(SyntaxKind::JS_REGEX_LITERAL, self.cur - start), diagnostic)
 								}
 							}
 						}
@@ -1020,7 +1020,7 @@ impl<'src> Lexer<'src> {
 						let err = Diagnostic::error(self.file_id, "", "expected a character after a regex escape, but found none")
 							.primary(self.cur..self.cur + 1, "expected a character following this");
 
-						return (Token::new(SyntaxKind::JS_REGEX_LITERAL_TOKEN, self.cur - start), Some(err));
+						return (Token::new(SyntaxKind::JS_REGEX_LITERAL, self.cur - start), Some(err));
 					}
 				},
 				None => {
@@ -1028,7 +1028,7 @@ impl<'src> Lexer<'src> {
 						.primary(self.cur..self.cur, "...but the file ends here")
 						.secondary(start..start + 1, "a regex literal starts there...");
 
-					return (Token::new(SyntaxKind::JS_REGEX_LITERAL_TOKEN, self.cur - start), Some(err));
+					return (Token::new(SyntaxKind::JS_REGEX_LITERAL, self.cur - start), Some(err));
 				},
 				_ => {},
 			}
@@ -1333,7 +1333,7 @@ impl<'src> Lexer<'src> {
 						Some(err),
 					)
 				} else {
-					tok!(JS_STRING_LITERAL_TOKEN, self.cur - start)
+					tok!(JS_STRING_LITERAL, self.cur - start)
 				}
 			}
 			IDT => self.resolve_identifier((byte as char, start)),
diff --git a/crates/rslint_lexer/src/tests.rs b/crates/rslint_lexer/src/tests.rs
index 14fb39f9f42d..11b487ce5657 100644
--- a/crates/rslint_lexer/src/tests.rs
+++ b/crates/rslint_lexer/src/tests.rs
@@ -170,12 +170,12 @@ fn all_whitespace() {
 fn empty_string() {
 	assert_lex! {
 		r#""""#,
-		JS_STRING_LITERAL_TOKEN:2
+		JS_STRING_LITERAL:2
 	}
 
 	assert_lex! {
 		"''",
-		JS_STRING_LITERAL_TOKEN:2
+		JS_STRING_LITERAL:2
 	}
 }
 
@@ -219,12 +219,12 @@ fn template_literals() {
 fn simple_string() {
 	assert_lex! {
 		r#"'abcdefghijklmnopqrstuvwxyz123456789\'10🦀'"#,
-		JS_STRING_LITERAL_TOKEN:45
+		JS_STRING_LITERAL:45
 	}
 
 	assert_lex! {
 		r#""abcdefghijklmnopqrstuvwxyz123456789\"10🦀""#,
-		JS_STRING_LITERAL_TOKEN:45
+		JS_STRING_LITERAL:45
 	}
 }
 
@@ -245,12 +245,12 @@ fn string_unicode_escape_invalid() {
 fn string_unicode_escape_valid() {
 	assert_lex! {
 		r#""abcd\u2000a""#,
-		JS_STRING_LITERAL_TOKEN:13
+		JS_STRING_LITERAL:13
 	}
 
 	assert_lex! {
 		r#"'abcd\u2000a'"#,
-		JS_STRING_LITERAL_TOKEN:13
+		JS_STRING_LITERAL:13
 	}
 }
 
@@ -258,12 +258,12 @@ fn string_unicode_escape_valid() {
 fn string_unicode_escape_valid_resolving_to_endquote() {
 	assert_lex! {
 		r#""abcd\u0022a""#,
-		JS_STRING_LITERAL_TOKEN:13
+		JS_STRING_LITERAL:13
 	}
 
 	assert_lex! {
 		r#"'abcd\u0027a'"#,
-		JS_STRING_LITERAL_TOKEN:13
+		JS_STRING_LITERAL:13
 	}
 }
 
@@ -284,12 +284,12 @@ fn string_hex_escape_invalid() {
 fn string_hex_escape_valid() {
 	assert_lex! {
 		r#""abcd \x00 \xAB""#,
-		JS_STRING_LITERAL_TOKEN:16
+		JS_STRING_LITERAL:16
 	}
 
 	assert_lex! {
 		r#"'abcd \x00 \xAB'"#,
-		JS_STRING_LITERAL_TOKEN:16
+		JS_STRING_LITERAL:16
 	}
 }
 
@@ -328,7 +328,7 @@ fn complex_string_1() {
 		WHITESPACE:1,
 		PLUSEQ:2,
 		WHITESPACE:1,
-		JS_STRING_LITERAL_TOKEN:14,
+		JS_STRING_LITERAL:14,
 		SEMICOLON:1
 	}
 
@@ -339,7 +339,7 @@ fn complex_string_1() {
 		WHITESPACE:1,
 		PLUSEQ:2,
 		WHITESPACE:1,
-		JS_STRING_LITERAL_TOKEN:14,
+		JS_STRING_LITERAL:14,
 		SEMICOLON:1
 	}
 }
@@ -677,23 +677,23 @@ fn labels_y() {
 fn number_basic() {
 	assert_lex! {
 		"1",
-		JS_NUMBER_LITERAL_TOKEN:1
+		JS_NUMBER_LITERAL:1
 	}
 
 	assert_lex! {
 		"123456 ",
-		JS_NUMBER_LITERAL_TOKEN:6,
+		JS_NUMBER_LITERAL:6,
 		WHITESPACE:1
 	}
 
 	assert_lex! {
 		"90",
-		JS_NUMBER_LITERAL_TOKEN:2
+		JS_NUMBER_LITERAL:2
 	}
 
 	assert_lex! {
 		".13",
-		JS_NUMBER_LITERAL_TOKEN:3
+		JS_NUMBER_LITERAL:3
 	}
 }
 
@@ -701,7 +701,7 @@ fn number_basic() {
 fn number_basic_err() {
 	assert_lex! {
 		"2_?",
-		JS_NUMBER_LITERAL_TOKEN:2, // numeric separator error
+		JS_NUMBER_LITERAL:2, // numeric separator error
 		QUESTION:1
 	}
 
@@ -712,7 +712,7 @@ fn number_basic_err() {
 
 	assert_lex! {
 		r#"25\uFEFFb"#,
-		JS_NUMBER_LITERAL_TOKEN:2,
+		JS_NUMBER_LITERAL:2,
 		ERROR_TOKEN:6,
 		IDENT:1
 	}
@@ -727,19 +727,19 @@ fn number_basic_err() {
 fn number_complex() {
 	assert_lex! {
 		"3e-5 123e+56",
-		JS_NUMBER_LITERAL_TOKEN:4,
+		JS_NUMBER_LITERAL:4,
 		WHITESPACE:1,
-		JS_NUMBER_LITERAL_TOKEN:7
+		JS_NUMBER_LITERAL:7
 	}
 
 	assert_lex! {
 		"3.14159e+1",
-		JS_NUMBER_LITERAL_TOKEN:10
+		JS_NUMBER_LITERAL:10
 	}
 
 	assert_lex! {
 		".0e34",
-		JS_NUMBER_LITERAL_TOKEN:5
+		JS_NUMBER_LITERAL:5
 	}
 }
 
@@ -750,12 +750,12 @@ fn dot_number_disambiguation() {
 		DOT:1,
 		IDENT:1,
 		PLUS:1,
-		JS_NUMBER_LITERAL_TOKEN:1
+		JS_NUMBER_LITERAL:1
 	}
 
 	assert_lex! {
 		".0e+5",
-		JS_NUMBER_LITERAL_TOKEN:5
+		JS_NUMBER_LITERAL:5
 	}
 }
 
@@ -763,13 +763,13 @@ fn dot_number_disambiguation() {
 fn binary_literals() {
 	assert_lex! {
 		"0b10101010, 0B10101010, 0b10101010n",
-		JS_NUMBER_LITERAL_TOKEN:10,
+		JS_NUMBER_LITERAL:10,
 		COMMA:1,
 		WHITESPACE:1,
-		JS_NUMBER_LITERAL_TOKEN:10,
+		JS_NUMBER_LITERAL:10,
 		COMMA:1,
 		WHITESPACE:1,
-		JS_NUMBER_LITERAL_TOKEN:11
+		JS_NUMBER_LITERAL:11
 	}
 }
 
@@ -777,13 +777,13 @@ fn binary_literals() {
 fn octal_literals() {
 	assert_lex! {
 		"0o01742242, 0B10101010, 0b10101010n",
-		JS_NUMBER_LITERAL_TOKEN:10,
+		JS_NUMBER_LITERAL:10,
 		COMMA:1,
 		WHITESPACE:1,
-		JS_NUMBER_LITERAL_TOKEN:10,
+		JS_NUMBER_LITERAL:10,
 		COMMA:1,
 		WHITESPACE:1,
-		JS_NUMBER_LITERAL_TOKEN:11
+		JS_NUMBER_LITERAL:11
 	}
 }
 
@@ -791,11 +791,11 @@ fn octal_literals() {
 fn bigint_literals() {
 	assert_lex! {
 		"0n 1743642n 1n",
-		JS_NUMBER_LITERAL_TOKEN:2,
+		JS_NUMBER_LITERAL:2,
 		WHITESPACE:1,
-		JS_NUMBER_LITERAL_TOKEN:8,
+		JS_NUMBER_LITERAL:8,
 		WHITESPACE:1,
-		JS_NUMBER_LITERAL_TOKEN:2
+		JS_NUMBER_LITERAL:2
 	}
 }
 
@@ -821,15 +821,15 @@ fn shebang() {
 	assert_lex! {
 		"#0",
 		ERROR_TOKEN:1,
-		JS_NUMBER_LITERAL_TOKEN:1
+		JS_NUMBER_LITERAL:1
 	}
 
 	assert_lex! {
 		"0#!/bin/deno",
-		JS_NUMBER_LITERAL_TOKEN:1,
+		JS_NUMBER_LITERAL:1,
 		HASH:1,
 		BANG:1,
-		JS_REGEX_LITERAL_TOKEN:9
+		JS_REGEX_LITERAL:9
 	}
 }
 
@@ -877,7 +877,7 @@ fn regex() {
 		WHITESPACE:1,
 		EQ:1,
 		WHITESPACE:1,
-		JS_REGEX_LITERAL_TOKEN:7
+		JS_REGEX_LITERAL:7
 	}
 }
 
@@ -891,11 +891,11 @@ fn division() {
 		WHITESPACE:1,
 		EQ:1,
 		WHITESPACE:1,
-		JS_NUMBER_LITERAL_TOKEN:1,
+		JS_NUMBER_LITERAL:1,
 		WHITESPACE:1,
 		SLASH:1,
 		WHITESPACE:1,
-		JS_NUMBER_LITERAL_TOKEN:1
+		JS_NUMBER_LITERAL:1
 	}
 }
 
@@ -1007,7 +1007,7 @@ fn issue_30() {
 fn fuzz_fail_7() {
 	assert_lex! {
 		"/\u{0}/ª\u{80}",
-		JS_REGEX_LITERAL_TOKEN:5,
+		JS_REGEX_LITERAL:5,
 		ERROR_TOKEN:2
 	}
 }
diff --git a/crates/rslint_parser/src/ast.rs b/crates/rslint_parser/src/ast.rs
index 51a9dc2f64c4..4488cfee14ee 100644
--- a/crates/rslint_parser/src/ast.rs
+++ b/crates/rslint_parser/src/ast.rs
@@ -455,10 +455,7 @@ mod tests {
 		for (node, separator) in elements.into_iter() {
 			if let Some(node) = node {
 				builder.start_node(SyntaxKind::JS_NUMBER_LITERAL_EXPRESSION);
-				builder.token(
-					SyntaxKind::JS_NUMBER_LITERAL_TOKEN,
-					node.to_string().as_str(),
-				);
+				builder.token(SyntaxKind::JS_NUMBER_LITERAL, node.to_string().as_str());
 				builder.finish_node();
 			}
 
diff --git a/crates/rslint_parser/src/ast/expr_ext.rs b/crates/rslint_parser/src/ast/expr_ext.rs
index 7431a06d4dfd..78fa577d4046 100644
--- a/crates/rslint_parser/src/ast/expr_ext.rs
+++ b/crates/rslint_parser/src/ast/expr_ext.rs
@@ -25,7 +25,7 @@ impl JsLiteralMemberName {
 	/// use rslint_parser::ast::JsLiteralMemberName;
 	///
 	/// let node: SyntaxNode = TreeBuilder::wrap_with_node(SyntaxKind::JS_LITERAL_MEMBER_NAME, |builder| {
-	///   builder.token(SyntaxKind::JS_STRING_LITERAL_TOKEN, "\"abcd\"");
+	///   builder.token(SyntaxKind::JS_STRING_LITERAL, "\"abcd\"");
 	/// });
 	///
 	/// let static_member_name = node.to::<JsLiteralMemberName>();
@@ -41,7 +41,7 @@ impl JsLiteralMemberName {
 	/// use rslint_parser::ast::JsLiteralMemberName;
 	///
 	/// let node: SyntaxNode = TreeBuilder::wrap_with_node(SyntaxKind::JS_LITERAL_MEMBER_NAME, |builder| {
-	///   builder.token(SyntaxKind::JS_NUMBER_LITERAL_TOKEN, "5");
+	///   builder.token(SyntaxKind::JS_NUMBER_LITERAL, "5");
 	/// });
 	///
 	/// let static_member_name = node.to::<JsLiteralMemberName>();
@@ -69,7 +69,7 @@ impl JsLiteralMemberName {
 		let name = value.text_trimmed();
 
 		let result = match value.kind() {
-			JS_STRING_LITERAL_TOKEN => String::from(&name[1..name.len() - 1]),
+			JS_STRING_LITERAL => String::from(&name[1..name.len() - 1]),
 			_ => String::from(name),
 		};
 
diff --git a/crates/rslint_parser/src/ast/generated/nodes.rs b/crates/rslint_parser/src/ast/generated/nodes.rs
index 71bd89135858..a10c9604542e 100644
--- a/crates/rslint_parser/src/ast/generated/nodes.rs
+++ b/crates/rslint_parser/src/ast/generated/nodes.rs
@@ -79,7 +79,7 @@ pub struct JsDirective {
 }
 impl JsDirective {
 	pub fn value_token(&self) -> SyntaxResult<SyntaxToken> {
-		support::required_token(&self.syntax, T![js_string_literal_token])
+		support::required_token(&self.syntax, T![js_string_literal])
 	}
 	pub fn semicolon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T ! [;]) }
 }
@@ -517,7 +517,7 @@ impl ImportDecl {
 		support::required_token(&self.syntax, T![from])
 	}
 	pub fn source_token(&self) -> SyntaxResult<SyntaxToken> {
-		support::required_token(&self.syntax, T![js_string_literal_token])
+		support::required_token(&self.syntax, T![js_string_literal])
 	}
 	pub fn asserted_object(&self) -> SyntaxResult<JsObjectExpression> {
 		support::required_node(&self.syntax)
@@ -587,7 +587,7 @@ impl ExportWildcard {
 		support::required_token(&self.syntax, T![from])
 	}
 	pub fn source_token(&self) -> SyntaxResult<SyntaxToken> {
-		support::required_token(&self.syntax, T![js_string_literal_token])
+		support::required_token(&self.syntax, T![js_string_literal])
 	}
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
@@ -1306,11 +1306,7 @@ impl JsLiteralMemberName {
 	pub fn value(&self) -> SyntaxResult<SyntaxToken> {
 		support::find_required_token(
 			&self.syntax,
-			&[
-				T![ident],
-				T![js_string_literal_token],
-				T![js_number_literal_token],
-			],
+			&[T![ident], T![js_string_literal], T![js_number_literal]],
 		)
 	}
 }
@@ -1434,7 +1430,7 @@ pub struct JsStringLiteralExpression {
 }
 impl JsStringLiteralExpression {
 	pub fn value_token(&self) -> SyntaxResult<SyntaxToken> {
-		support::required_token(&self.syntax, T![js_string_literal_token])
+		support::required_token(&self.syntax, T![js_string_literal])
 	}
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
@@ -1443,7 +1439,7 @@ pub struct JsNumberLiteralExpression {
 }
 impl JsNumberLiteralExpression {
 	pub fn value_token(&self) -> SyntaxResult<SyntaxToken> {
-		support::required_token(&self.syntax, T![js_number_literal_token])
+		support::required_token(&self.syntax, T![js_number_literal])
 	}
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
@@ -1689,7 +1685,7 @@ pub struct JsBigIntLiteralExpression {
 }
 impl JsBigIntLiteralExpression {
 	pub fn value_token(&self) -> SyntaxResult<SyntaxToken> {
-		support::required_token(&self.syntax, T![js_big_int_literal_token])
+		support::required_token(&self.syntax, T![js_big_int_literal])
 	}
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
@@ -1716,7 +1712,7 @@ pub struct JsRegexLiteralExpression {
 }
 impl JsRegexLiteralExpression {
 	pub fn value_token(&self) -> SyntaxResult<SyntaxToken> {
-		support::required_token(&self.syntax, T![js_regex_literal_token])
+		support::required_token(&self.syntax, T![js_regex_literal])
 	}
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
@@ -1841,8 +1837,8 @@ pub struct ImportStringSpecifier {
 	pub(crate) syntax: SyntaxNode,
 }
 impl ImportStringSpecifier {
-	pub fn js_string_literal_token_token(&self) -> SyntaxResult<SyntaxToken> {
-		support::required_token(&self.syntax, T![js_string_literal_token])
+	pub fn source_token(&self) -> SyntaxResult<SyntaxToken> {
+		support::required_token(&self.syntax, T![js_string_literal])
 	}
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
@@ -1894,8 +1890,8 @@ impl TsExternalModuleRef {
 	pub fn l_paren_token(&self) -> SyntaxResult<SyntaxToken> {
 		support::required_token(&self.syntax, T!['('])
 	}
-	pub fn js_string_literal_token_token(&self) -> SyntaxResult<SyntaxToken> {
-		support::required_token(&self.syntax, T![js_string_literal_token])
+	pub fn module_token(&self) -> SyntaxResult<SyntaxToken> {
+		support::required_token(&self.syntax, T![js_string_literal])
 	}
 	pub fn r_paren_token(&self) -> SyntaxResult<SyntaxToken> {
 		support::required_token(&self.syntax, T![')'])
diff --git a/crates/rslint_parser/src/ast/stmt_ext.rs b/crates/rslint_parser/src/ast/stmt_ext.rs
index 9f1a4c5047de..cfbc00334d76 100644
--- a/crates/rslint_parser/src/ast/stmt_ext.rs
+++ b/crates/rslint_parser/src/ast/stmt_ext.rs
@@ -84,6 +84,6 @@ mod tests {
 
 impl TsEnumMember {
 	pub fn string_token(&self) -> Option<SyntaxToken> {
-		support::token(&self.syntax, JS_STRING_LITERAL_TOKEN)
+		support::token(&self.syntax, JS_STRING_LITERAL)
 	}
 }
diff --git a/crates/rslint_parser/src/ast/ts_ext.rs b/crates/rslint_parser/src/ast/ts_ext.rs
index c38e18b39fbc..8d581a2c5afc 100644
--- a/crates/rslint_parser/src/ast/ts_ext.rs
+++ b/crates/rslint_parser/src/ast/ts_ext.rs
@@ -39,7 +39,7 @@ impl TsImport {
 		self.syntax()
 			.tokens()
 			.into_iter()
-			.find(|t| t.kind() == JS_STRING_LITERAL_TOKEN)
+			.find(|t| t.kind() == JS_STRING_LITERAL)
 	}
 }
 
diff --git a/crates/rslint_parser/src/parser.rs b/crates/rslint_parser/src/parser.rs
index 85481b374263..1a1fa701ffa8 100644
--- a/crates/rslint_parser/src/parser.rs
+++ b/crates/rslint_parser/src/parser.rs
@@ -764,7 +764,7 @@ mod tests {
 		expected = "Marker must either be `completed` or `abandoned` to avoid that children are implicitly attached to a markers parent."
 	)]
 	fn uncompleted_markers_panic() {
-		let tokens = vec![Token::new(SyntaxKind::JS_STRING_LITERAL_TOKEN, 12)];
+		let tokens = vec![Token::new(SyntaxKind::JS_STRING_LITERAL, 12)];
 		let token_source = TokenSource::new("'use strict'", tokens.as_slice());
 
 		let mut parser = Parser::new(token_source, 0, Syntax::default());
@@ -775,19 +775,19 @@ mod tests {
 
 	#[test]
 	fn completed_marker_doesnt_panic() {
-		let tokens = vec![Token::new(SyntaxKind::JS_STRING_LITERAL_TOKEN, 12)];
+		let tokens = vec![Token::new(SyntaxKind::JS_STRING_LITERAL, 12)];
 		let token_source = TokenSource::new("'use strict'", tokens.as_slice());
 
 		let mut p = Parser::new(token_source, 0, Syntax::default());
 
 		let m = p.start();
-		p.expect(SyntaxKind::JS_STRING_LITERAL_TOKEN);
+		p.expect(SyntaxKind::JS_STRING_LITERAL);
 		m.complete(&mut p, SyntaxKind::JS_STRING_LITERAL_EXPRESSION);
 	}
 
 	#[test]
 	fn abandoned_marker_doesnt_panic() {
-		let tokens = vec![Token::new(SyntaxKind::JS_STRING_LITERAL_TOKEN, 12)];
+		let tokens = vec![Token::new(SyntaxKind::JS_STRING_LITERAL, 12)];
 		let token_source = TokenSource::new("'use strict'", tokens.as_slice());
 
 		let mut p = Parser::new(token_source, 0, Syntax::default());
diff --git a/crates/rslint_parser/src/syntax/decl.rs b/crates/rslint_parser/src/syntax/decl.rs
index 439d87b1d5ed..1aac8181bb0d 100644
--- a/crates/rslint_parser/src/syntax/decl.rs
+++ b/crates/rslint_parser/src/syntax/decl.rs
@@ -13,8 +13,8 @@ pub const BASE_METHOD_RECOVERY_SET: TokenSet = token_set![
 	T![await],
 	T![;],
 	T!['}'],
-	JS_NUMBER_LITERAL_TOKEN,
-	JS_STRING_LITERAL_TOKEN
+	JS_NUMBER_LITERAL,
+	JS_STRING_LITERAL
 ];
 
 #[allow(clippy::unnecessary_unwrap)]
diff --git a/crates/rslint_parser/src/syntax/expr.rs b/crates/rslint_parser/src/syntax/expr.rs
index 2fd8cb614f3b..b948372f1a40 100644
--- a/crates/rslint_parser/src/syntax/expr.rs
+++ b/crates/rslint_parser/src/syntax/expr.rs
@@ -61,10 +61,10 @@ pub const STARTS_EXPR: TokenSet = token_set![
 	BACKTICK,
 	TRUE_KW,
 	FALSE_KW,
-	JS_NUMBER_LITERAL_TOKEN,
-	JS_STRING_LITERAL_TOKEN,
+	JS_NUMBER_LITERAL,
+	JS_STRING_LITERAL,
 	NULL_KW,
-	JS_REGEX_LITERAL_TOKEN
+	JS_REGEX_LITERAL
 ];
 
 /// A literal expression.
@@ -80,19 +80,19 @@ pub const STARTS_EXPR: TokenSet = token_set![
 // null
 pub fn literal(p: &mut Parser) -> Option<CompletedMarker> {
 	let literal_kind = match p.cur_tok().kind {
-		SyntaxKind::JS_NUMBER_LITERAL_TOKEN => {
+		SyntaxKind::JS_NUMBER_LITERAL => {
 			if p.cur_src().ends_with('n') {
 				let m = p.start();
-				p.bump_remap(SyntaxKind::JS_BIG_INT_LITERAL_TOKEN);
+				p.bump_remap(SyntaxKind::JS_BIG_INT_LITERAL);
 				return Some(m.complete(p, JS_BIG_INT_LITERAL_EXPRESSION));
 			};
 
 			SyntaxKind::JS_NUMBER_LITERAL_EXPRESSION
 		}
-		SyntaxKind::JS_STRING_LITERAL_TOKEN => SyntaxKind::JS_STRING_LITERAL_EXPRESSION,
+		SyntaxKind::JS_STRING_LITERAL => SyntaxKind::JS_STRING_LITERAL_EXPRESSION,
 		SyntaxKind::NULL_KW => SyntaxKind::JS_NULL_LITERAL_EXPRESSION,
 		SyntaxKind::TRUE_KW | SyntaxKind::FALSE_KW => SyntaxKind::JS_BOOLEAN_LITERAL_EXPRESSION,
-		SyntaxKind::JS_REGEX_LITERAL_TOKEN => SyntaxKind::JS_REGEX_LITERAL_EXPRESSION,
+		SyntaxKind::JS_REGEX_LITERAL => SyntaxKind::JS_REGEX_LITERAL_EXPRESSION,
 		_ => return None,
 	};
 
diff --git a/crates/rslint_parser/src/syntax/object.rs b/crates/rslint_parser/src/syntax/object.rs
index 93ee84376d6d..963f850689ce 100644
--- a/crates/rslint_parser/src/syntax/object.rs
+++ b/crates/rslint_parser/src/syntax/object.rs
@@ -6,8 +6,8 @@ use rslint_syntax::SyntaxKind::*;
 use rslint_syntax::T;
 
 const STARTS_OBJ_PROP: TokenSet = token_set![
-	JS_STRING_LITERAL_TOKEN,
-	JS_NUMBER_LITERAL_TOKEN,
+	JS_STRING_LITERAL,
+	JS_NUMBER_LITERAL,
 	T![ident],
 	T![await],
 	T![yield],
@@ -198,7 +198,7 @@ fn setter_object_member(p: &mut Parser) -> CompletedMarker {
 // let a = {"foo": foo, [6 + 6]: foo, bar: foo, 7: foo}
 pub fn object_prop_name(p: &mut Parser, binding: bool) -> Option<CompletedMarker> {
 	match p.cur() {
-		JS_STRING_LITERAL_TOKEN | JS_NUMBER_LITERAL_TOKEN => literal(p),
+		JS_STRING_LITERAL | JS_NUMBER_LITERAL => literal(p),
 		T!['['] => Some(computed_member_name(p)),
 		_ if binding => super::pat::binding_identifier(p),
 		_ => identifier_name(p),
@@ -228,7 +228,7 @@ pub(super) fn literal_member_name(p: &mut Parser) -> Option<CompletedMarker> {
 	let m = p.start();
 
 	match p.cur() {
-		JS_STRING_LITERAL_TOKEN | JS_NUMBER_LITERAL_TOKEN | T![ident] => {
+		JS_STRING_LITERAL | JS_NUMBER_LITERAL | T![ident] => {
 			p.bump_any();
 		}
 		t if t.is_keyword() => {
diff --git a/crates/rslint_parser/src/syntax/program.rs b/crates/rslint_parser/src/syntax/program.rs
index b634d39ebd3e..daa35a9e7a2b 100644
--- a/crates/rslint_parser/src/syntax/program.rs
+++ b/crates/rslint_parser/src/syntax/program.rs
@@ -116,7 +116,7 @@ pub fn import_decl(p: &mut Parser) -> CompletedMarker {
 
 	let list = p.start();
 
-	if p.at(JS_STRING_LITERAL_TOKEN) {
+	if p.at(JS_STRING_LITERAL) {
 		let inner = p.start();
 		p.bump_any();
 		inner.complete(p, IMPORT_STRING_SPECIFIER);
@@ -181,7 +181,7 @@ pub fn import_decl(p: &mut Parser) -> CompletedMarker {
 		p.bump_remap(T![from]);
 	}
 
-	if !p.at(JS_STRING_LITERAL_TOKEN) {
+	if !p.at(JS_STRING_LITERAL) {
 		let err = p
 			.err_builder(
 				"expected a source for a `from` clause in an import statement, but found none",
@@ -537,7 +537,7 @@ pub fn ts_external_module_ref(p: &mut Parser) -> CompletedMarker {
 	}
 
 	p.expect(T!['(']);
-	p.expect(JS_STRING_LITERAL_TOKEN);
+	p.expect(JS_STRING_LITERAL);
 	p.expect(T![')']);
 	m.complete(p, TS_EXTERNAL_MODULE_REF)
 }
diff --git a/crates/rslint_parser/src/syntax/stmt.rs b/crates/rslint_parser/src/syntax/stmt.rs
index a54a29f5fe10..0e564c3399ef 100644
--- a/crates/rslint_parser/src/syntax/stmt.rs
+++ b/crates/rslint_parser/src/syntax/stmt.rs
@@ -445,7 +445,7 @@ pub(crate) fn directives(p: &mut Parser) -> Option<ParserState> {
 	let mut old_state: Option<ParserState> = None;
 
 	fn is_directive(p: &Parser) -> bool {
-		if !p.at(JS_STRING_LITERAL_TOKEN) {
+		if !p.at(JS_STRING_LITERAL) {
 			false
 		} else {
 			let next = p.nth(1);
diff --git a/crates/rslint_parser/src/syntax/typescript.rs b/crates/rslint_parser/src/syntax/typescript.rs
index f1302c10f935..02174d509894 100644
--- a/crates/rslint_parser/src/syntax/typescript.rs
+++ b/crates/rslint_parser/src/syntax/typescript.rs
@@ -219,7 +219,7 @@ pub(crate) fn ts_decl(p: &mut Parser) -> Option<CompletedMarker> {
 	}
 
 	if p.cur_src() == "module" {
-		if p.nth_at(1, JS_STRING_LITERAL_TOKEN) {
+		if p.nth_at(1, JS_STRING_LITERAL) {
 			return ts_ambient_external_module_decl(p, true);
 		} else if token_set![T![ident], T![yield], T![await]].contains(p.nth(1)) {
 			p.bump_remap(T![module]);
@@ -311,7 +311,7 @@ pub fn ts_ambient_external_module_decl(
 	if p.cur_src() == "global" {
 		p.bump_any();
 	} else {
-		p.expect(JS_STRING_LITERAL_TOKEN);
+		p.expect(JS_STRING_LITERAL);
 	}
 	if p.at(T!['{']) {
 		ts_module_block(p);
@@ -462,7 +462,7 @@ fn ts_property_or_method_sig(p: &mut Parser, m: Marker, readonly: bool) -> Optio
 		p.expect_no_recover(T![']'])?;
 	} else {
 		match p.cur() {
-			JS_STRING_LITERAL_TOKEN | JS_NUMBER_LITERAL_TOKEN => {
+			JS_STRING_LITERAL | JS_NUMBER_LITERAL => {
 				literal(p);
 			}
 			_ => {
@@ -598,7 +598,7 @@ pub fn ts_enum(p: &mut Parser) -> CompletedMarker {
 		let member = p.start();
 		let err_occured = if !p.at_ts(token_set![T![ident], T![yield], T![await]])
 			&& !p.cur().is_keyword()
-			&& !p.at(JS_STRING_LITERAL_TOKEN)
+			&& !p.at(JS_STRING_LITERAL)
 		{
 			let err = p
 				.err_builder("expected an identifier or string for an enum variant, but found none")
@@ -611,7 +611,7 @@ pub fn ts_enum(p: &mut Parser) -> CompletedMarker {
 			);
 			true
 		} else {
-			if !p.eat(JS_STRING_LITERAL_TOKEN) {
+			if !p.eat(JS_STRING_LITERAL) {
 				identifier_name(p).unwrap().undo_completion(p).abandon(p);
 			}
 			false
@@ -953,11 +953,9 @@ pub fn ts_non_array_type(p: &mut Parser) -> Option<CompletedMarker> {
 				ts_type_ref(p, None)
 			}
 		}
-		JS_NUMBER_LITERAL_TOKEN
-		| JS_STRING_LITERAL_TOKEN
-		| TRUE_KW
-		| FALSE_KW
-		| JS_REGEX_LITERAL_TOKEN => Some(literal(p).unwrap().precede(p).complete(p, TS_LITERAL)),
+		JS_NUMBER_LITERAL | JS_STRING_LITERAL | TRUE_KW | FALSE_KW | JS_REGEX_LITERAL => {
+			Some(literal(p).unwrap().precede(p).complete(p, TS_LITERAL))
+		}
 		BACKTICK => {
 			let m = p.start();
 			p.bump_any();
@@ -984,12 +982,12 @@ pub fn ts_non_array_type(p: &mut Parser) -> Option<CompletedMarker> {
 		T![-] => {
 			let m = p.start();
 			p.bump_any();
-			if p.at(JS_NUMBER_LITERAL_TOKEN) {
+			if p.at(JS_NUMBER_LITERAL) {
 				let _m = p.start();
 				p.bump_any();
 				_m.complete(p, JS_NUMBER_LITERAL_EXPRESSION);
 			} else {
-				p.expect_no_recover(JS_NUMBER_LITERAL_TOKEN)?;
+				p.expect_no_recover(JS_NUMBER_LITERAL)?;
 			}
 			Some(m.complete(p, TS_LITERAL))
 		}
@@ -1043,11 +1041,11 @@ pub fn ts_non_array_type(p: &mut Parser) -> Option<CompletedMarker> {
 					T![this],
 					T![import],
 					T![-],
-					JS_NUMBER_LITERAL_TOKEN,
-					JS_STRING_LITERAL_TOKEN,
+					JS_NUMBER_LITERAL,
+					JS_STRING_LITERAL,
 					TRUE_KW,
 					FALSE_KW,
-					JS_REGEX_LITERAL_TOKEN,
+					JS_REGEX_LITERAL,
 					BACKTICK,
 					T![&],
 					T![|]
@@ -1174,7 +1172,7 @@ pub fn ts_import(p: &mut Parser) -> Option<CompletedMarker> {
 	let m = p.start();
 	p.expect_no_recover(T![import])?;
 	p.expect_no_recover(T!['('])?;
-	p.expect_no_recover(JS_STRING_LITERAL_TOKEN)?;
+	p.expect_no_recover(JS_STRING_LITERAL)?;
 	p.expect_no_recover(T![')'])?;
 	if p.eat(T![.]) {
 		ts_entity_name(p, None, false);
diff --git a/crates/rslint_parser/test_data/inline/err/binary_expressions_err.rast b/crates/rslint_parser/test_data/inline/err/binary_expressions_err.rast
index f67e11f111e5..7fcdabb738e4 100644
--- a/crates/rslint_parser/test_data/inline/err/binary_expressions_err.rast
+++ b/crates/rslint_parser/test_data/inline/err/binary_expressions_err.rast
@@ -23,7 +23,7 @@
         2: JS_BINARY_EXPRESSION@18..21
           0: STAR@18..20 "*" [] [Whitespace(" ")]
           1: JS_NUMBER_LITERAL_EXPRESSION@20..21
-            0: JS_NUMBER_LITERAL_TOKEN@20..21 "2" [] []
+            0: JS_NUMBER_LITERAL@20..21 "2" [] []
       1: SEMICOLON@21..22 ";" [] []
     2: JS_EXPRESSION_STATEMENT@22..34
       0: JS_BINARY_EXPRESSION@22..33
diff --git a/crates/rslint_parser/test_data/inline/err/binding_identifier_invalid.rast b/crates/rslint_parser/test_data/inline/err/binding_identifier_invalid.rast
index 53b26a80c327..14a85334a275 100644
--- a/crates/rslint_parser/test_data/inline/err/binding_identifier_invalid.rast
+++ b/crates/rslint_parser/test_data/inline/err/binding_identifier_invalid.rast
@@ -25,7 +25,7 @@
                     1: JS_EQUAL_VALUE_CLAUSE@24..27
                       0: EQ@24..26 "=" [] [Whitespace(" ")]
                       1: JS_NUMBER_LITERAL_EXPRESSION@26..27
-                        0: JS_NUMBER_LITERAL_TOKEN@26..27 "5" [] []
+                        0: JS_NUMBER_LITERAL@26..27 "5" [] []
               1: SEMICOLON@27..29 ";" [] [Whitespace(" ")]
           3: R_CURLY@29..30 "}" [] []
       1: (empty)
@@ -53,7 +53,7 @@
                   1: JS_EQUAL_VALUE_CLAUSE@62..65
                     0: EQ@62..64 "=" [] [Whitespace(" ")]
                     1: JS_NUMBER_LITERAL_EXPRESSION@64..65
-                      0: JS_NUMBER_LITERAL_TOKEN@64..65 "5" [] []
+                      0: JS_NUMBER_LITERAL@64..65 "5" [] []
             1: SEMICOLON@65..66 ";" [] []
         3: R_CURLY@66..68 "}" [Whitespace("\n")] []
     2: JS_VARIABLE_DECLARATION_STATEMENT@68..82
@@ -67,7 +67,7 @@
             1: JS_EQUAL_VALUE_CLAUSE@78..81
               0: EQ@78..80 "=" [] [Whitespace(" ")]
               1: JS_NUMBER_LITERAL_EXPRESSION@80..81
-                0: JS_NUMBER_LITERAL_TOKEN@80..81 "5" [] []
+                0: JS_NUMBER_LITERAL@80..81 "5" [] []
       1: SEMICOLON@81..82 ";" [] []
   3: EOF@82..83 "" [Whitespace("\n")] []
 --
diff --git a/crates/rslint_parser/test_data/inline/err/directives_err.rast b/crates/rslint_parser/test_data/inline/err/directives_err.rast
index 9afb6197c43d..cef16f4358fa 100644
--- a/crates/rslint_parser/test_data/inline/err/directives_err.rast
+++ b/crates/rslint_parser/test_data/inline/err/directives_err.rast
@@ -14,7 +14,7 @@
         0: L_CURLY@27..28 "{" [] []
         1: LIST@28..43
           0: JS_DIRECTIVE@28..43
-            0: JS_STRING_LITERAL_TOKEN@28..42 "\"use strict\"" [Whitespace("\n\t")] []
+            0: JS_STRING_LITERAL@28..42 "\"use strict\"" [Whitespace("\n\t")] []
             1: SEMICOLON@42..43 ";" [] []
         2: LIST@43..158
           0: JS_FUNCTION_DECLARATION@43..84
@@ -29,7 +29,7 @@
               0: L_CURLY@64..65 "{" [] []
               1: LIST@65..81
                 0: JS_DIRECTIVE@65..81
-                  0: JS_STRING_LITERAL_TOKEN@65..80 "\"use strict\"" [Whitespace("\n\t\t")] []
+                  0: JS_STRING_LITERAL@65..80 "\"use strict\"" [Whitespace("\n\t\t")] []
                   1: SEMICOLON@80..81 ";" [] []
               2: LIST@81..81
               3: R_CURLY@81..84 "}" [Whitespace("\n\t")] []
@@ -57,7 +57,7 @@
                     0: L_CURLY@133..134 "{" [] []
                     1: LIST@134..151
                       0: JS_DIRECTIVE@134..151
-                        0: JS_STRING_LITERAL_TOKEN@134..150 "\"use strict\"" [Whitespace("\n\t\t\t")] []
+                        0: JS_STRING_LITERAL@134..150 "\"use strict\"" [Whitespace("\n\t\t\t")] []
                         1: SEMICOLON@150..151 ";" [] []
                     2: LIST@151..151
                     3: R_CURLY@151..155 "}" [Whitespace("\n\t\t")] []
diff --git a/crates/rslint_parser/test_data/inline/err/export_decl_not_top_level.rast b/crates/rslint_parser/test_data/inline/err/export_decl_not_top_level.rast
index 16ff195bb130..311c5ecb807a 100644
--- a/crates/rslint_parser/test_data/inline/err/export_decl_not_top_level.rast
+++ b/crates/rslint_parser/test_data/inline/err/export_decl_not_top_level.rast
@@ -16,7 +16,7 @@
             2: R_CURLY@17..19 "}" [] [Whitespace(" ")]
             3: FROM_KW@19..24 "from" [] [Whitespace(" ")]
             4: JS_STRING_LITERAL_EXPRESSION@24..30
-              0: JS_STRING_LITERAL_TOKEN@24..30 "\"life\"" [] []
+              0: JS_STRING_LITERAL@24..30 "\"life\"" [] []
             5: SEMICOLON@30..31 ";" [] []
       2: R_CURLY@31..33 "}" [Whitespace("\n")] []
   3: EOF@33..34 "" [Whitespace("\n")] []
diff --git a/crates/rslint_parser/test_data/inline/err/for_stmt_err.rast b/crates/rslint_parser/test_data/inline/err/for_stmt_err.rast
index 4dc6d3ad8674..3a2574ccbe1b 100644
--- a/crates/rslint_parser/test_data/inline/err/for_stmt_err.rast
+++ b/crates/rslint_parser/test_data/inline/err/for_stmt_err.rast
@@ -27,7 +27,7 @@
                 1: JS_EQUAL_VALUE_CLAUSE@20..23
                   0: EQ@20..22 "=" [] [Whitespace(" ")]
                   1: JS_NUMBER_LITERAL_EXPRESSION@22..23
-                    0: JS_NUMBER_LITERAL_TOKEN@22..23 "5" [] []
+                    0: JS_NUMBER_LITERAL@22..23 "5" [] []
         3: SEMICOLON@23..25 ";" [] [Whitespace(" ")]
         4: FOR_STMT_TEST@25..31
           0: JS_BINARY_EXPRESSION@25..31
@@ -35,7 +35,7 @@
               0: IDENT@25..27 "i" [] [Whitespace(" ")]
             1: L_ANGLE@27..29 "<" [] [Whitespace(" ")]
             2: JS_NUMBER_LITERAL_EXPRESSION@29..31
-              0: JS_NUMBER_LITERAL_TOKEN@29..31 "10" [] []
+              0: JS_NUMBER_LITERAL@29..31 "10" [] []
         5: SEMICOLON@31..33 ";" [] [Whitespace(" ")]
         6: FOR_STMT_UPDATE@33..37
           0: JS_PRE_UPDATE_EXPRESSION@33..37
diff --git a/crates/rslint_parser/test_data/inline/err/import_decl_not_top_level.rast b/crates/rslint_parser/test_data/inline/err/import_decl_not_top_level.rast
index 76f27afda4f9..531e009f5f4b 100644
--- a/crates/rslint_parser/test_data/inline/err/import_decl_not_top_level.rast
+++ b/crates/rslint_parser/test_data/inline/err/import_decl_not_top_level.rast
@@ -12,7 +12,7 @@
               0: IDENT@10..14 "foo" [] [Whitespace(" ")]
           2: FROM_KW@14..19 "from" [] [Whitespace(" ")]
           3: JS_STRING_LITERAL_EXPRESSION@19..24
-            0: JS_STRING_LITERAL_TOKEN@19..24 "\"bar\"" [] []
+            0: JS_STRING_LITERAL@19..24 "\"bar\"" [] []
           4: SEMICOLON@24..25 ";" [] []
       2: R_CURLY@25..27 "}" [Whitespace("\n")] []
   3: EOF@27..28 "" [Whitespace("\n")] []
diff --git a/crates/rslint_parser/test_data/inline/err/invalid_method_recover.rast b/crates/rslint_parser/test_data/inline/err/invalid_method_recover.rast
index 111d3bb81336..e1edb265a9e0 100644
--- a/crates/rslint_parser/test_data/inline/err/invalid_method_recover.rast
+++ b/crates/rslint_parser/test_data/inline/err/invalid_method_recover.rast
@@ -11,10 +11,10 @@
             0: L_BRACK@7..11 "[" [Whitespace("\n  ")] []
             1: JS_BINARY_EXPRESSION@11..16
               0: JS_NUMBER_LITERAL_EXPRESSION@11..13
-                0: JS_NUMBER_LITERAL_TOKEN@11..13 "1" [] [Whitespace(" ")]
+                0: JS_NUMBER_LITERAL@11..13 "1" [] [Whitespace(" ")]
               1: PLUS@13..15 "+" [] [Whitespace(" ")]
               2: JS_NUMBER_LITERAL_EXPRESSION@15..16
-                0: JS_NUMBER_LITERAL_TOKEN@15..16 "1" [] []
+                0: JS_NUMBER_LITERAL@15..16 "1" [] []
             2: R_BRACK@16..18 "]" [] [Whitespace(" ")]
           1: JS_EQUAL_VALUE_CLAUSE@18..43
             0: EQ@18..20 "=" [] [Whitespace(" ")]
diff --git a/crates/rslint_parser/test_data/inline/err/logical_expressions_err.rast b/crates/rslint_parser/test_data/inline/err/logical_expressions_err.rast
index 99585b2325f3..4272f37ee2fa 100644
--- a/crates/rslint_parser/test_data/inline/err/logical_expressions_err.rast
+++ b/crates/rslint_parser/test_data/inline/err/logical_expressions_err.rast
@@ -10,7 +10,7 @@
         2: JS_BINARY_EXPRESSION@7..10
           0: STAR@7..9 "*" [] [Whitespace(" ")]
           1: JS_NUMBER_LITERAL_EXPRESSION@9..10
-            0: JS_NUMBER_LITERAL_TOKEN@9..10 "2" [] []
+            0: JS_NUMBER_LITERAL@9..10 "2" [] []
       1: SEMICOLON@10..11 ";" [] []
     1: JS_EXPRESSION_STATEMENT@11..24
       0: JS_LOGICAL_EXPRESSION@11..23
diff --git a/crates/rslint_parser/test_data/inline/err/object_expr_error_prop_name.rast b/crates/rslint_parser/test_data/inline/err/object_expr_error_prop_name.rast
index 8816713d6211..24fb361e9e8b 100644
--- a/crates/rslint_parser/test_data/inline/err/object_expr_error_prop_name.rast
+++ b/crates/rslint_parser/test_data/inline/err/object_expr_error_prop_name.rast
@@ -17,10 +17,10 @@
                 1: LIST@10..25
                   0: JS_PROPERTY_OBJECT_MEMBER@10..25
                     0: ERROR@10..17
-                      0: JS_REGEX_LITERAL_TOKEN@10..17 "/: 6, /" [] []
+                      0: JS_REGEX_LITERAL@10..17 "/: 6, /" [] []
                     1: COLON@17..19 ":" [] [Whitespace(" ")]
                     2: JS_REGEX_LITERAL_EXPRESSION@19..25
-                      0: JS_REGEX_LITERAL_TOKEN@19..25 "/foo/" [] [Whitespace(" ")]
+                      0: JS_REGEX_LITERAL@19..25 "/foo/" [] [Whitespace(" ")]
                 2: R_CURLY@25..26 "}" [] []
       1: (empty)
     1: JS_VARIABLE_DECLARATION_STATEMENT@26..38
diff --git a/crates/rslint_parser/test_data/inline/err/object_expr_non_ident_literal_prop.rast b/crates/rslint_parser/test_data/inline/err/object_expr_non_ident_literal_prop.rast
index db78d5632730..666aed1f6738 100644
--- a/crates/rslint_parser/test_data/inline/err/object_expr_non_ident_literal_prop.rast
+++ b/crates/rslint_parser/test_data/inline/err/object_expr_non_ident_literal_prop.rast
@@ -17,7 +17,7 @@
                 1: LIST@9..10
                   0: JS_PROPERTY_OBJECT_MEMBER@9..10
                     0: JS_LITERAL_MEMBER_NAME@9..10
-                      0: JS_NUMBER_LITERAL_TOKEN@9..10 "5" [] []
+                      0: JS_NUMBER_LITERAL@9..10 "5" [] []
                     1: (empty)
                 2: R_CURLY@10..11 "}" [] []
       1: (empty)
diff --git a/crates/rslint_parser/test_data/inline/err/paren_or_arrow_expr_invalid_params.rast b/crates/rslint_parser/test_data/inline/err/paren_or_arrow_expr_invalid_params.rast
index 0acc978d929a..f838dd5ba002 100644
--- a/crates/rslint_parser/test_data/inline/err/paren_or_arrow_expr_invalid_params.rast
+++ b/crates/rslint_parser/test_data/inline/err/paren_or_arrow_expr_invalid_params.rast
@@ -8,11 +8,11 @@
           0: L_PAREN@0..1 "(" [] []
           1: LIST@1..5
             0: ERROR@1..3
-              0: JS_NUMBER_LITERAL_TOKEN@1..3 "5" [] [Whitespace(" ")]
+              0: JS_NUMBER_LITERAL@1..3 "5" [] [Whitespace(" ")]
             1: ERROR@3..5
               0: PLUS@3..5 "+" [] [Whitespace(" ")]
           2: (empty)
-        1: JS_NUMBER_LITERAL_TOKEN@5..6 "5" [] []
+        1: JS_NUMBER_LITERAL@5..6 "5" [] []
       1: (empty)
     1: ERROR@6..8
       0: R_PAREN@6..8 ")" [] [Whitespace(" ")]
diff --git a/crates/rslint_parser/test_data/inline/err/throw_stmt_err.rast b/crates/rslint_parser/test_data/inline/err/throw_stmt_err.rast
index 56d3aa76bb40..6963bbfe37a9 100644
--- a/crates/rslint_parser/test_data/inline/err/throw_stmt_err.rast
+++ b/crates/rslint_parser/test_data/inline/err/throw_stmt_err.rast
@@ -14,7 +14,7 @@
           0: L_PAREN@15..16 "(" [] []
           1: LIST@16..26
             0: JS_STRING_LITERAL_EXPRESSION@16..26
-              0: JS_STRING_LITERAL_TOKEN@16..26 "\"oh no :(\"" [] []
+              0: JS_STRING_LITERAL@16..26 "\"oh no :(\"" [] []
           2: R_PAREN@26..27 ")" [] []
       1: (empty)
   3: EOF@27..28 "" [Whitespace("\n")] []
diff --git a/crates/rslint_parser/test_data/inline/err/var_decl_err.rast b/crates/rslint_parser/test_data/inline/err/var_decl_err.rast
index 19d9ca5871fe..f1541f017e6a 100644
--- a/crates/rslint_parser/test_data/inline/err/var_decl_err.rast
+++ b/crates/rslint_parser/test_data/inline/err/var_decl_err.rast
@@ -26,7 +26,7 @@
             1: JS_EQUAL_VALUE_CLAUSE@17..21
               0: EQ@17..19 "=" [] [Whitespace(" ")]
               1: JS_NUMBER_LITERAL_EXPRESSION@19..21
-                0: JS_NUMBER_LITERAL_TOKEN@19..21 "5" [] [Whitespace(" ")]
+                0: JS_NUMBER_LITERAL@19..21 "5" [] [Whitespace(" ")]
       1: (empty)
     2: JS_VARIABLE_DECLARATION_STATEMENT@21..31
       0: JS_VARIABLE_DECLARATION@21..30
@@ -39,7 +39,7 @@
             1: JS_EQUAL_VALUE_CLAUSE@27..30
               0: EQ@27..29 "=" [] [Whitespace(" ")]
               1: JS_NUMBER_LITERAL_EXPRESSION@29..30
-                0: JS_NUMBER_LITERAL_TOKEN@29..30 "5" [] []
+                0: JS_NUMBER_LITERAL@29..30 "5" [] []
       1: SEMICOLON@30..31 ";" [] []
   3: EOF@31..32 "" [Whitespace("\n")] []
 --
diff --git a/crates/rslint_parser/test_data/inline/ok/assign_expr.rast b/crates/rslint_parser/test_data/inline/ok/assign_expr.rast
index d0798c1180fd..8bcabc3c865c 100644
--- a/crates/rslint_parser/test_data/inline/ok/assign_expr.rast
+++ b/crates/rslint_parser/test_data/inline/ok/assign_expr.rast
@@ -16,7 +16,7 @@
               0: IDENT@13..15 "b" [] [Whitespace(" ")]
             1: QUESTION2EQ@15..19 "??=" [] [Whitespace(" ")]
             2: JS_NUMBER_LITERAL_EXPRESSION@19..20
-              0: JS_NUMBER_LITERAL_TOKEN@19..20 "3" [] []
+              0: JS_NUMBER_LITERAL@19..20 "3" [] []
       1: SEMICOLON@20..21 ";" [] []
     1: JS_EXPRESSION_STATEMENT@21..33
       0: ASSIGN_EXPR@21..32
diff --git a/crates/rslint_parser/test_data/inline/ok/await_expression.rast b/crates/rslint_parser/test_data/inline/ok/await_expression.rast
index 7cc536ef118c..029d3326bebc 100644
--- a/crates/rslint_parser/test_data/inline/ok/await_expression.rast
+++ b/crates/rslint_parser/test_data/inline/ok/await_expression.rast
@@ -68,7 +68,7 @@
           0: JS_RETURN_STATEMENT@102..113
             0: RETURN_KW@102..111 "return" [Whitespace("\n\t")] [Whitespace(" ")]
             1: JS_NUMBER_LITERAL_EXPRESSION@111..112
-              0: JS_NUMBER_LITERAL_TOKEN@111..112 "4" [] []
+              0: JS_NUMBER_LITERAL@111..112 "4" [] []
             2: SEMICOLON@112..113 ";" [] []
         3: R_CURLY@113..115 "}" [Whitespace("\n")] []
   3: EOF@115..116 "" [Whitespace("\n")] []
diff --git a/crates/rslint_parser/test_data/inline/ok/binary_expressions.rast b/crates/rslint_parser/test_data/inline/ok/binary_expressions.rast
index 726a92380753..6f168e0712be 100644
--- a/crates/rslint_parser/test_data/inline/ok/binary_expressions.rast
+++ b/crates/rslint_parser/test_data/inline/ok/binary_expressions.rast
@@ -5,62 +5,62 @@
     0: JS_EXPRESSION_STATEMENT@0..5
       0: JS_BINARY_EXPRESSION@0..5
         0: JS_NUMBER_LITERAL_EXPRESSION@0..2
-          0: JS_NUMBER_LITERAL_TOKEN@0..2 "5" [] [Whitespace(" ")]
+          0: JS_NUMBER_LITERAL@0..2 "5" [] [Whitespace(" ")]
         1: STAR@2..4 "*" [] [Whitespace(" ")]
         2: JS_NUMBER_LITERAL_EXPRESSION@4..5
-          0: JS_NUMBER_LITERAL_TOKEN@4..5 "5" [] []
+          0: JS_NUMBER_LITERAL@4..5 "5" [] []
       1: (empty)
     1: JS_EXPRESSION_STATEMENT@5..17
       0: JS_BINARY_EXPRESSION@5..17
         0: JS_NUMBER_LITERAL_EXPRESSION@5..8
-          0: JS_NUMBER_LITERAL_TOKEN@5..8 "6" [Whitespace("\n")] [Whitespace(" ")]
+          0: JS_NUMBER_LITERAL@5..8 "6" [Whitespace("\n")] [Whitespace(" ")]
         1: STAR2@8..11 "**" [] [Whitespace(" ")]
         2: JS_BINARY_EXPRESSION@11..17
           0: JS_NUMBER_LITERAL_EXPRESSION@11..13
-            0: JS_NUMBER_LITERAL_TOKEN@11..13 "6" [] [Whitespace(" ")]
+            0: JS_NUMBER_LITERAL@11..13 "6" [] [Whitespace(" ")]
           1: STAR2@13..16 "**" [] [Whitespace(" ")]
           2: JS_NUMBER_LITERAL_EXPRESSION@16..17
-            0: JS_NUMBER_LITERAL_TOKEN@16..17 "7" [] []
+            0: JS_NUMBER_LITERAL@16..17 "7" [] []
       1: (empty)
     2: JS_EXPRESSION_STATEMENT@17..39
       0: JS_BINARY_EXPRESSION@17..39
         0: JS_NUMBER_LITERAL_EXPRESSION@17..20
-          0: JS_NUMBER_LITERAL_TOKEN@17..20 "1" [Whitespace("\n")] [Whitespace(" ")]
+          0: JS_NUMBER_LITERAL@17..20 "1" [Whitespace("\n")] [Whitespace(" ")]
         1: PLUS@20..22 "+" [] [Whitespace(" ")]
         2: JS_BINARY_EXPRESSION@22..39
           0: JS_BINARY_EXPRESSION@22..36
             0: JS_NUMBER_LITERAL_EXPRESSION@22..24
-              0: JS_NUMBER_LITERAL_TOKEN@22..24 "2" [] [Whitespace(" ")]
+              0: JS_NUMBER_LITERAL@22..24 "2" [] [Whitespace(" ")]
             1: STAR@24..26 "*" [] [Whitespace(" ")]
             2: CALL_EXPR@26..36
               0: JS_NUMBER_LITERAL_EXPRESSION@26..27
-                0: JS_NUMBER_LITERAL_TOKEN@26..27 "3" [] []
+                0: JS_NUMBER_LITERAL@26..27 "3" [] []
               1: ARG_LIST@27..36
                 0: L_PAREN@27..29 "(" [Whitespace("\n")] []
                 1: LIST@29..34
                   0: JS_BINARY_EXPRESSION@29..34
                     0: JS_NUMBER_LITERAL_EXPRESSION@29..31
-                      0: JS_NUMBER_LITERAL_TOKEN@29..31 "1" [] [Whitespace(" ")]
+                      0: JS_NUMBER_LITERAL@29..31 "1" [] [Whitespace(" ")]
                     1: PLUS@31..33 "+" [] [Whitespace(" ")]
                     2: JS_NUMBER_LITERAL_EXPRESSION@33..34
-                      0: JS_NUMBER_LITERAL_TOKEN@33..34 "2" [] []
+                      0: JS_NUMBER_LITERAL@33..34 "2" [] []
                 2: R_PAREN@34..36 ")" [] [Whitespace(" ")]
           1: STAR@36..38 "*" [] [Whitespace(" ")]
           2: JS_NUMBER_LITERAL_EXPRESSION@38..39
-            0: JS_NUMBER_LITERAL_TOKEN@38..39 "3" [] []
+            0: JS_NUMBER_LITERAL@38..39 "3" [] []
       1: (empty)
     3: JS_EXPRESSION_STATEMENT@39..45
       0: JS_BINARY_EXPRESSION@39..45
         0: JS_NUMBER_LITERAL_EXPRESSION@39..42
-          0: JS_NUMBER_LITERAL_TOKEN@39..42 "1" [Whitespace("\n")] [Whitespace(" ")]
+          0: JS_NUMBER_LITERAL@39..42 "1" [Whitespace("\n")] [Whitespace(" ")]
         1: SLASH@42..44 "/" [] [Whitespace(" ")]
         2: JS_NUMBER_LITERAL_EXPRESSION@44..45
-          0: JS_NUMBER_LITERAL_TOKEN@44..45 "2" [] []
+          0: JS_NUMBER_LITERAL@44..45 "2" [] []
       1: (empty)
     4: JS_EXPRESSION_STATEMENT@45..55
       0: JS_BINARY_EXPRESSION@45..55
         0: JS_NUMBER_LITERAL_EXPRESSION@45..49
-          0: JS_NUMBER_LITERAL_TOKEN@45..49 "74" [Whitespace("\n")] [Whitespace(" ")]
+          0: JS_NUMBER_LITERAL@45..49 "74" [Whitespace("\n")] [Whitespace(" ")]
         1: IN_KW@49..52 "in" [] [Whitespace(" ")]
         2: JS_REFERENCE_IDENTIFIER_EXPRESSION@52..55
           0: IDENT@52..55 "foo" [] []
@@ -78,39 +78,39 @@
         0: JS_BINARY_EXPRESSION@76..87
           0: JS_BINARY_EXPRESSION@76..83
             0: JS_NUMBER_LITERAL_EXPRESSION@76..79
-              0: JS_NUMBER_LITERAL_TOKEN@76..79 "1" [Whitespace("\n")] [Whitespace(" ")]
+              0: JS_NUMBER_LITERAL@76..79 "1" [Whitespace("\n")] [Whitespace(" ")]
             1: PLUS@79..81 "+" [] [Whitespace(" ")]
             2: JS_NUMBER_LITERAL_EXPRESSION@81..83
-              0: JS_NUMBER_LITERAL_TOKEN@81..83 "1" [] [Whitespace(" ")]
+              0: JS_NUMBER_LITERAL@81..83 "1" [] [Whitespace(" ")]
           1: PLUS@83..85 "+" [] [Whitespace(" ")]
           2: JS_NUMBER_LITERAL_EXPRESSION@85..87
-            0: JS_NUMBER_LITERAL_TOKEN@85..87 "1" [] [Whitespace(" ")]
+            0: JS_NUMBER_LITERAL@85..87 "1" [] [Whitespace(" ")]
         1: PLUS@87..89 "+" [] [Whitespace(" ")]
         2: JS_NUMBER_LITERAL_EXPRESSION@89..90
-          0: JS_NUMBER_LITERAL_TOKEN@89..90 "1" [] []
+          0: JS_NUMBER_LITERAL@89..90 "1" [] []
       1: (empty)
     7: JS_EXPRESSION_STATEMENT@90..113
       0: JS_BINARY_EXPRESSION@90..113
         0: JS_BINARY_EXPRESSION@90..97
           0: JS_NUMBER_LITERAL_EXPRESSION@90..93
-            0: JS_NUMBER_LITERAL_TOKEN@90..93 "5" [Whitespace("\n")] [Whitespace(" ")]
+            0: JS_NUMBER_LITERAL@90..93 "5" [Whitespace("\n")] [Whitespace(" ")]
           1: PLUS@93..95 "+" [] [Whitespace(" ")]
           2: JS_NUMBER_LITERAL_EXPRESSION@95..97
-            0: JS_NUMBER_LITERAL_TOKEN@95..97 "6" [] [Whitespace(" ")]
+            0: JS_NUMBER_LITERAL@95..97 "6" [] [Whitespace(" ")]
         1: MINUS@97..99 "-" [] [Whitespace(" ")]
         2: JS_BINARY_EXPRESSION@99..113
           0: JS_BINARY_EXPRESSION@99..105
             0: JS_NUMBER_LITERAL_EXPRESSION@99..101
-              0: JS_NUMBER_LITERAL_TOKEN@99..101 "1" [] [Whitespace(" ")]
+              0: JS_NUMBER_LITERAL@99..101 "1" [] [Whitespace(" ")]
             1: STAR@101..103 "*" [] [Whitespace(" ")]
             2: JS_NUMBER_LITERAL_EXPRESSION@103..105
-              0: JS_NUMBER_LITERAL_TOKEN@103..105 "2" [] [Whitespace(" ")]
+              0: JS_NUMBER_LITERAL@103..105 "2" [] [Whitespace(" ")]
           1: SLASH@105..107 "/" [] [Whitespace(" ")]
           2: JS_BINARY_EXPRESSION@107..113
             0: JS_NUMBER_LITERAL_EXPRESSION@107..109
-              0: JS_NUMBER_LITERAL_TOKEN@107..109 "1" [] [Whitespace(" ")]
+              0: JS_NUMBER_LITERAL@107..109 "1" [] [Whitespace(" ")]
             1: STAR2@109..112 "**" [] [Whitespace(" ")]
             2: JS_NUMBER_LITERAL_EXPRESSION@112..113
-              0: JS_NUMBER_LITERAL_TOKEN@112..113 "6" [] []
+              0: JS_NUMBER_LITERAL@112..113 "6" [] []
       1: (empty)
   3: EOF@113..114 "" [Whitespace("\n")] []
diff --git a/crates/rslint_parser/test_data/inline/ok/computed_member_expression.rast b/crates/rslint_parser/test_data/inline/ok/computed_member_expression.rast
index 1e1db6c354aa..6059915b3468 100644
--- a/crates/rslint_parser/test_data/inline/ok/computed_member_expression.rast
+++ b/crates/rslint_parser/test_data/inline/ok/computed_member_expression.rast
@@ -18,10 +18,10 @@
         1: L_BRACK@12..13 "[" [] []
         2: JS_BINARY_EXPRESSION@13..18
           0: JS_NUMBER_LITERAL_EXPRESSION@13..15
-            0: JS_NUMBER_LITERAL_TOKEN@13..15 "5" [] [Whitespace(" ")]
+            0: JS_NUMBER_LITERAL@13..15 "5" [] [Whitespace(" ")]
           1: PLUS@15..17 "+" [] [Whitespace(" ")]
           2: JS_NUMBER_LITERAL_EXPRESSION@17..18
-            0: JS_NUMBER_LITERAL_TOKEN@17..18 "5" [] []
+            0: JS_NUMBER_LITERAL@17..18 "5" [] []
         3: R_BRACK@18..19 "]" [] []
       1: (empty)
     2: JS_EXPRESSION_STATEMENT@19..30
@@ -30,7 +30,7 @@
           0: IDENT@19..23 "foo" [Whitespace("\n")] []
         1: L_BRACK@23..24 "[" [] []
         2: JS_STRING_LITERAL_EXPRESSION@24..29
-          0: JS_STRING_LITERAL_TOKEN@24..29 "\"bar\"" [] []
+          0: JS_STRING_LITERAL@24..29 "\"bar\"" [] []
         3: R_BRACK@29..30 "]" [] []
       1: (empty)
     3: JS_EXPRESSION_STATEMENT@30..44
diff --git a/crates/rslint_parser/test_data/inline/ok/constructor_class_member.rast b/crates/rslint_parser/test_data/inline/ok/constructor_class_member.rast
index 7694108bfa97..438214a4bb41 100644
--- a/crates/rslint_parser/test_data/inline/ok/constructor_class_member.rast
+++ b/crates/rslint_parser/test_data/inline/ok/constructor_class_member.rast
@@ -44,7 +44,7 @@
       3: LIST@61..98
         0: JS_CONSTRUCTOR_CLASS_MEMBER@61..98
           0: JS_LITERAL_MEMBER_NAME@61..76
-            0: JS_STRING_LITERAL_TOKEN@61..76 "\"constructor\"" [Whitespace("\n\t")] []
+            0: JS_STRING_LITERAL@61..76 "\"constructor\"" [Whitespace("\n\t")] []
           1: JS_CONSTRUCTOR_PARAMETER_LIST@76..80
             0: L_PAREN@76..77 "(" [] []
             1: LIST@77..78
diff --git a/crates/rslint_parser/test_data/inline/ok/directives.rast b/crates/rslint_parser/test_data/inline/ok/directives.rast
index 979efab4ab3c..8279039d5b47 100644
--- a/crates/rslint_parser/test_data/inline/ok/directives.rast
+++ b/crates/rslint_parser/test_data/inline/ok/directives.rast
@@ -2,7 +2,7 @@
   0: (empty)
   1: LIST@0..20
     0: JS_DIRECTIVE@0..20
-      0: JS_STRING_LITERAL_TOKEN@0..20 "\"use new\"" [Comments("// SCRIPT"), Whitespace("\n\n")] []
+      0: JS_STRING_LITERAL@0..20 "\"use new\"" [Comments("// SCRIPT"), Whitespace("\n\n")] []
   2: LIST@20..359
     0: JS_VARIABLE_DECLARATION_STATEMENT@20..33
       0: JS_VARIABLE_DECLARATION@20..32
@@ -15,11 +15,11 @@
             1: JS_EQUAL_VALUE_CLAUSE@28..32
               0: EQ@28..30 "=" [] [Whitespace(" ")]
               1: JS_NUMBER_LITERAL_EXPRESSION@30..32
-                0: JS_NUMBER_LITERAL_TOKEN@30..32 "10" [] []
+                0: JS_NUMBER_LITERAL@30..32 "10" [] []
       1: SEMICOLON@32..33 ";" [] []
     1: JS_EXPRESSION_STATEMENT@33..67
       0: JS_STRING_LITERAL_EXPRESSION@33..47
-        0: JS_STRING_LITERAL_TOKEN@33..47 "\"use strict\"" [Whitespace("\n\n")] []
+        0: JS_STRING_LITERAL@33..47 "\"use strict\"" [Whitespace("\n\n")] []
       1: SEMICOLON@47..67 ";" [] [Whitespace(" "), Comments("// not a directive")]
     2: JS_FUNCTION_DECLARATION@67..152
       0: FUNCTION_KW@67..78 "function" [Whitespace("\n\n")] [Whitespace(" ")]
@@ -33,7 +33,7 @@
         0: L_CURLY@85..86 "{" [] []
         1: LIST@86..101
           0: JS_DIRECTIVE@86..101
-            0: JS_STRING_LITERAL_TOKEN@86..100 "'use strict'" [Whitespace("\n\t")] []
+            0: JS_STRING_LITERAL@86..100 "'use strict'" [Whitespace("\n\t")] []
             1: SEMICOLON@100..101 ";" [] []
         2: LIST@101..150
           0: JS_VARIABLE_DECLARATION_STATEMENT@101..115
@@ -47,11 +47,11 @@
                   1: JS_EQUAL_VALUE_CLAUSE@110..114
                     0: EQ@110..112 "=" [] [Whitespace(" ")]
                     1: JS_NUMBER_LITERAL_EXPRESSION@112..114
-                      0: JS_NUMBER_LITERAL_TOKEN@112..114 "10" [] []
+                      0: JS_NUMBER_LITERAL@112..114 "10" [] []
             1: SEMICOLON@114..115 ";" [] []
           1: JS_EXPRESSION_STATEMENT@115..150
             0: JS_STRING_LITERAL_EXPRESSION@115..130
-              0: JS_STRING_LITERAL_TOKEN@115..130 "'use strict'" [Whitespace("\n\n\t")] []
+              0: JS_STRING_LITERAL@115..130 "'use strict'" [Whitespace("\n\n\t")] []
             1: SEMICOLON@130..150 ";" [] [Whitespace(" "), Comments("// not a directive")]
         3: R_CURLY@150..152 "}" [Whitespace("\n")] []
     3: JS_EXPRESSION_STATEMENT@152..236
@@ -67,7 +67,7 @@
             0: L_CURLY@167..168 "{" [] []
             1: LIST@168..183
               0: JS_DIRECTIVE@168..183
-                0: JS_STRING_LITERAL_TOKEN@168..182 "\"use strict\"" [Whitespace("\n\t")] []
+                0: JS_STRING_LITERAL@168..182 "\"use strict\"" [Whitespace("\n\t")] []
                 1: SEMICOLON@182..183 ";" [] []
             2: LIST@183..232
               0: JS_VARIABLE_DECLARATION_STATEMENT@183..197
@@ -81,11 +81,11 @@
                       1: JS_EQUAL_VALUE_CLAUSE@192..196
                         0: EQ@192..194 "=" [] [Whitespace(" ")]
                         1: JS_NUMBER_LITERAL_EXPRESSION@194..196
-                          0: JS_NUMBER_LITERAL_TOKEN@194..196 "10" [] []
+                          0: JS_NUMBER_LITERAL@194..196 "10" [] []
                 1: SEMICOLON@196..197 ";" [] []
               1: JS_EXPRESSION_STATEMENT@197..232
                 0: JS_STRING_LITERAL_EXPRESSION@197..212
-                  0: JS_STRING_LITERAL_TOKEN@197..212 "\"use strict\"" [Whitespace("\n\n\t")] []
+                  0: JS_STRING_LITERAL@197..212 "\"use strict\"" [Whitespace("\n\n\t")] []
                 1: SEMICOLON@212..232 ";" [] [Whitespace(" "), Comments("// not a directive")]
             3: R_CURLY@232..234 "}" [Whitespace("\n")] []
         2: R_PAREN@234..235 ")" [] []
@@ -110,7 +110,7 @@
                   0: L_CURLY@252..253 "{" [] []
                   1: LIST@253..268
                     0: JS_DIRECTIVE@253..268
-                      0: JS_STRING_LITERAL_TOKEN@253..267 "\"use strict\"" [Whitespace("\n\t")] []
+                      0: JS_STRING_LITERAL@253..267 "\"use strict\"" [Whitespace("\n\t")] []
                       1: SEMICOLON@267..268 ";" [] []
                   2: LIST@268..318
                     0: JS_VARIABLE_DECLARATION_STATEMENT@268..282
@@ -124,11 +124,11 @@
                             1: JS_EQUAL_VALUE_CLAUSE@277..281
                               0: EQ@277..279 "=" [] [Whitespace(" ")]
                               1: JS_NUMBER_LITERAL_EXPRESSION@279..281
-                                0: JS_NUMBER_LITERAL_TOKEN@279..281 "10" [] []
+                                0: JS_NUMBER_LITERAL@279..281 "10" [] []
                       1: SEMICOLON@281..282 ";" [] []
                     1: JS_EXPRESSION_STATEMENT@282..318
                       0: JS_STRING_LITERAL_EXPRESSION@282..297
-                        0: JS_STRING_LITERAL_TOKEN@282..297 "\"use strict\"" [Whitespace("\n\n\t")] []
+                        0: JS_STRING_LITERAL@282..297 "\"use strict\"" [Whitespace("\n\n\t")] []
                       1: SEMICOLON@297..318 ";" [] [Whitespace("  "), Comments("// not a directive")]
                   3: R_CURLY@318..320 "}" [Whitespace("\n")] []
       1: (empty)
@@ -137,7 +137,7 @@
       1: LIST@323..357
         0: JS_EXPRESSION_STATEMENT@323..357
           0: JS_STRING_LITERAL_EXPRESSION@323..337
-            0: JS_STRING_LITERAL_TOKEN@323..337 "\"use strict\"" [Whitespace("\n\t")] []
+            0: JS_STRING_LITERAL@323..337 "\"use strict\"" [Whitespace("\n\t")] []
           1: SEMICOLON@337..357 ";" [] [Whitespace(" "), Comments("// not a directive")]
       2: R_CURLY@357..359 "}" [Whitespace("\n")] []
   3: EOF@359..360 "" [Whitespace("\n")] []
diff --git a/crates/rslint_parser/test_data/inline/ok/do_while_statement.rast b/crates/rslint_parser/test_data/inline/ok/do_while_statement.rast
index d3e684cebaaa..85ff738f1c1f 100644
--- a/crates/rslint_parser/test_data/inline/ok/do_while_statement.rast
+++ b/crates/rslint_parser/test_data/inline/ok/do_while_statement.rast
@@ -16,7 +16,7 @@
             0: L_PAREN@14..15 "(" [] []
             1: LIST@15..21
               0: JS_STRING_LITERAL_EXPRESSION@15..21
-                0: JS_STRING_LITERAL_TOKEN@15..21 "\"test\"" [] []
+                0: JS_STRING_LITERAL@15..21 "\"test\"" [] []
             2: R_PAREN@21..22 ")" [] []
         1: SEMICOLON@22..24 ";" [] [Whitespace(" ")]
       2: WHILE_KW@24..29 "while" [] []
@@ -42,7 +42,7 @@
                 0: L_PAREN@54..55 "(" [] []
                 1: LIST@55..61
                   0: JS_STRING_LITERAL_EXPRESSION@55..61
-                    0: JS_STRING_LITERAL_TOKEN@55..61 "\"test\"" [] []
+                    0: JS_STRING_LITERAL@55..61 "\"test\"" [] []
                 2: R_PAREN@61..62 ")" [] []
             1: (empty)
         2: R_CURLY@62..65 "}" [Whitespace("\n")] [Whitespace(" ")]
@@ -63,7 +63,7 @@
             1: JS_EQUAL_VALUE_CLAUSE@86..89
               0: EQ@86..88 "=" [] [Whitespace(" ")]
               1: JS_NUMBER_LITERAL_EXPRESSION@88..89
-                0: JS_NUMBER_LITERAL_TOKEN@88..89 "1" [] []
+                0: JS_NUMBER_LITERAL@88..89 "1" [] []
       1: SEMICOLON@89..90 ";" [] []
     3: JS_DO_WHILE_STATEMENT@90..143
       0: DO_KW@90..93 "do" [Whitespace("\n")] []
@@ -82,7 +82,7 @@
                     0: IDENT@106..108 "a" [] [Whitespace(" ")]
                   1: PLUS@108..110 "+" [] [Whitespace(" ")]
                   2: JS_NUMBER_LITERAL_EXPRESSION@110..111
-                    0: JS_NUMBER_LITERAL_TOKEN@110..111 "1" [] []
+                    0: JS_NUMBER_LITERAL@110..111 "1" [] []
               1: (empty)
           2: R_CURLY@111..115 "}" [Whitespace("\n\t")] [Whitespace(" ")]
         2: WHILE_KW@115..120 "while" [] []
@@ -92,7 +92,7 @@
             0: IDENT@121..123 "a" [] [Whitespace(" ")]
           1: L_ANGLE@123..125 "<" [] [Whitespace(" ")]
           2: JS_NUMBER_LITERAL_EXPRESSION@125..126
-            0: JS_NUMBER_LITERAL_TOKEN@125..126 "5" [] []
+            0: JS_NUMBER_LITERAL@125..126 "5" [] []
         5: R_PAREN@126..127 ")" [] []
         6: (empty)
       2: WHILE_KW@127..134 "while" [Whitespace("\n")] [Whitespace(" ")]
@@ -102,7 +102,7 @@
           0: IDENT@135..137 "a" [] [Whitespace(" ")]
         1: L_ANGLE@137..139 "<" [] [Whitespace(" ")]
         2: JS_NUMBER_LITERAL_EXPRESSION@139..142
-          0: JS_NUMBER_LITERAL_TOKEN@139..142 "100" [] []
+          0: JS_NUMBER_LITERAL@139..142 "100" [] []
       5: R_PAREN@142..143 ")" [] []
       6: (empty)
   3: EOF@143..144 "" [Whitespace("\n")] []
diff --git a/crates/rslint_parser/test_data/inline/ok/export.rast b/crates/rslint_parser/test_data/inline/ok/export.rast
index 647d8cb44868..6152de29059f 100644
--- a/crates/rslint_parser/test_data/inline/ok/export.rast
+++ b/crates/rslint_parser/test_data/inline/ok/export.rast
@@ -13,6 +13,6 @@
         2: R_CURLY@13..15 "}" [] [Whitespace(" ")]
         3: FROM_KW@15..20 "from" [] [Whitespace(" ")]
         4: JS_STRING_LITERAL_EXPRESSION@20..25
-          0: JS_STRING_LITERAL_TOKEN@20..25 "\"bla\"" [] []
+          0: JS_STRING_LITERAL@20..25 "\"bla\"" [] []
         5: SEMICOLON@25..26 ";" [] []
   3: EOF@26..27 "" [Whitespace("\n")] []
diff --git a/crates/rslint_parser/test_data/inline/ok/for_stmt.rast b/crates/rslint_parser/test_data/inline/ok/for_stmt.rast
index 2ed229348452..c1875ff5743d 100644
--- a/crates/rslint_parser/test_data/inline/ok/for_stmt.rast
+++ b/crates/rslint_parser/test_data/inline/ok/for_stmt.rast
@@ -16,7 +16,7 @@
               1: JS_EQUAL_VALUE_CLAUSE@11..14
                 0: EQ@11..13 "=" [] [Whitespace(" ")]
                 1: JS_NUMBER_LITERAL_EXPRESSION@13..14
-                  0: JS_NUMBER_LITERAL_TOKEN@13..14 "5" [] []
+                  0: JS_NUMBER_LITERAL@13..14 "5" [] []
       3: SEMICOLON@14..16 ";" [] [Whitespace(" ")]
       4: FOR_STMT_TEST@16..22
         0: JS_BINARY_EXPRESSION@16..22
@@ -24,7 +24,7 @@
             0: IDENT@16..18 "i" [] [Whitespace(" ")]
           1: L_ANGLE@18..20 "<" [] [Whitespace(" ")]
           2: JS_NUMBER_LITERAL_EXPRESSION@20..22
-            0: JS_NUMBER_LITERAL_TOKEN@20..22 "10" [] []
+            0: JS_NUMBER_LITERAL@20..22 "10" [] []
       5: SEMICOLON@22..24 ";" [] [Whitespace(" ")]
       6: FOR_STMT_UPDATE@24..27
         0: JS_POST_UPDATE_EXPRESSION@24..27
diff --git a/crates/rslint_parser/test_data/inline/ok/getter_class_member.rast b/crates/rslint_parser/test_data/inline/ok/getter_class_member.rast
index c24ddcb12156..dcf037cff5fe 100644
--- a/crates/rslint_parser/test_data/inline/ok/getter_class_member.rast
+++ b/crates/rslint_parser/test_data/inline/ok/getter_class_member.rast
@@ -45,7 +45,7 @@
         3: JS_GETTER_CLASS_MEMBER@67..84
           0: GET_KW@67..74 "get" [Whitespace("\n\n\t")] [Whitespace(" ")]
           1: JS_LITERAL_MEMBER_NAME@74..79
-            0: JS_STRING_LITERAL_TOKEN@74..79 "\"baz\"" [] []
+            0: JS_STRING_LITERAL@74..79 "\"baz\"" [] []
           2: L_PAREN@79..80 "(" [] []
           3: R_PAREN@80..82 ")" [] [Whitespace(" ")]
           4: JS_FUNCTION_BODY@82..84
@@ -59,10 +59,10 @@
             0: L_BRACK@91..92 "[" [] []
             1: JS_BINARY_EXPRESSION@92..101
               0: JS_STRING_LITERAL_EXPRESSION@92..96
-                0: JS_STRING_LITERAL_TOKEN@92..96 "\"a\"" [] [Whitespace(" ")]
+                0: JS_STRING_LITERAL@92..96 "\"a\"" [] [Whitespace(" ")]
               1: PLUS@96..98 "+" [] [Whitespace(" ")]
               2: JS_STRING_LITERAL_EXPRESSION@98..101
-                0: JS_STRING_LITERAL_TOKEN@98..101 "\"b\"" [] []
+                0: JS_STRING_LITERAL@98..101 "\"b\"" [] []
             2: R_BRACK@101..102 "]" [] []
           2: L_PAREN@102..103 "(" [] []
           3: R_PAREN@103..105 ")" [] [Whitespace(" ")]
@@ -74,7 +74,7 @@
         5: JS_GETTER_CLASS_MEMBER@107..120
           0: GET_KW@107..114 "get" [Whitespace("\n\n\t")] [Whitespace(" ")]
           1: JS_LITERAL_MEMBER_NAME@114..115
-            0: JS_NUMBER_LITERAL_TOKEN@114..115 "5" [] []
+            0: JS_NUMBER_LITERAL@114..115 "5" [] []
           2: L_PAREN@115..116 "(" [] []
           3: R_PAREN@116..118 ")" [] [Whitespace(" ")]
           4: JS_FUNCTION_BODY@118..120
diff --git a/crates/rslint_parser/test_data/inline/ok/getter_object_member.rast b/crates/rslint_parser/test_data/inline/ok/getter_object_member.rast
index 562a41944cc0..8ef86ccf4f48 100644
--- a/crates/rslint_parser/test_data/inline/ok/getter_object_member.rast
+++ b/crates/rslint_parser/test_data/inline/ok/getter_object_member.rast
@@ -35,7 +35,7 @@
                   2: JS_GETTER_OBJECT_MEMBER@41..76
                     0: GET_KW@41..48 "get" [Whitespace("\n\n ")] [Whitespace(" ")]
                     1: JS_LITERAL_MEMBER_NAME@48..53
-                      0: JS_STRING_LITERAL_TOKEN@48..53 "\"bar\"" [] []
+                      0: JS_STRING_LITERAL@48..53 "\"bar\"" [] []
                     2: L_PAREN@53..54 "(" [] []
                     3: R_PAREN@54..56 ")" [] [Whitespace(" ")]
                     4: JS_FUNCTION_BODY@56..76
@@ -45,7 +45,7 @@
                         0: JS_RETURN_STATEMENT@57..73
                           0: RETURN_KW@57..67 "return" [Whitespace("\n\t ")] [Whitespace(" ")]
                           1: JS_STRING_LITERAL_EXPRESSION@67..72
-                            0: JS_STRING_LITERAL_TOKEN@67..72 "\"bar\"" [] []
+                            0: JS_STRING_LITERAL@67..72 "\"bar\"" [] []
                           2: SEMICOLON@72..73 ";" [] []
                       3: R_CURLY@73..76 "}" [Whitespace("\n ")] []
                   3: COMMA@76..77 "," [] []
@@ -55,10 +55,10 @@
                       0: L_BRACK@84..85 "[" [] []
                       1: JS_BINARY_EXPRESSION@85..94
                         0: JS_STRING_LITERAL_EXPRESSION@85..89
-                          0: JS_STRING_LITERAL_TOKEN@85..89 "\"a\"" [] [Whitespace(" ")]
+                          0: JS_STRING_LITERAL@85..89 "\"a\"" [] [Whitespace(" ")]
                         1: PLUS@89..91 "+" [] [Whitespace(" ")]
                         2: JS_STRING_LITERAL_EXPRESSION@91..94
-                          0: JS_STRING_LITERAL_TOKEN@91..94 "\"b\"" [] []
+                          0: JS_STRING_LITERAL@91..94 "\"b\"" [] []
                       2: R_BRACK@94..95 "]" [] []
                     2: L_PAREN@95..96 "(" [] []
                     3: R_PAREN@96..98 ")" [] [Whitespace(" ")]
@@ -70,17 +70,17 @@
                           0: RETURN_KW@99..109 "return" [Whitespace("\n\t ")] [Whitespace(" ")]
                           1: JS_BINARY_EXPRESSION@109..118
                             0: JS_STRING_LITERAL_EXPRESSION@109..113
-                              0: JS_STRING_LITERAL_TOKEN@109..113 "\"a\"" [] [Whitespace(" ")]
+                              0: JS_STRING_LITERAL@109..113 "\"a\"" [] [Whitespace(" ")]
                             1: PLUS@113..115 "+" [] [Whitespace(" ")]
                             2: JS_STRING_LITERAL_EXPRESSION@115..118
-                              0: JS_STRING_LITERAL_TOKEN@115..118 "\"b\"" [] []
+                              0: JS_STRING_LITERAL@115..118 "\"b\"" [] []
                           2: (empty)
                       3: R_CURLY@118..121 "}" [Whitespace("\n ")] []
                   5: COMMA@121..122 "," [] []
                   6: JS_GETTER_OBJECT_MEMBER@122..149
                     0: GET_KW@122..129 "get" [Whitespace("\n\n\t")] [Whitespace(" ")]
                     1: JS_LITERAL_MEMBER_NAME@129..130
-                      0: JS_NUMBER_LITERAL_TOKEN@129..130 "5" [] []
+                      0: JS_NUMBER_LITERAL@129..130 "5" [] []
                     2: L_PAREN@130..131 "(" [] []
                     3: R_PAREN@131..133 ")" [] [Whitespace(" ")]
                     4: JS_FUNCTION_BODY@133..149
@@ -90,7 +90,7 @@
                         0: JS_RETURN_STATEMENT@134..146
                           0: RETURN_KW@134..144 "return" [Whitespace("\n\t ")] [Whitespace(" ")]
                           1: JS_NUMBER_LITERAL_EXPRESSION@144..145
-                            0: JS_NUMBER_LITERAL_TOKEN@144..145 "5" [] []
+                            0: JS_NUMBER_LITERAL@144..145 "5" [] []
                           2: SEMICOLON@145..146 ";" [] []
                       3: R_CURLY@146..149 "}" [Whitespace("\n\t")] []
                   7: COMMA@149..150 "," [] []
@@ -108,7 +108,7 @@
                         0: JS_RETURN_STATEMENT@160..206
                           0: RETURN_KW@160..170 "return" [Whitespace("\n\t ")] [Whitespace(" ")]
                           1: JS_STRING_LITERAL_EXPRESSION@170..205
-                            0: JS_STRING_LITERAL_TOKEN@170..205 "\"This is a method and not a getter\"" [] []
+                            0: JS_STRING_LITERAL@170..205 "\"This is a method and not a getter\"" [] []
                           2: SEMICOLON@205..206 ";" [] []
                       3: R_CURLY@206..209 "}" [Whitespace("\n\t")] []
                 2: R_CURLY@209..211 "}" [Whitespace("\n")] []
diff --git a/crates/rslint_parser/test_data/inline/ok/import_call.rast b/crates/rslint_parser/test_data/inline/ok/import_call.rast
index eca1669f2c73..33c760b78a5a 100644
--- a/crates/rslint_parser/test_data/inline/ok/import_call.rast
+++ b/crates/rslint_parser/test_data/inline/ok/import_call.rast
@@ -7,7 +7,7 @@
         0: IMPORT_KW@0..6 "import" [] []
         1: L_PAREN@6..7 "(" [] []
         2: JS_STRING_LITERAL_EXPRESSION@7..12
-          0: JS_STRING_LITERAL_TOKEN@7..12 "\"foo\"" [] []
+          0: JS_STRING_LITERAL@7..12 "\"foo\"" [] []
         3: R_PAREN@12..13 ")" [] []
       1: (empty)
   3: EOF@13..14 "" [Whitespace("\n")] []
diff --git a/crates/rslint_parser/test_data/inline/ok/import_decl.rast b/crates/rslint_parser/test_data/inline/ok/import_decl.rast
index dd2e926be7ba..43bdf822cd55 100644
--- a/crates/rslint_parser/test_data/inline/ok/import_decl.rast
+++ b/crates/rslint_parser/test_data/inline/ok/import_decl.rast
@@ -12,6 +12,6 @@
             0: IDENT@12..16 "foo" [] [Whitespace(" ")]
       2: FROM_KW@16..21 "from" [] [Whitespace(" ")]
       3: JS_STRING_LITERAL_EXPRESSION@21..26
-        0: JS_STRING_LITERAL_TOKEN@21..26 "\"bla\"" [] []
+        0: JS_STRING_LITERAL@21..26 "\"bla\"" [] []
       4: SEMICOLON@26..27 ";" [] []
   3: EOF@27..28 "" [Whitespace("\n")] []
diff --git a/crates/rslint_parser/test_data/inline/ok/js_unary_expressions.rast b/crates/rslint_parser/test_data/inline/ok/js_unary_expressions.rast
index e26ea9c736d2..0357a8e9a96d 100644
--- a/crates/rslint_parser/test_data/inline/ok/js_unary_expressions.rast
+++ b/crates/rslint_parser/test_data/inline/ok/js_unary_expressions.rast
@@ -10,7 +10,7 @@
             0: IDENT@7..8 "a" [] []
           1: L_BRACK@8..9 "[" [] []
           2: JS_STRING_LITERAL_EXPRESSION@9..15
-            0: JS_STRING_LITERAL_TOKEN@9..15 "'test'" [] []
+            0: JS_STRING_LITERAL@9..15 "'test'" [] []
           3: R_BRACK@15..16 "]" [] []
       1: SEMICOLON@16..17 ";" [] []
     1: JS_EXPRESSION_STATEMENT@17..25
@@ -29,19 +29,19 @@
       0: JS_UNARY_EXPRESSION@35..38
         0: PLUS@35..37 "+" [Whitespace("\n")] []
         1: JS_NUMBER_LITERAL_EXPRESSION@37..38
-          0: JS_NUMBER_LITERAL_TOKEN@37..38 "1" [] []
+          0: JS_NUMBER_LITERAL@37..38 "1" [] []
       1: SEMICOLON@38..39 ";" [] []
     4: JS_EXPRESSION_STATEMENT@39..43
       0: JS_UNARY_EXPRESSION@39..42
         0: MINUS@39..41 "-" [Whitespace("\n")] []
         1: JS_NUMBER_LITERAL_EXPRESSION@41..42
-          0: JS_NUMBER_LITERAL_TOKEN@41..42 "1" [] []
+          0: JS_NUMBER_LITERAL@41..42 "1" [] []
       1: SEMICOLON@42..43 ";" [] []
     5: JS_EXPRESSION_STATEMENT@43..47
       0: JS_UNARY_EXPRESSION@43..46
         0: TILDE@43..45 "~" [Whitespace("\n")] []
         1: JS_NUMBER_LITERAL_EXPRESSION@45..46
-          0: JS_NUMBER_LITERAL_TOKEN@45..46 "1" [] []
+          0: JS_NUMBER_LITERAL@45..46 "1" [] []
       1: SEMICOLON@46..47 ";" [] []
     6: JS_EXPRESSION_STATEMENT@47..54
       0: JS_UNARY_EXPRESSION@47..53
diff --git a/crates/rslint_parser/test_data/inline/ok/literals.rast b/crates/rslint_parser/test_data/inline/ok/literals.rast
index 70a112dd6eb0..7c3584ddc1a7 100644
--- a/crates/rslint_parser/test_data/inline/ok/literals.rast
+++ b/crates/rslint_parser/test_data/inline/ok/literals.rast
@@ -4,7 +4,7 @@
   2: LIST@0..32
     0: JS_EXPRESSION_STATEMENT@0..1
       0: JS_NUMBER_LITERAL_EXPRESSION@0..1
-        0: JS_NUMBER_LITERAL_TOKEN@0..1 "5" [] []
+        0: JS_NUMBER_LITERAL@0..1 "5" [] []
       1: (empty)
     1: JS_EXPRESSION_STATEMENT@1..6
       0: JS_BOOLEAN_LITERAL_EXPRESSION@1..6
@@ -16,15 +16,15 @@
       1: (empty)
     3: JS_EXPRESSION_STATEMENT@12..15
       0: JS_BIG_INT_LITERAL_EXPRESSION@12..15
-        0: JS_BIG_INT_LITERAL_TOKEN@12..15 "5n" [Whitespace("\n")] []
+        0: JS_BIG_INT_LITERAL@12..15 "5n" [Whitespace("\n")] []
       1: (empty)
     4: JS_EXPRESSION_STATEMENT@15..21
       0: JS_STRING_LITERAL_EXPRESSION@15..21
-        0: JS_STRING_LITERAL_TOKEN@15..21 "\"foo\"" [Whitespace("\n")] []
+        0: JS_STRING_LITERAL@15..21 "\"foo\"" [Whitespace("\n")] []
       1: (empty)
     5: JS_EXPRESSION_STATEMENT@21..27
       0: JS_STRING_LITERAL_EXPRESSION@21..27
-        0: JS_STRING_LITERAL_TOKEN@21..27 "'bar'" [Whitespace("\n")] []
+        0: JS_STRING_LITERAL@21..27 "'bar'" [Whitespace("\n")] []
       1: (empty)
     6: JS_EXPRESSION_STATEMENT@27..32
       0: JS_NULL_LITERAL_EXPRESSION@27..32
diff --git a/crates/rslint_parser/test_data/inline/ok/method_class_member.rast b/crates/rslint_parser/test_data/inline/ok/method_class_member.rast
index c515bce4f0b1..3ffc28087306 100644
--- a/crates/rslint_parser/test_data/inline/ok/method_class_member.rast
+++ b/crates/rslint_parser/test_data/inline/ok/method_class_member.rast
@@ -62,7 +62,7 @@
             3: R_CURLY@106..107 "}" [] []
         4: JS_METHOD_CLASS_MEMBER@107..120
           0: JS_LITERAL_MEMBER_NAME@107..115
-            0: JS_STRING_LITERAL_TOKEN@107..115 "\"foo\"" [Whitespace("\n\n\t")] []
+            0: JS_STRING_LITERAL@107..115 "\"foo\"" [Whitespace("\n\n\t")] []
           1: JS_PARAMETER_LIST@115..118
             0: L_PAREN@115..116 "(" [] []
             1: LIST@116..116
@@ -77,10 +77,10 @@
             0: L_BRACK@120..123 "[" [Whitespace("\n\t")] []
             1: JS_BINARY_EXPRESSION@123..136
               0: JS_STRING_LITERAL_EXPRESSION@123..129
-                0: JS_STRING_LITERAL_TOKEN@123..129 "\"foo\"" [] [Whitespace(" ")]
+                0: JS_STRING_LITERAL@123..129 "\"foo\"" [] [Whitespace(" ")]
               1: PLUS@129..131 "+" [] [Whitespace(" ")]
               2: JS_STRING_LITERAL_EXPRESSION@131..136
-                0: JS_STRING_LITERAL_TOKEN@131..136 "\"bar\"" [] []
+                0: JS_STRING_LITERAL@131..136 "\"bar\"" [] []
             2: R_BRACK@136..137 "]" [] []
           1: JS_PARAMETER_LIST@137..140
             0: L_PAREN@137..138 "(" [] []
@@ -93,7 +93,7 @@
             3: R_CURLY@141..142 "}" [] []
         6: JS_METHOD_CLASS_MEMBER@142..150
           0: JS_LITERAL_MEMBER_NAME@142..145
-            0: JS_NUMBER_LITERAL_TOKEN@142..145 "5" [Whitespace("\n\t")] []
+            0: JS_NUMBER_LITERAL@142..145 "5" [Whitespace("\n\t")] []
           1: JS_PARAMETER_LIST@145..148
             0: L_PAREN@145..146 "(" [] []
             1: LIST@146..146
diff --git a/crates/rslint_parser/test_data/inline/ok/new_exprs.rast b/crates/rslint_parser/test_data/inline/ok/new_exprs.rast
index de564c7bb210..9ebd07ae533d 100644
--- a/crates/rslint_parser/test_data/inline/ok/new_exprs.rast
+++ b/crates/rslint_parser/test_data/inline/ok/new_exprs.rast
@@ -56,10 +56,10 @@
             3: COMMA@69..71 "," [] [Whitespace(" ")]
             4: JS_BINARY_EXPRESSION@71..76
               0: JS_NUMBER_LITERAL_EXPRESSION@71..73
-                0: JS_NUMBER_LITERAL_TOKEN@71..73 "6" [] [Whitespace(" ")]
+                0: JS_NUMBER_LITERAL@71..73 "6" [] [Whitespace(" ")]
               1: PLUS@73..75 "+" [] [Whitespace(" ")]
               2: JS_NUMBER_LITERAL_EXPRESSION@75..76
-                0: JS_NUMBER_LITERAL_TOKEN@75..76 "6" [] []
+                0: JS_NUMBER_LITERAL@75..76 "6" [] []
             5: COMMA@76..78 "," [] [Whitespace(" ")]
             6: JS_BINARY_EXPRESSION@78..111
               0: JS_COMPUTED_MEMBER_EXPRESSION@78..87
diff --git a/crates/rslint_parser/test_data/inline/ok/object_expr_assign_prop.rast b/crates/rslint_parser/test_data/inline/ok/object_expr_assign_prop.rast
index 9a9f815a71e5..0494857892b9 100644
--- a/crates/rslint_parser/test_data/inline/ok/object_expr_assign_prop.rast
+++ b/crates/rslint_parser/test_data/inline/ok/object_expr_assign_prop.rast
@@ -20,7 +20,7 @@
                       0: IDENT@10..14 "foo" [] [Whitespace(" ")]
                     1: EQ@14..16 "=" [] [Whitespace(" ")]
                     2: JS_NUMBER_LITERAL_EXPRESSION@16..17
-                      0: JS_NUMBER_LITERAL_TOKEN@16..17 "4" [] []
+                      0: JS_NUMBER_LITERAL@16..17 "4" [] []
                   1: COMMA@17..19 "," [] [Whitespace(" ")]
                   2: INITIALIZED_PROP@19..29
                     0: NAME@19..23
diff --git a/crates/rslint_parser/test_data/inline/ok/object_expr_method.rast b/crates/rslint_parser/test_data/inline/ok/object_expr_method.rast
index 9c66f0622e10..a5dcea3ae391 100644
--- a/crates/rslint_parser/test_data/inline/ok/object_expr_method.rast
+++ b/crates/rslint_parser/test_data/inline/ok/object_expr_method.rast
@@ -30,7 +30,7 @@
                   1: COMMA@20..21 "," [] []
                   2: JS_METHOD_OBJECT_MEMBER@21..40
                     0: JS_LITERAL_MEMBER_NAME@21..28
-                      0: JS_STRING_LITERAL_TOKEN@21..28 "\"bar\"" [Whitespace("\n\t")] []
+                      0: JS_STRING_LITERAL@21..28 "\"bar\"" [Whitespace("\n\t")] []
                     1: JS_PARAMETER_LIST@28..38
                       0: L_PAREN@28..29 "(" [] []
                       1: LIST@29..36
@@ -57,10 +57,10 @@
                       0: L_BRACK@41..44 "[" [Whitespace("\n\t")] []
                       1: JS_BINARY_EXPRESSION@44..57
                         0: JS_STRING_LITERAL_EXPRESSION@44..50
-                          0: JS_STRING_LITERAL_TOKEN@44..50 "\"foo\"" [] [Whitespace(" ")]
+                          0: JS_STRING_LITERAL@44..50 "\"foo\"" [] [Whitespace(" ")]
                         1: PLUS@50..52 "+" [] [Whitespace(" ")]
                         2: JS_STRING_LITERAL_EXPRESSION@52..57
-                          0: JS_STRING_LITERAL_TOKEN@52..57 "\"bar\"" [] []
+                          0: JS_STRING_LITERAL@52..57 "\"bar\"" [] []
                       2: R_BRACK@57..58 "]" [] []
                     1: JS_PARAMETER_LIST@58..62
                       0: L_PAREN@58..59 "(" [] []
@@ -77,7 +77,7 @@
                   5: COMMA@64..65 "," [] []
                   6: JS_METHOD_OBJECT_MEMBER@65..80
                     0: JS_LITERAL_MEMBER_NAME@65..68
-                      0: JS_NUMBER_LITERAL_TOKEN@65..68 "5" [Whitespace("\n\t")] []
+                      0: JS_NUMBER_LITERAL@65..68 "5" [Whitespace("\n\t")] []
                     1: JS_PARAMETER_LIST@68..78
                       0: L_PAREN@68..69 "(" [] []
                       1: LIST@69..76
diff --git a/crates/rslint_parser/test_data/inline/ok/object_prop_name.rast b/crates/rslint_parser/test_data/inline/ok/object_prop_name.rast
index 0be29e501458..838953cd03b8 100644
--- a/crates/rslint_parser/test_data/inline/ok/object_prop_name.rast
+++ b/crates/rslint_parser/test_data/inline/ok/object_prop_name.rast
@@ -17,7 +17,7 @@
                 1: LIST@9..51
                   0: JS_PROPERTY_OBJECT_MEMBER@9..19
                     0: JS_LITERAL_MEMBER_NAME@9..14
-                      0: JS_STRING_LITERAL_TOKEN@9..14 "\"foo\"" [] []
+                      0: JS_STRING_LITERAL@9..14 "\"foo\"" [] []
                     1: COLON@14..16 ":" [] [Whitespace(" ")]
                     2: JS_REFERENCE_IDENTIFIER_EXPRESSION@16..19
                       0: IDENT@16..19 "foo" [] []
@@ -27,10 +27,10 @@
                       0: L_BRACK@21..22 "[" [] []
                       1: JS_BINARY_EXPRESSION@22..27
                         0: JS_NUMBER_LITERAL_EXPRESSION@22..24
-                          0: JS_NUMBER_LITERAL_TOKEN@22..24 "6" [] [Whitespace(" ")]
+                          0: JS_NUMBER_LITERAL@22..24 "6" [] [Whitespace(" ")]
                         1: PLUS@24..26 "+" [] [Whitespace(" ")]
                         2: JS_NUMBER_LITERAL_EXPRESSION@26..27
-                          0: JS_NUMBER_LITERAL_TOKEN@26..27 "6" [] []
+                          0: JS_NUMBER_LITERAL@26..27 "6" [] []
                       2: R_BRACK@27..28 "]" [] []
                     1: COLON@28..30 ":" [] [Whitespace(" ")]
                     2: JS_REFERENCE_IDENTIFIER_EXPRESSION@30..33
@@ -45,7 +45,7 @@
                   5: COMMA@43..45 "," [] [Whitespace(" ")]
                   6: JS_PROPERTY_OBJECT_MEMBER@45..51
                     0: JS_LITERAL_MEMBER_NAME@45..46
-                      0: JS_NUMBER_LITERAL_TOKEN@45..46 "7" [] []
+                      0: JS_NUMBER_LITERAL@45..46 "7" [] []
                     1: COLON@46..48 ":" [] [Whitespace(" ")]
                     2: JS_REFERENCE_IDENTIFIER_EXPRESSION@48..51
                       0: IDENT@48..51 "foo" [] []
diff --git a/crates/rslint_parser/test_data/inline/ok/paren_or_arrow_expr.rast b/crates/rslint_parser/test_data/inline/ok/paren_or_arrow_expr.rast
index 8580eef0c63e..f00748764a46 100644
--- a/crates/rslint_parser/test_data/inline/ok/paren_or_arrow_expr.rast
+++ b/crates/rslint_parser/test_data/inline/ok/paren_or_arrow_expr.rast
@@ -30,10 +30,10 @@
         0: L_PAREN@19..21 "(" [Whitespace("\n")] []
         1: JS_BINARY_EXPRESSION@21..26
           0: JS_NUMBER_LITERAL_EXPRESSION@21..23
-            0: JS_NUMBER_LITERAL_TOKEN@21..23 "5" [] [Whitespace(" ")]
+            0: JS_NUMBER_LITERAL@21..23 "5" [] [Whitespace(" ")]
           1: PLUS@23..25 "+" [] [Whitespace(" ")]
           2: JS_NUMBER_LITERAL_EXPRESSION@25..26
-            0: JS_NUMBER_LITERAL_TOKEN@25..26 "5" [] []
+            0: JS_NUMBER_LITERAL@25..26 "5" [] []
         2: R_PAREN@26..27 ")" [] []
       1: SEMICOLON@27..28 ";" [] []
     3: JS_EXPRESSION_STATEMENT@28..64
diff --git a/crates/rslint_parser/test_data/inline/ok/property_class_member.rast b/crates/rslint_parser/test_data/inline/ok/property_class_member.rast
index 676f48a565be..6590c9ab5ffd 100644
--- a/crates/rslint_parser/test_data/inline/ok/property_class_member.rast
+++ b/crates/rslint_parser/test_data/inline/ok/property_class_member.rast
@@ -22,25 +22,25 @@
           1: JS_EQUAL_VALUE_CLAUSE@53..58
             0: EQ@53..55 "=" [] [Whitespace(" ")]
             1: JS_STRING_LITERAL_EXPRESSION@55..58
-              0: JS_STRING_LITERAL_TOKEN@55..58 "\"a\"" [] []
+              0: JS_STRING_LITERAL@55..58 "\"a\"" [] []
           2: (empty)
         3: JS_PROPERTY_CLASS_MEMBER@58..65
           0: JS_LITERAL_MEMBER_NAME@58..64
-            0: JS_STRING_LITERAL_TOKEN@58..64 "\"a\"" [Whitespace("\n\n\t")] []
+            0: JS_STRING_LITERAL@58..64 "\"a\"" [Whitespace("\n\n\t")] []
           1: SEMICOLON@64..65 ";" [] []
         4: JS_PROPERTY_CLASS_MEMBER@65..68
           0: JS_LITERAL_MEMBER_NAME@65..68
-            0: JS_NUMBER_LITERAL_TOKEN@65..68 "5" [Whitespace("\n\t")] []
+            0: JS_NUMBER_LITERAL@65..68 "5" [Whitespace("\n\t")] []
           1: (empty)
         5: JS_PROPERTY_CLASS_MEMBER@68..81
           0: JS_COMPUTED_MEMBER_NAME@68..81
             0: L_BRACK@68..71 "[" [Whitespace("\n\t")] []
             1: JS_BINARY_EXPRESSION@71..80
               0: JS_STRING_LITERAL_EXPRESSION@71..75
-                0: JS_STRING_LITERAL_TOKEN@71..75 "\"a\"" [] [Whitespace(" ")]
+                0: JS_STRING_LITERAL@71..75 "\"a\"" [] [Whitespace(" ")]
               1: PLUS@75..77 "+" [] [Whitespace(" ")]
               2: JS_STRING_LITERAL_EXPRESSION@77..80
-                0: JS_STRING_LITERAL_TOKEN@77..80 "\"b\"" [] []
+                0: JS_STRING_LITERAL@77..80 "\"b\"" [] []
             2: R_BRACK@80..81 "]" [] []
           1: (empty)
         6: JS_PROPERTY_CLASS_MEMBER@81..105
@@ -55,7 +55,7 @@
           2: JS_EQUAL_VALUE_CLAUSE@140..143
             0: EQ@140..142 "=" [] [Whitespace(" ")]
             1: JS_NUMBER_LITERAL_EXPRESSION@142..143
-              0: JS_NUMBER_LITERAL_TOKEN@142..143 "1" [] []
+              0: JS_NUMBER_LITERAL@142..143 "1" [] []
           3: (empty)
         8: JS_PROPERTY_CLASS_MEMBER@143..154
           0: JS_PRIVATE_CLASS_MEMBER_NAME@143..154
@@ -69,7 +69,7 @@
           1: JS_EQUAL_VALUE_CLAUSE@176..181
             0: EQ@176..178 "=" [] [Whitespace(" ")]
             1: JS_STRING_LITERAL_EXPRESSION@178..181
-              0: JS_STRING_LITERAL_TOKEN@178..181 "\"a\"" [] []
+              0: JS_STRING_LITERAL@178..181 "\"a\"" [] []
           2: (empty)
         10: JS_PROPERTY_CLASS_MEMBER@181..205
           0: STATIC_KW@181..191 "static" [Whitespace("\n\n\t")] [Whitespace(" ")]
@@ -85,7 +85,7 @@
           2: JS_EQUAL_VALUE_CLAUSE@248..251
             0: EQ@248..250 "=" [] [Whitespace(" ")]
             1: JS_NUMBER_LITERAL_EXPRESSION@250..251
-              0: JS_NUMBER_LITERAL_TOKEN@250..251 "1" [] []
+              0: JS_NUMBER_LITERAL@250..251 "1" [] []
           3: (empty)
       4: R_CURLY@251..253 "}" [Whitespace("\n")] []
   3: EOF@253..255 "" [Whitespace("\n\n")] []
diff --git a/crates/rslint_parser/test_data/inline/ok/sequence_expr.rast b/crates/rslint_parser/test_data/inline/ok/sequence_expr.rast
index 6d811aa38872..0864bc98c85c 100644
--- a/crates/rslint_parser/test_data/inline/ok/sequence_expr.rast
+++ b/crates/rslint_parser/test_data/inline/ok/sequence_expr.rast
@@ -5,21 +5,21 @@
     0: JS_EXPRESSION_STATEMENT@0..13
       0: JS_SEQUENCE_EXPRESSION@0..13
         0: JS_NUMBER_LITERAL_EXPRESSION@0..1
-          0: JS_NUMBER_LITERAL_TOKEN@0..1 "1" [] []
+          0: JS_NUMBER_LITERAL@0..1 "1" [] []
         1: COMMA@1..3 "," [] [Whitespace(" ")]
         2: JS_SEQUENCE_EXPRESSION@3..13
           0: JS_NUMBER_LITERAL_EXPRESSION@3..4
-            0: JS_NUMBER_LITERAL_TOKEN@3..4 "2" [] []
+            0: JS_NUMBER_LITERAL@3..4 "2" [] []
           1: COMMA@4..6 "," [] [Whitespace(" ")]
           2: JS_SEQUENCE_EXPRESSION@6..13
             0: JS_NUMBER_LITERAL_EXPRESSION@6..7
-              0: JS_NUMBER_LITERAL_TOKEN@6..7 "3" [] []
+              0: JS_NUMBER_LITERAL@6..7 "3" [] []
             1: COMMA@7..9 "," [] [Whitespace(" ")]
             2: JS_SEQUENCE_EXPRESSION@9..13
               0: JS_NUMBER_LITERAL_EXPRESSION@9..10
-                0: JS_NUMBER_LITERAL_TOKEN@9..10 "4" [] []
+                0: JS_NUMBER_LITERAL@9..10 "4" [] []
               1: COMMA@10..12 "," [] [Whitespace(" ")]
               2: JS_NUMBER_LITERAL_EXPRESSION@12..13
-                0: JS_NUMBER_LITERAL_TOKEN@12..13 "5" [] []
+                0: JS_NUMBER_LITERAL@12..13 "5" [] []
       1: (empty)
   3: EOF@13..14 "" [Whitespace("\n")] []
diff --git a/crates/rslint_parser/test_data/inline/ok/setter_class_member.rast b/crates/rslint_parser/test_data/inline/ok/setter_class_member.rast
index f1b7de1633da..a291425d3f79 100644
--- a/crates/rslint_parser/test_data/inline/ok/setter_class_member.rast
+++ b/crates/rslint_parser/test_data/inline/ok/setter_class_member.rast
@@ -54,7 +54,7 @@
         3: JS_SETTER_CLASS_MEMBER@70..88
           0: SET_KW@70..77 "set" [Whitespace("\n\n\t")] [Whitespace(" ")]
           1: JS_LITERAL_MEMBER_NAME@77..82
-            0: JS_STRING_LITERAL_TOKEN@77..82 "\"baz\"" [] []
+            0: JS_STRING_LITERAL@77..82 "\"baz\"" [] []
           2: L_PAREN@82..83 "(" [] []
           3: SINGLE_PATTERN@83..84
             0: NAME@83..84
@@ -71,10 +71,10 @@
             0: L_BRACK@95..96 "[" [] []
             1: JS_BINARY_EXPRESSION@96..105
               0: JS_STRING_LITERAL_EXPRESSION@96..100
-                0: JS_STRING_LITERAL_TOKEN@96..100 "\"a\"" [] [Whitespace(" ")]
+                0: JS_STRING_LITERAL@96..100 "\"a\"" [] [Whitespace(" ")]
               1: PLUS@100..102 "+" [] [Whitespace(" ")]
               2: JS_STRING_LITERAL_EXPRESSION@102..105
-                0: JS_STRING_LITERAL_TOKEN@102..105 "\"b\"" [] []
+                0: JS_STRING_LITERAL@102..105 "\"b\"" [] []
             2: R_BRACK@105..106 "]" [] []
           2: L_PAREN@106..107 "(" [] []
           3: SINGLE_PATTERN@107..108
@@ -89,7 +89,7 @@
         5: JS_SETTER_CLASS_MEMBER@112..126
           0: SET_KW@112..119 "set" [Whitespace("\n\n\t")] [Whitespace(" ")]
           1: JS_LITERAL_MEMBER_NAME@119..120
-            0: JS_NUMBER_LITERAL_TOKEN@119..120 "5" [] []
+            0: JS_NUMBER_LITERAL@119..120 "5" [] []
           2: L_PAREN@120..121 "(" [] []
           3: SINGLE_PATTERN@121..122
             0: NAME@121..122
diff --git a/crates/rslint_parser/test_data/inline/ok/setter_object_member.rast b/crates/rslint_parser/test_data/inline/ok/setter_object_member.rast
index f5f6b3a21aef..7ce4d8b0affe 100644
--- a/crates/rslint_parser/test_data/inline/ok/setter_object_member.rast
+++ b/crates/rslint_parser/test_data/inline/ok/setter_object_member.rast
@@ -33,7 +33,7 @@
                   2: JS_SETTER_OBJECT_MEMBER@31..55
                     0: SET_KW@31..38 "set" [Whitespace("\n\n ")] [Whitespace(" ")]
                     1: JS_LITERAL_MEMBER_NAME@38..43
-                      0: JS_STRING_LITERAL_TOKEN@38..43 "\"bar\"" [] []
+                      0: JS_STRING_LITERAL@38..43 "\"bar\"" [] []
                     2: L_PAREN@43..44 "(" [] []
                     3: SINGLE_PATTERN@44..49
                       0: NAME@44..49
@@ -51,10 +51,10 @@
                       0: L_BRACK@63..64 "[" [] []
                       1: JS_BINARY_EXPRESSION@64..73
                         0: JS_STRING_LITERAL_EXPRESSION@64..68
-                          0: JS_STRING_LITERAL_TOKEN@64..68 "\"a\"" [] [Whitespace(" ")]
+                          0: JS_STRING_LITERAL@64..68 "\"a\"" [] [Whitespace(" ")]
                         1: PLUS@68..70 "+" [] [Whitespace(" ")]
                         2: JS_STRING_LITERAL_EXPRESSION@70..73
-                          0: JS_STRING_LITERAL_TOKEN@70..73 "\"b\"" [] []
+                          0: JS_STRING_LITERAL@70..73 "\"b\"" [] []
                       2: R_BRACK@73..74 "]" [] []
                     2: L_PAREN@74..75 "(" [] []
                     3: SINGLE_PATTERN@75..80
@@ -70,7 +70,7 @@
                   6: JS_SETTER_OBJECT_MEMBER@87..107
                     0: SET_KW@87..94 "set" [Whitespace("\n\n\t")] [Whitespace(" ")]
                     1: JS_LITERAL_MEMBER_NAME@94..95
-                      0: JS_NUMBER_LITERAL_TOKEN@94..95 "5" [] []
+                      0: JS_NUMBER_LITERAL@94..95 "5" [] []
                     2: L_PAREN@95..96 "(" [] []
                     3: SINGLE_PATTERN@96..101
                       0: NAME@96..101
@@ -96,7 +96,7 @@
                         0: JS_RETURN_STATEMENT@118..164
                           0: RETURN_KW@118..128 "return" [Whitespace("\n\t ")] [Whitespace(" ")]
                           1: JS_STRING_LITERAL_EXPRESSION@128..163
-                            0: JS_STRING_LITERAL_TOKEN@128..163 "\"This is a method and not a setter\"" [] []
+                            0: JS_STRING_LITERAL@128..163 "\"This is a method and not a setter\"" [] []
                           2: SEMICOLON@163..164 ";" [] []
                       3: R_CURLY@164..167 "}" [Whitespace("\n\t")] []
                 2: R_CURLY@167..169 "}" [Whitespace("\n")] []
diff --git a/crates/rslint_parser/test_data/inline/ok/super_expression.rast b/crates/rslint_parser/test_data/inline/ok/super_expression.rast
index 4c9e27edbec6..a6afe301b987 100644
--- a/crates/rslint_parser/test_data/inline/ok/super_expression.rast
+++ b/crates/rslint_parser/test_data/inline/ok/super_expression.rast
@@ -68,7 +68,7 @@
                     0: SUPER_KW@84..92 "super" [Whitespace("\n\t\t")] []
                   1: L_BRACK@92..93 "[" [] []
                   2: JS_NUMBER_LITERAL_EXPRESSION@93..94
-                    0: JS_NUMBER_LITERAL_TOKEN@93..94 "1" [] []
+                    0: JS_NUMBER_LITERAL@93..94 "1" [] []
                   3: R_BRACK@94..95 "]" [] []
                 1: SEMICOLON@95..96 ";" [] []
             3: R_CURLY@96..99 "}" [Whitespace("\n\t")] []
diff --git a/crates/rslint_parser/test_data/inline/ok/throw_stmt.rast b/crates/rslint_parser/test_data/inline/ok/throw_stmt.rast
index a46ca5e87d30..3db8338c2ede 100644
--- a/crates/rslint_parser/test_data/inline/ok/throw_stmt.rast
+++ b/crates/rslint_parser/test_data/inline/ok/throw_stmt.rast
@@ -12,12 +12,12 @@
           0: L_PAREN@15..16 "(" [] []
           1: LIST@16..21
             0: JS_STRING_LITERAL_EXPRESSION@16..21
-              0: JS_STRING_LITERAL_TOKEN@16..21 "\"foo\"" [] []
+              0: JS_STRING_LITERAL@16..21 "\"foo\"" [] []
           2: R_PAREN@21..22 ")" [] []
       2: SEMICOLON@22..23 ";" [] []
     1: JS_THROW_STATEMENT@23..35
       0: THROW_KW@23..30 "throw" [Whitespace("\n")] [Whitespace(" ")]
       1: JS_STRING_LITERAL_EXPRESSION@30..35
-        0: JS_STRING_LITERAL_TOKEN@30..35 "\"foo\"" [] []
+        0: JS_STRING_LITERAL@30..35 "\"foo\"" [] []
       2: (empty)
   3: EOF@35..36 "" [Whitespace("\n")] []
diff --git a/crates/rslint_parser/test_data/inline/ok/var_decl.rast b/crates/rslint_parser/test_data/inline/ok/var_decl.rast
index 8620e06a34a8..5c448c9a2f9a 100644
--- a/crates/rslint_parser/test_data/inline/ok/var_decl.rast
+++ b/crates/rslint_parser/test_data/inline/ok/var_decl.rast
@@ -13,7 +13,7 @@
             1: JS_EQUAL_VALUE_CLAUSE@6..9
               0: EQ@6..8 "=" [] [Whitespace(" ")]
               1: JS_NUMBER_LITERAL_EXPRESSION@8..9
-                0: JS_NUMBER_LITERAL_TOKEN@8..9 "5" [] []
+                0: JS_NUMBER_LITERAL@8..9 "5" [] []
       1: SEMICOLON@9..10 ";" [] []
     1: JS_VARIABLE_DECLARATION_STATEMENT@10..32
       0: JS_VARIABLE_DECLARATION@10..31
@@ -34,7 +34,7 @@
             1: JS_EQUAL_VALUE_CLAUSE@28..31
               0: EQ@28..30 "=" [] [Whitespace(" ")]
               1: JS_NUMBER_LITERAL_EXPRESSION@30..31
-                0: JS_NUMBER_LITERAL_TOKEN@30..31 "5" [] []
+                0: JS_NUMBER_LITERAL@30..31 "5" [] []
       1: SEMICOLON@31..32 ";" [] []
     2: JS_VARIABLE_DECLARATION_STATEMENT@32..46
       0: JS_VARIABLE_DECLARATION@32..45
@@ -61,7 +61,7 @@
             1: JS_EQUAL_VALUE_CLAUSE@55..58
               0: EQ@55..57 "=" [] [Whitespace(" ")]
               1: JS_NUMBER_LITERAL_EXPRESSION@57..58
-                0: JS_NUMBER_LITERAL_TOKEN@57..58 "5" [] []
+                0: JS_NUMBER_LITERAL@57..58 "5" [] []
       1: SEMICOLON@58..59 ";" [] []
     4: JS_VARIABLE_DECLARATION_STATEMENT@59..91
       0: JS_VARIABLE_DECLARATION@59..90
@@ -105,7 +105,7 @@
             1: JS_EQUAL_VALUE_CLAUSE@100..109
               0: EQ@100..102 "=" [] [Whitespace(" ")]
               1: JS_STRING_LITERAL_EXPRESSION@102..109
-                0: JS_STRING_LITERAL_TOKEN@102..109 "\"lorem\"" [] []
+                0: JS_STRING_LITERAL@102..109 "\"lorem\"" [] []
           1: COMMA@109..111 "," [] [Whitespace(" ")]
           2: JS_VARIABLE_DECLARATOR@111..124
             0: SINGLE_PATTERN@111..115
@@ -114,7 +114,7 @@
             1: JS_EQUAL_VALUE_CLAUSE@115..124
               0: EQ@115..117 "=" [] [Whitespace(" ")]
               1: JS_STRING_LITERAL_EXPRESSION@117..124
-                0: JS_STRING_LITERAL_TOKEN@117..124 "\"ipsum\"" [] []
+                0: JS_STRING_LITERAL@117..124 "\"ipsum\"" [] []
           3: COMMA@124..126 "," [] [Whitespace(" ")]
           4: JS_VARIABLE_DECLARATOR@126..141
             0: SINGLE_PATTERN@126..132
@@ -123,7 +123,7 @@
             1: JS_EQUAL_VALUE_CLAUSE@132..141
               0: EQ@132..134 "=" [] [Whitespace(" ")]
               1: JS_STRING_LITERAL_EXPRESSION@134..141
-                0: JS_STRING_LITERAL_TOKEN@134..141 "\"value\"" [] []
+                0: JS_STRING_LITERAL@134..141 "\"value\"" [] []
           5: COMMA@141..143 "," [] [Whitespace(" ")]
           6: JS_VARIABLE_DECLARATOR@143..153
             0: SINGLE_PATTERN@143..150
@@ -132,6 +132,6 @@
             1: JS_EQUAL_VALUE_CLAUSE@150..153
               0: EQ@150..152 "=" [] [Whitespace(" ")]
               1: JS_NUMBER_LITERAL_EXPRESSION@152..153
-                0: JS_NUMBER_LITERAL_TOKEN@152..153 "6" [] []
+                0: JS_NUMBER_LITERAL@152..153 "6" [] []
       1: SEMICOLON@153..154 ";" [] []
   3: EOF@154..155 "" [Whitespace("\n")] []
diff --git a/crates/rslint_parser/test_data/inline/ok/while_stmt.rast b/crates/rslint_parser/test_data/inline/ok/while_stmt.rast
index 5e25e5b8a815..20d5364cde17 100644
--- a/crates/rslint_parser/test_data/inline/ok/while_stmt.rast
+++ b/crates/rslint_parser/test_data/inline/ok/while_stmt.rast
@@ -16,7 +16,7 @@
       0: WHILE_KW@15..22 "while" [Whitespace("\n")] [Whitespace(" ")]
       1: L_PAREN@22..23 "(" [] []
       2: JS_NUMBER_LITERAL_EXPRESSION@23..24
-        0: JS_NUMBER_LITERAL_TOKEN@23..24 "5" [] []
+        0: JS_NUMBER_LITERAL@23..24 "5" [] []
       3: R_PAREN@24..26 ")" [] [Whitespace(" ")]
       4: JS_BLOCK_STATEMENT@26..28
         0: L_CURLY@26..27 "{" [] []
diff --git a/crates/rslint_syntax/src/generated.rs b/crates/rslint_syntax/src/generated.rs
index f3d14fc48ec2..00f49514353f 100644
--- a/crates/rslint_syntax/src/generated.rs
+++ b/crates/rslint_syntax/src/generated.rs
@@ -141,10 +141,10 @@ pub enum SyntaxKind {
 	LET_KW,
 	FLOAT_KW,
 	NUMBER_KW,
-	JS_NUMBER_LITERAL_TOKEN,
-	JS_BIG_INT_LITERAL_TOKEN,
-	JS_STRING_LITERAL_TOKEN,
-	JS_REGEX_LITERAL_TOKEN,
+	JS_NUMBER_LITERAL,
+	JS_BIG_INT_LITERAL,
+	JS_STRING_LITERAL,
+	JS_REGEX_LITERAL,
 	HASH,
 	TEMPLATE_CHUNK,
 	DOLLARCURLY,
@@ -392,10 +392,7 @@ impl SyntaxKind {
 	}
 	pub fn is_literal(self) -> bool {
 		match self {
-			JS_NUMBER_LITERAL_TOKEN
-			| JS_BIG_INT_LITERAL_TOKEN
-			| JS_STRING_LITERAL_TOKEN
-			| JS_REGEX_LITERAL_TOKEN => true,
+			JS_NUMBER_LITERAL | JS_BIG_INT_LITERAL | JS_STRING_LITERAL | JS_REGEX_LITERAL => true,
 			_ => false,
 		}
 	}
@@ -586,4 +583,4 @@ impl SyntaxKind {
 }
 #[doc = r" Utility macro for creating a SyntaxKind through simple macro syntax"]
 #[macro_export]
-macro_rules ! T { [;] => { $ crate :: SyntaxKind :: SEMICOLON } ; [,] => { $ crate :: SyntaxKind :: COMMA } ; ['('] => { $ crate :: SyntaxKind :: L_PAREN } ; [')'] => { $ crate :: SyntaxKind :: R_PAREN } ; ['{'] => { $ crate :: SyntaxKind :: L_CURLY } ; ['}'] => { $ crate :: SyntaxKind :: R_CURLY } ; ['['] => { $ crate :: SyntaxKind :: L_BRACK } ; [']'] => { $ crate :: SyntaxKind :: R_BRACK } ; [<] => { $ crate :: SyntaxKind :: L_ANGLE } ; [>] => { $ crate :: SyntaxKind :: R_ANGLE } ; [~] => { $ crate :: SyntaxKind :: TILDE } ; [?] => { $ crate :: SyntaxKind :: QUESTION } ; [??] => { $ crate :: SyntaxKind :: QUESTION2 } ; [?.] => { $ crate :: SyntaxKind :: QUESTIONDOT } ; [&] => { $ crate :: SyntaxKind :: AMP } ; [|] => { $ crate :: SyntaxKind :: PIPE } ; [+] => { $ crate :: SyntaxKind :: PLUS } ; [++] => { $ crate :: SyntaxKind :: PLUS2 } ; [*] => { $ crate :: SyntaxKind :: STAR } ; [**] => { $ crate :: SyntaxKind :: STAR2 } ; [/] => { $ crate :: SyntaxKind :: SLASH } ; [^] => { $ crate :: SyntaxKind :: CARET } ; [%] => { $ crate :: SyntaxKind :: PERCENT } ; [.] => { $ crate :: SyntaxKind :: DOT } ; [...] => { $ crate :: SyntaxKind :: DOT2 } ; [:] => { $ crate :: SyntaxKind :: COLON } ; [=] => { $ crate :: SyntaxKind :: EQ } ; [==] => { $ crate :: SyntaxKind :: EQ2 } ; [===] => { $ crate :: SyntaxKind :: EQ3 } ; [=>] => { $ crate :: SyntaxKind :: FAT_ARROW } ; [!] => { $ crate :: SyntaxKind :: BANG } ; [!=] => { $ crate :: SyntaxKind :: NEQ } ; [!==] => { $ crate :: SyntaxKind :: NEQ2 } ; [-] => { $ crate :: SyntaxKind :: MINUS } ; [--] => { $ crate :: SyntaxKind :: MINUS2 } ; [<=] => { $ crate :: SyntaxKind :: LTEQ } ; [>=] => { $ crate :: SyntaxKind :: GTEQ } ; [+=] => { $ crate :: SyntaxKind :: PLUSEQ } ; [-=] => { $ crate :: SyntaxKind :: MINUSEQ } ; [|=] => { $ crate :: SyntaxKind :: PIPEEQ } ; [&=] => { $ crate :: SyntaxKind :: AMPEQ } ; [^=] => { $ crate :: SyntaxKind :: CARETEQ } ; [/=] => { $ crate :: SyntaxKind :: SLASHEQ } ; [*=] => { $ crate :: SyntaxKind :: STAREQ } ; [%=] => { $ crate :: SyntaxKind :: PERCENTEQ } ; [&&] => { $ crate :: SyntaxKind :: AMP2 } ; [||] => { $ crate :: SyntaxKind :: PIPE2 } ; [<<] => { $ crate :: SyntaxKind :: SHL } ; [>>] => { $ crate :: SyntaxKind :: SHR } ; [>>>] => { $ crate :: SyntaxKind :: USHR } ; [<<=] => { $ crate :: SyntaxKind :: SHLEQ } ; [>>=] => { $ crate :: SyntaxKind :: SHREQ } ; [>>>=] => { $ crate :: SyntaxKind :: USHREQ } ; [&&=] => { $ crate :: SyntaxKind :: AMP2EQ } ; [||=] => { $ crate :: SyntaxKind :: PIPE2EQ } ; [**=] => { $ crate :: SyntaxKind :: STAR2EQ } ; [??=] => { $ crate :: SyntaxKind :: QUESTION2EQ } ; [@] => { $ crate :: SyntaxKind :: AT } ; ['`'] => { $ crate :: SyntaxKind :: BACKTICK } ; [await] => { $ crate :: SyntaxKind :: AWAIT_KW } ; [break] => { $ crate :: SyntaxKind :: BREAK_KW } ; [case] => { $ crate :: SyntaxKind :: CASE_KW } ; [catch] => { $ crate :: SyntaxKind :: CATCH_KW } ; [class] => { $ crate :: SyntaxKind :: CLASS_KW } ; [const] => { $ crate :: SyntaxKind :: CONST_KW } ; [continue] => { $ crate :: SyntaxKind :: CONTINUE_KW } ; [debugger] => { $ crate :: SyntaxKind :: DEBUGGER_KW } ; [default] => { $ crate :: SyntaxKind :: DEFAULT_KW } ; [delete] => { $ crate :: SyntaxKind :: DELETE_KW } ; [do] => { $ crate :: SyntaxKind :: DO_KW } ; [else] => { $ crate :: SyntaxKind :: ELSE_KW } ; [enum] => { $ crate :: SyntaxKind :: ENUM_KW } ; [export] => { $ crate :: SyntaxKind :: EXPORT_KW } ; [extends] => { $ crate :: SyntaxKind :: EXTENDS_KW } ; [false] => { $ crate :: SyntaxKind :: FALSE_KW } ; [finally] => { $ crate :: SyntaxKind :: FINALLY_KW } ; [for] => { $ crate :: SyntaxKind :: FOR_KW } ; [function] => { $ crate :: SyntaxKind :: FUNCTION_KW } ; [if] => { $ crate :: SyntaxKind :: IF_KW } ; [in] => { $ crate :: SyntaxKind :: IN_KW } ; [instanceof] => { $ crate :: SyntaxKind :: INSTANCEOF_KW } ; [interface] => { $ crate :: SyntaxKind :: INTERFACE_KW } ; [import] => { $ crate :: SyntaxKind :: IMPORT_KW } ; [implements] => { $ crate :: SyntaxKind :: IMPLEMENTS_KW } ; [new] => { $ crate :: SyntaxKind :: NEW_KW } ; [null] => { $ crate :: SyntaxKind :: NULL_KW } ; [package] => { $ crate :: SyntaxKind :: PACKAGE_KW } ; [private] => { $ crate :: SyntaxKind :: PRIVATE_KW } ; [protected] => { $ crate :: SyntaxKind :: PROTECTED_KW } ; [public] => { $ crate :: SyntaxKind :: PUBLIC_KW } ; [return] => { $ crate :: SyntaxKind :: RETURN_KW } ; [super] => { $ crate :: SyntaxKind :: SUPER_KW } ; [switch] => { $ crate :: SyntaxKind :: SWITCH_KW } ; [this] => { $ crate :: SyntaxKind :: THIS_KW } ; [throw] => { $ crate :: SyntaxKind :: THROW_KW } ; [try] => { $ crate :: SyntaxKind :: TRY_KW } ; [true] => { $ crate :: SyntaxKind :: TRUE_KW } ; [typeof] => { $ crate :: SyntaxKind :: TYPEOF_KW } ; [var] => { $ crate :: SyntaxKind :: VAR_KW } ; [void] => { $ crate :: SyntaxKind :: VOID_KW } ; [while] => { $ crate :: SyntaxKind :: WHILE_KW } ; [with] => { $ crate :: SyntaxKind :: WITH_KW } ; [yield] => { $ crate :: SyntaxKind :: YIELD_KW } ; [readonly] => { $ crate :: SyntaxKind :: READONLY_KW } ; [keyof] => { $ crate :: SyntaxKind :: KEYOF_KW } ; [unique] => { $ crate :: SyntaxKind :: UNIQUE_KW } ; [declare] => { $ crate :: SyntaxKind :: DECLARE_KW } ; [abstract] => { $ crate :: SyntaxKind :: ABSTRACT_KW } ; [static] => { $ crate :: SyntaxKind :: STATIC_KW } ; [async] => { $ crate :: SyntaxKind :: ASYNC_KW } ; [type] => { $ crate :: SyntaxKind :: TYPE_KW } ; [from] => { $ crate :: SyntaxKind :: FROM_KW } ; [as] => { $ crate :: SyntaxKind :: AS_KW } ; [require] => { $ crate :: SyntaxKind :: REQUIRE_KW } ; [namespace] => { $ crate :: SyntaxKind :: NAMESPACE_KW } ; [assert] => { $ crate :: SyntaxKind :: ASSERT_KW } ; [module] => { $ crate :: SyntaxKind :: MODULE_KW } ; [global] => { $ crate :: SyntaxKind :: GLOBAL_KW } ; [infer] => { $ crate :: SyntaxKind :: INFER_KW } ; [get] => { $ crate :: SyntaxKind :: GET_KW } ; [set] => { $ crate :: SyntaxKind :: SET_KW } ; [of] => { $ crate :: SyntaxKind :: OF_KW } ; [target] => { $ crate :: SyntaxKind :: TARGET_KW } ; [never] => { $ crate :: SyntaxKind :: NEVER_KW } ; [unknown] => { $ crate :: SyntaxKind :: UNKNOWN_KW } ; [any] => { $ crate :: SyntaxKind :: ANY_KW } ; [undefined] => { $ crate :: SyntaxKind :: UNDEFINED_KW } ; [let] => { $ crate :: SyntaxKind :: LET_KW } ; [float] => { $ crate :: SyntaxKind :: FLOAT_KW } ; [number] => { $ crate :: SyntaxKind :: NUMBER_KW } ; [ident] => { $ crate :: SyntaxKind :: IDENT } ; [js_shebang] => { $ crate :: SyntaxKind :: JS_SHEBANG } ; [js_string_literal_token] => { $ crate :: SyntaxKind :: JS_STRING_LITERAL_TOKEN } ; [js_number_literal_token] => { $ crate :: SyntaxKind :: JS_NUMBER_LITERAL_TOKEN } ; [js_big_int_literal_token] => { $ crate :: SyntaxKind :: JS_BIG_INT_LITERAL_TOKEN } ; [js_regex_literal_token] => { $ crate :: SyntaxKind :: JS_REGEX_LITERAL_TOKEN } ; [#] => { $ crate :: SyntaxKind :: HASH } ; }
+macro_rules ! T { [;] => { $ crate :: SyntaxKind :: SEMICOLON } ; [,] => { $ crate :: SyntaxKind :: COMMA } ; ['('] => { $ crate :: SyntaxKind :: L_PAREN } ; [')'] => { $ crate :: SyntaxKind :: R_PAREN } ; ['{'] => { $ crate :: SyntaxKind :: L_CURLY } ; ['}'] => { $ crate :: SyntaxKind :: R_CURLY } ; ['['] => { $ crate :: SyntaxKind :: L_BRACK } ; [']'] => { $ crate :: SyntaxKind :: R_BRACK } ; [<] => { $ crate :: SyntaxKind :: L_ANGLE } ; [>] => { $ crate :: SyntaxKind :: R_ANGLE } ; [~] => { $ crate :: SyntaxKind :: TILDE } ; [?] => { $ crate :: SyntaxKind :: QUESTION } ; [??] => { $ crate :: SyntaxKind :: QUESTION2 } ; [?.] => { $ crate :: SyntaxKind :: QUESTIONDOT } ; [&] => { $ crate :: SyntaxKind :: AMP } ; [|] => { $ crate :: SyntaxKind :: PIPE } ; [+] => { $ crate :: SyntaxKind :: PLUS } ; [++] => { $ crate :: SyntaxKind :: PLUS2 } ; [*] => { $ crate :: SyntaxKind :: STAR } ; [**] => { $ crate :: SyntaxKind :: STAR2 } ; [/] => { $ crate :: SyntaxKind :: SLASH } ; [^] => { $ crate :: SyntaxKind :: CARET } ; [%] => { $ crate :: SyntaxKind :: PERCENT } ; [.] => { $ crate :: SyntaxKind :: DOT } ; [...] => { $ crate :: SyntaxKind :: DOT2 } ; [:] => { $ crate :: SyntaxKind :: COLON } ; [=] => { $ crate :: SyntaxKind :: EQ } ; [==] => { $ crate :: SyntaxKind :: EQ2 } ; [===] => { $ crate :: SyntaxKind :: EQ3 } ; [=>] => { $ crate :: SyntaxKind :: FAT_ARROW } ; [!] => { $ crate :: SyntaxKind :: BANG } ; [!=] => { $ crate :: SyntaxKind :: NEQ } ; [!==] => { $ crate :: SyntaxKind :: NEQ2 } ; [-] => { $ crate :: SyntaxKind :: MINUS } ; [--] => { $ crate :: SyntaxKind :: MINUS2 } ; [<=] => { $ crate :: SyntaxKind :: LTEQ } ; [>=] => { $ crate :: SyntaxKind :: GTEQ } ; [+=] => { $ crate :: SyntaxKind :: PLUSEQ } ; [-=] => { $ crate :: SyntaxKind :: MINUSEQ } ; [|=] => { $ crate :: SyntaxKind :: PIPEEQ } ; [&=] => { $ crate :: SyntaxKind :: AMPEQ } ; [^=] => { $ crate :: SyntaxKind :: CARETEQ } ; [/=] => { $ crate :: SyntaxKind :: SLASHEQ } ; [*=] => { $ crate :: SyntaxKind :: STAREQ } ; [%=] => { $ crate :: SyntaxKind :: PERCENTEQ } ; [&&] => { $ crate :: SyntaxKind :: AMP2 } ; [||] => { $ crate :: SyntaxKind :: PIPE2 } ; [<<] => { $ crate :: SyntaxKind :: SHL } ; [>>] => { $ crate :: SyntaxKind :: SHR } ; [>>>] => { $ crate :: SyntaxKind :: USHR } ; [<<=] => { $ crate :: SyntaxKind :: SHLEQ } ; [>>=] => { $ crate :: SyntaxKind :: SHREQ } ; [>>>=] => { $ crate :: SyntaxKind :: USHREQ } ; [&&=] => { $ crate :: SyntaxKind :: AMP2EQ } ; [||=] => { $ crate :: SyntaxKind :: PIPE2EQ } ; [**=] => { $ crate :: SyntaxKind :: STAR2EQ } ; [??=] => { $ crate :: SyntaxKind :: QUESTION2EQ } ; [@] => { $ crate :: SyntaxKind :: AT } ; ['`'] => { $ crate :: SyntaxKind :: BACKTICK } ; [await] => { $ crate :: SyntaxKind :: AWAIT_KW } ; [break] => { $ crate :: SyntaxKind :: BREAK_KW } ; [case] => { $ crate :: SyntaxKind :: CASE_KW } ; [catch] => { $ crate :: SyntaxKind :: CATCH_KW } ; [class] => { $ crate :: SyntaxKind :: CLASS_KW } ; [const] => { $ crate :: SyntaxKind :: CONST_KW } ; [continue] => { $ crate :: SyntaxKind :: CONTINUE_KW } ; [debugger] => { $ crate :: SyntaxKind :: DEBUGGER_KW } ; [default] => { $ crate :: SyntaxKind :: DEFAULT_KW } ; [delete] => { $ crate :: SyntaxKind :: DELETE_KW } ; [do] => { $ crate :: SyntaxKind :: DO_KW } ; [else] => { $ crate :: SyntaxKind :: ELSE_KW } ; [enum] => { $ crate :: SyntaxKind :: ENUM_KW } ; [export] => { $ crate :: SyntaxKind :: EXPORT_KW } ; [extends] => { $ crate :: SyntaxKind :: EXTENDS_KW } ; [false] => { $ crate :: SyntaxKind :: FALSE_KW } ; [finally] => { $ crate :: SyntaxKind :: FINALLY_KW } ; [for] => { $ crate :: SyntaxKind :: FOR_KW } ; [function] => { $ crate :: SyntaxKind :: FUNCTION_KW } ; [if] => { $ crate :: SyntaxKind :: IF_KW } ; [in] => { $ crate :: SyntaxKind :: IN_KW } ; [instanceof] => { $ crate :: SyntaxKind :: INSTANCEOF_KW } ; [interface] => { $ crate :: SyntaxKind :: INTERFACE_KW } ; [import] => { $ crate :: SyntaxKind :: IMPORT_KW } ; [implements] => { $ crate :: SyntaxKind :: IMPLEMENTS_KW } ; [new] => { $ crate :: SyntaxKind :: NEW_KW } ; [null] => { $ crate :: SyntaxKind :: NULL_KW } ; [package] => { $ crate :: SyntaxKind :: PACKAGE_KW } ; [private] => { $ crate :: SyntaxKind :: PRIVATE_KW } ; [protected] => { $ crate :: SyntaxKind :: PROTECTED_KW } ; [public] => { $ crate :: SyntaxKind :: PUBLIC_KW } ; [return] => { $ crate :: SyntaxKind :: RETURN_KW } ; [super] => { $ crate :: SyntaxKind :: SUPER_KW } ; [switch] => { $ crate :: SyntaxKind :: SWITCH_KW } ; [this] => { $ crate :: SyntaxKind :: THIS_KW } ; [throw] => { $ crate :: SyntaxKind :: THROW_KW } ; [try] => { $ crate :: SyntaxKind :: TRY_KW } ; [true] => { $ crate :: SyntaxKind :: TRUE_KW } ; [typeof] => { $ crate :: SyntaxKind :: TYPEOF_KW } ; [var] => { $ crate :: SyntaxKind :: VAR_KW } ; [void] => { $ crate :: SyntaxKind :: VOID_KW } ; [while] => { $ crate :: SyntaxKind :: WHILE_KW } ; [with] => { $ crate :: SyntaxKind :: WITH_KW } ; [yield] => { $ crate :: SyntaxKind :: YIELD_KW } ; [readonly] => { $ crate :: SyntaxKind :: READONLY_KW } ; [keyof] => { $ crate :: SyntaxKind :: KEYOF_KW } ; [unique] => { $ crate :: SyntaxKind :: UNIQUE_KW } ; [declare] => { $ crate :: SyntaxKind :: DECLARE_KW } ; [abstract] => { $ crate :: SyntaxKind :: ABSTRACT_KW } ; [static] => { $ crate :: SyntaxKind :: STATIC_KW } ; [async] => { $ crate :: SyntaxKind :: ASYNC_KW } ; [type] => { $ crate :: SyntaxKind :: TYPE_KW } ; [from] => { $ crate :: SyntaxKind :: FROM_KW } ; [as] => { $ crate :: SyntaxKind :: AS_KW } ; [require] => { $ crate :: SyntaxKind :: REQUIRE_KW } ; [namespace] => { $ crate :: SyntaxKind :: NAMESPACE_KW } ; [assert] => { $ crate :: SyntaxKind :: ASSERT_KW } ; [module] => { $ crate :: SyntaxKind :: MODULE_KW } ; [global] => { $ crate :: SyntaxKind :: GLOBAL_KW } ; [infer] => { $ crate :: SyntaxKind :: INFER_KW } ; [get] => { $ crate :: SyntaxKind :: GET_KW } ; [set] => { $ crate :: SyntaxKind :: SET_KW } ; [of] => { $ crate :: SyntaxKind :: OF_KW } ; [target] => { $ crate :: SyntaxKind :: TARGET_KW } ; [never] => { $ crate :: SyntaxKind :: NEVER_KW } ; [unknown] => { $ crate :: SyntaxKind :: UNKNOWN_KW } ; [any] => { $ crate :: SyntaxKind :: ANY_KW } ; [undefined] => { $ crate :: SyntaxKind :: UNDEFINED_KW } ; [let] => { $ crate :: SyntaxKind :: LET_KW } ; [float] => { $ crate :: SyntaxKind :: FLOAT_KW } ; [number] => { $ crate :: SyntaxKind :: NUMBER_KW } ; [ident] => { $ crate :: SyntaxKind :: IDENT } ; [js_shebang] => { $ crate :: SyntaxKind :: JS_SHEBANG } ; [js_string_literal] => { $ crate :: SyntaxKind :: JS_STRING_LITERAL } ; [js_number_literal] => { $ crate :: SyntaxKind :: JS_NUMBER_LITERAL } ; [js_big_int_literal] => { $ crate :: SyntaxKind :: JS_BIG_INT_LITERAL } ; [js_regex_literal] => { $ crate :: SyntaxKind :: JS_REGEX_LITERAL } ; [#] => { $ crate :: SyntaxKind :: HASH } ; }
diff --git a/xtask/js.ungram b/xtask/js.ungram
index 7cb333563599..90bac5b0dcdd 100644
--- a/xtask/js.ungram
+++ b/xtask/js.ungram
@@ -54,7 +54,7 @@ JsRoot =
 	statements: JsAnyStatement*
 
 JsDirective =
-	value: 'js_string_literal_token'
+	value: 'js_string_literal'
 	';'?
 
 ///////////////
@@ -634,13 +634,13 @@ JsAnyLiteralExpression =
 	| JsRegexLiteralExpression
 
 // "abcd" | 'abcd'
-JsStringLiteralExpression = value: 'js_string_literal_token'
+JsStringLiteralExpression = value: 'js_string_literal'
 
 // 4, 5.5, 0x00, ...
-JsNumberLiteralExpression = value: 'js_number_literal_token'
+JsNumberLiteralExpression = value: 'js_number_literal'
 
 // 45n
-JsBigIntLiteralExpression =  value: 'js_big_int_literal_token'
+JsBigIntLiteralExpression =  value: 'js_big_int_literal'
 
 // true, false
 JsBooleanLiteralExpression = value_token: ('true' | 'false')
@@ -648,7 +648,7 @@ JsBooleanLiteralExpression = value_token: ('true' | 'false')
 // null
 JsNullLiteralExpression = value: 'null'
 
-JsRegexLiteralExpression = value: 'js_regex_literal_token'
+JsRegexLiteralExpression = value: 'js_regex_literal'
 
 
 ///////////////
@@ -745,7 +745,7 @@ ImportDecl =
 	imports:ImportClause*
 	'type'?
 	'from'
-	source: 'js_string_literal_token'
+	source: 'js_string_literal'
 	asserted_object: JsObjectExpression
 	'assert'?
 	';'?
@@ -761,7 +761,7 @@ DefaultDecl =
 ExportDefaultExpr = 'export' 'type'? 'default'? expr:JsAnyExpression
 
 // export wildcard
-ExportWildcard = 'export' 'type'? '*' 'as'? ident: Ident? 'from' source: 'js_string_literal_token'
+ExportWildcard = 'export' 'type'? '*' 'as'? ident: Ident? 'from' source: 'js_string_literal'
 
 
 // export declaration
@@ -799,7 +799,7 @@ Specifier = name:Ident manual__:'as'? manual__alias:Name
 
 
 // this is not currently implemented in rslint parser
-ImportStringSpecifier = 'js_string_literal_token'
+ImportStringSpecifier = source: 'js_string_literal'
 
 
 WildcardImport = '*' 'as'? ident: Ident?
@@ -831,7 +831,7 @@ JsSpread =
 
 // { a: ..., "b": ..., 4: ... }
 //   ^       ^^^       ^
-JsLiteralMemberName = value: ('ident' | 'js_string_literal_token' | 'js_number_literal_token')
+JsLiteralMemberName = value: ('ident' | 'js_string_literal' | 'js_number_literal')
 
 // { [call()]: ... }
 //   ^^^^^^^^
@@ -908,7 +908,7 @@ TsModuleRef =
 	TsEntityName
 
 
-TsExternalModuleRef = 'require' '(' 'js_string_literal_token' ')'
+TsExternalModuleRef = 'require' '(' module: 'js_string_literal' ')'
 
 TsType =
 	TsAny
diff --git a/xtask/src/codegen/generate_syntax_kinds.rs b/xtask/src/codegen/generate_syntax_kinds.rs
index 7a1ca564900d..4e2f3626d726 100644
--- a/xtask/src/codegen/generate_syntax_kinds.rs
+++ b/xtask/src/codegen/generate_syntax_kinds.rs
@@ -154,10 +154,10 @@ pub fn generate_syntax_kinds(grammar: KindsSrc) -> Result<String> {
 			#([#all_keywords_idents] => { $crate::SyntaxKind::#all_keywords };)*
 			[ident] => { $crate::SyntaxKind::IDENT };
 			[js_shebang] => { $crate::SyntaxKind::JS_SHEBANG };
-			[js_string_literal_token] => { $crate::SyntaxKind::JS_STRING_LITERAL_TOKEN };
-			[js_number_literal_token] => { $crate::SyntaxKind::JS_NUMBER_LITERAL_TOKEN };
-			[js_big_int_literal_token] => { $crate::SyntaxKind::JS_BIG_INT_LITERAL_TOKEN };
-			[js_regex_literal_token] => { $crate::SyntaxKind::JS_REGEX_LITERAL_TOKEN };
+			[js_string_literal] => { $crate::SyntaxKind::JS_STRING_LITERAL };
+			[js_number_literal] => { $crate::SyntaxKind::JS_NUMBER_LITERAL };
+			[js_big_int_literal] => { $crate::SyntaxKind::JS_BIG_INT_LITERAL };
+			[js_regex_literal] => { $crate::SyntaxKind::JS_REGEX_LITERAL };
 			[#] => { $crate::SyntaxKind::HASH };
 		}
 	};
diff --git a/xtask/src/codegen/kinds_src.rs b/xtask/src/codegen/kinds_src.rs
index dcbfa61fbff1..04c4f01315d8 100644
--- a/xtask/src/codegen/kinds_src.rs
+++ b/xtask/src/codegen/kinds_src.rs
@@ -152,10 +152,10 @@ pub const KINDS_SRC: KindsSrc = KindsSrc {
 		"number",
 	],
 	literals: &[
-		"JS_NUMBER_LITERAL_TOKEN",
-		"JS_BIG_INT_LITERAL_TOKEN",
-		"JS_STRING_LITERAL_TOKEN",
-		"JS_REGEX_LITERAL_TOKEN",
+		"JS_NUMBER_LITERAL",
+		"JS_BIG_INT_LITERAL",
+		"JS_STRING_LITERAL",
+		"JS_REGEX_LITERAL",
 	],
 	tokens: &[
 		"HASH", // #