diff --git a/pkg/registry/event/rest.go b/pkg/registry/event/rest.go
index 07d8a61f8cf..f4ec1981e00 100644
--- a/pkg/registry/event/rest.go
+++ b/pkg/registry/event/rest.go
@@ -131,13 +131,13 @@ func (rs *REST) getAttrs(obj runtime.Object) (objLabels, objFields labels.Set, e
 }
 
 func (rs *REST) List(ctx api.Context, label, field labels.Selector) (runtime.Object, error) {
-	return rs.registry.List(ctx, &generic.SelectionPredicate{label, field, rs.getAttrs})
+	return rs.registry.ListPredicate(ctx, &generic.SelectionPredicate{label, field, rs.getAttrs})
 }
 
 // Watch returns Events events via a watch.Interface.
 // It implements apiserver.ResourceWatcher.
 func (rs *REST) Watch(ctx api.Context, label, field labels.Selector, resourceVersion string) (watch.Interface, error) {
-	return rs.registry.Watch(ctx, &generic.SelectionPredicate{label, field, rs.getAttrs}, resourceVersion)
+	return rs.registry.WatchPredicate(ctx, &generic.SelectionPredicate{label, field, rs.getAttrs}, resourceVersion)
 }
 
 // New returns a new api.Event
diff --git a/pkg/registry/generic/etcd/etcd.go b/pkg/registry/generic/etcd/etcd.go
index b48797b7d42..30516cead1f 100644
--- a/pkg/registry/generic/etcd/etcd.go
+++ b/pkg/registry/generic/etcd/etcd.go
@@ -23,6 +23,7 @@ import (
 	kubeerr "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors"
 	etcderr "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors/etcd"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/api/rest"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/labels"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/registry/generic"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/tools"
@@ -70,6 +71,9 @@ type Etcd struct {
 	// is an operation against an existing object.
 	TTLFunc func(obj runtime.Object, update bool) (uint64, error)
 
+	// Returns a matcher corresponding to the provided labels and fields.
+	PredicateFunc func(label, field labels.Selector) generic.Matcher
+
 	// Called on all objects returned from the underlying store, after
 	// the exit hooks are invoked. Decorators are intended for integrations
 	// that are above etcd and should only be used for specific cases where
@@ -119,10 +123,23 @@ func NamespaceKeyFunc(ctx api.Context, prefix string, name string) (string, erro
 	return key, nil
 }
 
-// List returns a list of all the items matching m.
-// TODO: rename this to ListPredicate, take the default predicate function on the constructor, and
-// introduce a List method that uses the default predicate function
-func (e *Etcd) List(ctx api.Context, m generic.Matcher) (runtime.Object, error) {
+// New implements RESTStorage
+func (e *Etcd) New() runtime.Object {
+	return e.NewFunc()
+}
+
+// NewList implements RESTLister
+func (e *Etcd) NewList() runtime.Object {
+	return e.NewListFunc()
+}
+
+// List returns a list of items matching labels and field
+func (e *Etcd) List(ctx api.Context, label, field labels.Selector) (runtime.Object, error) {
+	return e.ListPredicate(ctx, e.PredicateFunc(label, field))
+}
+
+// ListPredicate returns a list of all the items matching m.
+func (e *Etcd) ListPredicate(ctx api.Context, m generic.Matcher) (runtime.Object, error) {
 	list := e.NewListFunc()
 	err := e.Helper.ExtractToList(e.KeyRootFunc(ctx), list)
 	if err != nil {
@@ -339,11 +356,15 @@ func (e *Etcd) Delete(ctx api.Context, name string) (runtime.Object, error) {
 	return &api.Status{Status: api.StatusSuccess}, nil
 }
 
-// Watch starts a watch for the items that m matches.
+// WatchPredicate starts a watch for the items that m matches.
 // TODO: Detect if m references a single object instead of a list.
-// TODO: rename this to WatchPredicate, take the default predicate function on the constructor, and
-// introduce a Watch method that uses the default predicate function
-func (e *Etcd) Watch(ctx api.Context, m generic.Matcher, resourceVersion string) (watch.Interface, error) {
+func (e *Etcd) Watch(ctx api.Context, label, field labels.Selector, resourceVersion string) (watch.Interface, error) {
+	return e.WatchPredicate(ctx, e.PredicateFunc(label, field), resourceVersion)
+}
+
+// WatchPredicate starts a watch for the items that m matches.
+// TODO: Detect if m references a single object instead of a list.
+func (e *Etcd) WatchPredicate(ctx api.Context, m generic.Matcher, resourceVersion string) (watch.Interface, error) {
 	version, err := tools.ParseWatchResourceVersion(resourceVersion, e.EndpointName)
 	if err != nil {
 		return nil, err
diff --git a/pkg/registry/generic/etcd/etcd_test.go b/pkg/registry/generic/etcd/etcd_test.go
index 59d9ee1782c..9c052014938 100644
--- a/pkg/registry/generic/etcd/etcd_test.go
+++ b/pkg/registry/generic/etcd/etcd_test.go
@@ -172,7 +172,7 @@ func TestEtcdList(t *testing.T) {
 	for name, item := range table {
 		fakeClient, registry := NewTestGenericEtcdRegistry(t)
 		fakeClient.Data[registry.KeyRootFunc(api.NewContext())] = item.in
-		list, err := registry.List(api.NewContext(), item.m)
+		list, err := registry.ListPredicate(api.NewContext(), item.m)
 		if e, a := item.succeed, err == nil; e != a {
 			t.Errorf("%v: expected %v, got %v", name, e, a)
 			continue
@@ -660,7 +660,7 @@ func TestEtcdWatch(t *testing.T) {
 	}
 
 	fakeClient, registry := NewTestGenericEtcdRegistry(t)
-	wi, err := registry.Watch(api.NewContext(), EverythingMatcher{}, "1")
+	wi, err := registry.WatchPredicate(api.NewContext(), EverythingMatcher{}, "1")
 	if err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	}
diff --git a/pkg/registry/generic/registry.go b/pkg/registry/generic/registry.go
index f801b754d75..c194208a25d 100644
--- a/pkg/registry/generic/registry.go
+++ b/pkg/registry/generic/registry.go
@@ -75,12 +75,12 @@ type DecoratorFunc func(obj runtime.Object) error
 // layer.
 // DEPRECATED: replace with direct implementation of RESTStorage
 type Registry interface {
-	List(api.Context, Matcher) (runtime.Object, error)
+	ListPredicate(api.Context, Matcher) (runtime.Object, error)
 	CreateWithName(ctx api.Context, id string, obj runtime.Object) error
 	UpdateWithName(ctx api.Context, id string, obj runtime.Object) error
 	Get(ctx api.Context, id string) (runtime.Object, error)
 	Delete(ctx api.Context, id string) (runtime.Object, error)
-	Watch(ctx api.Context, m Matcher, resourceVersion string) (watch.Interface, error)
+	WatchPredicate(ctx api.Context, m Matcher, resourceVersion string) (watch.Interface, error)
 }
 
 // FilterList filters any list object that conforms to the api conventions,
diff --git a/pkg/registry/limitrange/rest.go b/pkg/registry/limitrange/rest.go
index 26637e19e2d..7d9bf8c5f58 100644
--- a/pkg/registry/limitrange/rest.go
+++ b/pkg/registry/limitrange/rest.go
@@ -135,11 +135,11 @@ func (rs *REST) getAttrs(obj runtime.Object) (objLabels, objFields labels.Set, e
 }
 
 func (rs *REST) List(ctx api.Context, label, field labels.Selector) (runtime.Object, error) {
-	return rs.registry.List(ctx, &generic.SelectionPredicate{label, field, rs.getAttrs})
+	return rs.registry.ListPredicate(ctx, &generic.SelectionPredicate{label, field, rs.getAttrs})
 }
 
 func (rs *REST) Watch(ctx api.Context, label, field labels.Selector, resourceVersion string) (watch.Interface, error) {
-	return rs.registry.Watch(ctx, &generic.SelectionPredicate{label, field, rs.getAttrs}, resourceVersion)
+	return rs.registry.WatchPredicate(ctx, &generic.SelectionPredicate{label, field, rs.getAttrs}, resourceVersion)
 }
 
 // New returns a new api.LimitRange
diff --git a/pkg/registry/namespace/rest.go b/pkg/registry/namespace/rest.go
index 055dfe1f79d..db71a3a5cc9 100644
--- a/pkg/registry/namespace/rest.go
+++ b/pkg/registry/namespace/rest.go
@@ -109,11 +109,11 @@ func (rs *REST) getAttrs(obj runtime.Object) (objLabels, objFields labels.Set, e
 }
 
 func (rs *REST) List(ctx api.Context, label, field labels.Selector) (runtime.Object, error) {
-	return rs.registry.List(ctx, &generic.SelectionPredicate{label, field, rs.getAttrs})
+	return rs.registry.ListPredicate(ctx, &generic.SelectionPredicate{label, field, rs.getAttrs})
 }
 
 func (rs *REST) Watch(ctx api.Context, label, field labels.Selector, resourceVersion string) (watch.Interface, error) {
-	return rs.registry.Watch(ctx, &generic.SelectionPredicate{label, field, rs.getAttrs}, resourceVersion)
+	return rs.registry.WatchPredicate(ctx, &generic.SelectionPredicate{label, field, rs.getAttrs}, resourceVersion)
 }
 
 // New returns a new api.Namespace
diff --git a/pkg/registry/pod/etcd/etcd.go b/pkg/registry/pod/etcd/etcd.go
index 9bedb080854..2ca4e738446 100644
--- a/pkg/registry/pod/etcd/etcd.go
+++ b/pkg/registry/pod/etcd/etcd.go
@@ -24,6 +24,7 @@ import (
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/api/rest"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/constraint"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/labels"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/registry/generic"
 	etcdgeneric "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/generic/etcd"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/registry/pod"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"
@@ -53,6 +54,9 @@ func NewREST(h tools.EtcdHelper, factory pod.BoundPodFactory) (*REST, *BindingRE
 		ObjectNameFunc: func(obj runtime.Object) (string, error) {
 			return obj.(*api.Pod).Name, nil
 		},
+		PredicateFunc: func(label, field labels.Selector) generic.Matcher {
+			return pod.MatchPod(label, field)
+		},
 		EndpointName: "pods",
 
 		Helper: h,
@@ -92,12 +96,12 @@ func (r *REST) NewList() runtime.Object {
 
 // List obtains a list of pods with labels that match selector.
 func (r *REST) List(ctx api.Context, label, field labels.Selector) (runtime.Object, error) {
-	return r.store.List(ctx, pod.MatchPod(label, field))
+	return r.store.List(ctx, label, field)
 }
 
 // Watch begins watching for new, changed, or deleted pods.
 func (r *REST) Watch(ctx api.Context, label, field labels.Selector, resourceVersion string) (watch.Interface, error) {
-	return r.store.Watch(ctx, pod.MatchPod(label, field), resourceVersion)
+	return r.store.Watch(ctx, label, field, resourceVersion)
 }
 
 // Get gets a specific pod specified by its ID.
diff --git a/pkg/registry/registrytest/generic.go b/pkg/registry/registrytest/generic.go
index 820528f4aee..3cecc0a10a9 100644
--- a/pkg/registry/registrytest/generic.go
+++ b/pkg/registry/registrytest/generic.go
@@ -42,7 +42,7 @@ func NewGeneric(list runtime.Object) *GenericRegistry {
 	}
 }
 
-func (r *GenericRegistry) List(ctx api.Context, m generic.Matcher) (runtime.Object, error) {
+func (r *GenericRegistry) ListPredicate(ctx api.Context, m generic.Matcher) (runtime.Object, error) {
 	r.Lock()
 	defer r.Unlock()
 	if r.Err != nil {
@@ -51,7 +51,7 @@ func (r *GenericRegistry) List(ctx api.Context, m generic.Matcher) (runtime.Obje
 	return generic.FilterList(r.ObjectList, m, nil)
 }
 
-func (r *GenericRegistry) Watch(ctx api.Context, m generic.Matcher, resourceVersion string) (watch.Interface, error) {
+func (r *GenericRegistry) WatchPredicate(ctx api.Context, m generic.Matcher, resourceVersion string) (watch.Interface, error) {
 	// TODO: wire filter down into the mux; it needs access to current and previous state :(
 	return r.Broadcaster.Watch(), nil
 }
diff --git a/pkg/registry/resourcequota/rest.go b/pkg/registry/resourcequota/rest.go
index 62597c47d49..98616f2a351 100644
--- a/pkg/registry/resourcequota/rest.go
+++ b/pkg/registry/resourcequota/rest.go
@@ -138,11 +138,11 @@ func (rs *REST) getAttrs(obj runtime.Object) (objLabels, objFields labels.Set, e
 }
 
 func (rs *REST) List(ctx api.Context, label, field labels.Selector) (runtime.Object, error) {
-	return rs.registry.List(ctx, &generic.SelectionPredicate{label, field, rs.getAttrs})
+	return rs.registry.ListPredicate(ctx, &generic.SelectionPredicate{label, field, rs.getAttrs})
 }
 
 func (rs *REST) Watch(ctx api.Context, label, field labels.Selector, resourceVersion string) (watch.Interface, error) {
-	return rs.registry.Watch(ctx, &generic.SelectionPredicate{label, field, rs.getAttrs}, resourceVersion)
+	return rs.registry.WatchPredicate(ctx, &generic.SelectionPredicate{label, field, rs.getAttrs}, resourceVersion)
 }
 
 // New returns a new api.ResourceQuota
diff --git a/pkg/registry/secret/rest.go b/pkg/registry/secret/rest.go
index 8bdec0de328..265d23c5544 100644
--- a/pkg/registry/secret/rest.go
+++ b/pkg/registry/secret/rest.go
@@ -145,11 +145,11 @@ func (rs *REST) getAttrs(obj runtime.Object) (objLabels, objFields labels.Set, e
 }
 
 func (rs *REST) List(ctx api.Context, label, field labels.Selector) (runtime.Object, error) {
-	return rs.registry.List(ctx, &generic.SelectionPredicate{label, field, rs.getAttrs})
+	return rs.registry.ListPredicate(ctx, &generic.SelectionPredicate{label, field, rs.getAttrs})
 }
 
 func (rs *REST) Watch(ctx api.Context, label, field labels.Selector, resourceVersion string) (watch.Interface, error) {
-	return rs.registry.Watch(ctx, &generic.SelectionPredicate{label, field, rs.getAttrs}, resourceVersion)
+	return rs.registry.WatchPredicate(ctx, &generic.SelectionPredicate{label, field, rs.getAttrs}, resourceVersion)
 }
 
 // New returns a new api.Secret