diff --git a/src/services/services.ts b/src/services/services.ts
index c85c10dc411..f55c59a1b7b 100644
--- a/src/services/services.ts
+++ b/src/services/services.ts
@@ -6575,7 +6575,7 @@ namespace ts {
                         }
                     }
 
-                    return ClassificationType.text;
+                    return ClassificationType.identifier;
                 }
             }
 
diff --git a/tests/cases/fourslash/shims/getSyntacticClassifications.ts b/tests/cases/fourslash/shims/getSyntacticClassifications.ts
index 88f655683a3..1dbe2944b8a 100644
--- a/tests/cases/fourslash/shims/getSyntacticClassifications.ts
+++ b/tests/cases/fourslash/shims/getSyntacticClassifications.ts
@@ -22,8 +22,8 @@ var c = classification;
 verify.syntacticClassificationsAre(
     c.comment("// comment"),
     c.keyword("module"), c.moduleName("M"), c.punctuation("{"),
-        c.keyword("var"), c.text("v"), c.operator("="), c.numericLiteral("0"), c.operator("+"), c.numericLiteral("1"), c.punctuation(";"),
-        c.keyword("var"), c.text("s"), c.operator("="), c.stringLiteral('"string"'), c.punctuation(";"),
+        c.keyword("var"), c.identifier("v"), c.operator("="), c.numericLiteral("0"), c.operator("+"), c.numericLiteral("1"), c.punctuation(";"),
+        c.keyword("var"), c.identifier("s"), c.operator("="), c.stringLiteral('"string"'), c.punctuation(";"),
         c.keyword("class"), c.className("C"), c.punctuation("<"), c.typeParameterName("T"), c.punctuation(">"), c.punctuation("{"),
         c.punctuation("}"),
         c.keyword("enum"), c.enumName("E"), c.punctuation("{"),
diff --git a/tests/cases/fourslash/syntacticClassificationWithErrors.ts b/tests/cases/fourslash/syntacticClassificationWithErrors.ts
index b4572d3e620..166a22a1a51 100644
--- a/tests/cases/fourslash/syntacticClassificationWithErrors.ts
+++ b/tests/cases/fourslash/syntacticClassificationWithErrors.ts
@@ -8,7 +8,7 @@
 let c = classification
 verify.syntacticClassificationsAre(
     c.keyword("class"), c.className("A"), c.punctuation("{"),
-    c.text("a"), c.punctuation(":"),
+    c.identifier("a"), c.punctuation(":"),
     c.punctuation("}"),
-    c.text("c"), c.operator("=")
+    c.identifier("c"), c.operator("=")
     );
\ No newline at end of file
diff --git a/tests/cases/fourslash/syntacticClassifications1.ts b/tests/cases/fourslash/syntacticClassifications1.ts
index 88f655683a3..1dbe2944b8a 100644
--- a/tests/cases/fourslash/syntacticClassifications1.ts
+++ b/tests/cases/fourslash/syntacticClassifications1.ts
@@ -22,8 +22,8 @@ var c = classification;
 verify.syntacticClassificationsAre(
     c.comment("// comment"),
     c.keyword("module"), c.moduleName("M"), c.punctuation("{"),
-        c.keyword("var"), c.text("v"), c.operator("="), c.numericLiteral("0"), c.operator("+"), c.numericLiteral("1"), c.punctuation(";"),
-        c.keyword("var"), c.text("s"), c.operator("="), c.stringLiteral('"string"'), c.punctuation(";"),
+        c.keyword("var"), c.identifier("v"), c.operator("="), c.numericLiteral("0"), c.operator("+"), c.numericLiteral("1"), c.punctuation(";"),
+        c.keyword("var"), c.identifier("s"), c.operator("="), c.stringLiteral('"string"'), c.punctuation(";"),
         c.keyword("class"), c.className("C"), c.punctuation("<"), c.typeParameterName("T"), c.punctuation(">"), c.punctuation("{"),
         c.punctuation("}"),
         c.keyword("enum"), c.enumName("E"), c.punctuation("{"),
diff --git a/tests/cases/fourslash/syntacticClassificationsConflictMarkers1.ts b/tests/cases/fourslash/syntacticClassificationsConflictMarkers1.ts
index 7f26038c33e..99db7443a4c 100644
--- a/tests/cases/fourslash/syntacticClassificationsConflictMarkers1.ts
+++ b/tests/cases/fourslash/syntacticClassificationsConflictMarkers1.ts
@@ -12,8 +12,8 @@ var c = classification;
 verify.syntacticClassificationsAre(
     c.keyword("class"), c.className("C"), c.punctuation("{"),
     c.comment("<<<<<<< HEAD"),
-    c.text("v"), c.operator("="), c.numericLiteral("1"), c.punctuation(";"),
+    c.identifier("v"), c.operator("="), c.numericLiteral("1"), c.punctuation(";"),
     c.comment("======="),
-    c.text("v"), c.punctuation("="), c.numericLiteral("2"), c.punctuation(";"),
+    c.identifier("v"), c.punctuation("="), c.numericLiteral("2"), c.punctuation(";"),
     c.comment(">>>>>>> Branch - a"),
     c.punctuation("}"));
\ No newline at end of file
diff --git a/tests/cases/fourslash/syntacticClassificationsConflictMarkers2.ts b/tests/cases/fourslash/syntacticClassificationsConflictMarkers2.ts
index 92ede0d104b..18363c0389e 100644
--- a/tests/cases/fourslash/syntacticClassificationsConflictMarkers2.ts
+++ b/tests/cases/fourslash/syntacticClassificationsConflictMarkers2.ts
@@ -11,5 +11,5 @@ verify.syntacticClassificationsAre(
     c.comment("<<<<<<< HEAD"),
     c.keyword("class"), c.className("C"), c.punctuation("{"), c.punctuation("}"),
     c.comment("======="),
-    c.keyword("class"), c.text("D"), c.punctuation("{"), c.punctuation("}"),
+    c.keyword("class"), c.identifier("D"), c.punctuation("{"), c.punctuation("}"),
     c.comment(">>>>>>> Branch - a"));
\ No newline at end of file
diff --git a/tests/cases/fourslash/syntacticClassificationsDocComment1.ts b/tests/cases/fourslash/syntacticClassificationsDocComment1.ts
index fe812b4c780..1ea3bf9684a 100644
--- a/tests/cases/fourslash/syntacticClassificationsDocComment1.ts
+++ b/tests/cases/fourslash/syntacticClassificationsDocComment1.ts
@@ -13,5 +13,5 @@ verify.syntacticClassificationsAre(
     c.punctuation("}"),
     c.comment(" */"),
     c.keyword("var"),
-    c.text("v"),
+    c.identifier("v"),
     c.punctuation(";"));
diff --git a/tests/cases/fourslash/syntacticClassificationsDocComment2.ts b/tests/cases/fourslash/syntacticClassificationsDocComment2.ts
index 201251dde6d..38dca4edcf2 100644
--- a/tests/cases/fourslash/syntacticClassificationsDocComment2.ts
+++ b/tests/cases/fourslash/syntacticClassificationsDocComment2.ts
@@ -15,12 +15,12 @@ verify.syntacticClassificationsAre(
     c.punctuation("{"),
     c.keyword("function"),
     c.punctuation("("),
-    c.text("x"),
+    c.identifier("x"),
     c.punctuation(")"),
     c.punctuation(":"),
     c.keyword("string"),
     c.punctuation("}"),
     c.comment(" */"),
     c.keyword("var"),
-    c.text("v"),
+    c.identifier("v"),
     c.punctuation(";"));
diff --git a/tests/cases/fourslash/syntacticClassificationsDocComment3.ts b/tests/cases/fourslash/syntacticClassificationsDocComment3.ts
index 6aca8cc415f..d7996fbbc54 100644
--- a/tests/cases/fourslash/syntacticClassificationsDocComment3.ts
+++ b/tests/cases/fourslash/syntacticClassificationsDocComment3.ts
@@ -15,5 +15,5 @@ verify.syntacticClassificationsAre(
     c.keyword("number"),
     c.comment(" /* } */"),
     c.keyword("var"),
-    c.text("v"),
+    c.identifier("v"),
     c.punctuation(";"));
diff --git a/tests/cases/fourslash/syntacticClassificationsForOfKeyword.ts b/tests/cases/fourslash/syntacticClassificationsForOfKeyword.ts
index a7a8c704ce6..22d7aa8ba94 100644
--- a/tests/cases/fourslash/syntacticClassificationsForOfKeyword.ts
+++ b/tests/cases/fourslash/syntacticClassificationsForOfKeyword.ts
@@ -7,9 +7,9 @@ verify.syntacticClassificationsAre(
     c.keyword("for"),
     c.punctuation("("),
     c.keyword("var"),
-    c.text("of"),
+    c.identifier("of"),
     c.keyword("of"),
-    c.text("of"),
+    c.identifier("of"),
     c.punctuation(")"),
     c.punctuation("{"),
     c.punctuation("}")
diff --git a/tests/cases/fourslash/syntacticClassificationsForOfKeyword2.ts b/tests/cases/fourslash/syntacticClassificationsForOfKeyword2.ts
index 30cfaea51e0..190663caa99 100644
--- a/tests/cases/fourslash/syntacticClassificationsForOfKeyword2.ts
+++ b/tests/cases/fourslash/syntacticClassificationsForOfKeyword2.ts
@@ -7,9 +7,9 @@ verify.syntacticClassificationsAre(
     c.keyword("for"),
     c.punctuation("("),
     c.keyword("var"),
-    c.text("of"),
+    c.identifier("of"),
     c.keyword("in"),
-    c.text("of"),
+    c.identifier("of"),
     c.punctuation(")"),
     c.punctuation("{"),
     c.punctuation("}")
diff --git a/tests/cases/fourslash/syntacticClassificationsForOfKeyword3.ts b/tests/cases/fourslash/syntacticClassificationsForOfKeyword3.ts
index 3af4733f3b2..ef96c99fed4 100644
--- a/tests/cases/fourslash/syntacticClassificationsForOfKeyword3.ts
+++ b/tests/cases/fourslash/syntacticClassificationsForOfKeyword3.ts
@@ -7,11 +7,11 @@ verify.syntacticClassificationsAre(
     c.keyword("for"),
     c.punctuation("("),
     c.keyword("var"),
-    c.text("of"),
+    c.identifier("of"),
     c.punctuation(";"),
-    c.text("of"),
+    c.identifier("of"),
     c.punctuation(";"),
-    c.text("of"),
+    c.identifier("of"),
     c.punctuation(")"),
     c.punctuation("{"),
     c.punctuation("}")
diff --git a/tests/cases/fourslash/syntacticClassificationsFunctionWithComments.ts b/tests/cases/fourslash/syntacticClassificationsFunctionWithComments.ts
index f7e5b7355a7..05a5aaa173e 100644
--- a/tests/cases/fourslash/syntacticClassificationsFunctionWithComments.ts
+++ b/tests/cases/fourslash/syntacticClassificationsFunctionWithComments.ts
@@ -19,7 +19,7 @@ var firstCommentText =
 var c = classification;
 verify.syntacticClassificationsAre(
     c.comment(firstCommentText),
-    c.keyword("function"), c.text("myFunction"), c.punctuation("("), c.comment("/* x */"), c.parameterName("x"), c.punctuation(":"), c.keyword("any"), c.punctuation(")"), c.punctuation("{"),
-    c.keyword("var"), c.text("y"), c.operator("="), c.text("x"), c.operator("?"), c.text("x"), c.operator("++"), c.operator(":"), c.operator("++"), c.text("x"), c.punctuation(";"),
+    c.keyword("function"), c.identifier("myFunction"), c.punctuation("("), c.comment("/* x */"), c.parameterName("x"), c.punctuation(":"), c.keyword("any"), c.punctuation(")"), c.punctuation("{"),
+    c.keyword("var"), c.identifier("y"), c.operator("="), c.identifier("x"), c.operator("?"), c.identifier("x"), c.operator("++"), c.operator(":"), c.operator("++"), c.identifier("x"), c.punctuation(";"),
     c.punctuation("}"),
     c.comment("// end of file"));
\ No newline at end of file
diff --git a/tests/cases/fourslash/syntacticClassificationsObjectLiteral.ts b/tests/cases/fourslash/syntacticClassificationsObjectLiteral.ts
index 59642468ce9..c5bab5181a3 100644
--- a/tests/cases/fourslash/syntacticClassificationsObjectLiteral.ts
+++ b/tests/cases/fourslash/syntacticClassificationsObjectLiteral.ts
@@ -13,13 +13,13 @@
 
 var c = classification;
 verify.syntacticClassificationsAre(
-    c.keyword("var"), c.text("v"), c.operator("="), c.numericLiteral("10e0"), c.punctuation(";"),
-    c.keyword("var"), c.text("x"), c.operator("="), c.punctuation("{"),
-    c.text("p1"), c.punctuation(":"), c.numericLiteral("1"), c.punctuation(","),
-    c.text("p2"), c.punctuation(":"), c.numericLiteral("2"), c.punctuation(","),
-    c.text("any"), c.punctuation(":"), c.numericLiteral("3"), c.punctuation(","),
-    c.text("function"), c.punctuation(":"), c.numericLiteral("4"), c.punctuation(","),
-    c.text("var"), c.punctuation(":"), c.numericLiteral("5"), c.punctuation(","),
-    c.text("void"), c.punctuation(":"), c.keyword("void"), c.numericLiteral("0"), c.punctuation(","),
-    c.text("v"), c.punctuation(":"), c.text("v"), c.operator("+="), c.text("v"), c.punctuation(","),
+    c.keyword("var"), c.identifier("v"), c.operator("="), c.numericLiteral("10e0"), c.punctuation(";"),
+    c.keyword("var"), c.identifier("x"), c.operator("="), c.punctuation("{"),
+    c.identifier("p1"), c.punctuation(":"), c.numericLiteral("1"), c.punctuation(","),
+    c.identifier("p2"), c.punctuation(":"), c.numericLiteral("2"), c.punctuation(","),
+    c.identifier("any"), c.punctuation(":"), c.numericLiteral("3"), c.punctuation(","),
+    c.identifier("function"), c.punctuation(":"), c.numericLiteral("4"), c.punctuation(","),
+    c.identifier("var"), c.punctuation(":"), c.numericLiteral("5"), c.punctuation(","),
+    c.identifier("void"), c.punctuation(":"), c.keyword("void"), c.numericLiteral("0"), c.punctuation(","),
+    c.identifier("v"), c.punctuation(":"), c.identifier("v"), c.operator("+="), c.identifier("v"), c.punctuation(","),
     c.punctuation("}"), c.punctuation(";"));
\ No newline at end of file
diff --git a/tests/cases/fourslash/syntacticClassificationsTemplates1.ts b/tests/cases/fourslash/syntacticClassificationsTemplates1.ts
index 8ee48fb8a11..6c27aab3f40 100644
--- a/tests/cases/fourslash/syntacticClassificationsTemplates1.ts
+++ b/tests/cases/fourslash/syntacticClassificationsTemplates1.ts
@@ -8,8 +8,8 @@
 
 var c = classification;
 verify.syntacticClassificationsAre(
-    c.keyword("var"), c.text("v"), c.operator("="), c.numericLiteral("10e0"), c.punctuation(";"),
-    c.keyword("var"), c.text("x"), c.operator("="), c.punctuation("{"),
-    c.text("p1"), c.punctuation(":"), c.stringLiteral("`hello world`"), c.punctuation(","),
-    c.text("p2"), c.punctuation(":"), c.stringLiteral("`goodbye ${"), c.numericLiteral("0"), c.stringLiteral("} cruel ${"), c.numericLiteral("0"), c.stringLiteral("} world`"), c.punctuation(","),
+    c.keyword("var"), c.identifier("v"), c.operator("="), c.numericLiteral("10e0"), c.punctuation(";"),
+    c.keyword("var"), c.identifier("x"), c.operator("="), c.punctuation("{"),
+    c.identifier("p1"), c.punctuation(":"), c.stringLiteral("`hello world`"), c.punctuation(","),
+    c.identifier("p2"), c.punctuation(":"), c.stringLiteral("`goodbye ${"), c.numericLiteral("0"), c.stringLiteral("} cruel ${"), c.numericLiteral("0"), c.stringLiteral("} world`"), c.punctuation(","),
     c.punctuation("}"), c.punctuation(";"));
\ No newline at end of file
diff --git a/tests/cases/fourslash/syntacticClassificationsTemplates2.ts b/tests/cases/fourslash/syntacticClassificationsTemplates2.ts
index 913dc039012..25bb64e78ba 100644
--- a/tests/cases/fourslash/syntacticClassificationsTemplates2.ts
+++ b/tests/cases/fourslash/syntacticClassificationsTemplates2.ts
@@ -6,6 +6,6 @@
 
 var c = classification;
 verify.syntacticClassificationsAre(
-    c.keyword("var"), c.text("tiredOfCanonicalExamples"), c.operator("="),
+    c.keyword("var"), c.identifier("tiredOfCanonicalExamples"), c.operator("="),
     c.stringLiteral("`goodbye \"${"), c.stringLiteral("`hello world`"),
     c.stringLiteral("}\" \nand ${"), c.stringLiteral("`good${"), c.stringLiteral("\" \""), c.stringLiteral("}riddance`"), c.stringLiteral("}`"), c.punctuation(";"));
\ No newline at end of file