diff --git a/bench/query.go b/bench/query.go
index d08fe4d75..2cc035410 100644
--- a/bench/query.go
+++ b/bench/query.go
@@ -5,21 +5,21 @@ import (
 	"math/rand"
 )
 
-func NewQueryMaker(seed int64) *QueryMaker {
-	return &QueryMaker{
+func NewQueryGenerator(seed int64) *QueryGenerator {
+	return &QueryGenerator{
 		IDToFrameFn: func(id uint64) string { return "frame.n" },
 		R:           rand.New(rand.NewSource(seed)),
 		Frames:      []string{"frame.n"},
 	}
 }
 
-type QueryMaker struct {
+type QueryGenerator struct {
 	IDToFrameFn func(id uint64) string
 	R           *rand.Rand
 	Frames      []string
 }
 
-func (q *QueryMaker) Random(maxN, depth, maxargs int, idmin, idmax uint64) pql.Call {
+func (q *QueryGenerator) Random(maxN, depth, maxargs int, idmin, idmax uint64) pql.Call {
 	// TODO: handle depth==1 or 0
 	val := q.R.Intn(5)
 	switch val {
@@ -30,7 +30,7 @@ func (q *QueryMaker) Random(maxN, depth, maxargs int, idmin, idmax uint64) pql.C
 	}
 }
 
-func (q *QueryMaker) RandomTopN(maxN, depth, maxargs int, idmin, idmax uint64) *pql.TopN {
+func (q *QueryGenerator) RandomTopN(maxN, depth, maxargs int, idmin, idmax uint64) *pql.TopN {
 	frameIdx := q.R.Intn(len(q.Frames))
 	return &pql.TopN{
 		Frame: q.Frames[frameIdx],
@@ -39,7 +39,7 @@ func (q *QueryMaker) RandomTopN(maxN, depth, maxargs int, idmin, idmax uint64) *
 	}
 }
 
-func (q *QueryMaker) RandomBitmapCall(depth, maxargs int, idmin, idmax uint64) pql.BitmapCall {
+func (q *QueryGenerator) RandomBitmapCall(depth, maxargs int, idmin, idmax uint64) pql.BitmapCall {
 	if depth <= 1 {
 		bitmapID := q.R.Int63n(int64(idmax)-int64(idmin)) + int64(idmin)
 		return Bitmap(uint64(bitmapID), q.IDToFrameFn(uint64(bitmapID)))
diff --git a/bench/query_test.go b/bench/query_test.go
index 67b5c2521..0e2ecf454 100644
--- a/bench/query_test.go
+++ b/bench/query_test.go
@@ -6,14 +6,14 @@ import (
 )
 
 func TestRandomBitmapCall(t *testing.T) {
-	qm := bench.NewQueryMaker(5)
+	qm := bench.NewQueryGenerator(5)
 	bmc := qm.RandomBitmapCall(4, 3, 0, 1000)
 	t.Log(bmc.String())
 }
 
 func TestRandom(t *testing.T) {
 	for i := 99; i < 120; i++ {
-		qm := bench.NewQueryMaker(int64(i))
+		qm := bench.NewQueryGenerator(int64(i))
 		call := qm.Random(10, 4, 3, 0, 1000)
 		t.Log(call)
 	}
diff --git a/bench/randquery.go b/bench/randquery.go
index 3723cffdd..ce5571997 100644
--- a/bench/randquery.go
+++ b/bench/randquery.go
@@ -89,7 +89,7 @@ func (b *RandomQuery) Run(agentNum int) map[string]interface{} {
 		results["error"] = fmt.Errorf("No client set for RandomQuery agent: %v", agentNum)
 		return results
 	}
-	qm := NewQueryMaker(seed)
+	qm := NewQueryGenerator(seed)
 	s := NewStats()
 	var start time.Time
 	for n := 0; n < b.Iterations; n++ {