diff --git a/TypeScript.YAML-tmTheme b/TypeScript.YAML-tmTheme
index 2d99c80..dd52d06 100644
--- a/TypeScript.YAML-tmTheme
+++ b/TypeScript.YAML-tmTheme
@@ -32,10 +32,8 @@ settings:
   settings: { vsclassificationtype: comment }
 - scope: comment.block.documentation.ts, other.meta.jsdoc, other.description.jsdoc
   settings: { vsclassificationtype: comment }
-- scope: entity.name.type.instance.jsdoc, variable.other.jsdoc
+- scope: entity.name.type.instance.jsdoc
   settings: { vsclassificationtype: identifier }
-- scope: storage.type.class.jsdoc
-  settings: { vsclassificationtype: xml doc comment - name }
 
 - scope: entity.name.type.class.ts
   settings: { vsclassificationtype: class name }
@@ -56,7 +54,7 @@ settings:
 - scope: constant.language.undefined.ts, variable.language.arguments.ts, support.type.object
   settings: { vsclassificationtype: identifier }
 
-- scope: entity.name.tag
+- scope: entity.name.tag.inline, entity.name.tag.directive
   settings: { vsclassificationtype: HTML Element Name }
 
 - scope: entity.other.attribute-name
diff --git a/TypeScript.tmTheme b/TypeScript.tmTheme
index 415c0dc..60535aa 100644
--- a/TypeScript.tmTheme
+++ b/TypeScript.tmTheme
@@ -109,22 +109,13 @@
       </dict>
       <dict>
         <key>scope</key>
-        <string>entity.name.type.instance.jsdoc, variable.other.jsdoc</string>
+        <string>entity.name.type.instance.jsdoc</string>
         <key>settings</key>
         <dict>
           <key>vsclassificationtype</key>
           <string>identifier</string>
         </dict>
       </dict>
-      <dict>
-        <key>scope</key>
-        <string>storage.type.class.jsdoc</string>
-        <key>settings</key>
-        <dict>
-          <key>vsclassificationtype</key>
-          <string>xml doc comment - name</string>
-        </dict>
-      </dict>
       <dict>
         <key>scope</key>
         <string>entity.name.type.class.ts</string>
@@ -190,7 +181,7 @@
       </dict>
       <dict>
         <key>scope</key>
-        <string>entity.name.tag</string>
+        <string>entity.name.tag.inline, entity.name.tag.directive</string>
         <key>settings</key>
         <dict>
           <key>vsclassificationtype</key>
diff --git a/TypeScriptReact.tmTheme b/TypeScriptReact.tmTheme
index 6d9d572..bc565a8 100644
--- a/TypeScriptReact.tmTheme
+++ b/TypeScriptReact.tmTheme
@@ -109,22 +109,13 @@
       </dict>
       <dict>
         <key>scope</key>
-        <string>entity.name.type.instance.jsdoc, variable.other.jsdoc</string>
+        <string>entity.name.type.instance.jsdoc</string>
         <key>settings</key>
         <dict>
           <key>vsclassificationtype</key>
           <string>identifier</string>
         </dict>
       </dict>
-      <dict>
-        <key>scope</key>
-        <string>storage.type.class.jsdoc</string>
-        <key>settings</key>
-        <dict>
-          <key>vsclassificationtype</key>
-          <string>xml doc comment - name</string>
-        </dict>
-      </dict>
       <dict>
         <key>scope</key>
         <string>entity.name.type.class.tsx</string>
@@ -190,7 +181,7 @@
       </dict>
       <dict>
         <key>scope</key>
-        <string>entity.name.tag</string>
+        <string>entity.name.tag.inline, entity.name.tag.directive</string>
         <key>settings</key>
         <dict>
           <key>vsclassificationtype</key>