diff --git a/Syntaxes/Vento.sublime-syntax b/Syntaxes/Vento.sublime-syntax
index 3953f00..9982402 100644
--- a/Syntaxes/Vento.sublime-syntax
+++ b/Syntaxes/Vento.sublime-syntax
@@ -38,7 +38,7 @@ contexts:
 
   tag:
   - match: '{{-?'
-    scope: punctuation.definition.tag.begin.vento
+    scope: punctuation.definition.embedded.begin.vento
     push:
     - match: '\s+'
     - include: tag_echo
@@ -60,20 +60,20 @@ contexts:
     - match: '(?!\s*\|>|\s*-?}})'
       push:
       - match: '-?}}'
-        scope: punctuation.definition.tag.end.vento
+        scope: punctuation.definition.embedded.end.vento
         pop: 3
       - include: scope:source.js-expression-in-vento
     - match: ''
       push:
       - match: '-?}}'
-        scope: punctuation.definition.tag.end.vento
+        scope: punctuation.definition.embedded.end.vento
         push:
         - match: '({{-?)\s*((/)echo)\s*(-?}})'
           captures:
-            1: punctuation.definition.tag.begin.vento
+            1: punctuation.definition.embedded.begin.vento
             2: keyword.declaration.echo.end.vento
             3: punctuation.section.tag.end.vento
-            4: punctuation.definition.tag.end.vento
+            4: punctuation.definition.embedded.end.vento
           pop: 4
       - include: tag_opening_end_pipeable
 
@@ -130,7 +130,7 @@ contexts:
   - match: '(?=\bimport\b)'
     push:
     - match: '-?}}'
-      scope: punctuation.definition.tag.end.vento
+      scope: punctuation.definition.embedded.end.vento
       pop: 2
     - match: ''
       push:
@@ -184,7 +184,7 @@ contexts:
 
   tag_opening_end:
   - match: '-?}}'
-    scope: punctuation.definition.tag.end.vento
+    scope: punctuation.definition.embedded.end.vento
     pop: 2
   - include: scope:source.js-expression-in-vento
 
@@ -195,7 +195,7 @@ contexts:
 
   tag_closing_end:
   - match: '-?}}'
-    scope: punctuation.definition.tag.end.vento
+    scope: punctuation.definition.embedded.end.vento
     pop: 2
   - match: '\s+'
   - match: '\S'
