diff --git a/graph/memstore/all_iterator.go b/graph/memstore/all_iterator.go
index 3b52eda..0fe47ea 100644
--- a/graph/memstore/all_iterator.go
+++ b/graph/memstore/all_iterator.go
@@ -24,22 +24,24 @@ type AllIterator struct {
 	qs *QuadStore
 }
 
-type NodesAllIterator AllIterator
-type QuadsAllIterator AllIterator
+type (
+	nodesAllIterator AllIterator
+	quadsAllIterator AllIterator
+)
 
-func NewMemstoreNodesAllIterator(qs *QuadStore) *NodesAllIterator {
-	var out NodesAllIterator
+func newNodesAllIterator(qs *QuadStore) *nodesAllIterator {
+	var out nodesAllIterator
 	out.Int64 = *iterator.NewInt64(1, qs.idCounter-1)
 	out.qs = qs
 	return &out
 }
 
 // No subiterators.
-func (it *NodesAllIterator) SubIterators() []graph.Iterator {
+func (it *nodesAllIterator) SubIterators() []graph.Iterator {
 	return nil
 }
 
-func (it *NodesAllIterator) Next() bool {
+func (it *nodesAllIterator) Next() bool {
 	if !it.Int64.Next() {
 		return false
 	}
@@ -50,19 +52,19 @@ func (it *NodesAllIterator) Next() bool {
 	return true
 }
 
-func NewMemstoreQuadsAllIterator(qs *QuadStore) *QuadsAllIterator {
-	var out QuadsAllIterator
+func newQuadsAllIterator(qs *QuadStore) *quadsAllIterator {
+	var out quadsAllIterator
 	out.Int64 = *iterator.NewInt64(1, qs.quadIdCounter-1)
 	out.qs = qs
 	return &out
 }
 
-func (qit *QuadsAllIterator) Next() bool {
-	out := qit.Int64.Next()
+func (it *quadsAllIterator) Next() bool {
+	out := it.Int64.Next()
 	if out {
-		i64 := qit.Int64.Result().(int64)
-		if qit.qs.log[i64].DeletedBy != 0 || qit.qs.log[i64].Action == graph.Delete {
-			return qit.Next()
+		i64 := it.Int64.Result().(int64)
+		if it.qs.log[i64].DeletedBy != 0 || it.qs.log[i64].Action == graph.Delete {
+			return it.Next()
 		}
 	}
 	return out
diff --git a/graph/memstore/quadstore.go b/graph/memstore/quadstore.go
index 62713f9..852e769 100644
--- a/graph/memstore/quadstore.go
+++ b/graph/memstore/quadstore.go
@@ -231,7 +231,7 @@ func (qs *QuadStore) NameOf(id graph.Value) string {
 }
 
 func (qs *QuadStore) QuadsAllIterator() graph.Iterator {
-	return NewMemstoreQuadsAllIterator(qs)
+	return newQuadsAllIterator(qs)
 }
 
 func (qs *QuadStore) FixedIterator() graph.FixedIterator {
@@ -244,7 +244,7 @@ func (qs *QuadStore) QuadDirection(val graph.Value, d quad.Direction) graph.Valu
 }
 
 func (qs *QuadStore) NodesAllIterator() graph.Iterator {
-	return NewMemstoreNodesAllIterator(qs)
+	return newNodesAllIterator(qs)
 }
 
 func (qs *QuadStore) Close() {}