[ruby/prism] Change ConstantPathNode#child to ConstantPathNode#{name,name_loc}

This has been requested for a long time, and I'm finally doing it
now. Unfortunately this is a breaking change for all of the APIs.

I've added in a Ruby method for `#child` that is deprecated so that
existing usage doesn't break, but for everyone else this is going
to be a bit of a pain.

https://github.com/ruby/prism/commit/9cbe74464e

41 files changed, 335 insertions, 396 deletions

diff --git a/lib/prism/node_ext.rb b/lib/prism/node_ext.rb
index 8674544065..10fc1decbf 100644
--- a/lib/prism/node_ext.rb
+++ b/lib/prism/node_ext.rb
@@ -143,11 +143,12 @@ module Prism
       current = self #: node?
 
       while current.is_a?(ConstantPathNode)
-        child = current.child
-        if child.is_a?(MissingNode)
+        name = current.name
+        if name.nil?
           raise MissingNodesInConstantPathError, "Constant path contains missing nodes. Cannot compute full name"
         end
-        parts.unshift(child.name)
+
+        parts.unshift(name)
         current = current.parent
       end
 
@@ -162,6 +163,20 @@ module Prism
     def full_name
       full_name_parts.join("::")
     end
+
+    # Previously, we had a child node on this class that contained either a
+    # constant read or a missing node. To not cause a breaking change, we
+    # continue to supply that API.
+    def child
+      warn(<<~MSG, category: :deprecated)
+        DEPRECATED: ConstantPathNode#child is deprecated and will be removed \
+        in the next major version. Use \
+        ConstantPathNode#name/ConstantPathNode#name_loc instead. Called from \
+        #{caller(1..1).first}.
+      MSG
+
+      name ? ConstantReadNode.new(source, name, name_loc) : MissingNode.new(source, location)
+    end
   end
 
   class ConstantPathTargetNode < Node
@@ -179,17 +194,31 @@ module Prism
           raise ConstantPathNode::DynamicPartsInConstantPathError, "Constant target path contains dynamic parts. Cannot compute full name"
         end
 
-      if child.is_a?(MissingNode)
+      if name.nil?
         raise ConstantPathNode::MissingNodesInConstantPathError, "Constant target path contains missing nodes. Cannot compute full name"
       end
 
-      parts.push(child.name)
+      parts.push(name)
     end
 
     # Returns the full name of this constant path. For example: "Foo::Bar"
     def full_name
       full_name_parts.join("::")
     end
+
+    # Previously, we had a child node on this class that contained either a
+    # constant read or a missing node. To not cause a breaking change, we
+    # continue to supply that API.
+    def child
+      warn(<<~MSG, category: :deprecated)
+        DEPRECATED: ConstantPathTargetNode#child is deprecated and will be \
+        removed in the next major version. Use \
+        ConstantPathTargetNode#name/ConstantPathTargetNode#name_loc instead. \
+        Called from #{caller(1..1).first}.
+      MSG
+
+      name ? ConstantReadNode.new(source, name, name_loc) : MissingNode.new(source, location)
+    end
   end
 
   class ConstantTargetNode < Node
diff --git a/lib/prism/pattern.rb b/lib/prism/pattern.rb
index e12cfd597f..91b23afe3e 100644
--- a/lib/prism/pattern.rb
+++ b/lib/prism/pattern.rb
@@ -149,7 +149,7 @@ module Prism
       parent = node.parent
 
       if parent.is_a?(ConstantReadNode) && parent.slice == "Prism"
-        compile_node(node.child)
+        compile_constant_name(node, node.name)
       else
         compile_error(node)
       end
@@ -158,14 +158,17 @@ module Prism
     # in ConstantReadNode
     # in String
     def compile_constant_read_node(node)
-      value = node.slice
+      compile_constant_name(node, node.name)
+    end
 
-      if Prism.const_defined?(value, false)
-        clazz = Prism.const_get(value)
+    # Compile a name associated with a constant.
+    def compile_constant_name(node, name)
+      if Prism.const_defined?(name, false)
+        clazz = Prism.const_get(name)
 
         ->(other) { clazz === other }
-      elsif Object.const_defined?(value, false)
-        clazz = Object.const_get(value)
+      elsif Object.const_defined?(name, false)
+        clazz = Object.const_get(name)
 
         ->(other) { clazz === other }
       else
diff --git a/lib/prism/translation/parser/compiler.rb b/lib/prism/translation/parser/compiler.rb
index a4aaa41d6f..c311613388 100644
--- a/lib/prism/translation/parser/compiler.rb
+++ b/lib/prism/translation/parser/compiler.rb
@@ -483,13 +483,13 @@ module Prism
           if node.parent.nil?
             builder.const_global(
               token(node.delimiter_loc),
-              [node.child.name, srange(node.child.location)]
+              [node.name, srange(node.name_loc)]
             )
           else
             builder.const_fetch(
               visit(node.parent),
               token(node.delimiter_loc),
-              [node.child.name, srange(node.child.location)]
+              [node.name, srange(node.name_loc)]
             )
           end
         end
diff --git a/lib/prism/translation/ripper.rb b/lib/prism/translation/ripper.rb
index 4e3b1b74fd..5cb6f6715d 100644
--- a/lib/prism/translation/ripper.rb
+++ b/lib/prism/translation/ripper.rb
@@ -1456,16 +1456,16 @@ module Prism
       # ^^^^^^^^
       def visit_constant_path_node(node)
         if node.parent.nil?
-          bounds(node.child.location)
-          child = on_const(node.child.name.to_s)
+          bounds(node.name_loc)
+          child = on_const(node.name.to_s)
 
           bounds(node.location)
           on_top_const_ref(child)
         else
           parent = visit(node.parent)
 
-          bounds(node.child.location)
-          child = on_const(node.child.name.to_s)
+          bounds(node.name_loc)
+          child = on_const(node.name.to_s)
 
           bounds(node.location)
           on_const_path_ref(parent, child)
diff --git a/lib/prism/translation/ruby_parser.rb b/lib/prism/translation/ruby_parser.rb
index f0a3bdd607..c6f741c8e5 100644
--- a/lib/prism/translation/ruby_parser.rb
+++ b/lib/prism/translation/ruby_parser.rb
@@ -442,9 +442,9 @@ module Prism
         # ^^^^^^^^
         def visit_constant_path_node(node)
           if node.parent.nil?
-            s(node, :colon3, node.child.name)
+            s(node, :colon3, node.name)
           else
-            s(node, :colon2, visit(node.parent), node.child.name)
+            s(node, :colon2, visit(node.parent), node.name)
           end
         end
 
diff --git a/prism/config.yml b/prism/config.yml
index c9045d7707..9ef9eddce3 100644
--- a/prism/config.yml
+++ b/prism/config.yml
@@ -1520,23 +1520,9 @@ nodes:
 
               a.b::C
               ^^^
-      - name: child
-        type: node
-        kind:
-          - ConstantReadNode
-          - MissingNode
-        comment: |
-          The right-hand node of the path. Always a `ConstantReadNode` in a
-          valid Ruby syntax tree.
-
-              ::Foo
-                ^^^
-
-              self::Test
-                    ^^^^
-
-              a.b::C
-                   ^
+      - name: name
+        type: constant?
+        comment: The name of the constant being accessed. This could be `nil` in the event of a syntax error.
       - name: delimiter_loc
         type: location
         comment: |
@@ -1547,6 +1533,16 @@ nodes:
 
               One::Two
                  ^^
+      - name: name_loc
+        type: location
+        comment: |
+          The location of the name of the constant.
+
+              ::Foo
+                ^^^
+
+              One::Two
+                   ^^^
     comment: |
       Represents accessing a constant through a path of `::` operators.
 
@@ -1586,13 +1582,12 @@ nodes:
     fields:
       - name: parent
         type: node?
-      - name: child
-        type: node
-        kind:
-          - ConstantReadNode
-          - MissingNode
+      - name: name
+        type: constant?
       - name: delimiter_loc
         type: location
+      - name: name_loc
+        type: location
     comment: |
       Represents writing to a constant path in a context that doesn't have an explicit value.
 