diff --git a/tests/syntax_test_Vento.html.vto b/tests/syntax_test_Vento.html.vto
index 9b1de1c..cf65d5c 100644
--- a/tests/syntax_test_Vento.html.vto
+++ b/tests/syntax_test_Vento.html.vto
@@ -4,45 +4,45 @@
 {{# ^^^^ text.html.vento #}}
 
     {{ if foo == 'bar' }}
-{{# ^^ punctuation.definition.tag.begin.vento #}}
+{{# ^^ punctuation.definition.embedded.begin.vento #}}
 {{#    ^^ keyword.control.conditional.if.begin.vento #}}
 {{#       ^^^^^^^^^^^^ source.js.embedded.vento #}}
-{{#                    ^^ punctuation.definition.tag.end.vento #}}
+{{#                    ^^ punctuation.definition.embedded.end.vento #}}
 
     <input {{ 'hidden' }} type="text">
 {{# ^^^^^^ text.html.vento #}}
-{{#        ^^ punctuation.definition.tag.begin.vento #}}
+{{#        ^^ punctuation.definition.embedded.begin.vento #}}
 {{#           ^^^^^^^^ source.js.embedded.vento #}}
-{{#                    ^^ punctuation.definition.tag.end.vento #}}
+{{#                    ^^ punctuation.definition.embedded.end.vento #}}
 {{#                       ^^^^^^^^^^^ meta.attribute-with-value.html #}}
 
     <input type="{{ type }}">
 {{# ^^^^^^^^^^^^^ text.html.vento #}}
-{{#              ^^ punctuation.definition.tag.begin.vento #}}
+{{#              ^^ punctuation.definition.embedded.begin.vento #}}
 {{#                 ^^^^ source.js.embedded.vento #}}
-{{#                      ^^ punctuation.definition.tag.end.vento #}}
+{{#                      ^^ punctuation.definition.embedded.end.vento #}}
 {{#                        ^^ text.html.vento #}}
 
     {{ echo }}<br>{{ /echo }}
-{{# ^^ punctuation.definition.tag.begin.vento #}}
+{{# ^^ punctuation.definition.embedded.begin.vento #}}
 {{#    ^^^^ keyword.declaration.echo.begin.vento #}}
-{{#         ^^ punctuation.definition.tag.end.vento #}}
+{{#         ^^ punctuation.definition.embedded.end.vento #}}
 {{#           ^^^^ text.html.vento -entity #}}
-{{#               ^^ punctuation.definition.tag.begin.vento #}}
+{{#               ^^ punctuation.definition.embedded.begin.vento #}}
 {{#                  ^ punctuation.section.tag.end.vento #}}
 {{#                  ^^^^^ keyword.declaration.echo.end.vento #}}
-{{#                        ^^ punctuation.definition.tag.end.vento #}}
+{{#                        ^^ punctuation.definition.embedded.end.vento #}}
 
     <!-- {{ foo }} -->
 {{# ^^^^^ comment.block.html #}}
-{{#      ^^ punctuation.definition.tag.begin.vento #}}
+{{#      ^^ punctuation.definition.embedded.begin.vento #}}
 {{#         ^^^ source.js.embedded.vento #}}
-{{#             ^^ punctuation.definition.tag.end.vento #}}
+{{#             ^^ punctuation.definition.embedded.end.vento #}}
 {{#                ^^^ comment.block.html #}}
 
     <![CDATA[foo {{ 'bar' }} baz]]>
 {{# ^^^^^^^^^^^^^ text.html.vento #}}
-{{#              ^^ punctuation.definition.tag.begin.vento #}}
+{{#              ^^ punctuation.definition.embedded.begin.vento #}}
 {{#                 ^^^^^ source.js.embedded.vento #}}
-{{#                       ^^ punctuation.definition.tag.end.vento #}}
+{{#                       ^^ punctuation.definition.embedded.end.vento #}}
 {{#                         ^^^^^^^ text.html.vento #}}
diff --git a/tests/syntax_test_Vento.txt.vto b/tests/syntax_test_Vento.txt.vto
index 1f4b825..0c91e1a 100644
--- a/tests/syntax_test_Vento.txt.vto
+++ b/tests/syntax_test_Vento.txt.vto
@@ -38,216 +38,216 @@
 {{#              ^^ punctuation.definition.code.end.vento #}}
 
     {{ echo }}{{ echo }}{{ /echo }}
-{{# ^^ punctuation.definition.tag.begin.vento #}}
+{{# ^^ punctuation.definition.embedded.begin.vento #}}
 {{#    ^^^^ keyword.declaration.echo.begin.vento #}}
-{{#         ^^ punctuation.definition.tag.end.vento #}}
+{{#         ^^ punctuation.definition.embedded.end.vento #}}
 {{#           ^^^^^^^^^^ text.plain.vento -keyword.echo.vento #}}
-{{#                     ^^ punctuation.definition.tag.begin.vento #}}
+{{#                     ^^ punctuation.definition.embedded.begin.vento #}}
 {{#                        ^ punctuation.section.tag.end.vento #}}
 {{#                        ^^^^^ keyword.declaration.echo.end.vento #}}
-{{#                              ^^ punctuation.definition.tag.end.vento #}}
+{{#                              ^^ punctuation.definition.embedded.end.vento #}}
 
     {{ echo |> foo |> bar('baz') }}{{# hello #}}{{ /echo }}
-{{# ^^ punctuation.definition.tag.begin.vento #}}
+{{# ^^ punctuation.definition.embedded.begin.vento #}}
 {{#    ^^^^ keyword.declaration.echo.begin.vento #}}
 {{#         ^^ keyword.operator.pipe.vento #}}
 {{#            ^^^ source.js.embedded.vento #}}
 {{#                ^^ keyword.operator.pipe.vento #}}
 {{#                   ^^^^^^^^^^ source.js.embedded.vento #}}
-{{#                              ^^ punctuation.definition.tag.end.vento #}}
+{{#                              ^^ punctuation.definition.embedded.end.vento #}}
 {{#                                ^^^^^^^^^^^^^ text.plain.vento -comment #}}
-{{#                                             ^^ punctuation.definition.tag.begin.vento #}}
+{{#                                             ^^ punctuation.definition.embedded.begin.vento #}}
 {{#                                                ^ punctuation.section.tag.end.vento #}}
 {{#                                                 ^^^^ keyword.declaration.echo.end.vento #}}
-{{#                                                      ^^ punctuation.definition.tag.end.vento #}}
+{{#                                                      ^^ punctuation.definition.embedded.end.vento #}}
 
     {{ echo foo + 'bar' }}{{##}}
-{{# ^^ punctuation.definition.tag.begin.vento #}}
+{{# ^^ punctuation.definition.embedded.begin.vento #}}
 {{#    ^^^^ keyword.declaration.echo.begin.vento #}}
 {{#         ^^^^^^^^^^^ source.js.embedded.vento #}}
-{{#                     ^^ punctuation.definition.tag.end.vento #}}
+{{#                     ^^ punctuation.definition.embedded.end.vento #}}
 {{#                       ^^^^^^ comment.block.vento #}}
 
     {{ export foo = 'bar' }}
-{{# ^^ punctuation.definition.tag.begin.vento #}}
+{{# ^^ punctuation.definition.embedded.begin.vento #}}
 {{#    ^^^^^^ keyword.control.export.begin.vento #}}
 {{#           ^^^^^^^^^^^ source.js.embedded.vento #}}
-{{#                       ^^ punctuation.definition.tag.end.vento #}}
+{{#                       ^^ punctuation.definition.embedded.end.vento #}}
 
     {{- export foo |> bar('baz') -}}
-{{# ^^^ punctuation.definition.tag.begin.vento #}}
+{{# ^^^ punctuation.definition.embedded.begin.vento #}}
 {{#     ^^^^^^ keyword.control.export.begin.vento #}}
 {{#            ^^^ source.js.embedded.vento #}}
 {{#                ^^ keyword.operator.pipe.vento #}}
 {{#                   ^^^^^^^^^^ source.js.embedded.vento #}}
-{{#                              ^^^ punctuation.definition.tag.end.vento #}}
+{{#                              ^^^ punctuation.definition.embedded.end.vento #}}
 
     {{ /export }}
-{{# ^^ punctuation.definition.tag.begin.vento #}}
+{{# ^^ punctuation.definition.embedded.begin.vento #}}
 {{#    ^ punctuation.section.tag.end.vento #}}
 {{#    ^^^^^^^ keyword.control.export.end.vento #}}
-{{#            ^^ punctuation.definition.tag.end.vento #}}
+{{#            ^^ punctuation.definition.embedded.end.vento #}}
 
     {{ export async function foo(bar = 'baz') }}
-{{# ^^ punctuation.definition.tag.begin.vento #}}
+{{# ^^ punctuation.definition.embedded.begin.vento #}}
 {{#    ^^^^^^ keyword.control.export.begin.vento #}}
 {{#           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.js.embedded.vento #}}
-{{#                                           ^^ punctuation.definition.tag.end.vento #}}
+{{#                                           ^^ punctuation.definition.embedded.end.vento #}}
 
     {{ bar }}{{- /export -}}
-{{# ^^ punctuation.definition.tag.begin.vento #}}
+{{# ^^ punctuation.definition.embedded.begin.vento #}}
 {{#    ^^^ source.js.embedded.vento #}}
-{{#        ^^ punctuation.definition.tag.end.vento #}}
-{{#          ^^^ punctuation.definition.tag.begin.vento #}}
+{{#        ^^ punctuation.definition.embedded.end.vento #}}
+{{#          ^^^ punctuation.definition.embedded.begin.vento #}}
 {{#              ^ punctuation.section.tag.end.vento #}}
 {{#              ^^^^^^^ keyword.control.export.end.vento #}}
-{{#                      ^^^ punctuation.definition.tag.end.vento #}}
+{{#                      ^^^ punctuation.definition.embedded.end.vento #}}
 
     {{ for [{foo: [bar = 'of }}']}] of [[{foo: ['}}']}]] }}
-{{# ^^ punctuation.definition.tag.begin.vento #}}
+{{# ^^ punctuation.definition.embedded.begin.vento #}}
 {{#    ^^^ keyword.control.loop.for.begin.vento #}}
 {{#        ^^^^^^^^^^^^^^^^^^^^^^^^ source.js.embedded.vento #}}
 {{#                                 ^^ keyword.operator.word #}}
 {{#                                    ^^^^^^^^^^^^^^^^^ source.js.embedded.vento #}}
-{{#                                                      ^^ punctuation.definition.tag.end.vento #}}
+{{#                                                      ^^ punctuation.definition.embedded.end.vento #}}
 
     {{ /for }}
-{{# ^^ punctuation.definition.tag.begin.vento #}}
+{{# ^^ punctuation.definition.embedded.begin.vento #}}
 {{#    ^ punctuation.section.tag.end.vento #}}
 {{#    ^^^^ keyword.control.loop.for.end.vento #}}
-{{#         ^^ punctuation.definition.tag.end.vento #}}
+{{#         ^^ punctuation.definition.embedded.end.vento #}}
 
     {{- async function foo -}}
-{{# ^^^ punctuation.definition.tag.begin.vento #}}
+{{# ^^^ punctuation.definition.embedded.begin.vento #}}
 {{#     ^^^^^^^^^^^^^^^^^^ source.js.embedded.vento #}}
-{{#                        ^^^ punctuation.definition.tag.end.vento #}}
+{{#                        ^^^ punctuation.definition.embedded.end.vento #}}
 
     {{- /function -}}
-{{# ^^^ punctuation.definition.tag.begin.vento #}}
+{{# ^^^ punctuation.definition.embedded.begin.vento #}}
 {{#     ^ punctuation.section.tag.end.vento #}}
 {{#     ^^^^^^^^^ keyword.declaration.function.end.vento #}}
-{{#               ^^^ punctuation.definition.tag.end.vento #}}
+{{#               ^^^ punctuation.definition.embedded.end.vento #}}
 
     {{ function foo(bar = 'baz') }}{{ /function }}
-{{# ^^ punctuation.definition.tag.begin.vento #}}
+{{# ^^ punctuation.definition.embedded.begin.vento #}}
 {{#    ^^^^^^^^^^^^^^^^^^^^^^^^^ source.js.embedded.vento #}}
-{{#                              ^^ punctuation.definition.tag.end.vento #}}
+{{#                              ^^ punctuation.definition.embedded.end.vento #}}
 
     {{ if foo == 'bar' }}
-{{# ^^ punctuation.definition.tag.begin.vento #}}
+{{# ^^ punctuation.definition.embedded.begin.vento #}}
 {{#    ^^ keyword.control.conditional.if.begin.vento #}}
 {{#       ^^^^^^^^^^^^ source.js.embedded.vento #}}
-{{#                    ^^ punctuation.definition.tag.end.vento #}}
+{{#                    ^^ punctuation.definition.embedded.end.vento #}}
 
     {{- else if(bar == 'baz') -}}
-{{# ^^^ punctuation.definition.tag.begin.vento #}}
+{{# ^^^ punctuation.definition.embedded.begin.vento #}}
 {{#     ^^^^^^^ keyword.control.conditional.elseif.vento #}}
 {{#             ^^^^^^^^^^^^^ source.js.embedded.vento #}}
-{{#                           ^^^ punctuation.definition.tag.end.vento #}}
+{{#                           ^^^ punctuation.definition.embedded.end.vento #}}
 
     {{ else -}}
-{{# ^^ punctuation.definition.tag.begin.vento #}}
+{{# ^^ punctuation.definition.embedded.begin.vento #}}
 {{#    ^^^^ keyword.control.conditional.else.vento #}}
-{{#         ^^^ punctuation.definition.tag.end.vento #}}
+{{#         ^^^ punctuation.definition.embedded.end.vento #}}
 
     {{ /if }}
-{{# ^^ punctuation.definition.tag.begin.vento #}}
+{{# ^^ punctuation.definition.embedded.begin.vento #}}
 {{#    ^ punctuation.section.tag.end.vento #}}
 {{#    ^^^ keyword.control.conditional.if.end.vento #}}
-{{#        ^^ punctuation.definition.tag.end.vento #}}
+{{#        ^^ punctuation.definition.embedded.end.vento #}}
 
     {{ import { default as foo } from './bar.vto' }}
-{{# ^^ punctuation.definition.tag.begin.vento #}}
+{{# ^^ punctuation.definition.embedded.begin.vento #}}
 {{#    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.js.embedded.vento #}}
-{{#                                               ^^ punctuation.definition.tag.end.vento #}}
+{{#                                               ^^ punctuation.definition.embedded.end.vento #}}
 
     {{- import foo from './bar.vto' -}}
-{{# ^^^ punctuation.definition.tag.begin.vento #}}
+{{# ^^^ punctuation.definition.embedded.begin.vento #}}
 {{#     ^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.js.embedded.vento #}}
-{{#                                 ^^^ punctuation.definition.tag.end.vento #}}
+{{#                                 ^^^ punctuation.definition.embedded.end.vento #}}
 
     {{ include 'foo.vto' { bar: 'baz' } }}
-{{# ^^ punctuation.definition.tag.begin.vento #}}
+{{# ^^ punctuation.definition.embedded.begin.vento #}}
 {{#    ^^^^^^^ keyword.control.include.vento #}}
 {{#            ^^^^^^^^^^^^^^^^^^^^^^^^ source.js.embedded.vento #}}
-{{#                                     ^^ punctuation.definition.tag.end.vento #}}
+{{#                                     ^^ punctuation.definition.embedded.end.vento #}}
 
     {{ include `${foo}.vto` |> bar() }}
-{{# ^^ punctuation.definition.tag.begin.vento #}}
+{{# ^^ punctuation.definition.embedded.begin.vento #}}
 {{#    ^^^^^^^ keyword.control.include.vento #}}
 {{#            ^^^^^^^^^^^^ source.js.embedded.vento #}}
 {{#                         ^^ keyword.operator.pipe.vento #}}
 {{#                            ^^^^^ source.js.embedded.vento #}}
-{{#                                  ^^ punctuation.definition.tag.end.vento #}}
+{{#                                  ^^ punctuation.definition.embedded.end.vento #}}
 
     {{ layout 'foo.vto' { bar: 'baz'} }}
-{{# ^^ punctuation.definition.tag.begin.vento #}}
+{{# ^^ punctuation.definition.embedded.begin.vento #}}
 {{#    ^^^^^^ keyword.control.layout.begin.vento #}}
 {{#           ^^^^^^^^^^^^^^^^^^^^^^^ source.js.embedded.vento #}}
-{{#                                   ^^ punctuation.definition.tag.end.vento #}}
+{{#                                   ^^ punctuation.definition.embedded.end.vento #}}
 
     {{ /layout }}
-{{# ^^ punctuation.definition.tag.begin.vento #}}
+{{# ^^ punctuation.definition.embedded.begin.vento #}}
 {{#    ^ punctuation.section.tag.end.vento #}}
 {{#    ^^^^^^^ keyword.control.layout.end.vento #}}
-{{#            ^^ punctuation.definition.tag.end.vento #}}
+{{#            ^^ punctuation.definition.embedded.end.vento #}}
 
     {{- layout 'foo.vto' |> bar() -}}
-{{# ^^^ punctuation.definition.tag.begin.vento #}}
+{{# ^^^ punctuation.definition.embedded.begin.vento #}}
 {{#     ^^^^^^ keyword.control.layout.begin.vento #}}
 {{#            ^^^^^^^^^ source.js.embedded.vento #}}
 {{#                      ^^ keyword.operator.pipe.vento #}}
 {{#                         ^^^^^ source.js.embedded.vento #}}
-{{#                               ^^^ punctuation.definition.tag.end.vento #}}
+{{#                               ^^^ punctuation.definition.embedded.end.vento #}}
 
     {{- /layout -}}
-{{# ^^^ punctuation.definition.tag.begin.vento #}}
+{{# ^^^ punctuation.definition.embedded.begin.vento #}}
 {{#     ^ punctuation.section.tag.end.vento #}}
 {{#     ^^^^^^^ keyword.control.layout.end.vento #}}
-{{#             ^^^ punctuation.definition.tag.end.vento #}}
+{{#             ^^^ punctuation.definition.embedded.end.vento #}}
 
     {{ set foo = 'bar' |> baz() }}
-{{# ^^ punctuation.definition.tag.begin.vento #}}
+{{# ^^ punctuation.definition.embedded.begin.vento #}}
 {{#    ^^^ keyword.declaration.set.begin.vento #}}
 {{#        ^^^^^^^^^^^ source.js.embedded.vento #}}
 {{#                    ^^ keyword.operator.pipe.vento #}}
 {{#                       ^^^^^ source.js.embedded.vento #}}
-{{#                             ^^ punctuation.definition.tag.end.vento #}}
+{{#                             ^^ punctuation.definition.embedded.end.vento #}}
 
     {{- set foo |> bar() -}}
-{{# ^^^ punctuation.definition.tag.begin.vento #}}
+{{# ^^^ punctuation.definition.embedded.begin.vento #}}
 {{#     ^^^ keyword.declaration.set.begin.vento #}}
 {{#         ^^^ source.js.embedded.vento #}}
 {{#             ^^ keyword.operator.pipe.vento #}}
 {{#                ^^^^^ source.js.embedded.vento #}}
-{{#                      ^^^ punctuation.definition.tag.end.vento #}}
+{{#                      ^^^ punctuation.definition.embedded.end.vento #}}
 
     {{- /set -}}
-{{# ^^^ punctuation.definition.tag.begin.vento #}}
+{{# ^^^ punctuation.definition.embedded.begin.vento #}}
 {{#     ^ punctuation.section.tag.end.vento #}}
 {{#     ^^^^ keyword.declaration.set.end.vento #}}
-{{#          ^^^ punctuation.definition.tag.end.vento #}}
+{{#          ^^^ punctuation.definition.embedded.end.vento #}}
 
     {{ 'foo' |> bar() }}
-{{# ^^ punctuation.definition.tag.begin.vento #}}
+{{# ^^ punctuation.definition.embedded.begin.vento #}}
 {{#    ^^^^^ source.js.embedded.vento #}}
 {{#          ^^ keyword.operator.pipe.vento #}}
 {{#             ^^^^^ source.js.embedded.vento #}}
-{{#                   ^^ punctuation.definition.tag.end.vento #}}
+{{#                   ^^ punctuation.definition.embedded.end.vento #}}
 
     {{- await fetchThing() |> safe -}}
-{{# ^^^ punctuation.definition.tag.begin.vento #}}
+{{# ^^^ punctuation.definition.embedded.begin.vento #}}
 {{#     ^^^^^^^^^^^^^^^^^^ source.js.embedded.vento #}}
 {{#                        ^^ keyword.operator.pipe.vento #}}
 {{#                           ^^^^ source.js.embedded.vento #}}
-{{#                                ^^^ punctuation.definition.tag.end.vento #}}
+{{#                                ^^^ punctuation.definition.embedded.end.vento #}}
 
     {{ __defaults + __env }}
-{{# ^^ punctuation.definition.tag.begin.vento #}}
+{{# ^^ punctuation.definition.embedded.begin.vento #}}
 {{#    ^^^^^^^^^^^^^^^^^ source.js.embedded.vento #}}
 {{#    ^^^^^^^^^^ invalid.illegal.reserved.vento #}}
 {{#                 ^^^^^ invalid.illegal.reserved.vento #}}
-{{#                       ^^ punctuation.definition.tag.end.vento #}}
+{{#                       ^^ punctuation.definition.embedded.end.vento #}}
 
     {{> __exports = 'foo' }}
 {{# ^^^ punctuation.definition.code.begin.vento #}}
@@ -256,22 +256,22 @@
 {{#                       ^^ punctuation.definition.code.end.vento #}}
 
     {{ /if x {{##}}
-{{# ^^ punctuation.definition.tag.begin.vento #}}
+{{# ^^ punctuation.definition.embedded.begin.vento #}}
 {{#    ^ punctuation.section.tag.end.vento #}}
 {{#    ^^^ keyword.control.conditional.if.end.vento #}}
 {{#        ^ invalid.illegal.garbage.vento #}}
 {{#          ^^^^^^ comment.block.vento #}}
 
     {{ foo bar |> baz }}
-{{# ^^ punctuation.definition.tag.begin.vento #}}
+{{# ^^ punctuation.definition.embedded.begin.vento #}}
 {{#    ^^^ keyword.control.unknown.begin.vento #}}
 {{#        ^^^ source.js.embedded.vento #}}
 {{#            ^^ keyword.operator.pipe.vento #}}
 {{#               ^^^ source.js.embedded.vento #}}
-{{#                   ^^ punctuation.definition.tag.end.vento #}}
+{{#                   ^^ punctuation.definition.embedded.end.vento #}}
 
     {{ /foo }}
-{{# ^^ punctuation.definition.tag.begin.vento #}}
+{{# ^^ punctuation.definition.embedded.begin.vento #}}
 {{#    ^ punctuation.section.tag.end.vento #}}
 {{#    ^^^^ keyword.control.unknown.end.vento #}}
-{{#         ^^ punctuation.definition.tag.end.vento #}}
+{{#         ^^ punctuation.definition.embedded.end.vento #}}