diff --git a/src/graph/planner/ngql/SubgraphPlanner.cpp b/src/graph/planner/ngql/SubgraphPlanner.cpp
index cafedb3f29c..1621ff1a573 100644
--- a/src/graph/planner/ngql/SubgraphPlanner.cpp
+++ b/src/graph/planner/ngql/SubgraphPlanner.cpp
@@ -109,7 +109,7 @@ StatusOr<SubPlan> SubgraphPlanner::zeroStep(SubPlan& startVidPlan, const std::st
   auto* func = AggregateExpression::make(pool, "COLLECT", vertexExpr, false);
 
   auto* collect = Aggregate::make(qctx, getVertex, {}, {func});
-  collect->setColNames({"VERTICES"});
+  collect->setColNames(std::move(subgraphCtx_->colNames));
 
   SubPlan subPlan;
   subPlan.root = collect;
diff --git a/src/graph/validator/GetSubgraphValidator.cpp b/src/graph/validator/GetSubgraphValidator.cpp
index 0c06fe8b94e..421e801d969 100644
--- a/src/graph/validator/GetSubgraphValidator.cpp
+++ b/src/graph/validator/GetSubgraphValidator.cpp
@@ -104,10 +104,10 @@ Status GetSubgraphValidator::validateYield(YieldClause* yield) {
   if (yield == nullptr) {
     // version 3.0: return Status::SemanticError("No Yield Clause");
     auto* yieldColumns = new YieldColumns();
-    auto* vertex = new YieldColumn(LabelExpression::make(pool, "VERTICES"));
+    auto* vertex = new YieldColumn(LabelExpression::make(pool, "_vertices"));
     yieldColumns->addColumn(vertex);
     if (subgraphCtx_->steps.steps() != 0) {
-      auto* edge = new YieldColumn(LabelExpression::make(pool, "EDGES"));
+      auto* edge = new YieldColumn(LabelExpression::make(pool, "_edges"));
       yieldColumns->addColumn(edge);
     }
     yield = pool->add(new YieldClause(yieldColumns));
@@ -119,11 +119,11 @@ Status GetSubgraphValidator::validateYield(YieldClause* yield) {
   for (const auto& col : yield->columns()) {
     std::string lowerStr = col->expr()->toString();
     folly::toLowerAscii(lowerStr);
-    if (lowerStr == "vertices") {
+    if (lowerStr == "vertices" || lowerStr == "_vertices") {
       subgraphCtx_->getVertexProp = true;
       auto* newCol = new YieldColumn(InputPropertyExpression::make(pool, "VERTICES"), col->name());
       newCols->addColumn(newCol);
-    } else if (lowerStr == "edges") {
+    } else if (lowerStr == "edges" || lowerStr == "_edges") {
       if (subgraphCtx_->steps.steps() == 0) {
         return Status::SemanticError("Get Subgraph 0 STEPS only support YIELD VERTICES");
       }
diff --git a/tests/tck/features/bugfix/SubgraphBeforePipe.feature b/tests/tck/features/bugfix/SubgraphBeforePipe.feature
index 1dbe5555b6a..e38a7f250d2 100644
--- a/tests/tck/features/bugfix/SubgraphBeforePipe.feature
+++ b/tests/tck/features/bugfix/SubgraphBeforePipe.feature
@@ -11,7 +11,7 @@ Feature: Test get subgraph before pipe
   Scenario: subgraph with limit
     When executing query:
       """
-      GET SUBGRAPH WITH PROP FROM 'Tim Duncan' | LIMIT 1
+      GET SUBGRAPH WITH PROP FROM 'Tim Duncan' YIELD VERTICES, EDGES | LIMIT 1
       """
     Then define some list variables:
       | edge1                                           |
@@ -41,7 +41,7 @@ Feature: Test get subgraph before pipe
   Scenario: subgraph as variable with limit
     When executing query:
       """
-      $a = GET SUBGRAPH WITH PROP FROM 'Tim Duncan' | LIMIT 1
+      $a = GET SUBGRAPH WITH PROP FROM 'Tim Duncan' YIELD VERTICES, EDGES| LIMIT 1
       """
     Then define some list variables:
       | edge1                                           |
@@ -82,7 +82,7 @@ Feature: Test get subgraph before pipe
   Scenario: two steps subgraph with limit
     When executing query:
       """
-      GET SUBGRAPH WITH PROP 2 STEPS FROM 'Tim Duncan' | LIMIT 2
+      GET SUBGRAPH WITH PROP 2 STEPS FROM 'Tim Duncan' YIELD VERTICES, EDGES | LIMIT 2
       """
     Then define some list variables:
       | edge1                                           | vertex2               | edge2                                            |
@@ -164,7 +164,7 @@ Feature: Test get subgraph before pipe
   Scenario: three steps subgraph with property + direction + limit
     When executing query:
       """
-      GET SUBGRAPH WITH PROP 3 STEPS FROM 'Paul George' OUT serve BOTH like | LIMIT 2
+      GET SUBGRAPH WITH PROP 3 STEPS FROM 'Paul George' OUT serve BOTH like YIELD VERTICES, EDGES| LIMIT 2
       """
     Then define some list variables:
       | edge1                                        | edge2                                            |
diff --git a/tests/tck/features/subgraph/subgraph.IntVid.feature b/tests/tck/features/subgraph/subgraph.IntVid.feature
index 98e9b5b9ace..7bb215241ee 100644
--- a/tests/tck/features/subgraph/subgraph.IntVid.feature
+++ b/tests/tck/features/subgraph/subgraph.IntVid.feature
@@ -62,49 +62,49 @@ Feature: Integer Vid subgraph
   Scenario: Integer Vid zero step
     When executing query:
       """
-      GET SUBGRAPH WITH PROP 0 STEPS FROM hash("Tim Duncan")
+      GET SUBGRAPH WITH PROP 0 STEPS FROM hash("Tim Duncan") YIELD VERTICES
       """
     Then the result should be, in any order, with relax comparison:
       | VERTICES         |
       | [("Tim Duncan")] |
     When executing query:
       """
-      GET SUBGRAPH WITH PROP 0 STEPS FROM hash("Tim Duncan"), hash("Spurs")
+      GET SUBGRAPH WITH PROP 0 STEPS FROM hash("Tim Duncan"), hash("Spurs") YIELD VERTICES
       """
     Then the result should be, in any order, with relax comparison:
       | VERTICES                    |
       | [("Tim Duncan"), ("Spurs")] |
     When executing query:
       """
-      GET SUBGRAPH WITH PROP 0 STEPS FROM hash("Tim Duncan"), hash("Tony Parker"), hash("Spurs")
+      GET SUBGRAPH WITH PROP 0 STEPS FROM hash("Tim Duncan"), hash("Tony Parker"), hash("Spurs") YIELD VERTICES
       """
     Then the result should be, in any order, with relax comparison:
       | VERTICES                                     |
       | [("Tim Duncan"), ("Spurs"), ("Tony Parker")] |
     When executing query:
       """
-      GO FROM hash('Tim Duncan') over serve YIELD serve._dst AS id | GET SUBGRAPH WITH PROP 0 STEPS FROM $-.id
+      GO FROM hash('Tim Duncan') over serve YIELD serve._dst AS id | GET SUBGRAPH WITH PROP 0 STEPS FROM $-.id YIELD VERTICES
       """
     Then the result should be, in any order, with relax comparison:
       | VERTICES    |
       | [("Spurs")] |
     When executing query:
       """
-      GO FROM hash('Tim Duncan') over like YIELD like._dst AS id | GET SUBGRAPH WITH PROP 0 STEPS FROM $-.id
+      GO FROM hash('Tim Duncan') over like YIELD like._dst AS id | GET SUBGRAPH WITH PROP 0 STEPS FROM $-.id YIELD VERTICES
       """
     Then the result should be, in any order, with relax comparison:
       | VERTICES                             |
       | [("Manu Ginobili"), ("Tony Parker")] |
     When executing query:
       """
-      $a = GO FROM hash('Tim Duncan') over serve YIELD serve._dst AS id; GET SUBGRAPH WITH PROP 0 STEPS FROM $a.id
+      $a = GO FROM hash('Tim Duncan') over serve YIELD serve._dst AS id; GET SUBGRAPH WITH PROP 0 STEPS FROM $a.id YIELD VERTICES
       """
     Then the result should be, in any order, with relax comparison:
       | VERTICES    |
       | [("Spurs")] |
     When executing query:
       """
-      $a = GO FROM hash('Tim Duncan') over like YIELD like._dst AS id; GET SUBGRAPH WITH PROP 0 STEPS FROM $a.id
+      $a = GO FROM hash('Tim Duncan') over like YIELD like._dst AS id; GET SUBGRAPH WITH PROP 0 STEPS FROM $a.id YIELD VERTICES
       """
     Then the result should be, in any order, with relax comparison:
       | VERTICES                             |
@@ -143,7 +143,7 @@ Feature: Integer Vid subgraph
       |                                                 |                       | [:like "Danny Green"->"Marco Belinelli"@0]       |
       |                                                 |                       | [:serve "Danny Green"->"Spurs"@0]                |
     Then the result should be, in any order, with relax comparison:
-      | VERTICES         | EDGES     |
+      | _vertices        | _edges    |
       | [("Tim Duncan")] | <[edge1]> |
       | <[vertex2]>      | <[edge2]> |
 
@@ -225,7 +225,7 @@ Feature: Integer Vid subgraph
       |                                                 |                       | [:serve "Tiago Splitter"->"76ers"@0]             |                       |                                               |
       |                                                 |                       | [:serve "Tiago Splitter"->"Hawks"@0]             |                       |                                               |
     Then the result should be, in any order, with relax comparison:
-      | VERTICES         | EDGES     |
+      | _vertices        | _edges    |
       | [("Tim Duncan")] | <[edge1]> |
       | <[vertex2]>      | <[edge2]> |
       | <[vertex3]>      | <[edge3]> |
@@ -255,7 +255,7 @@ Feature: Integer Vid subgraph
       |                                             |                       | [:like "Marco Belinelli"->"Tony Parker"@0]      |                    |
       |                                             |                       | [:like "Tim Duncan"->"Tony Parker"@0]           |                    |
     Then the result should be, in any order, with relax comparison:
-      | VERTICES         | EDGES     |
+      | _vertices        | _edges    |
       | [("Tim Duncan")] | <[edge1]> |
       | <[vertex2]>      | <[edge2]> |
       | <[vertex3]>      | []        |
@@ -321,7 +321,7 @@ Feature: Integer Vid subgraph
       |                                             |                       | [:like "Marco Belinelli"->"Tony Parker"@0]      |                    |                                              |
       |                                             |                       | [:like "Tim Duncan"->"Tony Parker"@0]           |                    |                                              |
     Then the result should be, in any order, with relax comparison:
-      | VERTICES         | EDGES     |
+      | _vertices        | _edges    |
       | [("Tim Duncan")] | <[edge1]> |
       | <[vertex2]>      | <[edge2]> |
       | <[vertex3]>      | <[edge3]> |
@@ -329,7 +329,7 @@ Feature: Integer Vid subgraph
   Scenario: Integer Vid two steps in and out edge
     When executing query:
       """
-      GET SUBGRAPH WITH PROP 2 STEPS FROM hash('Tim Duncan'), hash('James Harden') IN teammate OUT serve
+      GET SUBGRAPH WITH PROP 2 STEPS FROM hash('Tim Duncan'), hash('James Harden') IN teammate OUT serve YIELD VERTICES, EDGES
       """
     Then define some list variables:
       | vertex1          | edge1                                       | vertex2           | edge2                                        | vertex3     |
@@ -349,7 +349,7 @@ Feature: Integer Vid subgraph
   Scenario: Integer Vid three steps
     When executing query:
       """
-      GET SUBGRAPH WITH PROP 3 STEPS FROM hash('Paul George') OUT serve BOTH like
+      GET SUBGRAPH WITH PROP 3 STEPS FROM hash('Paul George') OUT serve BOTH like YIELD VERTICES, EDGES
       """
     Then define some list variables:
       | edge1                                        | edge2                                            | edge3                                          | vertex4             | edge4                                      |
@@ -384,7 +384,7 @@ Feature: Integer Vid subgraph
   Scenario: Integer Vid bidirect edge
     When executing query:
       """
-      GET SUBGRAPH WITH PROP FROM hash('Tony Parker') BOTH like
+      GET SUBGRAPH WITH PROP FROM hash('Tony Parker') BOTH like YIELD VERTICES, EDGES
       """
     Then define some list variables:
       | edge1                                        | vertex2               | edge2                                          |
@@ -404,7 +404,7 @@ Feature: Integer Vid subgraph
   Scenario: Integer Vid pipe
     When executing query:
       """
-      GO FROM hash('Tim Duncan') over serve YIELD serve._src AS id | GET SUBGRAPH WITH PROP FROM $-.id
+      GO FROM hash('Tim Duncan') over serve YIELD serve._src AS id | GET SUBGRAPH WITH PROP FROM $-.id YIELD VERTICES, EDGES
       """
     Then define some list variables:
       | edge1                                           | vertex2               | edge2                                            |
@@ -442,7 +442,7 @@ Feature: Integer Vid subgraph
     When executing query:
       """
       $a = GO FROM hash('Tim Duncan') over serve YIELD serve._src AS id;
-      GET SUBGRAPH WITH PROP FROM $a.id
+      GET SUBGRAPH WITH PROP FROM $a.id YIELD VERTICES, EDGES
       """
     Then define some list variables:
       | edge1                                           | vertex2               | edge2                                            |
@@ -479,7 +479,7 @@ Feature: Integer Vid subgraph
   Scenario: Integer Vid many steps
     When executing query:
       """
-      GET SUBGRAPH WITH PROP 4 STEPS FROM hash('Yao Ming') IN teammate OUT serve
+      GET SUBGRAPH WITH PROP 4 STEPS FROM hash('Yao Ming') IN teammate OUT serve YIELD VERTICES, EDGES
       """
     Then the result should be, in any order, with relax comparison:
       | VERTICES       | EDGES                              |
@@ -487,14 +487,14 @@ Feature: Integer Vid subgraph
       | [("Rockets")]  | []                                 |
     When executing query:
       """
-      GET SUBGRAPH WITH PROP 4 STEPS FROM hash('NOBODY') IN teammate OUT serve
+      GET SUBGRAPH WITH PROP 4 STEPS FROM hash('NOBODY') IN teammate OUT serve YIELD VERTICES, EDGES
       """
     Then the result should be, in any order, with relax comparison:
       | VERTICES     | EDGES |
       | [("NOBODY")] | []    |
     When executing query:
       """
-      GET SUBGRAPH WITH PROP 4 steps from hash('Yao Ming') IN teammate OUT serve BOTH like
+      GET SUBGRAPH WITH PROP 4 steps from hash('Yao Ming') IN teammate OUT serve BOTH like YIELD VERTICES, EDGES
       """
     Then define some list variables:
       | edge1                                   | vertex2             | edge2                                       | vertex3          | edge3                                       | vertex4               | edge4                                            | vertex5               | edge5                                         |
@@ -580,7 +580,7 @@ Feature: Integer Vid subgraph
       | <[vertex5]>    | <[edge5]> |
     When executing query:
       """
-      GET SUBGRAPH WITH PROP 5 steps from hash('Tony Parker') IN teammate OUT serve BOTH like
+      GET SUBGRAPH WITH PROP 5 steps from hash('Tony Parker') IN teammate OUT serve BOTH like YIELD VERTICES, EDGES
       """
     Then define some list variables:
       | edge1                                        | vertex2               | edge2                                            | vertex3               | edge3                                         | vertex4             | edge4                                         | vertex5                | edge5                                        | vertex6        | edge6                                |
@@ -649,7 +649,7 @@ Feature: Integer Vid subgraph
       | <[vertex6]>       | <[edge6]> |
     When executing query:
       """
-      GET SUBGRAPH WITH PROP 4 steps from hash('Tim Duncan') BOTH like
+      GET SUBGRAPH WITH PROP 4 steps from hash('Tim Duncan') BOTH like YIELD VERTICES, EDGES
       """
     Then define some list variables:
       | edge1                                       | vertex2               | edge2                                            | vertex3               | edge3                                         | vertex4             | edge4                                         | vertex5                |
@@ -687,7 +687,7 @@ Feature: Integer Vid subgraph
   Scenario: Integer Vid over end
     When executing query:
       """
-      GET SUBGRAPH WITH PROP 10000000000000 STEPS FROM hash('Yao Ming') IN teammate OUT serve
+      GET SUBGRAPH WITH PROP 10000000000000 STEPS FROM hash('Yao Ming') IN teammate OUT serve YIELD VERTICES, EDGES
       """
     Then the result should be, in any order, with relax comparison:
       | VERTICES       | EDGES                              |
@@ -695,7 +695,7 @@ Feature: Integer Vid subgraph
       | [("Rockets")]  | []                                 |
     When executing query:
       """
-      GET SUBGRAPH 10000000000000 STEPS FROM hash('Yao Ming') IN teammate OUT serve
+      GET SUBGRAPH 10000000000000 STEPS FROM hash('Yao Ming') IN teammate OUT serve YIELD VERTICES, EDGES
       """
     Then the result should be, in any order, with relax comparison:
       | VERTICES       | EDGES                              |
@@ -705,7 +705,7 @@ Feature: Integer Vid subgraph
   Scenario: Integer Vid many steps without prop
     When executing query:
       """
-      GET SUBGRAPH 4 STEPS FROM hash('Yao Ming') IN teammate OUT serve
+      GET SUBGRAPH 4 STEPS FROM hash('Yao Ming') IN teammate OUT serve YIELD VERTICES, EDGES
       """
     Then the result should be, in any order, with relax comparison:
       | VERTICES       | EDGES                              |
@@ -713,14 +713,14 @@ Feature: Integer Vid subgraph
       | [("Rockets")]  | []                                 |
     When executing query:
       """
-      GET SUBGRAPH 4 STEPS FROM hash('NOBODY') IN teammate OUT serve
+      GET SUBGRAPH 4 STEPS FROM hash('NOBODY') IN teammate OUT serve YIELD VERTICES, EDGES
       """
     Then the result should be, in any order, with relax comparison:
       | VERTICES     | EDGES |
       | [("NOBODY")] | []    |
     When executing query:
       """
-      GET SUBGRAPH 4 steps from hash('Yao Ming') IN teammate OUT serve BOTH like
+      GET SUBGRAPH 4 steps from hash('Yao Ming') IN teammate OUT serve BOTH like YIELD VERTICES, EDGES
       """
     Then define some list variables:
       | edge1                                   | vertex2             | edge2                                       | vertex3          | edge3                                       | vertex4               | edge4                                            | vertex5               | edge5                                         |
@@ -806,7 +806,7 @@ Feature: Integer Vid subgraph
       | <[vertex5]>    | <[edge5]> |
     When executing query:
       """
-      GET SUBGRAPH 5 steps from hash('Tony Parker') IN teammate OUT serve BOTH like
+      GET SUBGRAPH 5 steps from hash('Tony Parker') IN teammate OUT serve BOTH like YIELD VERTICES, EDGES
       """
     Then define some list variables:
       | edge1                                        | vertex2               | edge2                                            | vertex3               | edge3                                         | vertex4             | edge4                                         | vertex5                | edge5                                        | vertex6        | edge6                                |
@@ -875,7 +875,7 @@ Feature: Integer Vid subgraph
       | <[vertex6]>       | <[edge6]> |
     When executing query:
       """
-      GET SUBGRAPH 4 steps from hash('Tim Duncan') BOTH like
+      GET SUBGRAPH 4 steps from hash('Tim Duncan') BOTH like YIELD VERTICES, EDGES
       """
     Then define some list variables:
       | edge1                                       | vertex2               | edge2                                            | vertex3               | edge3                                         | vertex4             | edge4                                         | vertex5                |
diff --git a/tests/tck/features/subgraph/subgraph.feature b/tests/tck/features/subgraph/subgraph.feature
index a71bb337f71..354ab7c1173 100644
--- a/tests/tck/features/subgraph/subgraph.feature
+++ b/tests/tck/features/subgraph/subgraph.feature
@@ -65,49 +65,49 @@ Feature: subgraph
       GET SUBGRAPH WITH PROP 0 STEPS FROM "Tim Duncan"
       """
     Then the result should be, in any order, with relax comparison:
-      | VERTICES         |
+      | _vertices        |
       | [("Tim Duncan")] |
     When executing query:
       """
       GET SUBGRAPH WITH PROP 0 STEPS FROM "Tim Duncan", "Spurs"
       """
     Then the result should be, in any order, with relax comparison:
-      | VERTICES                    |
+      | _vertices                   |
       | [("Tim Duncan"), ("Spurs")] |
     When executing query:
       """
       GET SUBGRAPH WITH PROP 0 STEPS FROM "Tim Duncan", "Tony Parker", "Spurs"
       """
     Then the result should be, in any order, with relax comparison:
-      | VERTICES                                     |
+      | _vertices                                    |
       | [("Tim Duncan"), ("Spurs"), ("Tony Parker")] |
     When executing query:
       """
       GO FROM 'Tim Duncan' over serve YIELD serve._dst AS id | GET SUBGRAPH WITH PROP 0 STEPS FROM $-.id
       """
     Then the result should be, in any order, with relax comparison:
-      | VERTICES    |
+      | _vertices   |
       | [("Spurs")] |
     When executing query:
       """
       GO FROM 'Tim Duncan' over like YIELD like._dst AS id | GET SUBGRAPH WITH PROP 0 STEPS FROM $-.id
       """
     Then the result should be, in any order, with relax comparison:
-      | VERTICES                             |
+      | _vertices                            |
       | [("Manu Ginobili"), ("Tony Parker")] |
     When executing query:
       """
       $a = GO FROM 'Tim Duncan' over serve YIELD serve._dst AS id; GET SUBGRAPH WITH PROP 0 STEPS FROM $a.id
       """
     Then the result should be, in any order, with relax comparison:
-      | VERTICES    |
+      | _vertices   |
       | [("Spurs")] |
     When executing query:
       """
       $a = GO FROM 'Tim Duncan' over like YIELD like._dst AS id; GET SUBGRAPH WITH PROP 0 STEPS FROM $a.id
       """
     Then the result should be, in any order, with relax comparison:
-      | VERTICES                             |
+      | _vertices                            |
       | [("Manu Ginobili"), ("Tony Parker")] |
 
   Scenario: subgraph
@@ -143,7 +143,7 @@ Feature: subgraph
       |                                                 |                       | [:like "Danny Green"->"Marco Belinelli"@0]       |
       |                                                 |                       | [:serve "Danny Green"->"Spurs"@0]                |
     Then the result should be, in any order, with relax comparison:
-      | VERTICES         | EDGES     |
+      | _vertices        | _edges    |
       | [("Tim Duncan")] | <[edge1]> |
       | <[vertex2]>      | <[edge2]> |
 
@@ -225,7 +225,7 @@ Feature: subgraph
       |                                                 |                       | [:serve "Tiago Splitter"->"76ers"@0]             |                       |                                               |
       |                                                 |                       | [:serve "Tiago Splitter"->"Hawks"@0]             |                       |                                               |
     Then the result should be, in any order, with relax comparison:
-      | VERTICES         | EDGES     |
+      | _vertices        | _edges    |
       | [("Tim Duncan")] | <[edge1]> |
       | <[vertex2]>      | <[edge2]> |
       | <[vertex3]>      | <[edge3]> |
@@ -255,7 +255,7 @@ Feature: subgraph
       |                                             |                       | [:like "Marco Belinelli"->"Tony Parker"@0]      |                    |
       |                                             |                       | [:like "Tim Duncan"->"Tony Parker"@0]           |                    |
     Then the result should be, in any order, with relax comparison:
-      | VERTICES         | EDGES     |
+      | _vertices        | _edges    |
       | [("Tim Duncan")] | <[edge1]> |
       | <[vertex2]>      | <[edge2]> |
       | <[vertex3]>      | []        |
@@ -321,7 +321,7 @@ Feature: subgraph
       |                                             |                       | [:like "Marco Belinelli"->"Tony Parker"@0]      |                    |                                              |
       |                                             |                       | [:like "Tim Duncan"->"Tony Parker"@0]           |                    |                                              |
     Then the result should be, in any order, with relax comparison:
-      | VERTICES         | EDGES     |
+      | _vertices        | _edges    |
       | [("Tim Duncan")] | <[edge1]> |
       | <[vertex2]>      | <[edge2]> |
       | <[vertex3]>      | <[edge3]> |
@@ -341,7 +341,7 @@ Feature: subgraph
       |                  |                                             |                   | [:teammate "Manu Ginobili"->"Tony Parker"@0] |             |
       |                  |                                             |                   | [:teammate "Tim Duncan"->"Tony Parker"@0]    |             |
     Then the result should be, in any order, with relax comparison:
-      | VERTICES    | EDGES     |
+      | _vertices   | _edges    |
       | <[vertex1]> | <[edge1]> |
       | <[vertex2]> | <[edge2]> |
       | <[vertex3]> | []        |
@@ -375,7 +375,7 @@ Feature: subgraph
       |                                              |                                                  |                                                |                     | [:serve "Chris Paul"->"Rockets"@0]         |
       |                                              |                                                  |                                                |                     | [:like "Chris Paul"->"LeBron James"@0]     |
     Then the result should be, in any order, with relax comparison:
-      | VERTICES                                          | EDGES     |
+      | _vertices                                         | _edges    |
       | [("Paul George")]                                 | <[edge1]> |
       | [("Russell Westbrook"), ("Pacers"), ("Thunders")] | <[edge2]> |
       | [("Dejounte Murray"), ("James Harden")]           | <[edge3]> |
@@ -384,7 +384,7 @@ Feature: subgraph
   Scenario: bidirect edge
     When executing query:
       """
-      GET SUBGRAPH WITH PROP FROM 'Tony Parker' BOTH like
+      GET SUBGRAPH WITH PROP FROM 'Tony Parker' BOTH like YIELD VERTICES, EDGES
       """
     Then define some list variables:
       | edge1                                        | vertex2               | edge2                                          |
@@ -404,7 +404,7 @@ Feature: subgraph
   Scenario: pipe
     When executing query:
       """
-      GO FROM 'Tim Duncan' over serve YIELD serve._src AS id | GET SUBGRAPH WITH PROP FROM $-.id
+      GO FROM 'Tim Duncan' over serve YIELD serve._src AS id | GET SUBGRAPH WITH PROP FROM $-.id YIELD VERTICES, EDGES
       """
     Then define some list variables:
       | edge1                                           | vertex2               | edge2                                            |
@@ -442,7 +442,7 @@ Feature: subgraph
     When executing query:
       """
       $a = GO FROM 'Tim Duncan' over serve YIELD serve._src AS id;
-      GET SUBGRAPH WITH PROP FROM $a.id
+      GET SUBGRAPH WITH PROP FROM $a.id YIELD VERTICES, EDGES
       """
     Then define some list variables:
       | edge1                                           | vertex2               | edge2                                            |
@@ -479,7 +479,7 @@ Feature: subgraph
   Scenario: many steps
     When executing query:
       """
-      GET SUBGRAPH WITH PROP 4 STEPS FROM 'Yao Ming' IN teammate OUT serve
+      GET SUBGRAPH WITH PROP 4 STEPS FROM 'Yao Ming' IN teammate OUT serve YIELD VERTICES, EDGES
       """
     Then the result should be, in any order, with relax comparison:
       | VERTICES       | EDGES                              |
@@ -487,14 +487,14 @@ Feature: subgraph
       | [("Rockets")]  | []                                 |
     When executing query:
       """
-      GET SUBGRAPH WITH PROP 4 STEPS FROM 'NOBODY' IN teammate OUT serve
+      GET SUBGRAPH WITH PROP 4 STEPS FROM 'NOBODY' IN teammate OUT serve YIELD VERTICES, EDGES
       """
     Then the result should be, in any order, with relax comparison:
       | VERTICES     | EDGES |
       | [("NOBODY")] | []    |
     When executing query:
       """
-      GET SUBGRAPH WITH PROP 4 steps from 'Yao Ming' IN teammate OUT serve BOTH like
+      GET SUBGRAPH WITH PROP 4 steps from 'Yao Ming' IN teammate OUT serve BOTH like YIELD VERTICES, EDGES
       """
     Then define some list variables:
       | edge1                                   | vertex2             | edge2                                       | vertex3          | edge3                                       | vertex4               | edge4                                            | vertex5               | edge5                                         |
@@ -580,7 +580,7 @@ Feature: subgraph
       | <[vertex5]>    | <[edge5]> |
     When executing query:
       """
-      GET SUBGRAPH WITH PROP 5 steps from 'Tony Parker' IN teammate OUT serve BOTH like
+      GET SUBGRAPH WITH PROP 5 steps from 'Tony Parker' IN teammate OUT serve BOTH like YIELD VERTICES, EDGES
       """
     Then define some list variables:
       | edge1                                        | vertex2               | edge2                                            | vertex3               | edge3                                         | vertex4             | edge4                                         | vertex5                | edge5                                        | vertex6        | edge6                                |
@@ -649,7 +649,7 @@ Feature: subgraph
       | <[vertex6]>       | <[edge6]> |
     When executing query:
       """
-      GET SUBGRAPH WITH PROP 4 steps from 'Tim Duncan' BOTH like
+      GET SUBGRAPH WITH PROP 4 steps from 'Tim Duncan' BOTH like YIELD VERTICES, EDGES
       """
     Then define some list variables:
       | edge1                                       | vertex2               | edge2                                            | vertex3               | edge3                                         | vertex4             | edge4                                         | vertex5                |
@@ -687,7 +687,7 @@ Feature: subgraph
   Scenario: over end
     When executing query:
       """
-      GET SUBGRAPH WITH PROP 10000000000000 STEPS FROM 'Yao Ming' IN teammate OUT serve
+      GET SUBGRAPH WITH PROP 10000000000000 STEPS FROM 'Yao Ming' IN teammate OUT serve YIELD VERTICES, EDGES
       """
     Then the result should be, in any order, with relax comparison:
       | VERTICES       | EDGES                              |
@@ -695,7 +695,7 @@ Feature: subgraph
       | [("Rockets")]  | []                                 |
     When executing query:
       """
-      GET SUBGRAPH 10000000000000 STEPS FROM 'Yao Ming' IN teammate OUT serve
+      GET SUBGRAPH 10000000000000 STEPS FROM 'Yao Ming' IN teammate OUT serve YIELD VERTICES, EDGES
       """
     Then the result should be, in any order, with relax comparison:
       | VERTICES       | EDGES                              |
@@ -705,7 +705,7 @@ Feature: subgraph
   Scenario: many steps without prop
     When executing query:
       """
-      GET SUBGRAPH 4 STEPS FROM 'Yao Ming' IN teammate OUT serve
+      GET SUBGRAPH 4 STEPS FROM 'Yao Ming' IN teammate OUT serve YIELD VERTICES, EDGES
       """
     Then the result should be, in any order, with relax comparison:
       | VERTICES       | EDGES                              |
@@ -713,14 +713,14 @@ Feature: subgraph
       | [("Rockets")]  | []                                 |
     When executing query:
       """
-      GET SUBGRAPH 4 STEPS FROM 'NOBODY' IN teammate OUT serve
+      GET SUBGRAPH 4 STEPS FROM 'NOBODY' IN teammate OUT serve YIELD VERTICES, EDGES
       """
     Then the result should be, in any order, with relax comparison:
       | VERTICES     | EDGES |
       | [("NOBODY")] | []    |
     When executing query:
       """
-      GET SUBGRAPH 4 steps from 'Yao Ming' IN teammate OUT serve BOTH like
+      GET SUBGRAPH 4 steps from 'Yao Ming' IN teammate OUT serve BOTH like YIELD VERTICES, EDGES
       """
     Then define some list variables:
       | edge1                                   | vertex2             | edge2                                       | vertex3          | edge3                                       | vertex4               | edge4                                            | vertex5               | edge5                                         |
@@ -806,7 +806,7 @@ Feature: subgraph
       | <[vertex5]>    | <[edge5]> |
     When executing query:
       """
-      GET SUBGRAPH 5 steps from 'Tony Parker' IN teammate OUT serve BOTH like
+      GET SUBGRAPH 5 steps from 'Tony Parker' IN teammate OUT serve BOTH like YIELD VERTICES, EDGES
       """
     Then define some list variables:
       | edge1                                        | vertex2               | edge2                                            | vertex3               | edge3                                         | vertex4             | edge4                                         | vertex5                | edge5                                        | vertex6        | edge6                                |
@@ -875,7 +875,7 @@ Feature: subgraph
       | <[vertex6]>       | <[edge6]> |
     When executing query:
       """
-      GET SUBGRAPH 4 steps from 'Tim Duncan' BOTH like
+      GET SUBGRAPH 4 steps from 'Tim Duncan' BOTH like YIELD VERTICES, EDGES
       """
     Then define some list variables:
       | edge1                                       | vertex2               | edge2                                            | vertex3               | edge3                                         | vertex4             | edge4                                         | vertex5                |
@@ -1029,7 +1029,7 @@ Feature: subgraph
     Then the execution should be successful
     When executing query:
       """
-      GET SUBGRAPH 1 STEPS FROM "Tom"
+      GET SUBGRAPH 1 STEPS FROM "Tom" YIELD VERTICES, EDGES
       """
     Then the result should be, in any order, with relax comparison:
       | VERTICES  | EDGES |