diff --git a/query/planner_test.go b/query/planner_test.go
index c414c8eea..f05f6b17c 100644
--- a/query/planner_test.go
+++ b/query/planner_test.go
@@ -5,7 +5,6 @@ import (
 	"pilosa/db"
 	"pilosa/util"
 	"testing"
-
 	. "github.com/smartystreets/goconvey/convey"
 )
 
@@ -13,7 +12,7 @@ func basic_database() (*db.Database, *db.Fragment) {
 	// create an empty database
 	cluster := db.NewCluster()
 	database := cluster.GetOrCreateDatabase("main")
-	frame := database.GetOrCreateFrame("general")
+	frame := database.GetOrCreateFrame("default")
 
 	slice1 := database.GetOrCreateSlice(0)
 	fragment_id1 := util.Id()
@@ -37,10 +36,10 @@ func TestQueryPlanner(t *testing.T) {
 	Convey("Union query plan", t, func() {
 
 		id1 := util.RandomUUID()
-		query1 := Query{Id: &id1, Operation: "get", Args: map[string]interface{}{"id": uint64(10), "frame": "general"}}
+		query1 := Query{Id: &id1, Operation: "get", Args: map[string]interface{}{"id": uint64(10), "frame": "default"}}
 
 		id2 := util.RandomUUID()
-		query2 := Query{Id: &id2, Operation: "get", Args: map[string]interface{}{"id": uint64(20), "frame": "general"}}
+		query2 := Query{Id: &id2, Operation: "get", Args: map[string]interface{}{"id": uint64(20), "frame": "default"}}
 
 		id3 := util.RandomUUID()
 		query := Query{Id: &id3, Operation: "union", Subqueries: []Query{query1, query2}}
@@ -60,10 +59,10 @@ func TestQueryPlanner(t *testing.T) {
 		So(len(qp), ShouldEqual, 7)
 		So(qp[0].(GetQueryStep).Operation, ShouldEqual, "get")
 		So(qp[0].(GetQueryStep).Slice, ShouldEqual, 0)
-		So(*(qp[0].(GetQueryStep).Bitmap), ShouldResemble, db.Bitmap{10, "general", 0})
+		So(*(qp[0].(GetQueryStep).Bitmap), ShouldResemble, db.Bitmap{10, "default", 0})
 		So(qp[1].(GetQueryStep).Operation, ShouldEqual, "get")
 		So(qp[1].(GetQueryStep).Slice, ShouldEqual, 0)
-		So(*(qp[1].(GetQueryStep).Bitmap), ShouldResemble, db.Bitmap{20, "general", 0})
+		So(*(qp[1].(GetQueryStep).Bitmap), ShouldResemble, db.Bitmap{20, "default", 0})
 		So(qp[2].(UnionQueryStep).Operation, ShouldEqual, "union")
 		So(qp[2].(UnionQueryStep).Inputs, ShouldResemble, []*util.GUID{
 			qp[0].(GetQueryStep).Id,
@@ -71,10 +70,10 @@ func TestQueryPlanner(t *testing.T) {
 		})
 		So(qp[3].(GetQueryStep).Operation, ShouldEqual, "get")
 		So(qp[3].(GetQueryStep).Slice, ShouldEqual, 1)
-		So(*(qp[3].(GetQueryStep).Bitmap), ShouldResemble, db.Bitmap{10, "general", 0})
+		So(*(qp[3].(GetQueryStep).Bitmap), ShouldResemble, db.Bitmap{10, "default", 0})
 		So(qp[4].(GetQueryStep).Operation, ShouldEqual, "get")
 		So(qp[4].(GetQueryStep).Slice, ShouldEqual, 1)
-		So(*(qp[4].(GetQueryStep).Bitmap), ShouldResemble, db.Bitmap{20, "general", 0})
+		So(*(qp[4].(GetQueryStep).Bitmap), ShouldResemble, db.Bitmap{20, "default", 0})
 		So(qp[5].(UnionQueryStep).Operation, ShouldEqual, "union")
 		So(qp[5].(UnionQueryStep).Inputs, ShouldResemble, []*util.GUID{
 			qp[3].(GetQueryStep).Id,
@@ -88,7 +87,7 @@ func TestQueryPlanner(t *testing.T) {
 	})
 	Convey("Get query plan - including parsing", t, func() {
 
-		query, err := QueryForPQL("get(10,general)")
+		query, err := QueryForPQL("get(10,default)")
 		So(err, ShouldEqual, nil)
 
 		database, fragment1 := basic_database()
@@ -104,10 +103,10 @@ func TestQueryPlanner(t *testing.T) {
 		So(len(qp), ShouldEqual, 3)
 		So(qp[0].(GetQueryStep).Operation, ShouldEqual, "get")
 		So(qp[0].(GetQueryStep).Slice, ShouldEqual, 0)
-		So(*(qp[0].(GetQueryStep).Bitmap), ShouldResemble, db.Bitmap{10, "general", 0})
+		So(*(qp[0].(GetQueryStep).Bitmap), ShouldResemble, db.Bitmap{10, "default", 0})
 		So(qp[1].(GetQueryStep).Operation, ShouldEqual, "get")
 		So(qp[1].(GetQueryStep).Slice, ShouldEqual, 1)
-		So(*(qp[1].(GetQueryStep).Bitmap), ShouldResemble, db.Bitmap{10, "general", 0})
+		So(*(qp[1].(GetQueryStep).Bitmap), ShouldResemble, db.Bitmap{10, "default", 0})
 		So(qp[2].(CatQueryStep).Operation, ShouldEqual, "cat")
 		So(qp[2].(CatQueryStep).Inputs, ShouldResemble, []*util.GUID{
 			qp[0].(GetQueryStep).Id,
@@ -116,7 +115,7 @@ func TestQueryPlanner(t *testing.T) {
 	})
 	Convey("Union query plan - including parsing", t, func() {
 
-		query, err := QueryForPQL("union(get(10, general), get(20, general))")
+		query, err := QueryForPQL("union(get(10, default), get(20, default))")
 		So(err, ShouldEqual, nil)
 
 		database, fragment1 := basic_database()
@@ -132,10 +131,10 @@ func TestQueryPlanner(t *testing.T) {
 		So(len(qp), ShouldEqual, 7)
 		So(qp[0].(GetQueryStep).Operation, ShouldEqual, "get")
 		So(qp[0].(GetQueryStep).Slice, ShouldEqual, 0)
-		So(*(qp[0].(GetQueryStep).Bitmap), ShouldResemble, db.Bitmap{10, "general", 0})
+		So(*(qp[0].(GetQueryStep).Bitmap), ShouldResemble, db.Bitmap{10, "default", 0})
 		So(qp[1].(GetQueryStep).Operation, ShouldEqual, "get")
 		So(qp[1].(GetQueryStep).Slice, ShouldEqual, 0)
-		So(*(qp[1].(GetQueryStep).Bitmap), ShouldResemble, db.Bitmap{20, "general", 0})
+		So(*(qp[1].(GetQueryStep).Bitmap), ShouldResemble, db.Bitmap{20, "default", 0})
 		So(qp[2].(UnionQueryStep).Operation, ShouldEqual, "union")
 		So(qp[2].(UnionQueryStep).Inputs, ShouldResemble, []*util.GUID{
 			qp[0].(GetQueryStep).Id,
@@ -143,10 +142,10 @@ func TestQueryPlanner(t *testing.T) {
 		})
 		So(qp[3].(GetQueryStep).Operation, ShouldEqual, "get")
 		So(qp[3].(GetQueryStep).Slice, ShouldEqual, 1)
-		So(*(qp[3].(GetQueryStep).Bitmap), ShouldResemble, db.Bitmap{10, "general", 0})
+		So(*(qp[3].(GetQueryStep).Bitmap), ShouldResemble, db.Bitmap{10, "default", 0})
 		So(qp[4].(GetQueryStep).Operation, ShouldEqual, "get")
 		So(qp[4].(GetQueryStep).Slice, ShouldEqual, 1)
-		So(*(qp[4].(GetQueryStep).Bitmap), ShouldResemble, db.Bitmap{20, "general", 0})
+		So(*(qp[4].(GetQueryStep).Bitmap), ShouldResemble, db.Bitmap{20, "default", 0})
 		So(qp[5].(UnionQueryStep).Operation, ShouldEqual, "union")
 		So(qp[5].(UnionQueryStep).Inputs, ShouldResemble, []*util.GUID{
 			qp[3].(GetQueryStep).Id,
@@ -159,7 +158,7 @@ func TestQueryPlanner(t *testing.T) {
 		})
 	})
 	Convey("Set query plan - including parsing", t, func() {
-		query, err := QueryForPQL("set(10, general, 0, 100)")
+		query, err := QueryForPQL("set(10, default, 0, 100)")
 		So(err, ShouldEqual, nil)
 
 		database, fragment1 := basic_database()
@@ -174,10 +173,10 @@ func TestQueryPlanner(t *testing.T) {
 		So(len(qp), ShouldEqual, 1)
 		So(qp[0].(SetQueryStep).Operation, ShouldEqual, "set")
 		So(qp[0].(SetQueryStep).ProfileId, ShouldEqual, 100)
-		So(*(qp[0].(SetQueryStep).Bitmap), ShouldResemble, db.Bitmap{10, "general", 0})
+		So(*(qp[0].(SetQueryStep).Bitmap), ShouldResemble, db.Bitmap{10, "default", 0})
 	})
 	Convey("Top-n query plan - including parsing", t, func() {
-		query, err := QueryForPQL("top-n(get(10, general), [1,2,3], 50)")
+		query, err := QueryForPQL("top-n(get(10, default), default, 50)")
 		So(err, ShouldEqual, nil)
 
 		database, fragment1 := basic_database()
@@ -192,12 +191,12 @@ func TestQueryPlanner(t *testing.T) {
 		So(err, ShouldEqual, nil)
 		So(len(qp), ShouldEqual, 5)
 		So(qp[0].(GetQueryStep).Operation, ShouldEqual, "get")
-		So(*(qp[0].(GetQueryStep).Bitmap), ShouldResemble, db.Bitmap{10, "general", 0})
+		So(*(qp[0].(GetQueryStep).Bitmap), ShouldResemble, db.Bitmap{10, "default", 0})
 		So(qp[1].(*TopNQueryStep).Operation, ShouldEqual, "top-n")
 		So(qp[1].(*TopNQueryStep).Input, ShouldEqual, qp[0].(GetQueryStep).Id)
 		So(qp[1].(*TopNQueryStep).N, ShouldEqual, 50)
 		So(qp[2].(GetQueryStep).Operation, ShouldEqual, "get")
-		So(*(qp[2].(GetQueryStep).Bitmap), ShouldResemble, db.Bitmap{10, "general", 0})
+		So(*(qp[2].(GetQueryStep).Bitmap), ShouldResemble, db.Bitmap{10, "default", 0})
 		So(qp[3].(*TopNQueryStep).Operation, ShouldEqual, "top-n")
 		So(qp[3].(*TopNQueryStep).Input, ShouldEqual, qp[2].(GetQueryStep).Id)
 		So(qp[3].(*TopNQueryStep).N, ShouldEqual, 50)