diff --git a/docs/examples/comments.yml b/docs/examples/comments.yml
index 6264d7e..72b151e 100644
--- a/docs/examples/comments.yml
+++ b/docs/examples/comments.yml
@@ -3,7 +3,7 @@ cases:
     mdast:
       type: root
       children:
-        - type: comment
+        - type: mystComment
           value: A comment
     myst: |-
       % A comment
@@ -18,7 +18,7 @@ cases:
           children:
             - type: text
               value: Something
-        - type: comment
+        - type: mystComment
           value: A comment
         - type: paragraph
           children:
@@ -39,7 +39,7 @@ cases:
           children:
             - type: text
               value: Something
-        - type: comment
+        - type: mystComment
           value: A comment --> <script>
         - type: paragraph
           children:
diff --git a/docs/examples/references.headings.yml b/docs/examples/references.headings.yml
index c8a2acf..834608c 100644
--- a/docs/examples/references.headings.yml
+++ b/docs/examples/references.headings.yml
@@ -15,8 +15,7 @@ cases:
                   kind: ref
                   identifier: my_id
                   label: my_id
-        - type: target
-          identifier: my_id
+        - type: mystTarget
           label: my_id
         - type: heading
           depth: 1
@@ -54,8 +53,7 @@ cases:
                   children:
                     - type: text
                       value: something...
-        - type: target
-          identifier: my_id
+        - type: mystTarget
           label: my_id
         - type: heading
           depth: 1
@@ -81,8 +79,7 @@ cases:
             - type: link
               url: my_id
               children: []
-        - type: target
-          identifier: my_id
+        - type: mystTarget
           label: my_id
         - type: heading
           depth: 1
@@ -115,8 +112,7 @@ cases:
               children:
                 - type: text
                   value: something...
-        - type: target
-          identifier: my_id
+        - type: mystTarget
           label: my_id
         - type: heading
           depth: 1
diff --git a/docs/examples/references.target.yml b/docs/examples/references.target.yml
index 775192f..b50662f 100644
--- a/docs/examples/references.target.yml
+++ b/docs/examples/references.target.yml
@@ -4,8 +4,7 @@ cases:
     mdast:
       type: root
       children:
-        - type: target
-          identifier: my_id
+        - type: mystTarget
           label: my_ID
         - type: heading
           depth: 1
diff --git a/schema/comments.schema.json b/schema/comments.schema.json
index a2b265d..e51bf24 100644
--- a/schema/comments.schema.json
+++ b/schema/comments.schema.json
@@ -10,7 +10,7 @@
         {
           "properties": {
             "type": {
-              "const": "comment"
+              "const": "mystComment"
             },
             "value": {},
             "position": {},
diff --git a/schema/references.schema.json b/schema/references.schema.json
index cd93cf2..7a613dd 100644
--- a/schema/references.schema.json
+++ b/schema/references.schema.json
@@ -10,17 +10,18 @@
         {
           "properties": {
             "type": {
-              "const": "target"
+              "const": "mystTarget"
+            },
+            "label": {
+              "description": "unresolved target label",
+              "type": "string"
             },
-            "identifier": {},
-            "label": {},
             "position": {},
             "data": {}
           },
           "additionalProperties": false
         },
-        { "$ref": "unist.schema.json#/$defs/Node" },
-        { "$ref": "commonmark.schema.json#/$defs/Association" }
+        { "$ref": "unist.schema.json#/$defs/Node" }
       ]
     },
     "CrossReference": {