diff --git a/prism/prism.c b/prism/prism.c
index 152e42a574..16422dc67e 100644
--- a/prism/prism.c
+++ b/prism/prism.c
@@ -3530,22 +3530,27 @@ pm_constant_path_or_write_node_create(pm_parser_t *parser, pm_constant_path_node
  * Allocate and initialize a new ConstantPathNode node.
  */
 static pm_constant_path_node_t *
-pm_constant_path_node_create(pm_parser_t *parser, pm_node_t *parent, const pm_token_t *delimiter, pm_node_t *child) {
+pm_constant_path_node_create(pm_parser_t *parser, pm_node_t *parent, const pm_token_t *delimiter, const pm_token_t *name_token) {
     pm_assert_value_expression(parser, parent);
-
     pm_constant_path_node_t *node = PM_ALLOC_NODE(parser, pm_constant_path_node_t);
 
+    pm_constant_id_t name = PM_CONSTANT_ID_UNSET;
+    if (name_token->type == PM_TOKEN_CONSTANT) {
+        name = pm_parser_constant_id_token(parser, name_token);
+    }
+
     *node = (pm_constant_path_node_t) {
         {
             .type = PM_CONSTANT_PATH_NODE,
             .location = {
                 .start = parent == NULL ? delimiter->start : parent->location.start,
-                .end = child->location.end
+                .end = name_token->end
             },
         },
         .parent = parent,
-        .child = child,
-        .delimiter_loc = PM_LOCATION_TOKEN_VALUE(delimiter)
+        .name = name,
+        .delimiter_loc = PM_LOCATION_TOKEN_VALUE(delimiter),
+        .name_loc = PM_LOCATION_TOKEN_VALUE(name_token)
     };
 
     return node;
@@ -15823,9 +15828,7 @@ parse_pattern_constant_path(pm_parser_t *parser, pm_constant_id_list_t *captures
     while (accept1(parser, PM_TOKEN_COLON_COLON)) {
         pm_token_t delimiter = parser->previous;
         expect1(parser, PM_TOKEN_CONSTANT, PM_ERR_CONSTANT_PATH_COLON_COLON_CONSTANT);
-
-        pm_node_t *child = (pm_node_t *) pm_constant_read_node_create(parser, &parser->previous);
-        node = (pm_node_t *) pm_constant_path_node_create(parser, node, &delimiter, child);
+        node = (pm_node_t *) pm_constant_path_node_create(parser, node, &delimiter, &parser->previous);
     }
 
     // If there is a [ or ( that follows, then this is part of a larger pattern
@@ -16404,8 +16407,7 @@ parse_pattern_primitive(pm_parser_t *parser, pm_constant_id_list_t *captures, pm
             parser_lex(parser);
 
             expect1(parser, PM_TOKEN_CONSTANT, PM_ERR_CONSTANT_PATH_COLON_COLON_CONSTANT);
-            pm_node_t *child = (pm_node_t *) pm_constant_read_node_create(parser, &parser->previous);
-            pm_constant_path_node_t *node = pm_constant_path_node_create(parser, NULL, &delimiter, child);
+            pm_constant_path_node_t *node = pm_constant_path_node_create(parser, NULL, &delimiter, &parser->previous);
 
             return parse_pattern_constant_path(parser, captures, (pm_node_t *) node);
         }
@@ -17379,12 +17381,10 @@ parse_expression_prefix(pm_parser_t *parser, pm_binding_power_t binding_power, b
         }
         case PM_TOKEN_UCOLON_COLON: {
             parser_lex(parser);
-
             pm_token_t delimiter = parser->previous;
-            expect1(parser, PM_TOKEN_CONSTANT, PM_ERR_CONSTANT_PATH_COLON_COLON_CONSTANT);
 
-            pm_node_t *constant = (pm_node_t *) pm_constant_read_node_create(parser, &parser->previous);
-            pm_node_t *node = (pm_node_t *)pm_constant_path_node_create(parser, NULL, &delimiter, constant);
+            expect1(parser, PM_TOKEN_CONSTANT, PM_ERR_CONSTANT_PATH_COLON_COLON_CONSTANT);
+            pm_node_t *node = (pm_node_t *) pm_constant_path_node_create(parser, NULL, &delimiter, &parser->previous);
 
             if ((binding_power == PM_BINDING_POWER_STATEMENT) && match1(parser, PM_TOKEN_COMMA)) {
                 node = parse_targets_validate(parser, node, PM_BINDING_POWER_INDEX);
@@ -18642,9 +18642,7 @@ parse_expression_prefix(pm_parser_t *parser, pm_binding_power_t binding_power, b
                 pm_token_t double_colon = parser->previous;
 
                 expect1(parser, PM_TOKEN_CONSTANT, PM_ERR_CONSTANT_PATH_COLON_COLON_CONSTANT);
-                pm_node_t *constant = (pm_node_t *) pm_constant_read_node_create(parser, &parser->previous);
-
-                constant_path = (pm_node_t *) pm_constant_path_node_create(parser, constant_path, &double_colon, constant);
+                constant_path = (pm_node_t *) pm_constant_path_node_create(parser, constant_path, &double_colon, &parser->previous);
             }
 
             // Here we retrieve the name of the module. If it wasn't a constant,
@@ -20442,8 +20440,7 @@ parse_expression_infix(pm_parser_t *parser, pm_node_t *node, pm_binding_power_t
                         path = (pm_node_t *) pm_call_node_call_create(parser, node, &delimiter, &message, &arguments);
                     } else {
                         // Otherwise, this is a constant path. That would look like Foo::Bar.
-                        pm_node_t *child = (pm_node_t *) pm_constant_read_node_create(parser, &parser->previous);
-                        path = (pm_node_t *)pm_constant_path_node_create(parser, node, &delimiter, child);
+                        path = (pm_node_t *) pm_constant_path_node_create(parser, node, &delimiter, &parser->previous);
                     }
 
                     // If this is followed by a comma then it is a multiple assignment.
@@ -20482,9 +20479,8 @@ parse_expression_infix(pm_parser_t *parser, pm_node_t *node, pm_binding_power_t
                     return (pm_node_t *) pm_call_node_shorthand_create(parser, node, &delimiter, &arguments);
                 }
                 default: {
-                    pm_parser_err_token(parser, &delimiter, PM_ERR_CONSTANT_PATH_COLON_COLON_CONSTANT);
-                    pm_node_t *child = (pm_node_t *) pm_missing_node_create(parser, delimiter.start, delimiter.end);
-                    return (pm_node_t *)pm_constant_path_node_create(parser, node, &delimiter, child);
+                    expect1(parser, PM_TOKEN_CONSTANT, PM_ERR_CONSTANT_PATH_COLON_COLON_CONSTANT);
+                    return (pm_node_t *) pm_constant_path_node_create(parser, node, &delimiter, &parser->previous);
                 }
             }
         }
diff --git a/test/prism/location_test.rb b/test/prism/location_test.rb
index 81417fbcb3..24976f48cc 100644
--- a/test/prism/location_test.rb
+++ b/test/prism/location_test.rb
@@ -298,7 +298,6 @@ module Prism
 
     def test_ConstantReadNode
       assert_location(ConstantReadNode, "Foo")
-      assert_location(ConstantReadNode, "Foo::Bar", 5...8, &:child)
     end
 
     def test_ConstantTargetNode
diff --git a/test/prism/snapshots/constants.txt b/test/prism/snapshots/constants.txt
index 59e234148a..89399b5519 100644
--- a/test/prism/snapshots/constants.txt
+++ b/test/prism/snapshots/constants.txt
@@ -7,24 +7,21 @@
         │   ├── parent:
         │   │   @ ConstantReadNode (location: (1,0)-(1,1))
         │   │   └── name: :A
-        │   ├── child:
-        │   │   @ ConstantReadNode (location: (1,3)-(1,4))
-        │   │   └── name: :B
-        │   └── delimiter_loc: (1,1)-(1,3) = "::"
+        │   ├── name: :B
+        │   ├── delimiter_loc: (1,1)-(1,3) = "::"
+        │   └── name_loc: (1,3)-(1,4) = "B"
         ├── @ ConstantPathNode (location: (3,0)-(3,7))
         │   ├── parent:
         │   │   @ ConstantPathNode (location: (3,0)-(3,4))
         │   │   ├── parent:
         │   │   │   @ ConstantReadNode (location: (3,0)-(3,1))
         │   │   │   └── name: :A
-        │   │   ├── child:
-        │   │   │   @ ConstantReadNode (location: (3,3)-(3,4))
-        │   │   │   └── name: :B
-        │   │   └── delimiter_loc: (3,1)-(3,3) = "::"
-        │   ├── child:
-        │   │   @ ConstantReadNode (location: (3,6)-(3,7))
-        │   │   └── name: :C
-        │   └── delimiter_loc: (3,4)-(3,6) = "::"
+        │   │   ├── name: :B
+        │   │   ├── delimiter_loc: (3,1)-(3,3) = "::"
+        │   │   └── name_loc: (3,3)-(3,4) = "B"
+        │   ├── name: :C
+        │   ├── delimiter_loc: (3,4)-(3,6) = "::"
+        │   └── name_loc: (3,6)-(3,7) = "C"
         ├── @ ConstantPathNode (location: (5,0)-(5,4))
         │   ├── parent:
         │   │   @ CallNode (location: (5,0)-(5,1))
@@ -37,20 +34,18 @@
         │   │   ├── arguments: ∅
         │   │   ├── closing_loc: ∅
         │   │   └── block: ∅
-        │   ├── child:
-        │   │   @ ConstantReadNode (location: (5,3)-(5,4))
-        │   │   └── name: :B
-        │   └── delimiter_loc: (5,1)-(5,3) = "::"
+        │   ├── name: :B
+        │   ├── delimiter_loc: (5,1)-(5,3) = "::"
+        │   └── name_loc: (5,3)-(5,4) = "B"
         ├── @ ConstantPathWriteNode (location: (7,0)-(7,8))
         │   ├── target:
         │   │   @ ConstantPathNode (location: (7,0)-(7,4))
         │   │   ├── parent:
         │   │   │   @ ConstantReadNode (location: (7,0)-(7,1))
         │   │   │   └── name: :A
-        │   │   ├── child:
-        │   │   │   @ ConstantReadNode (location: (7,3)-(7,4))
-        │   │   │   └── name: :B
-        │   │   └── delimiter_loc: (7,1)-(7,3) = "::"
+        │   │   ├── name: :B
+        │   │   ├── delimiter_loc: (7,1)-(7,3) = "::"
+        │   │   └── name_loc: (7,3)-(7,4) = "B"
         │   ├── operator_loc: (7,5)-(7,6) = "="
         │   └── value:
         │       @ IntegerNode (location: (7,7)-(7,8))
@@ -249,10 +244,9 @@
         │   ├── receiver:
         │   │   @ ConstantPathNode (location: (27,0)-(27,3))
         │   │   ├── parent: ∅
-        │   │   ├── child:
-        │   │   │   @ ConstantReadNode (location: (27,2)-(27,3))
-        │   │   │   └── name: :A
-        │   │   └── delimiter_loc: (27,0)-(27,2) = "::"
+        │   │   ├── name: :A
+        │   │   ├── delimiter_loc: (27,0)-(27,2) = "::"
+        │   │   └── name_loc: (27,2)-(27,3) = "A"
         │   ├── call_operator_loc: (27,3)-(27,5) = "::"
         │   ├── name: :foo
         │   ├── message_loc: (27,5)-(27,8) = "foo"
@@ -264,10 +258,9 @@
         │   ├── target:
         │   │   @ ConstantPathNode (location: (29,0)-(29,3))
         │   │   ├── parent: ∅
-        │   │   ├── child:
-        │   │   │   @ ConstantReadNode (location: (29,2)-(29,3))
-        │   │   │   └── name: :A
-        │   │   └── delimiter_loc: (29,0)-(29,2) = "::"
+        │   │   ├── name: :A
+        │   │   ├── delimiter_loc: (29,0)-(29,2) = "::"
+        │   │   └── name_loc: (29,2)-(29,3) = "A"
         │   ├── operator_loc: (29,4)-(29,5) = "="
         │   └── value:
         │       @ IntegerNode (location: (29,6)-(29,7))
@@ -279,14 +272,12 @@
         │   │   ├── parent:
         │   │   │   @ ConstantPathNode (location: (31,0)-(31,3))
         │   │   │   ├── parent: ∅
-        │   │   │   ├── child:
-        │   │   │   │   @ ConstantReadNode (location: (31,2)-(31,3))
-        │   │   │   │   └── name: :A
-        │   │   │   └── delimiter_loc: (31,0)-(31,2) = "::"
-        │   │   ├── child:
-        │   │   │   @ ConstantReadNode (location: (31,5)-(31,6))
-        │   │   │   └── name: :B
-        │   │   └── delimiter_loc: (31,3)-(31,5) = "::"
+        │   │   │   ├── name: :A
+        │   │   │   ├── delimiter_loc: (31,0)-(31,2) = "::"
+        │   │   │   └── name_loc: (31,2)-(31,3) = "A"
+        │   │   ├── name: :B
+        │   │   ├── delimiter_loc: (31,3)-(31,5) = "::"
+        │   │   └── name_loc: (31,5)-(31,6) = "B"
         │   ├── operator_loc: (31,7)-(31,8) = "="
         │   └── value:
         │       @ IntegerNode (location: (31,9)-(31,10))
@@ -296,20 +287,17 @@
         │   ├── parent:
         │   │   @ ConstantPathNode (location: (33,0)-(33,3))
         │   │   ├── parent: ∅
-        │   │   ├── child:
-        │   │   │   @ ConstantReadNode (location: (33,2)-(33,3))
-        │   │   │   └── name: :A
-        │   │   └── delimiter_loc: (33,0)-(33,2) = "::"
-        │   ├── child:
-        │   │   @ ConstantReadNode (location: (33,5)-(33,6))
-        │   │   └── name: :B
-        │   └── delimiter_loc: (33,3)-(33,5) = "::"
+        │   │   ├── name: :A
+        │   │   ├── delimiter_loc: (33,0)-(33,2) = "::"
+        │   │   └── name_loc: (33,2)-(33,3) = "A"
+        │   ├── name: :B
+        │   ├── delimiter_loc: (33,3)-(33,5) = "::"
+        │   └── name_loc: (33,5)-(33,6) = "B"
         ├── @ ConstantPathNode (location: (35,0)-(35,3))
         │   ├── parent: ∅
-        │   ├── child:
-        │   │   @ ConstantReadNode (location: (35,2)-(35,3))
-        │   │   └── name: :A
-        │   └── delimiter_loc: (35,0)-(35,2) = "::"
+        │   ├── name: :A
+        │   ├── delimiter_loc: (35,0)-(35,2) = "::"
+        │   └── name_loc: (35,2)-(35,3) = "A"
         ├── @ CallNode (location: (37,0)-(37,8))
         │   ├── flags: ∅
         │   ├── receiver:
@@ -329,10 +317,9 @@
         │   │   ├── parent:
         │   │   │   @ ConstantReadNode (location: (39,0)-(39,1))
         │   │   │   └── name: :A
-        │   │   ├── child:
-        │   │   │   @ ConstantReadNode (location: (39,3)-(39,4))
-        │   │   │   └── name: :B
-        │   │   └── delimiter_loc: (39,1)-(39,3) = "::"
+        │   │   ├── name: :B
+        │   │   ├── delimiter_loc: (39,1)-(39,3) = "::"
+        │   │   └── name_loc: (39,3)-(39,4) = "B"
         │   ├── call_operator_loc: (39,4)-(39,6) = "::"
         │   ├── name: :true
         │   ├── message_loc: (39,6)-(39,10) = "true"
@@ -488,10 +475,9 @@
         │   ├── parent:
         │   │   @ ConstantReadNode (location: (65,0)-(65,1))
         │   │   └── name: :A
-        │   ├── child:
-        │   │   @ ConstantReadNode (location: (67,0)-(67,1))
-        │   │   └── name: :C
-        │   └── delimiter_loc: (65,1)-(65,3) = "::"
+        │   ├── name: :C
+        │   ├── delimiter_loc: (65,1)-(65,3) = "::"
+        │   └── name_loc: (67,0)-(67,1) = "C"
         ├── @ CallNode (location: (69,0)-(69,8))
         │   ├── flags: ∅
         │   ├── receiver:
@@ -532,10 +518,9 @@
         │   ├── parent:
         │   │   @ ConstantReadNode (location: (75,0)-(75,1))
         │   │   └── name: :A
-        │   ├── child:
-        │   │   @ ConstantReadNode (location: (75,3)-(75,8))
-        │   │   └── name: :BEGIN
-        │   └── delimiter_loc: (75,1)-(75,3) = "::"
+        │   ├── name: :BEGIN
+        │   ├── delimiter_loc: (75,1)-(75,3) = "::"
+        │   └── name_loc: (75,3)-(75,8) = "BEGIN"
         ├── @ CallNode (location: (77,0)-(77,8))
         │   ├── flags: ∅
         │   ├── receiver:
@@ -636,10 +621,9 @@
         │   ├── parent:
         │   │   @ ConstantReadNode (location: (93,0)-(93,1))
         │   │   └── name: :A
-        │   ├── child:
-        │   │   @ ConstantReadNode (location: (93,3)-(93,6))
-        │   │   └── name: :END
-        │   └── delimiter_loc: (93,1)-(93,3) = "::"
+        │   ├── name: :END
+        │   ├── delimiter_loc: (93,1)-(93,3) = "::"
+        │   └── name_loc: (93,3)-(93,6) = "END"
         ├── @ CallNode (location: (95,0)-(95,9))
         │   ├── flags: ∅
         │   ├── receiver:
@@ -1207,10 +1191,9 @@
         │   │   ├── arguments: ∅
         │   │   ├── closing_loc: ∅
         │   │   └── block: ∅
-        │   ├── child:
-        │   │   @ ConstantReadNode (location: (180,0)-(180,1))
-        │   │   └── name: :C
-        │   └── delimiter_loc: (179,4)-(179,6) = "::"
+        │   ├── name: :C
+        │   ├── delimiter_loc: (179,4)-(179,6) = "::"
+        │   └── name_loc: (180,0)-(180,1) = "C"
         └── @ RangeNode (location: (182,0)-(184,10))
             ├── flags: ∅
             ├── left:
diff --git a/test/prism/snapshots/method_calls.txt b/test/prism/snapshots/method_calls.txt
index de9ba71ae0..4efc8106e9 100644
--- a/test/prism/snapshots/method_calls.txt
+++ b/test/prism/snapshots/method_calls.txt
@@ -1443,10 +1443,9 @@
         │   │   ├── parent:
         │   │   │   @ ConstantReadNode (location: (97,0)-(97,1))
         │   │   │   └── name: :A
-        │   │   ├── child:
-        │   │   │   @ ConstantReadNode (location: (97,3)-(97,4))
-        │   │   │   └── name: :B
-        │   │   └── delimiter_loc: (97,1)-(97,3) = "::"
+        │   │   ├── name: :B
+        │   │   ├── delimiter_loc: (97,1)-(97,3) = "::"
+        │   │   └── name_loc: (97,3)-(97,4) = "B"
         │   ├── call_operator_loc: (97,4)-(97,6) = "::"
         │   ├── name: :C
         │   ├── message_loc: (97,6)-(97,7) = "C"
@@ -1470,10 +1469,9 @@
         │   │   ├── parent:
         │   │   │   @ ConstantReadNode (location: (99,0)-(99,1))
         │   │   │   └── name: :A
-        │   │   ├── child:
-        │   │   │   @ ConstantReadNode (location: (99,3)-(99,4))
-        │   │   │   └── name: :B
-        │   │   └── delimiter_loc: (99,1)-(99,3) = "::"
+        │   │   ├── name: :B
+        │   │   ├── delimiter_loc: (99,1)-(99,3) = "::"
+        │   │   └── name_loc: (99,3)-(99,4) = "B"
         │   ├── call_operator_loc: (99,4)-(99,6) = "::"
         │   ├── name: :C
         │   ├── message_loc: (99,6)-(99,7) = "C"
@@ -1497,10 +1495,9 @@
         │   │   ├── parent:
         │   │   │   @ ConstantReadNode (location: (101,0)-(101,1))
         │   │   │   └── name: :A
-        │   │   ├── child:
-        │   │   │   @ ConstantReadNode (location: (101,3)-(101,4))
-        │   │   │   └── name: :B
-        │   │   └── delimiter_loc: (101,1)-(101,3) = "::"
+        │   │   ├── name: :B
+        │   │   ├── delimiter_loc: (101,1)-(101,3) = "::"
+        │   │   └── name_loc: (101,3)-(101,4) = "B"
         │   ├── call_operator_loc: (101,4)-(101,6) = "::"
         │   ├── name: :C
         │   ├── message_loc: (101,6)-(101,7) = "C"
diff --git a/test/prism/snapshots/modules.txt b/test/prism/snapshots/modules.txt
index 1a0eb6328a..de1ea8feeb 100644
--- a/test/prism/snapshots/modules.txt
+++ b/test/prism/snapshots/modules.txt
@@ -72,10 +72,9 @@
         │   │   │   ├── arguments: ∅
         │   │   │   ├── closing_loc: ∅
         │   │   │   └── block: ∅
-        │   │   ├── child:
-        │   │   │   @ ConstantReadNode (location: (5,10)-(5,11))
-        │   │   │   └── name: :M
-        │   │   └── delimiter_loc: (5,8)-(5,10) = "::"
+        │   │   ├── name: :M
+        │   │   ├── delimiter_loc: (5,8)-(5,10) = "::"
+        │   │   └── name_loc: (5,10)-(5,11) = "M"
         │   ├── body: ∅
         │   ├── end_keyword_loc: (6,0)-(6,3) = "end"
         │   └── name: :M
@@ -119,10 +118,9 @@
         │   ├── constant_path:
         │   │   @ ConstantPathNode (location: (11,7)-(11,10))
         │   │   ├── parent: ∅
-        │   │   ├── child:
-        │   │   │   @ ConstantReadNode (location: (11,9)-(11,10))
-        │   │   │   └── name: :A
-        │   │   └── delimiter_loc: (11,7)-(11,9) = "::"
+        │   │   ├── name: :A
+        │   │   ├── delimiter_loc: (11,7)-(11,9) = "::"
+        │   │   └── name_loc: (11,9)-(11,10) = "A"
         │   ├── body: ∅
         │   ├── end_keyword_loc: (12,0)-(12,3) = "end"
         │   └── name: :A
@@ -144,10 +142,9 @@
         │   │   │   ├── arguments: ∅
         │   │   │   ├── closing_loc: (14,9)-(14,10) = "]"
         │   │   │   └── block: ∅
-        │   │   ├── child:
-        │   │   │   @ ConstantReadNode (location: (14,12)-(14,13))
-        │   │   │   └── name: :B
-        │   │   └── delimiter_loc: (14,10)-(14,12) = "::"
+        │   │   ├── name: :B
+        │   │   ├── delimiter_loc: (14,10)-(14,12) = "::"
+        │   │   └── name_loc: (14,12)-(14,13) = "B"
         │   ├── body: ∅
         │   ├── end_keyword_loc: (15,0)-(15,3) = "end"
         │   └── name: :B
@@ -175,10 +172,9 @@
             │   │   │           └── value: 1
             │   │   ├── closing_loc: (17,10)-(17,11) = "]"
             │   │   └── block: ∅
-            │   ├── child:
-            │   │   @ ConstantReadNode (location: (17,13)-(17,14))
-            │   │   └── name: :B
-            │   └── delimiter_loc: (17,11)-(17,13) = "::"
+            │   ├── name: :B
+            │   ├── delimiter_loc: (17,11)-(17,13) = "::"
+            │   └── name_loc: (17,13)-(17,14) = "B"
             ├── body: ∅
             ├── end_keyword_loc: (18,0)-(18,3) = "end"
             └── name: :B
diff --git a/test/prism/snapshots/patterns.txt b/test/prism/snapshots/patterns.txt
index 5662129dae..16298e7984 100644
--- a/test/prism/snapshots/patterns.txt
+++ b/test/prism/snapshots/patterns.txt
@@ -1454,14 +1454,12 @@
         │   │   │   ├── parent:
         │   │   │   │   @ ConstantReadNode (location: (64,7)-(64,10))
         │   │   │   │   └── name: :Foo
-        │   │   │   ├── child:
-        │   │   │   │   @ ConstantReadNode (location: (64,12)-(64,15))
-        │   │   │   │   └── name: :Bar
-        │   │   │   └── delimiter_loc: (64,10)-(64,12) = "::"
-        │   │   ├── child:
-        │   │   │   @ ConstantReadNode (location: (64,17)-(64,20))
-        │   │   │   └── name: :Baz
-        │   │   └── delimiter_loc: (64,15)-(64,17) = "::"
+        │   │   │   ├── name: :Bar
+        │   │   │   ├── delimiter_loc: (64,10)-(64,12) = "::"
+        │   │   │   └── name_loc: (64,12)-(64,15) = "Bar"
+        │   │   ├── name: :Baz
+        │   │   ├── delimiter_loc: (64,15)-(64,17) = "::"
+        │   │   └── name_loc: (64,17)-(64,20) = "Baz"
         │   └── operator_loc: (64,4)-(64,6) = "=>"
         ├── @ MatchRequiredNode (location: (65,0)-(65,12))
         │   ├── value:
@@ -1478,10 +1476,9 @@
         │   ├── pattern:
         │   │   @ ConstantPathNode (location: (65,7)-(65,12))
         │   │   ├── parent: ∅
-        │   │   ├── child:
-        │   │   │   @ ConstantReadNode (location: (65,9)-(65,12))
-        │   │   │   └── name: :Foo
-        │   │   └── delimiter_loc: (65,7)-(65,9) = "::"
+        │   │   ├── name: :Foo
+        │   │   ├── delimiter_loc: (65,7)-(65,9) = "::"
+        │   │   └── name_loc: (65,9)-(65,12) = "Foo"
         │   └── operator_loc: (65,4)-(65,6) = "=>"
         ├── @ MatchRequiredNode (location: (66,0)-(66,22))
         │   ├── value:
@@ -1502,18 +1499,15 @@
         │   │   │   ├── parent:
         │   │   │   │   @ ConstantPathNode (location: (66,7)-(66,12))
         │   │   │   │   ├── parent: ∅
-        │   │   │   │   ├── child:
-        │   │   │   │   │   @ ConstantReadNode (location: (66,9)-(66,12))
-        │   │   │   │   │   └── name: :Foo
-        │   │   │   │   └── delimiter_loc: (66,7)-(66,9) = "::"
-        │   │   │   ├── child:
-        │   │   │   │   @ ConstantReadNode (location: (66,14)-(66,17))
-        │   │   │   │   └── name: :Bar
-        │   │   │   └── delimiter_loc: (66,12)-(66,14) = "::"
-        │   │   ├── child:
-        │   │   │   @ ConstantReadNode (location: (66,19)-(66,22))
-        │   │   │   └── name: :Baz
-        │   │   └── delimiter_loc: (66,17)-(66,19) = "::"
+        │   │   │   │   ├── name: :Foo
+        │   │   │   │   ├── delimiter_loc: (66,7)-(66,9) = "::"
+        │   │   │   │   └── name_loc: (66,9)-(66,12) = "Foo"
+        │   │   │   ├── name: :Bar
+        │   │   │   ├── delimiter_loc: (66,12)-(66,14) = "::"
+        │   │   │   └── name_loc: (66,14)-(66,17) = "Bar"
+        │   │   ├── name: :Baz
+        │   │   ├── delimiter_loc: (66,17)-(66,19) = "::"
+        │   │   └── name_loc: (66,19)-(66,22) = "Baz"
         │   └── operator_loc: (66,4)-(66,6) = "=>"
         ├── @ MatchRequiredNode (location: (68,0)-(68,12))
         │   ├── value:
diff --git a/test/prism/snapshots/seattlerb/case_in_86.txt b/test/prism/snapshots/seattlerb/case_in_86.txt
index 5889137844..082aa74eca 100644
--- a/test/prism/snapshots/seattlerb/case_in_86.txt
+++ b/test/prism/snapshots/seattlerb/case_in_86.txt
@@ -30,10 +30,9 @@
             │       │   ├── requireds: (length: 1)
             │       │   │   └── @ ConstantPathNode (location: (2,3)-(2,13))
             │       │   │       ├── parent: ∅
-            │       │   │       ├── child:
-            │       │   │       │   @ ConstantReadNode (location: (2,5)-(2,13))
-            │       │   │       │   └── name: :NilClass
-            │       │   │       └── delimiter_loc: (2,3)-(2,5) = "::"
+            │       │   │       ├── name: :NilClass
+            │       │   │       ├── delimiter_loc: (2,3)-(2,5) = "::"
+            │       │   │       └── name_loc: (2,5)-(2,13) = "NilClass"
             │       │   ├── rest:
             │       │   │   @ SplatNode (location: (2,15)-(2,16))
             │       │   │   ├── operator_loc: (2,15)-(2,16) = "*"
diff --git a/test/prism/snapshots/seattlerb/case_in_86_2.txt b/test/prism/snapshots/seattlerb/case_in_86_2.txt
index 18ce70ae93..346264f907 100644
--- a/test/prism/snapshots/seattlerb/case_in_86_2.txt
+++ b/test/prism/snapshots/seattlerb/case_in_86_2.txt
@@ -35,10 +35,9 @@
             │       │   ├── posts: (length: 1)
             │       │   │   └── @ ConstantPathNode (location: (2,6)-(2,16))
             │       │   │       ├── parent: ∅
-            │       │   │       ├── child:
-            │       │   │       │   @ ConstantReadNode (location: (2,8)-(2,16))
-            │       │   │       │   └── name: :NilClass
-            │       │   │       └── delimiter_loc: (2,6)-(2,8) = "::"
+            │       │   │       ├── name: :NilClass
+            │       │   │       ├── delimiter_loc: (2,6)-(2,8) = "::"
+            │       │   │       └── name_loc: (2,8)-(2,16) = "NilClass"
             │       │   ├── opening_loc: ∅
             │       │   └── closing_loc: ∅
             │       ├── statements:
diff --git a/test/prism/snapshots/seattlerb/case_in_array_pat_const2.txt b/test/prism/snapshots/seattlerb/case_in_array_pat_const2.txt
index c783af9ce5..d6fb80ef90 100644
--- a/test/prism/snapshots/seattlerb/case_in_array_pat_const2.txt
+++ b/test/prism/snapshots/seattlerb/case_in_array_pat_const2.txt
@@ -20,10 +20,9 @@
             │       │   │   ├── parent:
             │       │   │   │   @ ConstantReadNode (location: (2,3)-(2,4))
             │       │   │   │   └── name: :B
-            │       │   │   ├── child:
-            │       │   │   │   @ ConstantReadNode (location: (2,6)-(2,7))
-            │       │   │   │   └── name: :C
-            │       │   │   └── delimiter_loc: (2,4)-(2,6) = "::"
+            │       │   │   ├── name: :C
+            │       │   │   ├── delimiter_loc: (2,4)-(2,6) = "::"
+            │       │   │   └── name_loc: (2,6)-(2,7) = "C"
             │       │   ├── requireds: (length: 1)
             │       │   │   └── @ LocalVariableTargetNode (location: (2,8)-(2,9))
             │       │   │       ├── name: :d
diff --git a/test/prism/snapshots/seattlerb/case_in_multiple.txt b/test/prism/snapshots/seattlerb/case_in_multiple.txt
index d8597c4bfa..eba0084f96 100644
--- a/test/prism/snapshots/seattlerb/case_in_multiple.txt
+++ b/test/prism/snapshots/seattlerb/case_in_multiple.txt
@@ -18,10 +18,9 @@
             │   │   │   ├── parent:
             │   │   │   │   @ ConstantReadNode (location: (2,3)-(2,4))
             │   │   │   │   └── name: :A
-            │   │   │   ├── child:
-            │   │   │   │   @ ConstantReadNode (location: (2,6)-(2,7))
-            │   │   │   │   └── name: :B
-            │   │   │   └── delimiter_loc: (2,4)-(2,6) = "::"
+            │   │   │   ├── name: :B
+            │   │   │   ├── delimiter_loc: (2,4)-(2,6) = "::"
+            │   │   │   └── name_loc: (2,6)-(2,7) = "B"
             │   │   ├── statements:
             │   │   │   @ StatementsNode (location: (3,2)-(3,4))
             │   │   │   └── body: (length: 1)
@@ -39,10 +38,9 @@
             │       │   ├── parent:
             │       │   │   @ ConstantReadNode (location: (4,3)-(4,4))
             │       │   │   └── name: :D
-            │       │   ├── child:
-            │       │   │   @ ConstantReadNode (location: (4,6)-(4,7))
-            │       │   │   └── name: :E
-            │       │   └── delimiter_loc: (4,4)-(4,6) = "::"
+            │       │   ├── name: :E
+            │       │   ├── delimiter_loc: (4,4)-(4,6) = "::"
+            │       │   └── name_loc: (4,6)-(4,7) = "E"
             │       ├── statements:
             │       │   @ StatementsNode (location: (5,2)-(5,4))
             │       │   └── body: (length: 1)
diff --git a/test/prism/snapshots/seattlerb/const_2_op_asgn_or2.txt b/test/prism/snapshots/seattlerb/const_2_op_asgn_or2.txt
index b018ac48d4..e09eed7d2f 100644
--- a/test/prism/snapshots/seattlerb/const_2_op_asgn_or2.txt
+++ b/test/prism/snapshots/seattlerb/const_2_op_asgn_or2.txt
@@ -9,14 +9,12 @@
             │   ├── parent:
             │   │   @ ConstantPathNode (location: (1,0)-(1,3))
             │   │   ├── parent: ∅
-            │   │   ├── child:
-            │   │   │   @ ConstantReadNode (location: (1,2)-(1,3))
-            │   │   │   └── name: :X
-            │   │   └── delimiter_loc: (1,0)-(1,2) = "::"
-            │   ├── child:
-            │   │   @ ConstantReadNode (location: (1,5)-(1,6))
-            │   │   └── name: :Y
-            │   └── delimiter_loc: (1,3)-(1,5) = "::"
+            │   │   ├── name: :X
+            │   │   ├── delimiter_loc: (1,0)-(1,2) = "::"
+            │   │   └── name_loc: (1,2)-(1,3) = "X"
+            │   ├── name: :Y
+            │   ├── delimiter_loc: (1,3)-(1,5) = "::"
+            │   └── name_loc: (1,5)-(1,6) = "Y"
             ├── operator_loc: (1,7)-(1,10) = "||="
             └── value:
                 @ IntegerNode (location: (1,11)-(1,12))
diff --git a/test/prism/snapshots/seattlerb/const_3_op_asgn_or.txt b/test/prism/snapshots/seattlerb/const_3_op_asgn_or.txt
index 8d9d94931b..398af888a8 100644
--- a/test/prism/snapshots/seattlerb/const_3_op_asgn_or.txt
+++ b/test/prism/snapshots/seattlerb/const_3_op_asgn_or.txt
@@ -7,10 +7,9 @@
             ├── target:
             │   @ ConstantPathNode (location: (1,0)-(1,3))
             │   ├── parent: ∅
-            │   ├── child:
-            │   │   @ ConstantReadNode (location: (1,2)-(1,3))
-            │   │   └── name: :X
-            │   └── delimiter_loc: (1,0)-(1,2) = "::"
+            │   ├── name: :X
+            │   ├── delimiter_loc: (1,0)-(1,2) = "::"
+            │   └── name_loc: (1,2)-(1,3) = "X"
             ├── operator_loc: (1,4)-(1,7) = "||="
             └── value:
                 @ IntegerNode (location: (1,8)-(1,9))
diff --git a/test/prism/snapshots/seattlerb/const_op_asgn_and1.txt b/test/prism/snapshots/seattlerb/const_op_asgn_and1.txt
index b1d61b3752..b5acfa1d8b 100644
--- a/test/prism/snapshots/seattlerb/const_op_asgn_and1.txt
+++ b/test/prism/snapshots/seattlerb/const_op_asgn_and1.txt
@@ -7,10 +7,9 @@
             ├── target:
             │   @ ConstantPathNode (location: (1,0)-(1,3))
             │   ├── parent: ∅
-            │   ├── child:
-            │   │   @ ConstantReadNode (location: (1,2)-(1,3))
-            │   │   └── name: :X
-            │   └── delimiter_loc: (1,0)-(1,2) = "::"
+            │   ├── name: :X
+            │   ├── delimiter_loc: (1,0)-(1,2) = "::"
+            │   └── name_loc: (1,2)-(1,3) = "X"
             ├── operator_loc: (1,4)-(1,6) = "&="
             ├── value:
             │   @ IntegerNode (location: (1,7)-(1,8))
diff --git a/test/prism/snapshots/seattlerb/const_op_asgn_and2.txt b/test/prism/snapshots/seattlerb/const_op_asgn_and2.txt
index 22f6682534..146455d327 100644
--- a/test/prism/snapshots/seattlerb/const_op_asgn_and2.txt
+++ b/test/prism/snapshots/seattlerb/const_op_asgn_and2.txt
@@ -7,10 +7,9 @@
             ├── target:
             │   @ ConstantPathNode (location: (1,0)-(1,3))
             │   ├── parent: ∅
-            │   ├── child:
-            │   │   @ ConstantReadNode (location: (1,2)-(1,3))
-            │   │   └── name: :X
-            │   └── delimiter_loc: (1,0)-(1,2) = "::"
+            │   ├── name: :X
+            │   ├── delimiter_loc: (1,0)-(1,2) = "::"
+            │   └── name_loc: (1,2)-(1,3) = "X"
             ├── operator_loc: (1,4)-(1,7) = "&&="
             └── value:
                 @ IntegerNode (location: (1,8)-(1,9))
diff --git a/test/prism/snapshots/seattlerb/const_op_asgn_or.txt b/test/prism/snapshots/seattlerb/const_op_asgn_or.txt
index 067e0fbb93..5e9dd39604 100644
--- a/test/prism/snapshots/seattlerb/const_op_asgn_or.txt
+++ b/test/prism/snapshots/seattlerb/const_op_asgn_or.txt
@@ -9,10 +9,9 @@
             │   ├── parent:
             │   │   @ ConstantReadNode (location: (1,0)-(1,1))
             │   │   └── name: :X
-            │   ├── child:
-            │   │   @ ConstantReadNode (location: (1,3)-(1,4))
-            │   │   └── name: :Y
-            │   └── delimiter_loc: (1,1)-(1,3) = "::"
+            │   ├── name: :Y
+            │   ├── delimiter_loc: (1,1)-(1,3) = "::"
+            │   └── name_loc: (1,3)-(1,4) = "Y"
             ├── operator_loc: (1,5)-(1,8) = "||="
             └── value:
                 @ IntegerNode (location: (1,9)-(1,10))
diff --git a/test/prism/snapshots/seattlerb/masgn_colon2.txt b/test/prism/snapshots/seattlerb/masgn_colon2.txt
index 73ce8a71da..a0dfe72ffc 100644
--- a/test/prism/snapshots/seattlerb/masgn_colon2.txt
+++ b/test/prism/snapshots/seattlerb/masgn_colon2.txt
@@ -20,10 +20,9 @@
             │       │   ├── arguments: ∅
             │       │   ├── closing_loc: ∅
             │       │   └── block: ∅
-            │       ├── child:
-            │       │   @ ConstantReadNode (location: (1,6)-(1,7))
-            │       │   └── name: :C
-            │       └── delimiter_loc: (1,4)-(1,6) = "::"
+            │       ├── name: :C
+            │       ├── delimiter_loc: (1,4)-(1,6) = "::"
+            │       └── name_loc: (1,6)-(1,7) = "C"
             ├── rest: ∅
             ├── rights: (length: 0)
             ├── lparen_loc: ∅
diff --git a/test/prism/snapshots/seattlerb/masgn_colon3.txt b/test/prism/snapshots/seattlerb/masgn_colon3.txt
index 0cf4f8626d..f28ed7ecee 100644
--- a/test/prism/snapshots/seattlerb/masgn_colon3.txt
+++ b/test/prism/snapshots/seattlerb/masgn_colon3.txt
@@ -7,16 +7,14 @@
             ├── lefts: (length: 2)
             │   ├── @ ConstantPathTargetNode (location: (1,0)-(1,3))
             │   │   ├── parent: ∅
-            │   │   ├── child:
-            │   │   │   @ ConstantReadNode (location: (1,2)-(1,3))
-            │   │   │   └── name: :A
-            │   │   └── delimiter_loc: (1,0)-(1,2) = "::"
+            │   │   ├── name: :A
+            │   │   ├── delimiter_loc: (1,0)-(1,2) = "::"
+            │   │   └── name_loc: (1,2)-(1,3) = "A"
             │   └── @ ConstantPathTargetNode (location: (1,5)-(1,8))
             │       ├── parent: ∅
-            │       ├── child:
-            │       │   @ ConstantReadNode (location: (1,7)-(1,8))
-            │       │   └── name: :B
-            │       └── delimiter_loc: (1,5)-(1,7) = "::"
+            │       ├── name: :B
+            │       ├── delimiter_loc: (1,5)-(1,7) = "::"
+            │       └── name_loc: (1,7)-(1,8) = "B"
             ├── rest: ∅
             ├── rights: (length: 0)
             ├── lparen_loc: ∅
diff --git a/test/prism/snapshots/seattlerb/messy_op_asgn_lineno.txt b/test/prism/snapshots/seattlerb/messy_op_asgn_lineno.txt
index 7a3e9affb5..92373aeeaf 100644
--- a/test/prism/snapshots/seattlerb/messy_op_asgn_lineno.txt
+++ b/test/prism/snapshots/seattlerb/messy_op_asgn_lineno.txt
@@ -24,10 +24,9 @@
             │           │           │   ├── parent:
             │           │           │   │   @ ConstantReadNode (location: (1,3)-(1,4))
             │           │           │   │   └── name: :B
-            │           │           │   ├── child:
-            │           │           │   │   @ ConstantReadNode (location: (1,6)-(1,7))
-            │           │           │   │   └── name: :C
-            │           │           │   └── delimiter_loc: (1,4)-(1,6) = "::"
+            │           │           │   ├── name: :C
+            │           │           │   ├── delimiter_loc: (1,4)-(1,6) = "::"
+            │           │           │   └── name_loc: (1,6)-(1,7) = "C"
             │           │           ├── operator_loc: (1,8)-(1,10) = "*="
             │           │           ├── value:
             │           │           │   @ CallNode (location: (1,11)-(1,14))
diff --git a/test/prism/snapshots/seattlerb/op_asgn_primary_colon_const_command_call.txt b/test/prism/snapshots/seattlerb/op_asgn_primary_colon_const_command_call.txt
index 8e6df3e812..e0e8c5b3e3 100644
--- a/test/prism/snapshots/seattlerb/op_asgn_primary_colon_const_command_call.txt
+++ b/test/prism/snapshots/seattlerb/op_asgn_primary_colon_const_command_call.txt
@@ -9,10 +9,9 @@
             │   ├── parent:
             │   │   @ ConstantReadNode (location: (1,0)-(1,1))
             │   │   └── name: :A
-            │   ├── child:
-            │   │   @ ConstantReadNode (location: (1,3)-(1,4))
-            │   │   └── name: :B
-            │   └── delimiter_loc: (1,1)-(1,3) = "::"
+            │   ├── name: :B
+            │   ├── delimiter_loc: (1,1)-(1,3) = "::"
+            │   └── name_loc: (1,3)-(1,4) = "B"
             ├── operator_loc: (1,5)-(1,7) = "*="
             ├── value:
             │   @ CallNode (location: (1,8)-(1,11))
diff --git a/test/prism/snapshots/unparser/corpus/literal/assignment.txt b/test/prism/snapshots/unparser/corpus/literal/assignment.txt
index 99c8daf34c..7d3cc389c6 100644
--- a/test/prism/snapshots/unparser/corpus/literal/assignment.txt
+++ b/test/prism/snapshots/unparser/corpus/literal/assignment.txt
@@ -469,18 +469,16 @@
         │   ├── target:
         │   │   @ ConstantPathNode (location: (18,0)-(18,5))
         │   │   ├── parent: ∅
-        │   │   ├── child:
-        │   │   │   @ ConstantReadNode (location: (18,2)-(18,5))
-        │   │   │   └── name: :Foo
-        │   │   └── delimiter_loc: (18,0)-(18,2) = "::"
+        │   │   ├── name: :Foo
+        │   │   ├── delimiter_loc: (18,0)-(18,2) = "::"
+        │   │   └── name_loc: (18,2)-(18,5) = "Foo"
         │   ├── operator_loc: (18,6)-(18,7) = "="
         │   └── value:
         │       @ ConstantPathNode (location: (18,8)-(18,13))
         │       ├── parent: ∅
-        │       ├── child:
-        │       │   @ ConstantReadNode (location: (18,10)-(18,13))
-        │       │   └── name: :Bar
-        │       └── delimiter_loc: (18,8)-(18,10) = "::"
+        │       ├── name: :Bar
+        │       ├── delimiter_loc: (18,8)-(18,10) = "::"
+        │       └── name_loc: (18,10)-(18,13) = "Bar"
         ├── @ ClassVariableWriteNode (location: (19,0)-(19,7))
         │   ├── name: :@@a
         │   ├── name_loc: (19,0)-(19,3) = "@@a"
@@ -513,14 +511,12 @@
         │   │   │   ├── parent:
         │   │   │   │   @ ConstantReadNode (location: (22,0)-(22,4))
         │   │   │   │   └── name: :Name
-        │   │   │   ├── child:
-        │   │   │   │   @ ConstantReadNode (location: (22,6)-(22,12))
-        │   │   │   │   └── name: :Spaced
-        │   │   │   └── delimiter_loc: (22,4)-(22,6) = "::"
-        │   │   ├── child:
-        │   │   │   @ ConstantReadNode (location: (22,14)-(22,19))
-        │   │   │   └── name: :CONST
-        │   │   └── delimiter_loc: (22,12)-(22,14) = "::"
+        │   │   │   ├── name: :Spaced
+        │   │   │   ├── delimiter_loc: (22,4)-(22,6) = "::"
+        │   │   │   └── name_loc: (22,6)-(22,12) = "Spaced"
+        │   │   ├── name: :CONST
+        │   │   ├── delimiter_loc: (22,12)-(22,14) = "::"
+        │   │   └── name_loc: (22,14)-(22,19) = "CONST"
         │   ├── operator_loc: (22,20)-(22,21) = "="
         │   └── value:
         │       @ IntegerNode (location: (22,22)-(22,23))
diff --git a/test/prism/snapshots/unparser/corpus/literal/class.txt b/test/prism/snapshots/unparser/corpus/literal/class.txt
index 34eb03edb3..5306888398 100644
--- a/test/prism/snapshots/unparser/corpus/literal/class.txt
+++ b/test/prism/snapshots/unparser/corpus/literal/class.txt
@@ -68,10 +68,9 @@
         │   │   ├── parent:
         │   │   │   @ ConstantReadNode (location: (11,6)-(11,7))
         │   │   │   └── name: :A
-        │   │   ├── child:
-        │   │   │   @ ConstantReadNode (location: (11,9)-(11,10))
-        │   │   │   └── name: :B
-        │   │   └── delimiter_loc: (11,7)-(11,9) = "::"
+        │   │   ├── name: :B
+        │   │   ├── delimiter_loc: (11,7)-(11,9) = "::"
+        │   │   └── name_loc: (11,9)-(11,10) = "B"
         │   ├── inheritance_operator_loc: ∅
         │   ├── superclass: ∅
         │   ├── body: ∅
@@ -87,14 +86,12 @@
         │   │   │   ├── parent:
         │   │   │   │   @ ConstantReadNode (location: (14,6)-(14,7))
         │   │   │   │   └── name: :A
-        │   │   │   ├── child:
-        │   │   │   │   @ ConstantReadNode (location: (14,9)-(14,10))
-        │   │   │   │   └── name: :B
-        │   │   │   └── delimiter_loc: (14,7)-(14,9) = "::"
-        │   │   ├── child:
-        │   │   │   @ ConstantReadNode (location: (14,12)-(14,13))
-        │   │   │   └── name: :C
-        │   │   └── delimiter_loc: (14,10)-(14,12) = "::"
+        │   │   │   ├── name: :B
+        │   │   │   ├── delimiter_loc: (14,7)-(14,9) = "::"
+        │   │   │   └── name_loc: (14,9)-(14,10) = "B"
+        │   │   ├── name: :C
+        │   │   ├── delimiter_loc: (14,10)-(14,12) = "::"
+        │   │   └── name_loc: (14,12)-(14,13) = "C"
         │   ├── inheritance_operator_loc: ∅
         │   ├── superclass: ∅
         │   ├── body: ∅
@@ -125,10 +122,9 @@
         │   │   ├── parent:
         │   │   │   @ ConstantReadNode (location: (20,10)-(20,11))
         │   │   │   └── name: :B
-        │   │   ├── child:
-        │   │   │   @ ConstantReadNode (location: (20,13)-(20,14))
-        │   │   │   └── name: :C
-        │   │   └── delimiter_loc: (20,11)-(20,13) = "::"
+        │   │   ├── name: :C
+        │   │   ├── delimiter_loc: (20,11)-(20,13) = "::"
+        │   │   └── name_loc: (20,13)-(20,14) = "C"
         │   ├── body: ∅
         │   ├── end_keyword_loc: (21,0)-(21,3) = "end"
         │   └── name: :A
@@ -140,20 +136,18 @@
         │   │   ├── parent:
         │   │   │   @ ConstantReadNode (location: (23,6)-(23,7))
         │   │   │   └── name: :A
-        │   │   ├── child:
-        │   │   │   @ ConstantReadNode (location: (23,9)-(23,10))
-        │   │   │   └── name: :B
-        │   │   └── delimiter_loc: (23,7)-(23,9) = "::"
+        │   │   ├── name: :B
+        │   │   ├── delimiter_loc: (23,7)-(23,9) = "::"
+        │   │   └── name_loc: (23,9)-(23,10) = "B"
         │   ├── inheritance_operator_loc: (23,11)-(23,12) = "<"
         │   ├── superclass:
         │   │   @ ConstantPathNode (location: (23,13)-(23,17))
         │   │   ├── parent:
         │   │   │   @ ConstantReadNode (location: (23,13)-(23,14))
         │   │   │   └── name: :C
-        │   │   ├── child:
-        │   │   │   @ ConstantReadNode (location: (23,16)-(23,17))
-        │   │   │   └── name: :D
-        │   │   └── delimiter_loc: (23,14)-(23,16) = "::"
+        │   │   ├── name: :D
+        │   │   ├── delimiter_loc: (23,14)-(23,16) = "::"
+        │   │   └── name_loc: (23,16)-(23,17) = "D"
         │   ├── body: ∅
         │   ├── end_keyword_loc: (24,0)-(24,3) = "end"
         │   └── name: :B
@@ -222,10 +216,9 @@
             ├── constant_path:
             │   @ ConstantPathNode (location: (34,6)-(34,9))
             │   ├── parent: ∅
-            │   ├── child:
-            │   │   @ ConstantReadNode (location: (34,8)-(34,9))
-            │   │   └── name: :A
-            │   └── delimiter_loc: (34,6)-(34,8) = "::"
+            │   ├── name: :A
+            │   ├── delimiter_loc: (34,6)-(34,8) = "::"
+            │   └── name_loc: (34,8)-(34,9) = "A"
             ├── inheritance_operator_loc: ∅
             ├── superclass: ∅
             ├── body: ∅
diff --git a/test/prism/snapshots/unparser/corpus/literal/defs.txt b/test/prism/snapshots/unparser/corpus/literal/defs.txt
index 431843cc19..7858877172 100644
--- a/test/prism/snapshots/unparser/corpus/literal/defs.txt
+++ b/test/prism/snapshots/unparser/corpus/literal/defs.txt
@@ -225,10 +225,9 @@
         │   │   │   │   ├── parent:
         │   │   │   │   │   @ ConstantReadNode (location: (26,5)-(26,8))
         │   │   │   │   │   └── name: :Foo
-        │   │   │   │   ├── child:
-        │   │   │   │   │   @ ConstantReadNode (location: (26,10)-(26,13))
-        │   │   │   │   │   └── name: :Bar
-        │   │   │   │   └── delimiter_loc: (26,8)-(26,10) = "::"
+        │   │   │   │   ├── name: :Bar
+        │   │   │   │   ├── delimiter_loc: (26,8)-(26,10) = "::"
+        │   │   │   │   └── name_loc: (26,10)-(26,13) = "Bar"
         │   │   │   ├── call_operator_loc: (26,13)-(26,14) = "."
         │   │   │   ├── name: :baz
         │   │   │   ├── message_loc: (26,14)-(26,17) = "baz"
@@ -269,10 +268,9 @@
         │   │   │   ├── parent:
         │   │   │   │   @ ConstantReadNode (location: (30,5)-(30,8))
         │   │   │   │   └── name: :Foo
-        │   │   │   ├── child:
-        │   │   │   │   @ ConstantReadNode (location: (30,10)-(30,13))
-        │   │   │   │   └── name: :Bar
-        │   │   │   └── delimiter_loc: (30,8)-(30,10) = "::"
+        │   │   │   ├── name: :Bar
+        │   │   │   ├── delimiter_loc: (30,8)-(30,10) = "::"
+        │   │   │   └── name_loc: (30,10)-(30,13) = "Bar"
         │   │   ├── opening_loc: (30,4)-(30,5) = "("
         │   │   └── closing_loc: (30,13)-(30,14) = ")"
         │   ├── parameters: ∅
diff --git a/test/prism/snapshots/unparser/corpus/literal/module.txt b/test/prism/snapshots/unparser/corpus/literal/module.txt
index 5dd8c03b51..6428aeea82 100644
--- a/test/prism/snapshots/unparser/corpus/literal/module.txt
+++ b/test/prism/snapshots/unparser/corpus/literal/module.txt
@@ -20,10 +20,9 @@
         │   │   ├── parent:
         │   │   │   @ ConstantReadNode (location: (4,7)-(4,8))
         │   │   │   └── name: :A
-        │   │   ├── child:
-        │   │   │   @ ConstantReadNode (location: (4,10)-(4,11))
-        │   │   │   └── name: :B
-        │   │   └── delimiter_loc: (4,8)-(4,10) = "::"
+        │   │   ├── name: :B
+        │   │   ├── delimiter_loc: (4,8)-(4,10) = "::"
+        │   │   └── name_loc: (4,10)-(4,11) = "B"
         │   ├── body: ∅
         │   ├── end_keyword_loc: (5,0)-(5,3) = "end"
         │   └── name: :B
@@ -37,14 +36,12 @@
         │   │   │   ├── parent:
         │   │   │   │   @ ConstantReadNode (location: (7,7)-(7,8))
         │   │   │   │   └── name: :A
-        │   │   │   ├── child:
-        │   │   │   │   @ ConstantReadNode (location: (7,10)-(7,11))
-        │   │   │   │   └── name: :B
-        │   │   │   └── delimiter_loc: (7,8)-(7,10) = "::"
-        │   │   ├── child:
-        │   │   │   @ ConstantReadNode (location: (7,13)-(7,14))
-        │   │   │   └── name: :C
-        │   │   └── delimiter_loc: (7,11)-(7,13) = "::"
+        │   │   │   ├── name: :B
+        │   │   │   ├── delimiter_loc: (7,8)-(7,10) = "::"
+        │   │   │   └── name_loc: (7,10)-(7,11) = "B"
+        │   │   ├── name: :C
+        │   │   ├── delimiter_loc: (7,11)-(7,13) = "::"
+        │   │   └── name_loc: (7,13)-(7,14) = "C"
         │   ├── body: ∅
         │   ├── end_keyword_loc: (8,0)-(8,3) = "end"
         │   └── name: :C
diff --git a/test/prism/snapshots/unparser/corpus/literal/variables.txt b/test/prism/snapshots/unparser/corpus/literal/variables.txt
index bf79de385c..9ae8ad1207 100644
--- a/test/prism/snapshots/unparser/corpus/literal/variables.txt
+++ b/test/prism/snapshots/unparser/corpus/literal/variables.txt
@@ -29,25 +29,21 @@
         │   ├── parent:
         │   │   @ ConstantReadNode (location: (8,0)-(8,6))
         │   │   └── name: :SCOPED
-        │   ├── child:
-        │   │   @ ConstantReadNode (location: (8,8)-(8,13))
-        │   │   └── name: :CONST
-        │   └── delimiter_loc: (8,6)-(8,8) = "::"
+        │   ├── name: :CONST
+        │   ├── delimiter_loc: (8,6)-(8,8) = "::"
+        │   └── name_loc: (8,8)-(8,13) = "CONST"
         ├── @ ConstantPathNode (location: (9,0)-(9,10))
         │   ├── parent: ∅
-        │   ├── child:
-        │   │   @ ConstantReadNode (location: (9,2)-(9,10))
-        │   │   └── name: :TOPLEVEL
-        │   └── delimiter_loc: (9,0)-(9,2) = "::"
+        │   ├── name: :TOPLEVEL
+        │   ├── delimiter_loc: (9,0)-(9,2) = "::"
+        │   └── name_loc: (9,2)-(9,10) = "TOPLEVEL"
         └── @ ConstantPathNode (location: (10,0)-(10,17))
             ├── parent:
             │   @ ConstantPathNode (location: (10,0)-(10,10))
             │   ├── parent: ∅
-            │   ├── child:
-            │   │   @ ConstantReadNode (location: (10,2)-(10,10))
-            │   │   └── name: :TOPLEVEL
-            │   └── delimiter_loc: (10,0)-(10,2) = "::"
-            ├── child:
-            │   @ ConstantReadNode (location: (10,12)-(10,17))
-            │   └── name: :CONST
-            └── delimiter_loc: (10,10)-(10,12) = "::"
+            │   ├── name: :TOPLEVEL
+            │   ├── delimiter_loc: (10,0)-(10,2) = "::"
+            │   └── name_loc: (10,2)-(10,10) = "TOPLEVEL"
+            ├── name: :CONST
+            ├── delimiter_loc: (10,10)-(10,12) = "::"
+            └── name_loc: (10,12)-(10,17) = "CONST"
diff --git a/test/prism/snapshots/whitequark/casgn_scoped.txt b/test/prism/snapshots/whitequark/casgn_scoped.txt
index 4e3fd6fe44..42b90be061 100644
--- a/test/prism/snapshots/whitequark/casgn_scoped.txt
+++ b/test/prism/snapshots/whitequark/casgn_scoped.txt
@@ -9,10 +9,9 @@
             │   ├── parent:
             │   │   @ ConstantReadNode (location: (1,0)-(1,3))
             │   │   └── name: :Bar
-            │   ├── child:
-            │   │   @ ConstantReadNode (location: (1,5)-(1,8))
-            │   │   └── name: :Foo
-            │   └── delimiter_loc: (1,3)-(1,5) = "::"
+            │   ├── name: :Foo
+            │   ├── delimiter_loc: (1,3)-(1,5) = "::"
+            │   └── name_loc: (1,5)-(1,8) = "Foo"
             ├── operator_loc: (1,9)-(1,10) = "="
             └── value:
                 @ IntegerNode (location: (1,11)-(1,13))
diff --git a/test/prism/snapshots/whitequark/casgn_toplevel.txt b/test/prism/snapshots/whitequark/casgn_toplevel.txt
index 11facfefb3..070d90a46b 100644
--- a/test/prism/snapshots/whitequark/casgn_toplevel.txt
+++ b/test/prism/snapshots/whitequark/casgn_toplevel.txt
@@ -7,10 +7,9 @@
             ├── target:
             │   @ ConstantPathNode (location: (1,0)-(1,5))
             │   ├── parent: ∅
-            │   ├── child:
-            │   │   @ ConstantReadNode (location: (1,2)-(1,5))
-            │   │   └── name: :Foo
-            │   └── delimiter_loc: (1,0)-(1,2) = "::"
+            │   ├── name: :Foo
+            │   ├── delimiter_loc: (1,0)-(1,2) = "::"
+            │   └── name_loc: (1,2)-(1,5) = "Foo"
             ├── operator_loc: (1,6)-(1,7) = "="
             └── value:
                 @ IntegerNode (location: (1,8)-(1,10))
diff --git a/test/prism/snapshots/whitequark/const_op_asgn.txt b/test/prism/snapshots/whitequark/const_op_asgn.txt
index 4985f3e54b..505ce6ef64 100644
--- a/test/prism/snapshots/whitequark/const_op_asgn.txt
+++ b/test/prism/snapshots/whitequark/const_op_asgn.txt
@@ -7,10 +7,9 @@
         │   ├── target:
         │   │   @ ConstantPathNode (location: (1,0)-(1,3))
         │   │   ├── parent: ∅
-        │   │   ├── child:
-        │   │   │   @ ConstantReadNode (location: (1,2)-(1,3))
-        │   │   │   └── name: :A
-        │   │   └── delimiter_loc: (1,0)-(1,2) = "::"
+        │   │   ├── name: :A
+        │   │   ├── delimiter_loc: (1,0)-(1,2) = "::"
+        │   │   └── name_loc: (1,2)-(1,3) = "A"
         │   ├── operator_loc: (1,4)-(1,6) = "+="
         │   ├── value:
         │   │   @ IntegerNode (location: (1,7)-(1,8))
@@ -32,10 +31,9 @@
         │   │   ├── parent:
         │   │   │   @ ConstantReadNode (location: (5,0)-(5,1))
         │   │   │   └── name: :B
-        │   │   ├── child:
-        │   │   │   @ ConstantReadNode (location: (5,3)-(5,4))
-        │   │   │   └── name: :A
-        │   │   └── delimiter_loc: (5,1)-(5,3) = "::"
+        │   │   ├── name: :A
+        │   │   ├── delimiter_loc: (5,1)-(5,3) = "::"
+        │   │   └── name_loc: (5,3)-(5,4) = "A"
         │   ├── operator_loc: (5,5)-(5,7) = "+="
         │   ├── value:
         │   │   @ IntegerNode (location: (5,8)-(5,9))
@@ -54,10 +52,9 @@
         │   │           ├── target:
         │   │           │   @ ConstantPathNode (location: (7,7)-(7,10))
         │   │           │   ├── parent: ∅
-        │   │           │   ├── child:
-        │   │           │   │   @ ConstantReadNode (location: (7,9)-(7,10))
-        │   │           │   │   └── name: :A
-        │   │           │   └── delimiter_loc: (7,7)-(7,9) = "::"
+        │   │           │   ├── name: :A
+        │   │           │   ├── delimiter_loc: (7,7)-(7,9) = "::"
+        │   │           │   └── name_loc: (7,9)-(7,10) = "A"
         │   │           ├── operator_loc: (7,11)-(7,14) = "||="
         │   │           └── value:
         │   │               @ IntegerNode (location: (7,15)-(7,16))
@@ -83,10 +80,9 @@
             │           │   @ ConstantPathNode (location: (9,7)-(9,14))
             │           │   ├── parent:
             │           │   │   @ SelfNode (location: (9,7)-(9,11))
-            │           │   ├── child:
-            │           │   │   @ ConstantReadNode (location: (9,13)-(9,14))
-            │           │   │   └── name: :A
-            │           │   └── delimiter_loc: (9,11)-(9,13) = "::"
+            │           │   ├── name: :A
+            │           │   ├── delimiter_loc: (9,11)-(9,13) = "::"
+            │           │   └── name_loc: (9,13)-(9,14) = "A"
             │           ├── operator_loc: (9,15)-(9,18) = "||="
             │           └── value:
             │               @ IntegerNode (location: (9,19)-(9,20))
diff --git a/test/prism/snapshots/whitequark/const_scoped.txt b/test/prism/snapshots/whitequark/const_scoped.txt
index 1e2bccef96..83af4b187b 100644
--- a/test/prism/snapshots/whitequark/const_scoped.txt
+++ b/test/prism/snapshots/whitequark/const_scoped.txt
@@ -7,7 +7,6 @@
             ├── parent:
             │   @ ConstantReadNode (location: (1,0)-(1,3))
             │   └── name: :Bar
-            ├── child:
-            │   @ ConstantReadNode (location: (1,5)-(1,8))
-            │   └── name: :Foo
-            └── delimiter_loc: (1,3)-(1,5) = "::"
+            ├── name: :Foo
+            ├── delimiter_loc: (1,3)-(1,5) = "::"
+            └── name_loc: (1,5)-(1,8) = "Foo"
diff --git a/test/prism/snapshots/whitequark/const_toplevel.txt b/test/prism/snapshots/whitequark/const_toplevel.txt
index b54b069d06..3d7df5defc 100644
--- a/test/prism/snapshots/whitequark/const_toplevel.txt
+++ b/test/prism/snapshots/whitequark/const_toplevel.txt
@@ -5,7 +5,6 @@
     └── body: (length: 1)
         └── @ ConstantPathNode (location: (1,0)-(1,5))
             ├── parent: ∅
-            ├── child:
-            │   @ ConstantReadNode (location: (1,2)-(1,5))
-            │   └── name: :Foo
-            └── delimiter_loc: (1,0)-(1,2) = "::"
+            ├── name: :Foo
+            ├── delimiter_loc: (1,0)-(1,2) = "::"
+            └── name_loc: (1,2)-(1,5) = "Foo"
diff --git a/test/prism/snapshots/whitequark/cpath.txt b/test/prism/snapshots/whitequark/cpath.txt
index b892525646..e801456bf7 100644
--- a/test/prism/snapshots/whitequark/cpath.txt
+++ b/test/prism/snapshots/whitequark/cpath.txt
@@ -9,10 +9,9 @@
         │   ├── constant_path:
         │   │   @ ConstantPathNode (location: (1,7)-(1,12))
         │   │   ├── parent: ∅
-        │   │   ├── child:
-        │   │   │   @ ConstantReadNode (location: (1,9)-(1,12))
-        │   │   │   └── name: :Foo
-        │   │   └── delimiter_loc: (1,7)-(1,9) = "::"
+        │   │   ├── name: :Foo
+        │   │   ├── delimiter_loc: (1,7)-(1,9) = "::"
+        │   │   └── name_loc: (1,9)-(1,12) = "Foo"
         │   ├── body: ∅
         │   ├── end_keyword_loc: (1,14)-(1,17) = "end"
         │   └── name: :Foo
@@ -24,10 +23,9 @@
             │   ├── parent:
             │   │   @ ConstantReadNode (location: (3,7)-(3,10))
             │   │   └── name: :Bar
-            │   ├── child:
-            │   │   @ ConstantReadNode (location: (3,12)-(3,15))
-            │   │   └── name: :Foo
-            │   └── delimiter_loc: (3,10)-(3,12) = "::"
+            │   ├── name: :Foo
+            │   ├── delimiter_loc: (3,10)-(3,12) = "::"
+            │   └── name_loc: (3,12)-(3,15) = "Foo"
             ├── body: ∅
             ├── end_keyword_loc: (3,17)-(3,20) = "end"
             └── name: :Foo
diff --git a/test/prism/snapshots/whitequark/masgn_const.txt b/test/prism/snapshots/whitequark/masgn_const.txt
index 56169deb17..ddfccb0d8b 100644
--- a/test/prism/snapshots/whitequark/masgn_const.txt
+++ b/test/prism/snapshots/whitequark/masgn_const.txt
@@ -7,10 +7,9 @@
         │   ├── lefts: (length: 2)
         │   │   ├── @ ConstantPathTargetNode (location: (1,0)-(1,3))
         │   │   │   ├── parent: ∅
-        │   │   │   ├── child:
-        │   │   │   │   @ ConstantReadNode (location: (1,2)-(1,3))
-        │   │   │   │   └── name: :A
-        │   │   │   └── delimiter_loc: (1,0)-(1,2) = "::"
+        │   │   │   ├── name: :A
+        │   │   │   ├── delimiter_loc: (1,0)-(1,2) = "::"
+        │   │   │   └── name_loc: (1,2)-(1,3) = "A"
         │   │   └── @ LocalVariableTargetNode (location: (1,5)-(1,8))
         │   │       ├── name: :foo
         │   │       └── depth: 0
@@ -28,10 +27,9 @@
             │   ├── @ ConstantPathTargetNode (location: (3,0)-(3,7))
             │   │   ├── parent:
             │   │   │   @ SelfNode (location: (3,0)-(3,4))
-            │   │   ├── child:
-            │   │   │   @ ConstantReadNode (location: (3,6)-(3,7))
-            │   │   │   └── name: :A
-            │   │   └── delimiter_loc: (3,4)-(3,6) = "::"
+            │   │   ├── name: :A
+            │   │   ├── delimiter_loc: (3,4)-(3,6) = "::"
+            │   │   └── name_loc: (3,6)-(3,7) = "A"
             │   └── @ LocalVariableTargetNode (location: (3,9)-(3,12))
             │       ├── name: :foo
             │       └── depth: 0
diff --git a/test/prism/snapshots/whitequark/op_asgn_cmd.txt b/test/prism/snapshots/whitequark/op_asgn_cmd.txt
index 109c2fd2ed..7d5ad21d55 100644
--- a/test/prism/snapshots/whitequark/op_asgn_cmd.txt
+++ b/test/prism/snapshots/whitequark/op_asgn_cmd.txt
@@ -103,10 +103,9 @@
         │   │   │   ├── arguments: ∅
         │   │   │   ├── closing_loc: ∅
         │   │   │   └── block: ∅
-        │   │   ├── child:
-        │   │   │   @ ConstantReadNode (location: (5,5)-(5,6))
-        │   │   │   └── name: :A
-        │   │   └── delimiter_loc: (5,3)-(5,5) = "::"
+        │   │   ├── name: :A
+        │   │   ├── delimiter_loc: (5,3)-(5,5) = "::"
+        │   │   └── name_loc: (5,5)-(5,6) = "A"
         │   ├── operator_loc: (5,7)-(5,9) = "+="
         │   ├── value:
         │   │   @ CallNode (location: (5,10)-(5,15))
diff --git a/test/prism/snapshots/whitequark/ruby_bug_12073.txt b/test/prism/snapshots/whitequark/ruby_bug_12073.txt
index 9db30f6fec..eb7d5f1e11 100644
--- a/test/prism/snapshots/whitequark/ruby_bug_12073.txt
+++ b/test/prism/snapshots/whitequark/ruby_bug_12073.txt
@@ -75,10 +75,9 @@
             │           │       │   ├── parent:
             │           │       │   │   @ ConstantReadNode (location: (3,21)-(3,22))
             │           │       │   │   └── name: :A
-            │           │       │   ├── child:
-            │           │       │   │   @ ConstantReadNode (location: (3,24)-(3,25))
-            │           │       │   │   └── name: :B
-            │           │       │   └── delimiter_loc: (3,22)-(3,24) = "::"
+            │           │       │   ├── name: :B
+            │           │       │   ├── delimiter_loc: (3,22)-(3,24) = "::"
+            │           │       │   └── name_loc: (3,24)-(3,25) = "B"
             │           │       └── @ StringNode (location: (3,27)-(3,29))
             │           │           ├── flags: ∅
             │           │           ├── opening_loc: (3,27)-(3,28) = "'"
diff --git a/test/prism/snapshots/whitequark/ruby_bug_12402.txt b/test/prism/snapshots/whitequark/ruby_bug_12402.txt
index df5aea00c3..20bcfeafbe 100644
--- a/test/prism/snapshots/whitequark/ruby_bug_12402.txt
+++ b/test/prism/snapshots/whitequark/ruby_bug_12402.txt
@@ -312,10 +312,9 @@
         │   │   │   @ LocalVariableReadNode (location: (17,0)-(17,3))
         │   │   │   ├── name: :foo
         │   │   │   └── depth: 0
-        │   │   ├── child:
-        │   │   │   @ ConstantReadNode (location: (17,5)-(17,6))
-        │   │   │   └── name: :C
-        │   │   └── delimiter_loc: (17,3)-(17,5) = "::"
+        │   │   ├── name: :C
+        │   │   ├── delimiter_loc: (17,3)-(17,5) = "::"
+        │   │   └── name_loc: (17,5)-(17,6) = "C"
         │   ├── operator_loc: (17,7)-(17,10) = "||="
         │   └── value:
         │       @ RescueModifierNode (location: (17,11)-(17,31))
@@ -353,10 +352,9 @@
         │   │   │   @ LocalVariableReadNode (location: (19,0)-(19,3))
         │   │   │   ├── name: :foo
         │   │   │   └── depth: 0
-        │   │   ├── child:
-        │   │   │   @ ConstantReadNode (location: (19,5)-(19,6))
-        │   │   │   └── name: :C
-        │   │   └── delimiter_loc: (19,3)-(19,5) = "::"
+        │   │   ├── name: :C
+        │   │   ├── delimiter_loc: (19,3)-(19,5) = "::"
+        │   │   └── name_loc: (19,5)-(19,6) = "C"
         │   ├── operator_loc: (19,7)-(19,10) = "||="
         │   └── value:
         │       @ RescueModifierNode (location: (19,11)-(19,32))
diff --git a/test/prism/snapshots/whitequark/send_attr_asgn.txt b/test/prism/snapshots/whitequark/send_attr_asgn.txt
index 392ae5587e..1d09daa4a6 100644
--- a/test/prism/snapshots/whitequark/send_attr_asgn.txt
+++ b/test/prism/snapshots/whitequark/send_attr_asgn.txt
@@ -69,10 +69,9 @@
         │   │   │   ├── arguments: ∅
         │   │   │   ├── closing_loc: ∅
         │   │   │   └── block: ∅
-        │   │   ├── child:
-        │   │   │   @ ConstantReadNode (location: (5,5)-(5,6))
-        │   │   │   └── name: :A
-        │   │   └── delimiter_loc: (5,3)-(5,5) = "::"
+        │   │   ├── name: :A
+        │   │   ├── delimiter_loc: (5,3)-(5,5) = "::"
+        │   │   └── name_loc: (5,5)-(5,6) = "A"
         │   ├── operator_loc: (5,7)-(5,8) = "="
         │   └── value:
         │       @ IntegerNode (location: (5,9)-(5,10))