diff --git a/executor.go b/executor.go
index 80d9b5a8b..5de820a22 100644
--- a/executor.go
+++ b/executor.go
@@ -196,7 +196,7 @@ func (e *executor) executeCall(ctx context.Context, index string, c *pql.Call, s
 	case "TopN":
 		e.Holder.Stats.CountWithCustomTags(c.Name, 1, 1.0, []string{indexTag})
 		return e.executeTopN(ctx, index, c, shards, opt)
-	case "RowIDs":
+	case "Rows":
 		e.Holder.Stats.CountWithCustomTags(c.Name, 1, 1.0, []string{indexTag})
 		return e.executeRows(ctx, index, c, shards, opt)
 	case "GroupBy":
@@ -994,7 +994,7 @@ func (e *executor) executeRowsShard(ctx context.Context, index string, c *pql.Ca
 	// Fetch field name from argument.
 	fieldName, ok := c.Args["field"].(string)
 	if !ok {
-		return nil, errors.New("RowIDs() argument required: field")
+		return nil, errors.New("Rows() argument required: field")
 	}
 	// Fetch field.
 	f := e.Holder.Field(index, fieldName)
@@ -2205,7 +2205,7 @@ func needsShards(calls []*pql.Call) bool {
 		switch call.Name {
 		case "Clear", "Set", "SetRowAttrs", "SetColumnAttrs":
 			continue
-		case "Count", "TopN", "RowIDs":
+		case "Count", "TopN", "Rows":
 			return true
 		// default catches Bitmap calls
 		default:
diff --git a/executor_test.go b/executor_test.go
index c6ae4d9ab..73af2e2f8 100644
--- a/executor_test.go
+++ b/executor_test.go
@@ -1650,25 +1650,25 @@ func TestExecutor_Execute_RowIDs(t *testing.T) {
 	hldr.SetBit("i", "general", 12, 2)
 	hldr.SetBit("i", "general", 12, ShardWidth+2)
 
-	if res, err := c[0].API.Query(context.Background(), &pilosa.QueryRequest{Index: "i", Query: `RowIDs(field=general)`}); err != nil {
+	if res, err := c[0].API.Query(context.Background(), &pilosa.QueryRequest{Index: "i", Query: `Rows(field=general)`}); err != nil {
 		t.Fatal(err)
 	} else if columns := res.Results[0].(pilosa.RowIdentifiers); !reflect.DeepEqual(columns, pilosa.RowIdentifiers{Rows: []uint64{10, 11, 12}}) {
 		t.Fatalf("unexpected columns: %+v", columns)
 	}
 
-	if res, err := c[0].API.Query(context.Background(), &pilosa.QueryRequest{Index: "i", Query: `RowIDs(field=general, limit=2)`}); err != nil {
+	if res, err := c[0].API.Query(context.Background(), &pilosa.QueryRequest{Index: "i", Query: `Rows(field=general, limit=2)`}); err != nil {
 		t.Fatal(err)
 	} else if columns := res.Results[0].(pilosa.RowIdentifiers); !reflect.DeepEqual(columns, pilosa.RowIdentifiers{Rows: []uint64{10, 11}}) {
 		t.Fatalf("unexpected columns: %+v", columns)
 	}
 
-	if res, err := c[0].API.Query(context.Background(), &pilosa.QueryRequest{Index: "i", Query: `RowIDs(field=general, offset=1,limit=2)`}); err != nil {
+	if res, err := c[0].API.Query(context.Background(), &pilosa.QueryRequest{Index: "i", Query: `Rows(field=general, offset=1,limit=2)`}); err != nil {
 		t.Fatal(err)
 	} else if columns := res.Results[0].(pilosa.RowIdentifiers); !reflect.DeepEqual(columns, pilosa.RowIdentifiers{Rows: []uint64{11, 12}}) {
 		t.Fatalf("unexpected columns: %+v", columns)
 	}
 
-	if res, err := c[0].API.Query(context.Background(), &pilosa.QueryRequest{Index: "i", Query: `RowIDs(field=general, column=2)`}); err != nil {
+	if res, err := c[0].API.Query(context.Background(), &pilosa.QueryRequest{Index: "i", Query: `Rows(field=general, column=2)`}); err != nil {
 		t.Fatal(err)
 	} else if columns := res.Results[0].(pilosa.RowIdentifiers); !reflect.DeepEqual(columns, pilosa.RowIdentifiers{Rows: []uint64{11, 12}}) {
 		t.Fatalf("unexpected columns: %+v", columns)