refactoring: fix naming

internal/php7/php7.go

@@ -2598,7 +2598,7 @@ yydefault:
 		{
 			yyVAL.node = &ParserSeparatedList{
 				Items: []ast.Vertex{
-					&ast.NameNamePart{
+					&ast.NamePart{
 						Position:  yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
 						StringTkn: yyDollar[1].token,
 						Value:     yyDollar[1].token.Value,
@@ -2610,7 +2610,7 @@ yydefault:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		// line internal/php7/php7.y:350
 		{
-			part := &ast.NameNamePart{
+			part := &ast.NamePart{
 				Position:  yylex.(*Parser).builder.NewTokenPosition(yyDollar[3].token),
 				StringTkn: yyDollar[3].token,
 				Value:     yyDollar[3].token.Value,
@@ -2625,7 +2625,7 @@ yydefault:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		// line internal/php7/php7.y:366
 		{
-			yyVAL.node = &ast.NameName{
+			yyVAL.node = &ast.Name{
 				Position:      yylex.(*Parser).builder.NewNodeListPosition(yyDollar[1].node.(*ParserSeparatedList).Items),
 				Parts:         yyDollar[1].node.(*ParserSeparatedList).Items,
 				SeparatorTkns: yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns,
@@ -2710,7 +2710,7 @@ yydefault:
 			yyVAL.node = &ast.StmtNamespace{
 				Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token),
 				NsTkn:    yyDollar[1].token,
-				Name: &ast.NameName{
+				Name: &ast.Name{
 					Position:      yylex.(*Parser).builder.NewNodeListPosition(yyDollar[2].node.(*ParserSeparatedList).Items),
 					Parts:         yyDollar[2].node.(*ParserSeparatedList).Items,
 					SeparatorTkns: yyDollar[2].node.(*ParserSeparatedList).SeparatorTkns,
@@ -2725,7 +2725,7 @@ yydefault:
 			yyVAL.node = &ast.StmtNamespace{
 				Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[5].token),
 				NsTkn:    yyDollar[1].token,
-				Name: &ast.NameName{
+				Name: &ast.Name{
 					Position:      yylex.(*Parser).builder.NewNodeListPosition(yyDollar[2].node.(*ParserSeparatedList).Items),
 					Parts:         yyDollar[2].node.(*ParserSeparatedList).Items,
 					SeparatorTkns: yyDollar[2].node.(*ParserSeparatedList).SeparatorTkns,
@@ -2751,7 +2751,7 @@ yydefault:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		// line internal/php7/php7.y:469
 		{
-			use := yyDollar[2].node.(*ast.StmtGroupUse)
+			use := yyDollar[2].node.(*ast.StmtGroupUseList)
 
 			use.Position = yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token)
 			use.UseTkn = yyDollar[1].token
@@ -2763,7 +2763,7 @@ yydefault:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		// line internal/php7/php7.y:479
 		{
-			use := yyDollar[3].node.(*ast.StmtGroupUse)
+			use := yyDollar[3].node.(*ast.StmtGroupUseList)
 
 			use.Position = yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token)
 			use.UseTkn = yyDollar[1].token
@@ -2776,25 +2776,25 @@ yydefault:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		// line internal/php7/php7.y:490
 		{
-			yyVAL.node = &ast.StmtUse{
-				Position:        yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token),
-				UseTkn:          yyDollar[1].token,
-				UseDeclarations: yyDollar[2].node.(*ParserSeparatedList).Items,
-				SeparatorTkns:   yyDollar[2].node.(*ParserSeparatedList).SeparatorTkns,
-				SemiColonTkn:    yyDollar[3].token,
+			yyVAL.node = &ast.StmtUseList{
+				Position:      yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token),
+				UseTkn:        yyDollar[1].token,
+				Uses:          yyDollar[2].node.(*ParserSeparatedList).Items,
+				SeparatorTkns: yyDollar[2].node.(*ParserSeparatedList).SeparatorTkns,
+				SemiColonTkn:  yyDollar[3].token,
 			}
 		}
 	case 99:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		// line internal/php7/php7.y:500
 		{
-			yyVAL.node = &ast.StmtUse{
-				Position:        yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token),
-				UseTkn:          yyDollar[1].token,
-				Type:            yyDollar[2].node,
-				UseDeclarations: yyDollar[3].node.(*ParserSeparatedList).Items,
-				SeparatorTkns:   yyDollar[3].node.(*ParserSeparatedList).SeparatorTkns,
-				SemiColonTkn:    yyDollar[4].token,
+			yyVAL.node = &ast.StmtUseList{
+				Position:      yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token),
+				UseTkn:        yyDollar[1].token,
+				Type:          yyDollar[2].node,
+				Uses:          yyDollar[3].node.(*ParserSeparatedList).Items,
+				SeparatorTkns: yyDollar[3].node.(*ParserSeparatedList).SeparatorTkns,
+				SemiColonTkn:  yyDollar[4].token,
 			}
 		}
 	case 100:
@@ -2837,16 +2837,16 @@ yydefault:
 				yyDollar[4].node.(*ParserSeparatedList).SeparatorTkns = append(yyDollar[4].node.(*ParserSeparatedList).SeparatorTkns, yyDollar[5].token)
 			}
 
-			yyVAL.node = &ast.StmtGroupUse{
+			yyVAL.node = &ast.StmtGroupUseList{
 				Position: yylex.(*Parser).builder.NewNodeListTokenPosition(yyDollar[1].node.(*ParserSeparatedList).Items, yyDollar[6].token),
-				Prefix: &ast.NameName{
+				Prefix: &ast.Name{
 					Position:      yylex.(*Parser).builder.NewNodeListPosition(yyDollar[1].node.(*ParserSeparatedList).Items),
 					Parts:         yyDollar[1].node.(*ParserSeparatedList).Items,
 					SeparatorTkns: yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns,
 				},
 				NsSeparatorTkn:       yyDollar[2].token,
 				OpenCurlyBracketTkn:  yyDollar[3].token,
-				UseDeclarations:      yyDollar[4].node.(*ParserSeparatedList).Items,
+				Uses:                 yyDollar[4].node.(*ParserSeparatedList).Items,
 				SeparatorTkns:        yyDollar[4].node.(*ParserSeparatedList).SeparatorTkns,
 				CloseCurlyBracketTkn: yyDollar[6].token,
 			}
@@ -2859,17 +2859,17 @@ yydefault:
 				yyDollar[5].node.(*ParserSeparatedList).SeparatorTkns = append(yyDollar[5].node.(*ParserSeparatedList).SeparatorTkns, yyDollar[6].token)
 			}
 
-			yyVAL.node = &ast.StmtGroupUse{
+			yyVAL.node = &ast.StmtGroupUseList{
 				Position:              yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[7].token),
 				LeadingNsSeparatorTkn: yyDollar[1].token,
-				Prefix: &ast.NameName{
+				Prefix: &ast.Name{
 					Position:      yylex.(*Parser).builder.NewNodeListPosition(yyDollar[2].node.(*ParserSeparatedList).Items),
 					Parts:         yyDollar[2].node.(*ParserSeparatedList).Items,
 					SeparatorTkns: yyDollar[2].node.(*ParserSeparatedList).SeparatorTkns,
 				},
 				NsSeparatorTkn:       yyDollar[3].token,
 				OpenCurlyBracketTkn:  yyDollar[4].token,
-				UseDeclarations:      yyDollar[5].node.(*ParserSeparatedList).Items,
+				Uses:                 yyDollar[5].node.(*ParserSeparatedList).Items,
 				SeparatorTkns:        yyDollar[5].node.(*ParserSeparatedList).SeparatorTkns,
 				CloseCurlyBracketTkn: yyDollar[7].token,
 			}
@@ -2882,16 +2882,16 @@ yydefault:
 				yyDollar[4].node.(*ParserSeparatedList).SeparatorTkns = append(yyDollar[4].node.(*ParserSeparatedList).SeparatorTkns, yyDollar[5].token)
 			}
 
-			yyVAL.node = &ast.StmtGroupUse{
+			yyVAL.node = &ast.StmtGroupUseList{
 				Position: yylex.(*Parser).builder.NewNodeListTokenPosition(yyDollar[1].node.(*ParserSeparatedList).Items, yyDollar[6].token),
-				Prefix: &ast.NameName{
+				Prefix: &ast.Name{
 					Position:      yylex.(*Parser).builder.NewNodeListPosition(yyDollar[1].node.(*ParserSeparatedList).Items),
 					Parts:         yyDollar[1].node.(*ParserSeparatedList).Items,
 					SeparatorTkns: yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns,
 				},
 				NsSeparatorTkn:       yyDollar[2].token,
 				OpenCurlyBracketTkn:  yyDollar[3].token,
-				UseDeclarations:      yyDollar[4].node.(*ParserSeparatedList).Items,
+				Uses:                 yyDollar[4].node.(*ParserSeparatedList).Items,
 				SeparatorTkns:        yyDollar[4].node.(*ParserSeparatedList).SeparatorTkns,
 				CloseCurlyBracketTkn: yyDollar[6].token,
 			}
@@ -2904,17 +2904,17 @@ yydefault:
 				yyDollar[5].node.(*ParserSeparatedList).SeparatorTkns = append(yyDollar[5].node.(*ParserSeparatedList).SeparatorTkns, yyDollar[6].token)
 			}
 
-			yyVAL.node = &ast.StmtGroupUse{
+			yyVAL.node = &ast.StmtGroupUseList{
 				Position:              yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[7].token),
 				LeadingNsSeparatorTkn: yyDollar[1].token,
-				Prefix: &ast.NameName{
+				Prefix: &ast.Name{
 					Position:      yylex.(*Parser).builder.NewNodeListPosition(yyDollar[2].node.(*ParserSeparatedList).Items),
 					Parts:         yyDollar[2].node.(*ParserSeparatedList).Items,
 					SeparatorTkns: yyDollar[2].node.(*ParserSeparatedList).SeparatorTkns,
 				},
 				NsSeparatorTkn:       yyDollar[3].token,
 				OpenCurlyBracketTkn:  yyDollar[4].token,
-				UseDeclarations:      yyDollar[5].node.(*ParserSeparatedList).Items,
+				Uses:                 yyDollar[5].node.(*ParserSeparatedList).Items,
 				SeparatorTkns:        yyDollar[5].node.(*ParserSeparatedList).SeparatorTkns,
 				CloseCurlyBracketTkn: yyDollar[7].token,
 			}
@@ -2992,7 +2992,7 @@ yydefault:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		// line internal/php7/php7.y:694
 		{
-			decl := yyDollar[2].node.(*ast.StmtUseDeclaration)
+			decl := yyDollar[2].node.(*ast.StmtUse)
 			decl.Type = yyDollar[1].node
 			decl.Position = yylex.(*Parser).builder.NewNodesPosition(yyDollar[1].node, yyDollar[2].node)
 
@@ -3002,9 +3002,9 @@ yydefault:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		// line internal/php7/php7.y:705
 		{
-			yyVAL.node = &ast.StmtUseDeclaration{
+			yyVAL.node = &ast.StmtUse{
 				Position: yylex.(*Parser).builder.NewNodeListPosition(yyDollar[1].node.(*ParserSeparatedList).Items),
-				Use: &ast.NameName{
+				Use: &ast.Name{
 					Position:      yylex.(*Parser).builder.NewNodeListPosition(yyDollar[1].node.(*ParserSeparatedList).Items),
 					Parts:         yyDollar[1].node.(*ParserSeparatedList).Items,
 					SeparatorTkns: yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns,
@@ -3015,9 +3015,9 @@ yydefault:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		// line internal/php7/php7.y:716
 		{
-			yyVAL.node = &ast.StmtUseDeclaration{
+			yyVAL.node = &ast.StmtUse{
 				Position: yylex.(*Parser).builder.NewNodeListTokenPosition(yyDollar[1].node.(*ParserSeparatedList).Items, yyDollar[3].token),
-				Use: &ast.NameName{
+				Use: &ast.Name{
 					Position:      yylex.(*Parser).builder.NewNodeListPosition(yyDollar[1].node.(*ParserSeparatedList).Items),
 					Parts:         yyDollar[1].node.(*ParserSeparatedList).Items,
 					SeparatorTkns: yyDollar[1].node.(*ParserSeparatedList).SeparatorTkns,
@@ -3040,7 +3040,7 @@ yydefault:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		// line internal/php7/php7.y:740
 		{
-			decl := yyDollar[2].node.(*ast.StmtUseDeclaration)
+			decl := yyDollar[2].node.(*ast.StmtUse)
 			decl.NsSeparatorTkn = yyDollar[1].token
 			decl.Position = yylex.(*Parser).builder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node)
 
@@ -3422,7 +3422,7 @@ yydefault:
 		{
 			yyVAL.node = &ast.StmtLabel{
 				Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[2].token),
-				LabelName: &ast.Identifier{
+				Name: &ast.Identifier{
 					Position:      yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
 					IdentifierTkn: yyDollar[1].token,
 					Value:         yyDollar[1].token.Value,
@@ -3445,7 +3445,7 @@ yydefault:
 			catch.OpenParenthesisTkn = yyDollar[3].token
 			catch.Var = &ast.ExprVariable{
 				Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[5].token),
-				VarName: &ast.Identifier{
+				Name: &ast.Identifier{
 					Position:      yylex.(*Parser).builder.NewTokenPosition(yyDollar[5].token),
 					IdentifierTkn: yyDollar[5].token,
 					Value:         yyDollar[5].token.Value,
@@ -3525,7 +3525,7 @@ yydefault:
 				Position:     yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[11].token),
 				FunctionTkn:  yyDollar[1].token,
 				AmpersandTkn: yyDollar[2].token,
-				FunctionName: &ast.Identifier{
+				Name: &ast.Identifier{
 					Position:      yylex.(*Parser).builder.NewTokenPosition(yyDollar[3].token),
 					IdentifierTkn: yyDollar[3].token,
 					Value:         yyDollar[3].token.Value,
@@ -3573,7 +3573,7 @@ yydefault:
 				Position:  yylex.(*Parser).builder.NewOptionalListTokensPosition(yyDollar[1].list, yyDollar[2].token, yyDollar[9].token),
 				Modifiers: yyDollar[1].list,
 				ClassTkn:  yyDollar[2].token,
-				ClassName: &ast.Identifier{
+				Name: &ast.Identifier{
 					Position:      yylex.(*Parser).builder.NewTokenPosition(yyDollar[3].token),
 					IdentifierTkn: yyDollar[3].token,
 					Value:         yyDollar[3].token.Value,
@@ -3603,7 +3603,7 @@ yydefault:
 			class := &ast.StmtClass{
 				Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[8].token),
 				ClassTkn: yyDollar[1].token,
-				ClassName: &ast.Identifier{
+				Name: &ast.Identifier{
 					Position:      yylex.(*Parser).builder.NewTokenPosition(yyDollar[2].token),
 					IdentifierTkn: yyDollar[2].token,
 					Value:         yyDollar[2].token.Value,
@@ -3665,7 +3665,7 @@ yydefault:
 			yyVAL.node = &ast.StmtTrait{
 				Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[6].token),
 				TraitTkn: yyDollar[1].token,
-				TraitName: &ast.Identifier{
+				Name: &ast.Identifier{
 					Position:      yylex.(*Parser).builder.NewTokenPosition(yyDollar[2].token),
 					IdentifierTkn: yyDollar[2].token,
 					Value:         yyDollar[2].token.Value,
@@ -3682,7 +3682,7 @@ yydefault:
 			iface := &ast.StmtInterface{
 				Position:     yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[7].token),
 				InterfaceTkn: yyDollar[1].token,
-				InterfaceName: &ast.Identifier{
+				Name: &ast.Identifier{
 					Position:      yylex.(*Parser).builder.NewTokenPosition(yyDollar[2].token),
 					IdentifierTkn: yyDollar[2].token,
 					Value:         yyDollar[2].token.Value,
@@ -3870,7 +3870,7 @@ yydefault:
 			yyVAL.node = &ast.StmtSwitch{
 				Position:             yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token),
 				OpenCurlyBracketTkn:  yyDollar[1].token,
-				CaseList:             yyDollar[2].list,
+				Cases:                yyDollar[2].list,
 				CloseCurlyBracketTkn: yyDollar[3].token,
 			}
 		}
@@ -3882,7 +3882,7 @@ yydefault:
 				Position:             yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token),
 				OpenCurlyBracketTkn:  yyDollar[1].token,
 				CaseSeparatorTkn:     yyDollar[2].token,
-				CaseList:             yyDollar[3].list,
+				Cases:                yyDollar[3].list,
 				CloseCurlyBracketTkn: yyDollar[4].token,
 			}
 		}
@@ -3893,7 +3893,7 @@ yydefault:
 			yyVAL.node = &ast.StmtSwitch{
 				Position:     yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token),
 				ColonTkn:     yyDollar[1].token,
-				CaseList:     yyDollar[2].list,
+				Cases:        yyDollar[2].list,
 				EndSwitchTkn: yyDollar[3].token,
 				SemiColonTkn: yyDollar[4].token,
 			}
@@ -3906,7 +3906,7 @@ yydefault:
 				Position:         yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[5].token),
 				ColonTkn:         yyDollar[1].token,
 				CaseSeparatorTkn: yyDollar[2].token,
-				CaseList:         yyDollar[3].list,
+				Cases:            yyDollar[3].list,
 				EndSwitchTkn:     yyDollar[4].token,
 				SemiColonTkn:     yyDollar[5].token,
 			}
@@ -4140,7 +4140,7 @@ yydefault:
 				VariadicTkn:  yyDollar[3].token,
 				Var: &ast.ExprVariable{
 					Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[4].token),
-					VarName: &ast.Identifier{
+					Name: &ast.Identifier{
 						Position:      yylex.(*Parser).builder.NewTokenPosition(yyDollar[4].token),
 						IdentifierTkn: yyDollar[4].token,
 						Value:         yyDollar[4].token.Value,
@@ -4168,7 +4168,7 @@ yydefault:
 				VariadicTkn:  yyDollar[3].token,
 				Var: &ast.ExprVariable{
 					Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[4].token),
-					VarName: &ast.Identifier{
+					Name: &ast.Identifier{
 						Position:      yylex.(*Parser).builder.NewTokenPosition(yyDollar[4].token),
 						IdentifierTkn: yyDollar[4].token,
 						Value:         yyDollar[4].token.Value,
@@ -4356,7 +4356,7 @@ yydefault:
 				Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
 				Var: &ast.ExprVariable{
 					Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
-					VarName: &ast.Identifier{
+					Name: &ast.Identifier{
 						Position:      yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
 						IdentifierTkn: yyDollar[1].token,
 						Value:         yyDollar[1].token.Value,
@@ -4372,7 +4372,7 @@ yydefault:
 				Position: yylex.(*Parser).builder.NewTokenNodePosition(yyDollar[1].token, yyDollar[3].node),
 				Var: &ast.ExprVariable{
 					Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
-					VarName: &ast.Identifier{
+					Name: &ast.Identifier{
 						Position:      yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
 						IdentifierTkn: yyDollar[1].token,
 						Value:         yyDollar[1].token.Value,
@@ -4402,7 +4402,7 @@ yydefault:
 				Position:      yylex.(*Parser).builder.NewNodeListTokenPosition(yyDollar[1].list, yyDollar[4].token),
 				Modifiers:     yyDollar[1].list,
 				Type:          yyDollar[2].node,
-				Properties:    yyDollar[3].node.(*ParserSeparatedList).Items,
+				Props:         yyDollar[3].node.(*ParserSeparatedList).Items,
 				SeparatorTkns: yyDollar[3].node.(*ParserSeparatedList).SeparatorTkns,
 				SemiColonTkn:  yyDollar[4].token,
 			}
@@ -4456,7 +4456,7 @@ yydefault:
 				Modifiers:    yyDollar[1].list,
 				FunctionTkn:  yyDollar[2].token,
 				AmpersandTkn: yyDollar[3].token,
-				MethodName: &ast.Identifier{
+				Name: &ast.Identifier{
 					Position:      yylex.(*Parser).builder.NewTokenPosition(yyDollar[4].token),
 					IdentifierTkn: yyDollar[4].token,
 					Value:         yyDollar[4].token.Value,
@@ -4805,7 +4805,7 @@ yydefault:
 				Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
 				Var: &ast.ExprVariable{
 					Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
-					VarName: &ast.Identifier{
+					Name: &ast.Identifier{
 						Position:      yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
 						IdentifierTkn: yyDollar[1].token,
 						Value:         yyDollar[1].token.Value,
@@ -4822,7 +4822,7 @@ yydefault:
 				Position: yylex.(*Parser).builder.NewTokenNodePosition(yyDollar[1].token, yyDollar[3].node),
 				Var: &ast.ExprVariable{
 					Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
-					VarName: &ast.Identifier{
+					Name: &ast.Identifier{
 						Position:      yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
 						IdentifierTkn: yyDollar[1].token,
 						Value:         yyDollar[1].token.Value,
@@ -4939,7 +4939,7 @@ yydefault:
 				Position:             yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[8].token),
 				ClassTkn:             yyDollar[1].token,
 				OpenParenthesisTkn:   yyDollar[2].node.(*ArgumentList).OpenParenthesisTkn,
-				Arguments:            yyDollar[2].node.(*ArgumentList).Arguments,
+				Args:                 yyDollar[2].node.(*ArgumentList).Arguments,
 				SeparatorTkns:        yyDollar[2].node.(*ArgumentList).SeparatorTkns,
 				CloseParenthesisTkn:  yyDollar[2].node.(*ArgumentList).CloseParenthesisTkn,
 				OpenCurlyBracketTkn:  yyDollar[6].token,
@@ -4970,7 +4970,7 @@ yydefault:
 					NewTkn:              yyDollar[1].token,
 					Class:               yyDollar[2].node,
 					OpenParenthesisTkn:  yyDollar[3].node.(*ArgumentList).OpenParenthesisTkn,
-					Arguments:           yyDollar[3].node.(*ArgumentList).Arguments,
+					Args:                yyDollar[3].node.(*ArgumentList).Arguments,
 					SeparatorTkns:       yyDollar[3].node.(*ArgumentList).SeparatorTkns,
 					CloseParenthesisTkn: yyDollar[3].node.(*ArgumentList).CloseParenthesisTkn,
 				}
@@ -5603,7 +5603,7 @@ yydefault:
 		{
 			yyVAL.node = &ast.ExprTernary{
 				Position:    yylex.(*Parser).builder.NewNodesPosition(yyDollar[1].node, yyDollar[5].node),
-				Condition:   yyDollar[1].node,
+				Cond:        yyDollar[1].node,
 				QuestionTkn: yyDollar[2].token,
 				IfTrue:      yyDollar[3].node,
 				ColonTkn:    yyDollar[4].token,
@@ -5616,7 +5616,7 @@ yydefault:
 		{
 			yyVAL.node = &ast.ExprTernary{
 				Position:    yylex.(*Parser).builder.NewNodesPosition(yyDollar[1].node, yyDollar[4].node),
-				Condition:   yyDollar[1].node,
+				Cond:        yyDollar[1].node,
 				QuestionTkn: yyDollar[2].token,
 				ColonTkn:    yyDollar[3].token,
 				IfFalse:     yyDollar[4].node,
@@ -5781,7 +5781,7 @@ yydefault:
 			yyVAL.node = &ast.ExprYield{
 				Position: yylex.(*Parser).builder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node),
 				YieldTkn: yyDollar[1].token,
-				Value:    yyDollar[2].node,
+				Val:      yyDollar[2].node,
 			}
 		}
 	case 369:
@@ -5793,7 +5793,7 @@ yydefault:
 				YieldTkn:       yyDollar[1].token,
 				Key:            yyDollar[2].node,
 				DoubleArrowTkn: yyDollar[3].token,
-				Value:          yyDollar[4].node,
+				Val:            yyDollar[4].node,
 			}
 		}
 	case 370:
@@ -5891,7 +5891,7 @@ yydefault:
 			yyVAL.node = &ast.ExprClosure{
 				UseTkn:                 yyDollar[1].token,
 				UseOpenParenthesisTkn:  yyDollar[2].token,
-				Use:                    yyDollar[3].node.(*ParserSeparatedList).Items,
+				Uses:                   yyDollar[3].node.(*ParserSeparatedList).Items,
 				UseSeparatorTkns:       yyDollar[3].node.(*ParserSeparatedList).SeparatorTkns,
 				UseCloseParenthesisTkn: yyDollar[4].token,
 			}
@@ -5921,7 +5921,7 @@ yydefault:
 				Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
 				Var: &ast.ExprVariable{
 					Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
-					VarName: &ast.Identifier{
+					Name: &ast.Identifier{
 						Position:      yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
 						IdentifierTkn: yyDollar[1].token,
 						Value:         yyDollar[1].token.Value,
@@ -5938,7 +5938,7 @@ yydefault:
 				AmpersandTkn: yyDollar[1].token,
 				Var: &ast.ExprVariable{
 					Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[2].token),
-					VarName: &ast.Identifier{
+					Name: &ast.Identifier{
 						Position:      yylex.(*Parser).builder.NewTokenPosition(yyDollar[2].token),
 						IdentifierTkn: yyDollar[2].token,
 						Value:         yyDollar[2].token.Value,
@@ -5954,7 +5954,7 @@ yydefault:
 				Position:            yylex.(*Parser).builder.NewNodesPosition(yyDollar[1].node, yyDollar[2].node),
 				Function:            yyDollar[1].node,
 				OpenParenthesisTkn:  yyDollar[2].node.(*ArgumentList).OpenParenthesisTkn,
-				Arguments:           yyDollar[2].node.(*ArgumentList).Arguments,
+				Args:                yyDollar[2].node.(*ArgumentList).Arguments,
 				SeparatorTkns:       yyDollar[2].node.(*ArgumentList).SeparatorTkns,
 				CloseParenthesisTkn: yyDollar[2].node.(*ArgumentList).CloseParenthesisTkn,
 			}
@@ -5969,7 +5969,7 @@ yydefault:
 				DoubleColonTkn:      yyDollar[2].token,
 				Call:                yyDollar[3].node,
 				OpenParenthesisTkn:  yyDollar[4].node.(*ArgumentList).OpenParenthesisTkn,
-				Arguments:           yyDollar[4].node.(*ArgumentList).Arguments,
+				Args:                yyDollar[4].node.(*ArgumentList).Arguments,
 				SeparatorTkns:       yyDollar[4].node.(*ArgumentList).SeparatorTkns,
 				CloseParenthesisTkn: yyDollar[4].node.(*ArgumentList).CloseParenthesisTkn,
 			}
@@ -5992,7 +5992,7 @@ yydefault:
 				DoubleColonTkn:      yyDollar[2].token,
 				Call:                yyDollar[3].node,
 				OpenParenthesisTkn:  yyDollar[4].node.(*ArgumentList).OpenParenthesisTkn,
-				Arguments:           yyDollar[4].node.(*ArgumentList).Arguments,
+				Args:                yyDollar[4].node.(*ArgumentList).Arguments,
 				SeparatorTkns:       yyDollar[4].node.(*ArgumentList).SeparatorTkns,
 				CloseParenthesisTkn: yyDollar[4].node.(*ArgumentList).CloseParenthesisTkn,
 			}
@@ -6013,7 +6013,7 @@ yydefault:
 				Position:            yylex.(*Parser).builder.NewNodesPosition(yyDollar[1].node, yyDollar[2].node),
 				Function:            yyDollar[1].node,
 				OpenParenthesisTkn:  yyDollar[2].node.(*ArgumentList).OpenParenthesisTkn,
-				Arguments:           yyDollar[2].node.(*ArgumentList).Arguments,
+				Args:                yyDollar[2].node.(*ArgumentList).Arguments,
 				SeparatorTkns:       yyDollar[2].node.(*ArgumentList).SeparatorTkns,
 				CloseParenthesisTkn: yyDollar[2].node.(*ArgumentList).CloseParenthesisTkn,
 			}
@@ -6312,7 +6312,7 @@ yydefault:
 				Position:       yylex.(*Parser).builder.NewNodeTokenPosition(yyDollar[1].node, yyDollar[3].token),
 				Class:          yyDollar[1].node,
 				DoubleColonTkn: yyDollar[2].token,
-				ConstantName: &ast.Identifier{
+				Const: &ast.Identifier{
 					Position:      yylex.(*Parser).builder.NewTokenPosition(yyDollar[3].token),
 					IdentifierTkn: yyDollar[3].token,
 					Value:         yyDollar[3].token.Value,
@@ -6327,7 +6327,7 @@ yydefault:
 				Position:       yylex.(*Parser).builder.NewNodeTokenPosition(yyDollar[1].node, yyDollar[3].token),
 				Class:          yyDollar[1].node,
 				DoubleColonTkn: yyDollar[2].token,
-				ConstantName: &ast.Identifier{
+				Const: &ast.Identifier{
 					Position:      yylex.(*Parser).builder.NewTokenPosition(yyDollar[3].token),
 					IdentifierTkn: yyDollar[3].token,
 					Value:         yyDollar[3].token.Value,
@@ -6462,7 +6462,7 @@ yydefault:
 				ObjectOperatorTkn:   yyDollar[2].token,
 				Method:              yyDollar[3].node,
 				OpenParenthesisTkn:  yyDollar[4].node.(*ArgumentList).OpenParenthesisTkn,
-				Arguments:           yyDollar[4].node.(*ArgumentList).Arguments,
+				Args:                yyDollar[4].node.(*ArgumentList).Arguments,
 				SeparatorTkns:       yyDollar[4].node.(*ArgumentList).SeparatorTkns,
 				CloseParenthesisTkn: yyDollar[4].node.(*ArgumentList).CloseParenthesisTkn,
 			}
@@ -6501,12 +6501,12 @@ yydefault:
 				Position:          yylex.(*Parser).builder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node),
 				Var:               yyDollar[1].node,
 				ObjectOperatorTkn: yyDollar[2].token,
-				Property:          yyDollar[3].node,
+				Prop:              yyDollar[3].node,
 			}
 
 			if brackets, ok := yyDollar[3].node.(*ParserBrackets); ok {
 				propertyFetch.OpenCurlyBracketTkn = brackets.OpenBracketTkn
-				propertyFetch.Property = brackets.Child
+				propertyFetch.Prop = brackets.Child
 				propertyFetch.CloseCurlyBracketTkn = brackets.CloseBracketTkn
 			}
 
@@ -6518,7 +6518,7 @@ yydefault:
 		{
 			yyVAL.node = &ast.ExprVariable{
 				Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
-				VarName: &ast.Identifier{
+				Name: &ast.Identifier{
 					Position:      yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
 					IdentifierTkn: yyDollar[1].token,
 					Value:         yyDollar[1].token.Value,
@@ -6533,7 +6533,7 @@ yydefault:
 				Position:             yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token),
 				DollarTkn:            yyDollar[1].token,
 				OpenCurlyBracketTkn:  yyDollar[2].token,
-				VarName:              yyDollar[3].node,
+				Name:                 yyDollar[3].node,
 				CloseCurlyBracketTkn: yyDollar[4].token,
 			}
 		}
@@ -6544,7 +6544,7 @@ yydefault:
 			yyVAL.node = &ast.ExprVariable{
 				Position:  yylex.(*Parser).builder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node),
 				DollarTkn: yyDollar[1].token,
-				VarName:   yyDollar[2].node,
+				Name:      yyDollar[2].node,
 			}
 		}
 	case 444:
@@ -6555,7 +6555,7 @@ yydefault:
 				Position:       yylex.(*Parser).builder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node),
 				Class:          yyDollar[1].node,
 				DoubleColonTkn: yyDollar[2].token,
-				Property:       yyDollar[3].node,
+				Prop:           yyDollar[3].node,
 			}
 		}
 	case 445:
@@ -6566,7 +6566,7 @@ yydefault:
 				Position:       yylex.(*Parser).builder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node),
 				Class:          yyDollar[1].node,
 				DoubleColonTkn: yyDollar[2].token,
-				Property:       yyDollar[3].node,
+				Prop:           yyDollar[3].node,
 			}
 		}
 	case 446:
@@ -6607,12 +6607,12 @@ yydefault:
 				Position:          yylex.(*Parser).builder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node),
 				Var:               yyDollar[1].node,
 				ObjectOperatorTkn: yyDollar[2].token,
-				Property:          yyDollar[3].node,
+				Prop:              yyDollar[3].node,
 			}
 
 			if brackets, ok := yyDollar[3].node.(*ParserBrackets); ok {
 				propertyFetch.OpenCurlyBracketTkn = brackets.OpenBracketTkn
-				propertyFetch.Property = brackets.Child
+				propertyFetch.Prop = brackets.Child
 				propertyFetch.CloseCurlyBracketTkn = brackets.CloseBracketTkn
 			}
 
@@ -6626,7 +6626,7 @@ yydefault:
 				Position:       yylex.(*Parser).builder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node),
 				Class:          yyDollar[1].node,
 				DoubleColonTkn: yyDollar[2].token,
-				Property:       yyDollar[3].node,
+				Prop:           yyDollar[3].node,
 			}
 		}
 	case 451:
@@ -6637,7 +6637,7 @@ yydefault:
 				Position:       yylex.(*Parser).builder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node),
 				Class:          yyDollar[1].node,
 				DoubleColonTkn: yyDollar[2].token,
-				Property:       yyDollar[3].node,
+				Prop:           yyDollar[3].node,
 			}
 		}
 	case 452:
@@ -6866,7 +6866,7 @@ yydefault:
 		{
 			yyVAL.node = &ast.ExprVariable{
 				Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
-				VarName: &ast.Identifier{
+				Name: &ast.Identifier{
 					Position:      yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
 					IdentifierTkn: yyDollar[1].token,
 					Value:         yyDollar[1].token.Value,
@@ -6881,7 +6881,7 @@ yydefault:
 				Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token),
 				Var: &ast.ExprVariable{
 					Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
-					VarName: &ast.Identifier{
+					Name: &ast.Identifier{
 						Position:      yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
 						IdentifierTkn: yyDollar[1].token,
 						Value:         yyDollar[1].token.Value,
@@ -6900,14 +6900,14 @@ yydefault:
 				Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token),
 				Var: &ast.ExprVariable{
 					Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
-					VarName: &ast.Identifier{
+					Name: &ast.Identifier{
 						Position:      yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
 						IdentifierTkn: yyDollar[1].token,
 						Value:         yyDollar[1].token.Value,
 					},
 				},
 				ObjectOperatorTkn: yyDollar[2].token,
-				Property: &ast.Identifier{
+				Prop: &ast.Identifier{
 					Position:      yylex.(*Parser).builder.NewTokenPosition(yyDollar[3].token),
 					IdentifierTkn: yyDollar[3].token,
 					Value:         yyDollar[3].token.Value,
@@ -6921,7 +6921,7 @@ yydefault:
 			yyVAL.node = &ast.ScalarEncapsedStringVar{
 				Position:                  yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token),
 				DollarOpenCurlyBracketTkn: yyDollar[1].token,
-				VarName:                   yyDollar[2].node,
+				Name:                      yyDollar[2].node,
 				CloseCurlyBracketTkn:      yyDollar[3].token,
 			}
 		}
@@ -6932,7 +6932,7 @@ yydefault:
 			yyVAL.node = &ast.ScalarEncapsedStringVar{
 				Position:                  yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token),
 				DollarOpenCurlyBracketTkn: yyDollar[1].token,
-				VarName: &ast.Identifier{
+				Name: &ast.Identifier{
 					Position:      yylex.(*Parser).builder.NewTokenPosition(yyDollar[2].token),
 					IdentifierTkn: yyDollar[2].token,
 					Value:         yyDollar[2].token.Value,
@@ -6947,7 +6947,7 @@ yydefault:
 			yyVAL.node = &ast.ScalarEncapsedStringVar{
 				Position:                  yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token),
 				DollarOpenCurlyBracketTkn: yyDollar[1].token,
-				VarName: &ast.Identifier{
+				Name: &ast.Identifier{
 					Position:      yylex.(*Parser).builder.NewTokenPosition(yyDollar[2].token),
 					IdentifierTkn: yyDollar[2].token,
 					Value:         yyDollar[2].token.Value,
@@ -7030,7 +7030,7 @@ yydefault:
 		{
 			yyVAL.node = &ast.ExprVariable{
 				Position: yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
-				VarName: &ast.Identifier{
+				Name: &ast.Identifier{
 					Position:      yylex.(*Parser).builder.NewTokenPosition(yyDollar[1].token),
 					IdentifierTkn: yyDollar[1].token,
 					Value:         yyDollar[1].token.Value,

internal/php7/php7.y

@@ -338,7 +338,7 @@ namespace_name:
             {
                 $$ = &ParserSeparatedList{
                     Items: []ast.Vertex{
-                        &ast.NameNamePart{
+                        &ast.NamePart{
                             Position: yylex.(*Parser).builder.NewTokenPosition($1),
                             StringTkn: $1,
                             Value:     $1.Value,
@@ -348,7 +348,7 @@ namespace_name:
             }
     |   namespace_name T_NS_SEPARATOR T_STRING
             {
-                part := &ast.NameNamePart{
+                part := &ast.NamePart{
                     Position: yylex.(*Parser).builder.NewTokenPosition($3),
                     StringTkn:      $3,
                     Value:          $3.Value,
@@ -364,7 +364,7 @@ namespace_name:
 name:
         namespace_name
             {
-                $$ = &ast.NameName{
+                $$ = &ast.Name{
                     Position: yylex.(*Parser).builder.NewNodeListPosition($1.(*ParserSeparatedList).Items),
                     Parts:         $1.(*ParserSeparatedList).Items,
                     SeparatorTkns: $1.(*ParserSeparatedList).SeparatorTkns,
@@ -432,7 +432,7 @@ top_statement:
                 $$ = &ast.StmtNamespace{
                     Position: yylex.(*Parser).builder.NewTokensPosition($1, $3),
                     NsTkn: $1,
-                    Name: &ast.NameName{
+                    Name: &ast.Name{
                         Position: yylex.(*Parser).builder.NewNodeListPosition($2.(*ParserSeparatedList).Items),
                         Parts:         $2.(*ParserSeparatedList).Items,
                         SeparatorTkns: $2.(*ParserSeparatedList).SeparatorTkns,
@@ -445,7 +445,7 @@ top_statement:
                 $$ = &ast.StmtNamespace{
                     Position: yylex.(*Parser).builder.NewTokensPosition($1, $5),
                     NsTkn: $1,
-                    Name: &ast.NameName{
+                    Name: &ast.Name{
                         Position: yylex.(*Parser).builder.NewNodeListPosition($2.(*ParserSeparatedList).Items),
                         Parts:         $2.(*ParserSeparatedList).Items,
                         SeparatorTkns: $2.(*ParserSeparatedList).SeparatorTkns,
@@ -467,7 +467,7 @@ top_statement:
             }
     |   T_USE mixed_group_use_declaration ';'
             {
-                use := $2.(*ast.StmtGroupUse)
+                use := $2.(*ast.StmtGroupUseList)
 
                 use.Position = yylex.(*Parser).builder.NewTokensPosition($1, $3)
                 use.UseTkn        = $1
@@ -477,7 +477,7 @@ top_statement:
             }
     |   T_USE use_type group_use_declaration ';'
             {
-                use := $3.(*ast.StmtGroupUse)
+                use := $3.(*ast.StmtGroupUseList)
 
                 use.Position = yylex.(*Parser).builder.NewTokensPosition($1, $4)
                 use.UseTkn        = $1
@@ -488,23 +488,23 @@ top_statement:
             }
     |   T_USE use_declarations ';'
             {
-                $$ = &ast.StmtUse{
-                    Position: yylex.(*Parser).builder.NewTokensPosition($1, $3),
-                    UseTkn:          $1,
-                    UseDeclarations: $2.(*ParserSeparatedList).Items,
-                    SeparatorTkns:   $2.(*ParserSeparatedList).SeparatorTkns,
-                    SemiColonTkn:    $3,
+                $$ = &ast.StmtUseList{
+                    Position:      yylex.(*Parser).builder.NewTokensPosition($1, $3),
+                    UseTkn:        $1,
+                    Uses:          $2.(*ParserSeparatedList).Items,
+                    SeparatorTkns: $2.(*ParserSeparatedList).SeparatorTkns,
+                    SemiColonTkn:  $3,
                 }
             }
     |   T_USE use_type use_declarations ';'
             {
-                $$ = &ast.StmtUse{
-                    Position: yylex.(*Parser).builder.NewTokensPosition($1, $4),
-                    UseTkn:          $1,
-                    Type:            $2,
-                    UseDeclarations: $3.(*ParserSeparatedList).Items,
-                    SeparatorTkns:   $3.(*ParserSeparatedList).SeparatorTkns,
-                    SemiColonTkn:    $4,
+                $$ = &ast.StmtUseList{
+                    Position:      yylex.(*Parser).builder.NewTokensPosition($1, $4),
+                    UseTkn:        $1,
+                    Type:          $2,
+                    Uses:          $3.(*ParserSeparatedList).Items,
+                    SeparatorTkns: $3.(*ParserSeparatedList).SeparatorTkns,
+                    SemiColonTkn:  $4,
                 }
             }
     |   T_CONST const_list ';'
@@ -545,16 +545,16 @@ group_use_declaration:
                     $4.(*ParserSeparatedList).SeparatorTkns = append($4.(*ParserSeparatedList).SeparatorTkns, $5)
                 }
 
-                $$ = &ast.StmtGroupUse{
+                $$ = &ast.StmtGroupUseList{
                     Position: yylex.(*Parser).builder.NewNodeListTokenPosition($1.(*ParserSeparatedList).Items, $6),
-                    Prefix: &ast.NameName{
+                    Prefix: &ast.Name{
                         Position: yylex.(*Parser).builder.NewNodeListPosition($1.(*ParserSeparatedList).Items),
                         Parts:         $1.(*ParserSeparatedList).Items,
                         SeparatorTkns: $1.(*ParserSeparatedList).SeparatorTkns,
                     },
                     NsSeparatorTkn:       $2,
                     OpenCurlyBracketTkn:  $3,
-                    UseDeclarations:      $4.(*ParserSeparatedList).Items,
+                    Uses:                 $4.(*ParserSeparatedList).Items,
                     SeparatorTkns:        $4.(*ParserSeparatedList).SeparatorTkns,
                     CloseCurlyBracketTkn: $6,
                 }
@@ -565,17 +565,17 @@ group_use_declaration:
                     $5.(*ParserSeparatedList).SeparatorTkns = append($5.(*ParserSeparatedList).SeparatorTkns, $6)
                 }
 
-                $$ = &ast.StmtGroupUse{
+                $$ = &ast.StmtGroupUseList{
                     Position: yylex.(*Parser).builder.NewTokensPosition($1, $7),
                     LeadingNsSeparatorTkn: $1,
-                    Prefix: &ast.NameName{
+                    Prefix: &ast.Name{
                         Position: yylex.(*Parser).builder.NewNodeListPosition($2.(*ParserSeparatedList).Items),
                         Parts:         $2.(*ParserSeparatedList).Items,
                         SeparatorTkns: $2.(*ParserSeparatedList).SeparatorTkns,
                     },
                     NsSeparatorTkn:       $3,
                     OpenCurlyBracketTkn:  $4,
-                    UseDeclarations:      $5.(*ParserSeparatedList).Items,
+                    Uses:                 $5.(*ParserSeparatedList).Items,
                     SeparatorTkns:        $5.(*ParserSeparatedList).SeparatorTkns,
                     CloseCurlyBracketTkn: $7,
                 }
@@ -589,16 +589,16 @@ mixed_group_use_declaration:
                     $4.(*ParserSeparatedList).SeparatorTkns = append($4.(*ParserSeparatedList).SeparatorTkns, $5)
                 }
 
-                $$ = &ast.StmtGroupUse{
+                $$ = &ast.StmtGroupUseList{
                     Position: yylex.(*Parser).builder.NewNodeListTokenPosition($1.(*ParserSeparatedList).Items, $6),
-                    Prefix: &ast.NameName{
+                    Prefix: &ast.Name{
                         Position: yylex.(*Parser).builder.NewNodeListPosition($1.(*ParserSeparatedList).Items),
                         Parts:         $1.(*ParserSeparatedList).Items,
                         SeparatorTkns: $1.(*ParserSeparatedList).SeparatorTkns,
                     },
                     NsSeparatorTkn:       $2,
                     OpenCurlyBracketTkn:  $3,
-                    UseDeclarations:      $4.(*ParserSeparatedList).Items,
+                    Uses:                 $4.(*ParserSeparatedList).Items,
                     SeparatorTkns:        $4.(*ParserSeparatedList).SeparatorTkns,
                     CloseCurlyBracketTkn: $6,
                 }
@@ -609,17 +609,17 @@ mixed_group_use_declaration:
                     $5.(*ParserSeparatedList).SeparatorTkns = append($5.(*ParserSeparatedList).SeparatorTkns, $6)
                 }
 
-                $$ = &ast.StmtGroupUse{
+                $$ = &ast.StmtGroupUseList{
                     Position: yylex.(*Parser).builder.NewTokensPosition($1, $7),
                     LeadingNsSeparatorTkn: $1,
-                    Prefix: &ast.NameName{
+                    Prefix: &ast.Name{
                         Position: yylex.(*Parser).builder.NewNodeListPosition($2.(*ParserSeparatedList).Items),
                         Parts:         $2.(*ParserSeparatedList).Items,
                         SeparatorTkns: $2.(*ParserSeparatedList).SeparatorTkns,
                     },
                     NsSeparatorTkn:       $3,
                     OpenCurlyBracketTkn:  $4,
-                    UseDeclarations:      $5.(*ParserSeparatedList).Items,
+                    Uses:                 $5.(*ParserSeparatedList).Items,
                     SeparatorTkns:        $5.(*ParserSeparatedList).SeparatorTkns,
                     CloseCurlyBracketTkn: $7,
                 }
@@ -692,7 +692,7 @@ inline_use_declaration:
             }
     |   use_type unprefixed_use_declaration
             {
-                decl := $2.(*ast.StmtUseDeclaration)
+                decl := $2.(*ast.StmtUse)
                 decl.Type = $1
                 decl.Position = yylex.(*Parser).builder.NewNodesPosition($1, $2)
 
@@ -703,9 +703,9 @@ inline_use_declaration:
 unprefixed_use_declaration:
         namespace_name
             {
-                $$ = &ast.StmtUseDeclaration{
+                $$ = &ast.StmtUse{
                     Position: yylex.(*Parser).builder.NewNodeListPosition($1.(*ParserSeparatedList).Items),
-                    Use: &ast.NameName{
+                    Use: &ast.Name{
                         Position: yylex.(*Parser).builder.NewNodeListPosition($1.(*ParserSeparatedList).Items),
                         Parts:         $1.(*ParserSeparatedList).Items,
                         SeparatorTkns: $1.(*ParserSeparatedList).SeparatorTkns,
@@ -714,9 +714,9 @@ unprefixed_use_declaration:
             }
     |   namespace_name T_AS T_STRING
             {
-                $$ = &ast.StmtUseDeclaration{
+                $$ = &ast.StmtUse{
                     Position: yylex.(*Parser).builder.NewNodeListTokenPosition($1.(*ParserSeparatedList).Items, $3),
-                    Use: &ast.NameName{
+                    Use: &ast.Name{
                         Position: yylex.(*Parser).builder.NewNodeListPosition($1.(*ParserSeparatedList).Items),
                         Parts:         $1.(*ParserSeparatedList).Items,
                         SeparatorTkns: $1.(*ParserSeparatedList).SeparatorTkns,
@@ -738,7 +738,7 @@ use_declaration:
             }
     |   T_NS_SEPARATOR unprefixed_use_declaration
             {
-                decl := $2.(*ast.StmtUseDeclaration)
+                decl := $2.(*ast.StmtUse)
                 decl.NsSeparatorTkn = $1
                 decl.Position = yylex.(*Parser).builder.NewTokenNodePosition($1, $2)
 
@@ -1061,7 +1061,7 @@ statement:
             {
                 $$ = &ast.StmtLabel{
                     Position: yylex.(*Parser).builder.NewTokensPosition($1, $2),
-                    LabelName: &ast.Identifier{
+                    Name: &ast.Identifier{
                         Position: yylex.(*Parser).builder.NewTokenPosition($1),
                         IdentifierTkn: $1,
                         Value:         $1.Value,
@@ -1082,7 +1082,7 @@ catch_list:
                 catch.OpenParenthesisTkn = $3
                 catch.Var = &ast.ExprVariable{
                     Position: yylex.(*Parser).builder.NewTokenPosition($5),
-                    VarName: &ast.Identifier{
+                    Name: &ast.Identifier{
                         Position: yylex.(*Parser).builder.NewTokenPosition($5),
                         IdentifierTkn: $5,
                         Value:         $5.Value,
@@ -1160,7 +1160,7 @@ function_declaration_statement:
                     Position: yylex.(*Parser).builder.NewTokensPosition($1, $11),
                     FunctionTkn:  $1,
                     AmpersandTkn: $2,
-                    FunctionName: &ast.Identifier{
+                    Name: &ast.Identifier{
                         Position: yylex.(*Parser).builder.NewTokenPosition($3),
                         IdentifierTkn: $3,
                         Value:         $3.Value,
@@ -1207,7 +1207,7 @@ class_declaration_statement:
                     Position: yylex.(*Parser).builder.NewOptionalListTokensPosition($1, $2, $9),
                     Modifiers: $1,
                     ClassTkn:  $2,
-                    ClassName: &ast.Identifier{
+                    Name: &ast.Identifier{
                         Position: yylex.(*Parser).builder.NewTokenPosition($3),
                         IdentifierTkn: $3,
                         Value:         $3.Value,
@@ -1235,7 +1235,7 @@ class_declaration_statement:
                 class := &ast.StmtClass{
                     Position: yylex.(*Parser).builder.NewTokensPosition($1, $8),
                     ClassTkn: $1,
-                    ClassName: &ast.Identifier{
+                    Name: &ast.Identifier{
                         Position: yylex.(*Parser).builder.NewTokenPosition($2),
                         IdentifierTkn: $2,
                         Value:         $2.Value,
@@ -1296,7 +1296,7 @@ trait_declaration_statement:
                 $$ = &ast.StmtTrait{
                     Position: yylex.(*Parser).builder.NewTokensPosition($1, $6),
                     TraitTkn: $1,
-                    TraitName: &ast.Identifier{
+                    Name: &ast.Identifier{
                         Position: yylex.(*Parser).builder.NewTokenPosition($2),
                         IdentifierTkn: $2,
                         Value:         $2.Value,
@@ -1314,7 +1314,7 @@ interface_declaration_statement:
                 iface := &ast.StmtInterface{
                     Position: yylex.(*Parser).builder.NewTokensPosition($1, $7),
                     InterfaceTkn: $1,
-                    InterfaceName: &ast.Identifier{
+                    Name: &ast.Identifier{
                         Position: yylex.(*Parser).builder.NewTokenPosition($2),
                         IdentifierTkn: $2,
                         Value:         $2.Value,
@@ -1492,7 +1492,7 @@ switch_case_list:
                 $$ = &ast.StmtSwitch{
                     Position: yylex.(*Parser).builder.NewTokensPosition($1, $3),
                     OpenCurlyBracketTkn:  $1,
-                    CaseList:             $2,
+                    Cases:                $2,
                     CloseCurlyBracketTkn: $3,
                 }
             }
@@ -1502,7 +1502,7 @@ switch_case_list:
                     Position: yylex.(*Parser).builder.NewTokensPosition($1, $4),
                     OpenCurlyBracketTkn:  $1,
                     CaseSeparatorTkn:     $2,
-                    CaseList:             $3,
+                    Cases:                $3,
                     CloseCurlyBracketTkn: $4,
                 }
             }
@@ -1511,7 +1511,7 @@ switch_case_list:
                 $$ = &ast.StmtSwitch{
                     Position: yylex.(*Parser).builder.NewTokensPosition($1, $4),
                     ColonTkn:     $1,
-                    CaseList:     $2,
+                    Cases:        $2,
                     EndSwitchTkn: $3,
                     SemiColonTkn: $4,
                 }
@@ -1522,7 +1522,7 @@ switch_case_list:
                     Position: yylex.(*Parser).builder.NewTokensPosition($1, $5),
                     ColonTkn:         $1,
                     CaseSeparatorTkn: $2,
-                    CaseList:         $3,
+                    Cases:            $3,
                     EndSwitchTkn:     $4,
                     SemiColonTkn:     $5,
                 }
@@ -1746,7 +1746,7 @@ parameter:
                     VariadicTkn:  $3,
                     Var: &ast.ExprVariable{
                         Position: yylex.(*Parser).builder.NewTokenPosition($4),
-                        VarName: &ast.Identifier{
+                        Name: &ast.Identifier{
                             Position: yylex.(*Parser).builder.NewTokenPosition($4),
                             IdentifierTkn: $4,
                             Value:         $4.Value,
@@ -1772,7 +1772,7 @@ parameter:
                     VariadicTkn:  $3,
                     Var: &ast.ExprVariable{
                         Position: yylex.(*Parser).builder.NewTokenPosition($4),
-                        VarName: &ast.Identifier{
+                        Name: &ast.Identifier{
                             Position: yylex.(*Parser).builder.NewTokenPosition($4),
                             IdentifierTkn: $4,
                             Value:         $4.Value,
@@ -1951,7 +1951,7 @@ static_var:
                     Position: yylex.(*Parser).builder.NewTokenPosition($1),
                     Var: &ast.ExprVariable{
                         Position: yylex.(*Parser).builder.NewTokenPosition($1),
-                        VarName: &ast.Identifier{
+                        Name: &ast.Identifier{
                             Position: yylex.(*Parser).builder.NewTokenPosition($1),
                             IdentifierTkn: $1,
                             Value:         $1.Value,
@@ -1965,7 +1965,7 @@ static_var:
                     Position: yylex.(*Parser).builder.NewTokenNodePosition($1, $3),
                     Var: &ast.ExprVariable{
                         Position: yylex.(*Parser).builder.NewTokenPosition($1),
-                        VarName: &ast.Identifier{
+                        Name: &ast.Identifier{
                             Position: yylex.(*Parser).builder.NewTokenPosition($1),
                             IdentifierTkn: $1,
                             Value:         $1.Value,
@@ -1995,7 +1995,7 @@ class_statement:
                     Position: yylex.(*Parser).builder.NewNodeListTokenPosition($1, $4),
                     Modifiers:     $1,
                     Type:          $2,
-                    Properties:    $3.(*ParserSeparatedList).Items,
+                    Props:         $3.(*ParserSeparatedList).Items,
                     SeparatorTkns: $3.(*ParserSeparatedList).SeparatorTkns,
                     SemiColonTkn:  $4,
                 }
@@ -2043,7 +2043,7 @@ class_statement:
                     Modifiers:    $1,
                     FunctionTkn:  $2,
                     AmpersandTkn: $3,
-                    MethodName: &ast.Identifier{
+                    Name: &ast.Identifier{
                         Position: yylex.(*Parser).builder.NewTokenPosition($4),
                         IdentifierTkn: $4,
                         Value:         $4.Value,
@@ -2369,7 +2369,7 @@ property:
                     Position: yylex.(*Parser).builder.NewTokenPosition($1),
                     Var: &ast.ExprVariable{
                         Position: yylex.(*Parser).builder.NewTokenPosition($1),
-                        VarName: &ast.Identifier{
+                        Name: &ast.Identifier{
                             Position: yylex.(*Parser).builder.NewTokenPosition($1),
                             IdentifierTkn: $1,
                             Value:         $1.Value,
@@ -2384,7 +2384,7 @@ property:
                     Position: yylex.(*Parser).builder.NewTokenNodePosition($1, $3),
                     Var: &ast.ExprVariable{
                         Position: yylex.(*Parser).builder.NewTokenPosition($1),
-                        VarName: &ast.Identifier{
+                        Name: &ast.Identifier{
                             Position: yylex.(*Parser).builder.NewTokenPosition($1),
                             IdentifierTkn: $1,
                             Value:         $1.Value,
@@ -2501,7 +2501,7 @@ anonymous_class:
                     Position: yylex.(*Parser).builder.NewTokensPosition($1, $8),
                     ClassTkn:             $1,
                     OpenParenthesisTkn:   $2.(*ArgumentList).OpenParenthesisTkn,
-                    Arguments:            $2.(*ArgumentList).Arguments,
+                    Args:                 $2.(*ArgumentList).Arguments,
                     SeparatorTkns:        $2.(*ArgumentList).SeparatorTkns,
                     CloseParenthesisTkn:  $2.(*ArgumentList).CloseParenthesisTkn,
                     OpenCurlyBracketTkn:  $6,
@@ -2533,7 +2533,7 @@ new_expr:
                         NewTkn:              $1,
                         Class:               $2,
                         OpenParenthesisTkn:  $3.(*ArgumentList).OpenParenthesisTkn,
-                        Arguments:           $3.(*ArgumentList).Arguments,
+                        Args:                $3.(*ArgumentList).Arguments,
                         SeparatorTkns:       $3.(*ArgumentList).SeparatorTkns,
                         CloseParenthesisTkn: $3.(*ArgumentList).CloseParenthesisTkn,
                     }
@@ -3055,7 +3055,7 @@ expr_without_variable:
             {
                 $$ = &ast.ExprTernary{
                     Position: yylex.(*Parser).builder.NewNodesPosition($1, $5),
-                    Condition:   $1,
+                    Cond:        $1,
                     QuestionTkn: $2,
                     IfTrue:      $3,
                     ColonTkn:    $4,
@@ -3066,7 +3066,7 @@ expr_without_variable:
             {
                 $$ = &ast.ExprTernary{
                     Position: yylex.(*Parser).builder.NewNodesPosition($1, $4),
-                    Condition:   $1,
+                    Cond:        $1,
                     QuestionTkn: $2,
                     ColonTkn:    $3,
                     IfFalse:     $4,
@@ -3199,7 +3199,7 @@ expr_without_variable:
                 $$ = &ast.ExprYield{
                     Position: yylex.(*Parser).builder.NewTokenNodePosition($1, $2),
                     YieldTkn: $1,
-                    Value:    $2,
+                    Val:      $2,
                 }
             }
     |   T_YIELD expr T_DOUBLE_ARROW expr
@@ -3209,7 +3209,7 @@ expr_without_variable:
                     YieldTkn:       $1,
                     Key:            $2,
                     DoubleArrowTkn: $3,
-                    Value:          $4,
+                    Val:            $4,
                 }
             }
     |   T_YIELD_FROM expr
@@ -3302,7 +3302,7 @@ lexical_vars:
                 $$ = &ast.ExprClosure{
                     UseTkn:                 $1,
                     UseOpenParenthesisTkn:  $2,
-                    Use:                    $3.(*ParserSeparatedList).Items,
+                    Uses:                   $3.(*ParserSeparatedList).Items,
                     UseSeparatorTkns:       $3.(*ParserSeparatedList).SeparatorTkns,
                     UseCloseParenthesisTkn: $4,
                 }
@@ -3332,7 +3332,7 @@ lexical_var:
                     Position: yylex.(*Parser).builder.NewTokenPosition($1),
                     Var: &ast.ExprVariable{
                         Position: yylex.(*Parser).builder.NewTokenPosition($1),
-                        VarName: &ast.Identifier{
+                        Name: &ast.Identifier{
                             Position: yylex.(*Parser).builder.NewTokenPosition($1),
                             IdentifierTkn: $1,
                             Value:         $1.Value,
@@ -3347,7 +3347,7 @@ lexical_var:
                     AmpersandTkn: $1,
                     Var: &ast.ExprVariable{
                         Position: yylex.(*Parser).builder.NewTokenPosition($2),
-                        VarName: &ast.Identifier{
+                        Name: &ast.Identifier{
                             Position: yylex.(*Parser).builder.NewTokenPosition($2),
                             IdentifierTkn: $2,
                             Value:         $2.Value,
@@ -3364,7 +3364,7 @@ function_call:
                     Position: yylex.(*Parser).builder.NewNodesPosition($1, $2),
                     Function:            $1,
                     OpenParenthesisTkn:  $2.(*ArgumentList).OpenParenthesisTkn,
-                    Arguments:           $2.(*ArgumentList).Arguments,
+                    Args:                $2.(*ArgumentList).Arguments,
                     SeparatorTkns:       $2.(*ArgumentList).SeparatorTkns,
                     CloseParenthesisTkn: $2.(*ArgumentList).CloseParenthesisTkn,
                 }
@@ -3377,7 +3377,7 @@ function_call:
                     DoubleColonTkn:      $2,
                     Call:                $3,
                     OpenParenthesisTkn:  $4.(*ArgumentList).OpenParenthesisTkn,
-                    Arguments:           $4.(*ArgumentList).Arguments,
+                    Args:                $4.(*ArgumentList).Arguments,
                     SeparatorTkns:       $4.(*ArgumentList).SeparatorTkns,
                     CloseParenthesisTkn: $4.(*ArgumentList).CloseParenthesisTkn,
                 }
@@ -3398,7 +3398,7 @@ function_call:
                     DoubleColonTkn:      $2,
                     Call:                $3,
                     OpenParenthesisTkn:  $4.(*ArgumentList).OpenParenthesisTkn,
-                    Arguments:           $4.(*ArgumentList).Arguments,
+                    Args:                $4.(*ArgumentList).Arguments,
                     SeparatorTkns:       $4.(*ArgumentList).SeparatorTkns,
                     CloseParenthesisTkn: $4.(*ArgumentList).CloseParenthesisTkn,
                 }
@@ -3417,7 +3417,7 @@ function_call:
                     Position: yylex.(*Parser).builder.NewNodesPosition($1, $2),
                     Function:            $1,
                     OpenParenthesisTkn:  $2.(*ArgumentList).OpenParenthesisTkn,
-                    Arguments:           $2.(*ArgumentList).Arguments,
+                    Args:                $2.(*ArgumentList).Arguments,
                     SeparatorTkns:       $2.(*ArgumentList).SeparatorTkns,
                     CloseParenthesisTkn: $2.(*ArgumentList).CloseParenthesisTkn,
                 }
@@ -3676,7 +3676,7 @@ constant:
                     Position: yylex.(*Parser).builder.NewNodeTokenPosition($1, $3),
                     Class:          $1,
                     DoubleColonTkn: $2,
-                    ConstantName: &ast.Identifier{
+                    Const: &ast.Identifier{
                         Position: yylex.(*Parser).builder.NewTokenPosition($3),
                         IdentifierTkn: $3,
                         Value:         $3.Value,
@@ -3689,7 +3689,7 @@ constant:
                     Position: yylex.(*Parser).builder.NewNodeTokenPosition($1, $3),
                     Class:          $1,
                     DoubleColonTkn: $2,
-                    ConstantName: &ast.Identifier{
+                    Const: &ast.Identifier{
                         Position: yylex.(*Parser).builder.NewTokenPosition($3),
                         IdentifierTkn: $3,
                         Value:         $3.Value,
@@ -3810,7 +3810,7 @@ callable_variable:
                     ObjectOperatorTkn:   $2,
                     Method:              $3,
                     OpenParenthesisTkn:  $4.(*ArgumentList).OpenParenthesisTkn,
-                    Arguments:           $4.(*ArgumentList).Arguments,
+                    Args:                $4.(*ArgumentList).Arguments,
                     SeparatorTkns:       $4.(*ArgumentList).SeparatorTkns,
                     CloseParenthesisTkn: $4.(*ArgumentList).CloseParenthesisTkn,
                 }
@@ -3844,12 +3844,12 @@ variable:
                     Position: yylex.(*Parser).builder.NewNodesPosition($1, $3),
                     Var:               $1,
                     ObjectOperatorTkn: $2,
-                    Property:          $3,
+                    Prop:              $3,
                 }
 
                 if brackets, ok := $3.(*ParserBrackets); ok {
                     propertyFetch.OpenCurlyBracketTkn  = brackets.OpenBracketTkn
-                    propertyFetch.Property             = brackets.Child
+                    propertyFetch.Prop                 = brackets.Child
                     propertyFetch.CloseCurlyBracketTkn = brackets.CloseBracketTkn
                 }
 
@@ -3862,7 +3862,7 @@ simple_variable:
             {
                 $$ = &ast.ExprVariable{
                     Position: yylex.(*Parser).builder.NewTokenPosition($1),
-                    VarName: &ast.Identifier{
+                    Name: &ast.Identifier{
                         Position: yylex.(*Parser).builder.NewTokenPosition($1),
                         IdentifierTkn: $1,
                         Value:         $1.Value,
@@ -3875,7 +3875,7 @@ simple_variable:
                     Position:             yylex.(*Parser).builder.NewTokensPosition($1, $4),
                     DollarTkn:            $1,
                     OpenCurlyBracketTkn:  $2,
-                    VarName:              $3,
+                    Name:                 $3,
                     CloseCurlyBracketTkn: $4,
                 }
             }
@@ -3884,7 +3884,7 @@ simple_variable:
                 $$ = &ast.ExprVariable{
                     Position: yylex.(*Parser).builder.NewTokenNodePosition($1, $2),
                     DollarTkn: $1,
-                    VarName:   $2,
+                    Name:      $2,
                 }
             }
 ;
@@ -3896,7 +3896,7 @@ static_member:
                     Position: yylex.(*Parser).builder.NewNodesPosition($1, $3),
                     Class:          $1,
                     DoubleColonTkn: $2,
-                    Property:       $3,
+                    Prop:           $3,
                 }
             }
     |   variable_class_name T_PAAMAYIM_NEKUDOTAYIM simple_variable
@@ -3905,7 +3905,7 @@ static_member:
                     Position: yylex.(*Parser).builder.NewNodesPosition($1, $3),
                     Class:          $1,
                     DoubleColonTkn: $2,
-                    Property:       $3,
+                    Prop:           $3,
                 }
             }
 ;
@@ -3941,12 +3941,12 @@ new_variable:
                     Position: yylex.(*Parser).builder.NewNodesPosition($1, $3),
                     Var:               $1,
                     ObjectOperatorTkn: $2,
-                    Property:          $3,
+                    Prop:              $3,
                 }
 
                 if brackets, ok := $3.(*ParserBrackets); ok {
                     propertyFetch.OpenCurlyBracketTkn  = brackets.OpenBracketTkn
-                    propertyFetch.Property             = brackets.Child
+                    propertyFetch.Prop                 = brackets.Child
                     propertyFetch.CloseCurlyBracketTkn = brackets.CloseBracketTkn
                 }
 
@@ -3958,7 +3958,7 @@ new_variable:
                     Position: yylex.(*Parser).builder.NewNodesPosition($1, $3),
                     Class:          $1,
                     DoubleColonTkn: $2,
-                    Property:       $3,
+                    Prop:           $3,
                 }
             }
     |   new_variable T_PAAMAYIM_NEKUDOTAYIM simple_variable
@@ -3967,7 +3967,7 @@ new_variable:
                     Position: yylex.(*Parser).builder.NewNodesPosition($1, $3),
                     Class:          $1,
                     DoubleColonTkn: $2,
-                    Property:       $3,
+                    Prop:           $3,
                 }
             }
 ;
@@ -4174,7 +4174,7 @@ encaps_var:
             {
                 $$ = &ast.ExprVariable{
                     Position: yylex.(*Parser).builder.NewTokenPosition($1),
-                    VarName: &ast.Identifier{
+                    Name: &ast.Identifier{
                         Position: yylex.(*Parser).builder.NewTokenPosition($1),
                         IdentifierTkn: $1,
                         Value:         $1.Value,
@@ -4187,7 +4187,7 @@ encaps_var:
                     Position: yylex.(*Parser).builder.NewTokensPosition($1, $4),
                     Var: &ast.ExprVariable{
                         Position: yylex.(*Parser).builder.NewTokenPosition($1),
-                        VarName: &ast.Identifier{
+                        Name: &ast.Identifier{
                             Position: yylex.(*Parser).builder.NewTokenPosition($1),
                             IdentifierTkn: $1,
                             Value:         $1.Value,
@@ -4204,14 +4204,14 @@ encaps_var:
                     Position: yylex.(*Parser).builder.NewTokensPosition($1, $3),
                     Var: &ast.ExprVariable{
                         Position: yylex.(*Parser).builder.NewTokenPosition($1),
-                        VarName: &ast.Identifier{
+                        Name: &ast.Identifier{
                             Position: yylex.(*Parser).builder.NewTokenPosition($1),
                             IdentifierTkn: $1,
                             Value:         $1.Value,
                         },
                     },
                     ObjectOperatorTkn: $2,
-                    Property: &ast.Identifier{
+                    Prop: &ast.Identifier{
                         Position: yylex.(*Parser).builder.NewTokenPosition($3),
                         IdentifierTkn: $3,
                         Value:         $3.Value,
@@ -4223,7 +4223,7 @@ encaps_var:
                 $$ = &ast.ScalarEncapsedStringVar{
                     Position:                  yylex.(*Parser).builder.NewTokensPosition($1, $3),
                     DollarOpenCurlyBracketTkn: $1,
-                    VarName:                   $2,
+                    Name:                      $2,
                     CloseCurlyBracketTkn:      $3,
                 }
             }
@@ -4232,7 +4232,7 @@ encaps_var:
                 $$ = &ast.ScalarEncapsedStringVar{
                     Position:                  yylex.(*Parser).builder.NewTokensPosition($1, $3),
                     DollarOpenCurlyBracketTkn: $1,
-                    VarName: &ast.Identifier{
+                    Name: &ast.Identifier{
                         Position: yylex.(*Parser).builder.NewTokenPosition($2),
                         IdentifierTkn: $2,
                         Value:         $2.Value,
@@ -4245,7 +4245,7 @@ encaps_var:
                 $$ = &ast.ScalarEncapsedStringVar{
                     Position:                  yylex.(*Parser).builder.NewTokensPosition($1, $3),
                     DollarOpenCurlyBracketTkn: $1,
-                    VarName: &ast.Identifier{
+                    Name: &ast.Identifier{
                         Position: yylex.(*Parser).builder.NewTokenPosition($2),
                         IdentifierTkn: $2,
                         Value:         $2.Value,
@@ -4321,7 +4321,7 @@ encaps_var_offset:
             {
                 $$ = &ast.ExprVariable{
                     Position: yylex.(*Parser).builder.NewTokenPosition($1),
-                    VarName: &ast.Identifier{
+                    Name: &ast.Identifier{
                         Position: yylex.(*Parser).builder.NewTokenPosition($1),
                         IdentifierTkn: $1,
                         Value:         $1.Value,