diff --git a/pkg/store/consul.go b/pkg/store/consul.go
index d4525acfc7..72271b05f0 100644
--- a/pkg/store/consul.go
+++ b/pkg/store/consul.go
@@ -116,7 +116,7 @@ func (s *Consul) Exists(key string) (bool, error) {
 	return true, nil
 }
 
-// GetRange gets a range of values at "directory"
+// List values at "directory"
 func (s *Consul) List(prefix string) ([]*KVPair, error) {
 	pairs, _, err := s.client.KV().List(s.normalize(prefix), nil)
 	if err != nil {
@@ -135,7 +135,7 @@ func (s *Consul) List(prefix string) ([]*KVPair, error) {
 	return kv, nil
 }
 
-// DeleteRange deletes a range of values at "directory"
+// DeleteTree deletes a range of values at "directory"
 func (s *Consul) DeleteTree(prefix string) error {
 	_, err := s.client.KV().DeleteTree(s.normalize(prefix), nil)
 	return err
@@ -207,7 +207,7 @@ func (s *Consul) waitForChange(key string) <-chan uint64 {
 	return ch
 }
 
-// WatchRange triggers a watch on a range of values at "directory"
+// WatchTree triggers a watch on a range of values at "directory"
 func (s *Consul) WatchTree(prefix string, callback WatchCallback) error {
 	fprefix := s.normalize(prefix)
 
diff --git a/pkg/store/etcd.go b/pkg/store/etcd.go
index e51cd094ac..92d77ed615 100644
--- a/pkg/store/etcd.go
+++ b/pkg/store/etcd.go
@@ -193,7 +193,7 @@ func (s *Etcd) AtomicDelete(key string, previous *KVPair) (bool, error) {
 	return true, nil
 }
 
-// GetRange gets a range of values at "directory"
+// List a range of values at "directory"
 func (s *Etcd) List(prefix string) ([]*KVPair, error) {
 	resp, err := s.client.Get(normalize(prefix), true, true)
 	if err != nil {
@@ -206,7 +206,7 @@ func (s *Etcd) List(prefix string) ([]*KVPair, error) {
 	return kv, nil
 }
 
-// DeleteRange deletes a range of values at "directory"
+// DeleteTree deletes a range of values at "directory"
 func (s *Etcd) DeleteTree(prefix string) error {
 	if _, err := s.client.Delete(normalize(prefix), true); err != nil {
 		return err
@@ -214,7 +214,7 @@ func (s *Etcd) DeleteTree(prefix string) error {
 	return nil
 }
 
-// WatchRange triggers a watch on a range of values at "directory"
+// WatchTree triggers a watch on a range of values at "directory"
 func (s *Etcd) WatchTree(prefix string, callback WatchCallback) error {
 	prefix = normalize(prefix)
 	watchChan := make(chan *etcd.Response)
diff --git a/pkg/store/zookeeper.go b/pkg/store/zookeeper.go
index a312771362..62cf5e3387 100644
--- a/pkg/store/zookeeper.go
+++ b/pkg/store/zookeeper.go
@@ -138,7 +138,7 @@ func (s *Zookeeper) CancelWatch(key string) error {
 	return nil
 }
 
-// GetRange gets a range of values at "directory"
+// List a range of values at "directory"
 func (s *Zookeeper) List(prefix string) ([]*KVPair, error) {
 	prefix = normalize(prefix)
 	entries, stat, err := s.client.Children(prefix)
@@ -153,13 +153,13 @@ func (s *Zookeeper) List(prefix string) ([]*KVPair, error) {
 	return kv, err
 }
 
-// DeleteRange deletes a range of values at "directory"
+// DeleteTree deletes a range of values at "directory"
 func (s *Zookeeper) DeleteTree(prefix string) error {
 	err := s.client.Delete(normalize(prefix), -1)
 	return err
 }
 
-// WatchRange triggers a watch on a range of values at "directory"
+// WatchTree triggers a watch on a range of values at "directory"
 func (s *Zookeeper) WatchTree(prefix string, callback WatchCallback) error {
 	fprefix := normalize(prefix)
 	_, _, eventChan, err := s.client.ChildrenW(fprefix)