diff --git a/syntaxes/let-declaration.json b/syntaxes/let-declaration.json
index 0ce1762952..7b3b71dad1 100644
--- a/syntaxes/let-declaration.json
+++ b/syntaxes/let-declaration.json
@@ -8,13 +8,14 @@
   ],
   "repository": {
     "letDeclaration": {
+      "name": "meta.definition.variable.ng",
       "begin": "(@let)\\s+([_$[:alpha:]][_$[:alnum:]]*)\\s*(=)?",
       "beginCaptures": {
         "1": {
           "name": "storage.type.ng"
         },
         "2": {
-          "name": "meta.definition.variable.ng"
+          "name": "variable.other.constant.ng"
         },
         "3": {
           "name": "keyword.operator.assignment.ng"
@@ -25,7 +26,6 @@
           "include": "#letInitializer"
         }
       ],
-      "contentName": "meta.definition.variable.ng",
       "end": "(?<=;)"
     },
     "letInitializer": {
diff --git a/syntaxes/src/template-let-declaration.ts b/syntaxes/src/template-let-declaration.ts
index 999d49bb02..9c02412886 100644
--- a/syntaxes/src/template-let-declaration.ts
+++ b/syntaxes/src/template-let-declaration.ts
@@ -16,16 +16,16 @@ export const LetDeclaration: GrammarDefinition = {
   ],
   repository: {
     letDeclaration: {
+      name: 'meta.definition.variable.ng',
       // Equals group is optional so that we start highlighting as
       // soon as the user starts writing a valid name.
       begin: /(@let)\s+([_$[:alpha:]][_$[:alnum:]]*)\s*(=)?/,
       beginCaptures: {
         1: {name: 'storage.type.ng'},
-        2: {name: 'meta.definition.variable.ng'},
+        2: {name: 'variable.other.constant.ng'},
         3: {name: 'keyword.operator.assignment.ng'},
       },
       patterns: [{include: '#letInitializer'}],
-      contentName: 'meta.definition.variable.ng',
       end: /(?<=;)/,
     },
 
diff --git a/syntaxes/test/data/let-declaration.html.snap b/syntaxes/test/data/let-declaration.html.snap
index d44d2fc536..764fb84be1 100644
--- a/syntaxes/test/data/let-declaration.html.snap
+++ b/syntaxes/test/data/let-declaration.html.snap
@@ -1,9 +1,9 @@
 >@let basicLet = 123 + 456;
-#^^^^ template.let.ng storage.type.ng
-#    ^ template.let.ng
-#     ^^^^^^^^ template.let.ng meta.definition.variable.ng
-#             ^ template.let.ng
-#              ^ template.let.ng keyword.operator.assignment.ng
+#^^^^ template.let.ng meta.definition.variable.ng storage.type.ng
+#    ^ template.let.ng meta.definition.variable.ng
+#     ^^^^^^^^ template.let.ng meta.definition.variable.ng variable.other.constant.ng
+#             ^ template.let.ng meta.definition.variable.ng
+#              ^ template.let.ng meta.definition.variable.ng keyword.operator.assignment.ng
 #               ^ template.let.ng meta.definition.variable.ng keyword.operator.assignment.ng
 #                ^^^ template.let.ng meta.definition.variable.ng meta.definition.variable.initializer.ng constant.numeric.decimal.ts
 #                   ^ template.let.ng meta.definition.variable.ng meta.definition.variable.initializer.ng
@@ -13,37 +13,37 @@
 #                         ^ template.let.ng meta.definition.variable.ng punctuation.terminator.statement.ng
 >
 >@let noSpaceAfterEquals =true;
-#^^^^ template.let.ng storage.type.ng
-#    ^ template.let.ng
-#     ^^^^^^^^^^^^^^^^^^ template.let.ng meta.definition.variable.ng
-#                       ^ template.let.ng
-#                        ^ template.let.ng keyword.operator.assignment.ng
+#^^^^ template.let.ng meta.definition.variable.ng storage.type.ng
+#    ^ template.let.ng meta.definition.variable.ng
+#     ^^^^^^^^^^^^^^^^^^ template.let.ng meta.definition.variable.ng variable.other.constant.ng
+#                       ^ template.let.ng meta.definition.variable.ng
+#                        ^ template.let.ng meta.definition.variable.ng keyword.operator.assignment.ng
 #                         ^^^^ template.let.ng meta.definition.variable.ng meta.definition.variable.initializer.ng constant.language.boolean.true.ts
 #                             ^ template.let.ng meta.definition.variable.ng punctuation.terminator.statement.ng
 >
 >@let noSpaceBeforeEquals= true;
-#^^^^ template.let.ng storage.type.ng
-#    ^ template.let.ng
-#     ^^^^^^^^^^^^^^^^^^^ template.let.ng meta.definition.variable.ng
-#                        ^ template.let.ng keyword.operator.assignment.ng
+#^^^^ template.let.ng meta.definition.variable.ng storage.type.ng
+#    ^ template.let.ng meta.definition.variable.ng
+#     ^^^^^^^^^^^^^^^^^^^ template.let.ng meta.definition.variable.ng variable.other.constant.ng
+#                        ^ template.let.ng meta.definition.variable.ng keyword.operator.assignment.ng
 #                         ^ template.let.ng meta.definition.variable.ng keyword.operator.assignment.ng
 #                          ^^^^ template.let.ng meta.definition.variable.ng meta.definition.variable.initializer.ng constant.language.boolean.true.ts
 #                              ^ template.let.ng meta.definition.variable.ng punctuation.terminator.statement.ng
 >
 >@let noSpaceAroundEquals=true;
-#^^^^ template.let.ng storage.type.ng
-#    ^ template.let.ng
-#     ^^^^^^^^^^^^^^^^^^^ template.let.ng meta.definition.variable.ng
-#                        ^ template.let.ng keyword.operator.assignment.ng
+#^^^^ template.let.ng meta.definition.variable.ng storage.type.ng
+#    ^ template.let.ng meta.definition.variable.ng
+#     ^^^^^^^^^^^^^^^^^^^ template.let.ng meta.definition.variable.ng variable.other.constant.ng
+#                        ^ template.let.ng meta.definition.variable.ng keyword.operator.assignment.ng
 #                         ^^^^ template.let.ng meta.definition.variable.ng meta.definition.variable.initializer.ng constant.language.boolean.true.ts
 #                             ^ template.let.ng meta.definition.variable.ng punctuation.terminator.statement.ng
 >
 >@let                    lotOfSpaceAroundEquals      =            true;
-#^^^^ template.let.ng storage.type.ng
-#    ^^^^^^^^^^^^^^^^^^^^ template.let.ng
-#                        ^^^^^^^^^^^^^^^^^^^^^^ template.let.ng meta.definition.variable.ng
-#                                              ^^^^^^ template.let.ng
-#                                                    ^ template.let.ng keyword.operator.assignment.ng
+#^^^^ template.let.ng meta.definition.variable.ng storage.type.ng
+#    ^^^^^^^^^^^^^^^^^^^^ template.let.ng meta.definition.variable.ng
+#                        ^^^^^^^^^^^^^^^^^^^^^^ template.let.ng meta.definition.variable.ng variable.other.constant.ng
+#                                              ^^^^^^ template.let.ng meta.definition.variable.ng
+#                                                    ^ template.let.ng meta.definition.variable.ng keyword.operator.assignment.ng
 #                                                     ^^^^^^^^^^^^ template.let.ng meta.definition.variable.ng keyword.operator.assignment.ng
 #                                                                 ^^^^ template.let.ng meta.definition.variable.ng meta.definition.variable.initializer.ng constant.language.boolean.true.ts
 #                                                                     ^ template.let.ng meta.definition.variable.ng punctuation.terminator.statement.ng
@@ -51,9 +51,9 @@
 >@let #invalid = true;
 #^^^^^^^^^^^^^^^^^^^^^^ template.let.ng
 >@let invalidIn#TheMiddle = true;
-#^^^^ template.let.ng storage.type.ng
-#    ^ template.let.ng
-#     ^^^^^^^^^ template.let.ng meta.definition.variable.ng
+#^^^^ template.let.ng meta.definition.variable.ng storage.type.ng
+#    ^ template.let.ng meta.definition.variable.ng
+#     ^^^^^^^^^ template.let.ng meta.definition.variable.ng variable.other.constant.ng
 #              ^ template.let.ng meta.definition.variable.ng meta.definition.variable.initializer.ng
 #               ^^^^^^^^^ template.let.ng meta.definition.variable.ng meta.definition.variable.initializer.ng variable.other.readwrite.ts
 #                        ^ template.let.ng meta.definition.variable.ng meta.definition.variable.initializer.ng
@@ -65,11 +65,11 @@
 #^^^^^^^^^^^^^^^^^^^^ template.let.ng
 >
 >@let stringContainingSemicolon = 'hello ;' + 'world';
-#^^^^ template.let.ng storage.type.ng
-#    ^ template.let.ng
-#     ^^^^^^^^^^^^^^^^^^^^^^^^^ template.let.ng meta.definition.variable.ng
-#                              ^ template.let.ng
-#                               ^ template.let.ng keyword.operator.assignment.ng
+#^^^^ template.let.ng meta.definition.variable.ng storage.type.ng
+#    ^ template.let.ng meta.definition.variable.ng
+#     ^^^^^^^^^^^^^^^^^^^^^^^^^ template.let.ng meta.definition.variable.ng variable.other.constant.ng
+#                              ^ template.let.ng meta.definition.variable.ng
+#                               ^ template.let.ng meta.definition.variable.ng keyword.operator.assignment.ng
 #                                ^ template.let.ng meta.definition.variable.ng keyword.operator.assignment.ng
 #                                 ^ template.let.ng meta.definition.variable.ng meta.definition.variable.initializer.ng string.quoted.single.ts punctuation.definition.string.begin.ts
 #                                  ^^^^^^^ template.let.ng meta.definition.variable.ng meta.definition.variable.initializer.ng string.quoted.single.ts
@@ -83,11 +83,11 @@
 #                                                    ^ template.let.ng meta.definition.variable.ng punctuation.terminator.statement.ng
 >
 >@let complexExpression = something ? 123 : {prop: 'hello' + true + 'world'};
-#^^^^ template.let.ng storage.type.ng
-#    ^ template.let.ng
-#     ^^^^^^^^^^^^^^^^^ template.let.ng meta.definition.variable.ng
-#                      ^ template.let.ng
-#                       ^ template.let.ng keyword.operator.assignment.ng
+#^^^^ template.let.ng meta.definition.variable.ng storage.type.ng
+#    ^ template.let.ng meta.definition.variable.ng
+#     ^^^^^^^^^^^^^^^^^ template.let.ng meta.definition.variable.ng variable.other.constant.ng
+#                      ^ template.let.ng meta.definition.variable.ng
+#                       ^ template.let.ng meta.definition.variable.ng keyword.operator.assignment.ng
 #                        ^ template.let.ng meta.definition.variable.ng keyword.operator.assignment.ng
 #                         ^^^^^^^^^ template.let.ng meta.definition.variable.ng meta.definition.variable.initializer.ng variable.other.readwrite.ts
 #                                  ^ template.let.ng meta.definition.variable.ng meta.definition.variable.initializer.ng
@@ -116,11 +116,11 @@
 #                                                                           ^ template.let.ng meta.definition.variable.ng punctuation.terminator.statement.ng
 >
 >@let usingPipes = 123 + foo | async | multiply: 2 | separator: ';';
-#^^^^ template.let.ng storage.type.ng
-#    ^ template.let.ng
-#     ^^^^^^^^^^ template.let.ng meta.definition.variable.ng
-#               ^ template.let.ng
-#                ^ template.let.ng keyword.operator.assignment.ng
+#^^^^ template.let.ng meta.definition.variable.ng storage.type.ng
+#    ^ template.let.ng meta.definition.variable.ng
+#     ^^^^^^^^^^ template.let.ng meta.definition.variable.ng variable.other.constant.ng
+#               ^ template.let.ng meta.definition.variable.ng
+#                ^ template.let.ng meta.definition.variable.ng keyword.operator.assignment.ng
 #                 ^ template.let.ng meta.definition.variable.ng keyword.operator.assignment.ng
 #                  ^^^ template.let.ng meta.definition.variable.ng meta.definition.variable.initializer.ng constant.numeric.decimal.ts
 #                     ^ template.let.ng meta.definition.variable.ng meta.definition.variable.initializer.ng
@@ -151,11 +151,11 @@
 #^^^^^^^^^^^^^^^^^^^^^^^^^ template.let.ng
 >  @let inBlock = true;
 #^^ template.let.ng
-#  ^^^^ template.let.ng storage.type.ng
-#      ^ template.let.ng
-#       ^^^^^^^ template.let.ng meta.definition.variable.ng
-#              ^ template.let.ng
-#               ^ template.let.ng keyword.operator.assignment.ng
+#  ^^^^ template.let.ng meta.definition.variable.ng storage.type.ng
+#      ^ template.let.ng meta.definition.variable.ng
+#       ^^^^^^^ template.let.ng meta.definition.variable.ng variable.other.constant.ng
+#              ^ template.let.ng meta.definition.variable.ng
+#               ^ template.let.ng meta.definition.variable.ng keyword.operator.assignment.ng
 #                ^ template.let.ng meta.definition.variable.ng keyword.operator.assignment.ng
 #                 ^^^^ template.let.ng meta.definition.variable.ng meta.definition.variable.initializer.ng constant.language.boolean.true.ts
 #                     ^ template.let.ng meta.definition.variable.ng punctuation.terminator.statement.ng
@@ -164,11 +164,11 @@
 #^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ template.let.ng
 >    @let inNestedBlock = 123;
 #^^^^ template.let.ng
-#    ^^^^ template.let.ng storage.type.ng
-#        ^ template.let.ng
-#         ^^^^^^^^^^^^^ template.let.ng meta.definition.variable.ng
-#                      ^ template.let.ng
-#                       ^ template.let.ng keyword.operator.assignment.ng
+#    ^^^^ template.let.ng meta.definition.variable.ng storage.type.ng
+#        ^ template.let.ng meta.definition.variable.ng
+#         ^^^^^^^^^^^^^ template.let.ng meta.definition.variable.ng variable.other.constant.ng
+#                      ^ template.let.ng meta.definition.variable.ng
+#                       ^ template.let.ng meta.definition.variable.ng keyword.operator.assignment.ng
 #                        ^ template.let.ng meta.definition.variable.ng keyword.operator.assignment.ng
 #                         ^^^ template.let.ng meta.definition.variable.ng meta.definition.variable.initializer.ng constant.numeric.decimal.ts
 #                            ^ template.let.ng meta.definition.variable.ng punctuation.terminator.statement.ng
@@ -178,9 +178,9 @@
 #^^ template.let.ng
 >
 >@let noEquals
-#^^^^ template.let.ng storage.type.ng
-#    ^ template.let.ng
-#     ^^^^^^^^ template.let.ng meta.definition.variable.ng
+#^^^^ template.let.ng meta.definition.variable.ng storage.type.ng
+#    ^ template.let.ng meta.definition.variable.ng
+#     ^^^^^^^^ template.let.ng meta.definition.variable.ng variable.other.constant.ng
 >
 >@let noValue =
 #^ template.let.ng meta.definition.variable.ng meta.definition.variable.initializer.ng