diff --git a/test/fixtures/javascript/corpus/class.diffA-B.txt b/test/fixtures/javascript/corpus/class.diffA-B.txt
index 6896309ab..2b32baf3b 100644
--- a/test/fixtures/javascript/corpus/class.diffA-B.txt
+++ b/test/fixtures/javascript/corpus/class.diffA-B.txt
@@ -1,6 +1,6 @@
 (Statements
   (Class
-    (Identifier)
+    (TypeIdentifier)
     (Statements
     {+(Method
       {+(Empty)+}
diff --git a/test/fixtures/javascript/corpus/class.diffB-A.txt b/test/fixtures/javascript/corpus/class.diffB-A.txt
index 48206cf61..6dc54cfb9 100644
--- a/test/fixtures/javascript/corpus/class.diffB-A.txt
+++ b/test/fixtures/javascript/corpus/class.diffB-A.txt
@@ -1,6 +1,6 @@
 (Statements
   (Class
-    (Identifier)
+    (TypeIdentifier)
     (Statements
     {+(PublicFieldDefinition
       {+(Empty)+}
diff --git a/test/fixtures/javascript/corpus/class.parseA.txt b/test/fixtures/javascript/corpus/class.parseA.txt
index d7efa27f8..137db706e 100644
--- a/test/fixtures/javascript/corpus/class.parseA.txt
+++ b/test/fixtures/javascript/corpus/class.parseA.txt
@@ -1,6 +1,6 @@
 (Statements
   (Class
-    (Identifier)
+    (TypeIdentifier)
     (Statements
       (PublicFieldDefinition
         (Empty)
diff --git a/test/fixtures/javascript/corpus/class.parseB.txt b/test/fixtures/javascript/corpus/class.parseB.txt
index 57e40f4f1..92c712dda 100644
--- a/test/fixtures/javascript/corpus/class.parseB.txt
+++ b/test/fixtures/javascript/corpus/class.parseB.txt
@@ -1,6 +1,6 @@
 (Statements
   (Class
-    (Identifier)
+    (TypeIdentifier)
     (Statements
       (Method
         (Empty)
diff --git a/test/fixtures/typescript/corpus/ambient-declarations.diffA-B.txt b/test/fixtures/typescript/corpus/ambient-declarations.diffA-B.txt
index e1e3f0fd6..1668f71bf 100644
--- a/test/fixtures/typescript/corpus/ambient-declarations.diffA-B.txt
+++ b/test/fixtures/typescript/corpus/ambient-declarations.diffA-B.txt
@@ -4,8 +4,8 @@
     {+(Identifier)+})+})+}
   (AmbientDeclaration
     (Class
-    { (Identifier)
-    ->(Identifier) }
+    { (TypeIdentifier)
+    ->(TypeIdentifier) }
     { (PublicFieldDefinition
       {-(Empty)-}
       {-(Empty)-}
@@ -23,7 +23,7 @@
       {-(Empty)-})-})
   ->(InterfaceDeclaration
     {+(Empty)+}
-    {+(Identifier)+}
+    {+(TypeIdentifier)+}
     {+(ObjectType)+}) })
 {-(AmbientDeclaration
   {-(AmbientFunction
@@ -63,7 +63,7 @@
         {-(Empty)-})-})-}
     {-(InterfaceDeclaration
       {-(Empty)-}
-      {-(Identifier)-}
+      {-(TypeIdentifier)-}
       {-(ObjectType
         {-(PropertySignature
           {-(Empty)-}
@@ -73,7 +73,7 @@
           {-(Identifier)-})-})-})-}
     {-(InterfaceDeclaration
       {-(Empty)-}
-      {-(Identifier)-}
+      {-(TypeIdentifier)-}
       {-(ObjectType
         {-(PropertySignature
           {-(Empty)-}
@@ -95,7 +95,7 @@
           {-(Identifier)-})-})-})-})-})-}
   (AmbientDeclaration
     (Class
-      (Identifier)
+      (TypeIdentifier)
       (Statements
         (MethodSignature
           (Empty)
diff --git a/test/fixtures/typescript/corpus/ambient-declarations.diffB-A.txt b/test/fixtures/typescript/corpus/ambient-declarations.diffB-A.txt
index 5cbf08214..4e4f1b7a2 100644
--- a/test/fixtures/typescript/corpus/ambient-declarations.diffB-A.txt
+++ b/test/fixtures/typescript/corpus/ambient-declarations.diffB-A.txt
@@ -1,7 +1,7 @@
 (Statements
 {+(AmbientDeclaration
   {+(Class
-    {+(Identifier)+}
+    {+(TypeIdentifier)+}
     {+(PublicFieldDefinition
       {+(Empty)+}
       {+(Empty)+}
@@ -54,7 +54,7 @@
         {+(Empty)+})+})+}
     {+(InterfaceDeclaration
       {+(Empty)+}
-      {+(Identifier)+}
+      {+(TypeIdentifier)+}
       {+(ObjectType
         {+(PropertySignature
           {+(Empty)+}
@@ -64,7 +64,7 @@
           {+(Identifier)+})+})+})+}
     {+(InterfaceDeclaration
       {+(Empty)+}
-      {+(Identifier)+}
+      {+(TypeIdentifier)+}
       {+(ObjectType
         {+(PropertySignature
           {+(Empty)+}
@@ -89,16 +89,16 @@
     {-(Identifier)-})-})-}
 {-(AmbientDeclaration
   {-(Class
-    {-(Identifier)-}
+    {-(TypeIdentifier)-}
     {-(Statements)-})-})-}
 {-(AmbientDeclaration
   {-(InterfaceDeclaration
     {-(Empty)-}
-    {-(Identifier)-}
+    {-(TypeIdentifier)-}
     {-(ObjectType)-})-})-}
   (AmbientDeclaration
     (Class
-      (Identifier)
+      (TypeIdentifier)
       (Statements
         (MethodSignature
           (Empty)
diff --git a/test/fixtures/typescript/corpus/ambient-declarations.parseA.txt b/test/fixtures/typescript/corpus/ambient-declarations.parseA.txt
index e16ff63f6..4ae7a3d6c 100644
--- a/test/fixtures/typescript/corpus/ambient-declarations.parseA.txt
+++ b/test/fixtures/typescript/corpus/ambient-declarations.parseA.txt
@@ -1,7 +1,7 @@
 (Statements
   (AmbientDeclaration
     (Class
-      (Identifier)
+      (TypeIdentifier)
       (PublicFieldDefinition
         (Empty)
         (Empty)
@@ -54,7 +54,7 @@
           (Empty)))
       (InterfaceDeclaration
         (Empty)
-        (Identifier)
+        (TypeIdentifier)
         (ObjectType
           (PropertySignature
             (Empty)
@@ -64,7 +64,7 @@
             (Identifier))))
       (InterfaceDeclaration
         (Empty)
-        (Identifier)
+        (TypeIdentifier)
         (ObjectType
           (PropertySignature
             (Empty)
@@ -86,7 +86,7 @@
             (Identifier))))))
   (AmbientDeclaration
     (Class
-      (Identifier)
+      (TypeIdentifier)
       (Statements
         (MethodSignature
           (Empty)
diff --git a/test/fixtures/typescript/corpus/ambient-declarations.parseB.txt b/test/fixtures/typescript/corpus/ambient-declarations.parseB.txt
index 80110f215..4731ef691 100644
--- a/test/fixtures/typescript/corpus/ambient-declarations.parseB.txt
+++ b/test/fixtures/typescript/corpus/ambient-declarations.parseB.txt
@@ -4,16 +4,16 @@
       (Identifier)))
   (AmbientDeclaration
     (Class
-      (Identifier)
+      (TypeIdentifier)
       (Statements)))
   (AmbientDeclaration
     (InterfaceDeclaration
       (Empty)
-      (Identifier)
+      (TypeIdentifier)
       (ObjectType)))
   (AmbientDeclaration
     (Class
-      (Identifier)
+      (TypeIdentifier)
       (Statements
         (MethodSignature
           (Empty)
diff --git a/test/fixtures/typescript/corpus/ambient-exports.diffA-B.txt b/test/fixtures/typescript/corpus/ambient-exports.diffA-B.txt
index 5fd6df395..3bae9ece2 100644
--- a/test/fixtures/typescript/corpus/ambient-exports.diffA-B.txt
+++ b/test/fixtures/typescript/corpus/ambient-exports.diffA-B.txt
@@ -1,7 +1,7 @@
 (Statements
   (DefaultExport
   { (Class
-    {-(Identifier)-}
+    {-(TypeIdentifier)-}
     {-(Statements)-})
   ->(Function
     {+(Empty)+}
diff --git a/test/fixtures/typescript/corpus/ambient-exports.diffB-A.txt b/test/fixtures/typescript/corpus/ambient-exports.diffB-A.txt
index 9208b88b7..3eb82a886 100644
--- a/test/fixtures/typescript/corpus/ambient-exports.diffB-A.txt
+++ b/test/fixtures/typescript/corpus/ambient-exports.diffB-A.txt
@@ -26,5 +26,5 @@
           {-(ShorthandPropertyIdentifier)-}
           {-(ShorthandPropertyIdentifier)-})-})-})-})
   ->(Class
-    {+(Identifier)+}
+    {+(TypeIdentifier)+}
     {+(Statements)+}) }))
diff --git a/test/fixtures/typescript/corpus/ambient-exports.parseA.txt b/test/fixtures/typescript/corpus/ambient-exports.parseA.txt
index e3c2e46bf..410034923 100644
--- a/test/fixtures/typescript/corpus/ambient-exports.parseA.txt
+++ b/test/fixtures/typescript/corpus/ambient-exports.parseA.txt
@@ -1,5 +1,5 @@
 (Statements
   (DefaultExport
     (Class
-      (Identifier)
+      (TypeIdentifier)
       (Statements))))
diff --git a/test/fixtures/typescript/corpus/ambient-type-declarations.diffA-B.txt b/test/fixtures/typescript/corpus/ambient-type-declarations.diffA-B.txt
index b631f3881..134d95348 100644
--- a/test/fixtures/typescript/corpus/ambient-type-declarations.diffA-B.txt
+++ b/test/fixtures/typescript/corpus/ambient-type-declarations.diffA-B.txt
@@ -1,7 +1,7 @@
 (Statements
 {+(TypeAlias
   {+(Empty)+}
-  {+(Identifier)+}
+  {+(TypeIdentifier)+}
   {+(Union
     {+(Union
       {+(Union
@@ -19,7 +19,7 @@
 {-(AmbientDeclaration
   {-(TypeAlias
     {-(Empty)-}
-    {-(Identifier)-}
+    {-(TypeIdentifier)-}
     {-(Union
       {-(Union
         {-(Union
diff --git a/test/fixtures/typescript/corpus/ambient-type-declarations.diffB-A.txt b/test/fixtures/typescript/corpus/ambient-type-declarations.diffB-A.txt
index 2678f24e9..364870f21 100644
--- a/test/fixtures/typescript/corpus/ambient-type-declarations.diffB-A.txt
+++ b/test/fixtures/typescript/corpus/ambient-type-declarations.diffB-A.txt
@@ -2,7 +2,7 @@
 {+(AmbientDeclaration
   {+(TypeAlias
     {+(Empty)+}
-    {+(Identifier)+}
+    {+(TypeIdentifier)+}
     {+(Union
       {+(Union
         {+(Union
@@ -19,7 +19,7 @@
             {+(TypeIdentifier)+})+})+})+})+})+})+}
 {-(TypeAlias
   {-(Empty)-}
-  {-(Identifier)-}
+  {-(TypeIdentifier)-}
   {-(Union
     {-(Union
       {-(Union
diff --git a/test/fixtures/typescript/corpus/ambient-type-declarations.parseA.txt b/test/fixtures/typescript/corpus/ambient-type-declarations.parseA.txt
index 61049abbd..77768814a 100644
--- a/test/fixtures/typescript/corpus/ambient-type-declarations.parseA.txt
+++ b/test/fixtures/typescript/corpus/ambient-type-declarations.parseA.txt
@@ -2,7 +2,7 @@
   (AmbientDeclaration
     (TypeAlias
       (Empty)
-      (Identifier)
+      (TypeIdentifier)
       (Union
         (Union
           (Union
diff --git a/test/fixtures/typescript/corpus/ambient-type-declarations.parseB.txt b/test/fixtures/typescript/corpus/ambient-type-declarations.parseB.txt
index a508d4161..2ba358486 100644
--- a/test/fixtures/typescript/corpus/ambient-type-declarations.parseB.txt
+++ b/test/fixtures/typescript/corpus/ambient-type-declarations.parseB.txt
@@ -1,7 +1,7 @@
 (Statements
   (TypeAlias
     (Empty)
-    (Identifier)
+    (TypeIdentifier)
     (Union
       (Union
         (Union
diff --git a/test/fixtures/typescript/corpus/class.diffA-B.txt b/test/fixtures/typescript/corpus/class.diffA-B.txt
index 7567c2eb0..29879240f 100644
--- a/test/fixtures/typescript/corpus/class.diffA-B.txt
+++ b/test/fixtures/typescript/corpus/class.diffA-B.txt
@@ -5,8 +5,8 @@
     ->(Identifier) }
       (Empty)
       (Empty))
-  { (Identifier)
-  ->(Identifier) }
+  { (TypeIdentifier)
+  ->(TypeIdentifier) }
     (ExtendsClause
     { (TypeIdentifier)
     ->(TypeIdentifier) })
diff --git a/test/fixtures/typescript/corpus/class.diffB-A.txt b/test/fixtures/typescript/corpus/class.diffB-A.txt
index aa3082cc2..926e88625 100644
--- a/test/fixtures/typescript/corpus/class.diffB-A.txt
+++ b/test/fixtures/typescript/corpus/class.diffB-A.txt
@@ -5,8 +5,8 @@
     ->(Identifier) }
       (Empty)
       (Empty))
-  { (Identifier)
-  ->(Identifier) }
+  { (TypeIdentifier)
+  ->(TypeIdentifier) }
     (ExtendsClause
     { (TypeIdentifier)
     ->(TypeIdentifier) })
diff --git a/test/fixtures/typescript/corpus/class.parseA.txt b/test/fixtures/typescript/corpus/class.parseA.txt
index 98dcd26a0..c6cec68e4 100644
--- a/test/fixtures/typescript/corpus/class.parseA.txt
+++ b/test/fixtures/typescript/corpus/class.parseA.txt
@@ -4,7 +4,7 @@
       (Identifier)
       (Empty)
       (Empty))
-    (Identifier)
+    (TypeIdentifier)
     (ExtendsClause
       (TypeIdentifier))
     (Statements
diff --git a/test/fixtures/typescript/corpus/class.parseB.txt b/test/fixtures/typescript/corpus/class.parseB.txt
index 7202698bb..9a7ad3a5b 100644
--- a/test/fixtures/typescript/corpus/class.parseB.txt
+++ b/test/fixtures/typescript/corpus/class.parseB.txt
@@ -4,7 +4,7 @@
       (Identifier)
       (Empty)
       (Empty))
-    (Identifier)
+    (TypeIdentifier)
     (ExtendsClause
       (TypeIdentifier))
     (Statements
diff --git a/test/fixtures/typescript/corpus/interface.diffA-B.txt b/test/fixtures/typescript/corpus/interface.diffA-B.txt
index 6a5ffe86b..6a32ceab7 100644
--- a/test/fixtures/typescript/corpus/interface.diffA-B.txt
+++ b/test/fixtures/typescript/corpus/interface.diffA-B.txt
@@ -6,8 +6,8 @@
       {-(Identifier)-}
       {-(Empty)-}
       {-(Empty)-})-})-}
-  { (Identifier)
-  ->(Identifier) }
+  { (TypeIdentifier)
+  ->(TypeIdentifier) }
     (ObjectType
       (PropertySignature
         (Empty)
diff --git a/test/fixtures/typescript/corpus/interface.diffB-A.txt b/test/fixtures/typescript/corpus/interface.diffB-A.txt
index 2c44f0f48..642cc7eab 100644
--- a/test/fixtures/typescript/corpus/interface.diffB-A.txt
+++ b/test/fixtures/typescript/corpus/interface.diffB-A.txt
@@ -6,8 +6,8 @@
       {+(Empty)+}
       {+(Empty)+})+})+}
   {-(Empty)-}
-  { (Identifier)
-  ->(Identifier) }
+  { (TypeIdentifier)
+  ->(TypeIdentifier) }
     (ObjectType
       (PropertySignature
         (Empty)
diff --git a/test/fixtures/typescript/corpus/interface.parseA.txt b/test/fixtures/typescript/corpus/interface.parseA.txt
index a0ac0a3fb..1b6b96deb 100644
--- a/test/fixtures/typescript/corpus/interface.parseA.txt
+++ b/test/fixtures/typescript/corpus/interface.parseA.txt
@@ -5,7 +5,7 @@
         (Identifier)
         (Empty)
         (Empty)))
-    (Identifier)
+    (TypeIdentifier)
     (ObjectType
       (PropertySignature
         (Empty)
diff --git a/test/fixtures/typescript/corpus/interface.parseB.txt b/test/fixtures/typescript/corpus/interface.parseB.txt
index fd9d86c04..c9e10a07d 100644
--- a/test/fixtures/typescript/corpus/interface.parseB.txt
+++ b/test/fixtures/typescript/corpus/interface.parseB.txt
@@ -1,7 +1,7 @@
 (Statements
   (InterfaceDeclaration
     (Empty)
-    (Identifier)
+    (TypeIdentifier)
     (ObjectType
       (PropertySignature
         (Empty)
diff --git a/test/fixtures/typescript/corpus/method-definition.diffA-B.txt b/test/fixtures/typescript/corpus/method-definition.diffA-B.txt
index 0bbb52aaa..79f0be483 100644
--- a/test/fixtures/typescript/corpus/method-definition.diffA-B.txt
+++ b/test/fixtures/typescript/corpus/method-definition.diffA-B.txt
@@ -1,6 +1,6 @@
 (Statements
   (Class
-    (Identifier)
+    (TypeIdentifier)
     (Method
       (Identifier)
     {+(Readonly)+}
diff --git a/test/fixtures/typescript/corpus/method-definition.diffB-A.txt b/test/fixtures/typescript/corpus/method-definition.diffB-A.txt
index 2b621eb4b..0b3052251 100644
--- a/test/fixtures/typescript/corpus/method-definition.diffB-A.txt
+++ b/test/fixtures/typescript/corpus/method-definition.diffB-A.txt
@@ -1,6 +1,6 @@
 (Statements
   (Class
-    (Identifier)
+    (TypeIdentifier)
     (Method
       (Identifier)
     {-(Readonly)-}
diff --git a/test/fixtures/typescript/corpus/method-definition.parseA.txt b/test/fixtures/typescript/corpus/method-definition.parseA.txt
index 1845562be..3b6f80483 100644
--- a/test/fixtures/typescript/corpus/method-definition.parseA.txt
+++ b/test/fixtures/typescript/corpus/method-definition.parseA.txt
@@ -1,6 +1,6 @@
 (Statements
   (Class
-    (Identifier)
+    (TypeIdentifier)
     (Method
       (Identifier)
       (Empty)
diff --git a/test/fixtures/typescript/corpus/method-definition.parseB.txt b/test/fixtures/typescript/corpus/method-definition.parseB.txt
index 23f2869f3..5b9851206 100644
--- a/test/fixtures/typescript/corpus/method-definition.parseB.txt
+++ b/test/fixtures/typescript/corpus/method-definition.parseB.txt
@@ -1,6 +1,6 @@
 (Statements
   (Class
-    (Identifier)
+    (TypeIdentifier)
     (Method
       (Identifier)
       (Readonly)
diff --git a/test/fixtures/typescript/corpus/public-field-definition.diffA-B.txt b/test/fixtures/typescript/corpus/public-field-definition.diffA-B.txt
index ade4f7f13..2395bf5ce 100644
--- a/test/fixtures/typescript/corpus/public-field-definition.diffA-B.txt
+++ b/test/fixtures/typescript/corpus/public-field-definition.diffA-B.txt
@@ -1,6 +1,6 @@
 (Statements
   (Class
-    (Identifier)
+    (TypeIdentifier)
     (Statements
       (PublicFieldDefinition
         (Empty)
diff --git a/test/fixtures/typescript/corpus/public-field-definition.diffB-A.txt b/test/fixtures/typescript/corpus/public-field-definition.diffB-A.txt
index be620477a..2dd2b36f1 100644
--- a/test/fixtures/typescript/corpus/public-field-definition.diffB-A.txt
+++ b/test/fixtures/typescript/corpus/public-field-definition.diffB-A.txt
@@ -1,6 +1,6 @@
 (Statements
   (Class
-    (Identifier)
+    (TypeIdentifier)
     (Statements
       (PublicFieldDefinition
         (Empty)
diff --git a/test/fixtures/typescript/corpus/public-field-definition.parseA.txt b/test/fixtures/typescript/corpus/public-field-definition.parseA.txt
index c4fc6b5d6..c3db2ee25 100644
--- a/test/fixtures/typescript/corpus/public-field-definition.parseA.txt
+++ b/test/fixtures/typescript/corpus/public-field-definition.parseA.txt
@@ -1,6 +1,6 @@
 (Statements
   (Class
-    (Identifier)
+    (TypeIdentifier)
     (Statements
       (PublicFieldDefinition
         (Empty)
diff --git a/test/fixtures/typescript/corpus/public-field-definition.parseB.txt b/test/fixtures/typescript/corpus/public-field-definition.parseB.txt
index 1e58aa5c4..620212d95 100644
--- a/test/fixtures/typescript/corpus/public-field-definition.parseB.txt
+++ b/test/fixtures/typescript/corpus/public-field-definition.parseB.txt
@@ -1,6 +1,6 @@
 (Statements
   (Class
-    (Identifier)
+    (TypeIdentifier)
     (Statements
       (PublicFieldDefinition
         (Empty)