diff --git a/pkg/master/master.go b/pkg/master/master.go
index 5b17457fcb3..80831fa095e 100644
--- a/pkg/master/master.go
+++ b/pkg/master/master.go
@@ -87,7 +87,7 @@ func (m *Master) init(cloud cloudprovider.Interface, podInfoGetter client.PodInf
 	s := scheduler.MakeFirstFitScheduler(m.podRegistry, m.random)
 	m.storage = map[string]apiserver.RESTStorage{
 		"pods": registry.MakePodRegistryStorage(m.podRegistry, podInfoGetter, s, m.minionRegistry, cloud, podCache),
-		"replicationControllers": registry.MakeControllerRegistryStorage(m.controllerRegistry, m.podRegistry),
+		"replicationControllers": registry.NewControllerRegistryStorage(m.controllerRegistry, m.podRegistry),
 		"services":               registry.MakeServiceRegistryStorage(m.serviceRegistry, cloud, m.minionRegistry),
 		"minions":                registry.MakeMinionRegistryStorage(m.minionRegistry),
 	}
diff --git a/pkg/registry/controller_registry.go b/pkg/registry/controller_registry.go
index 6aa0dcbe99d..a91bed859a4 100644
--- a/pkg/registry/controller_registry.go
+++ b/pkg/registry/controller_registry.go
@@ -26,7 +26,7 @@ import (
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/labels"
 )
 
-// Implementation of RESTStorage for the api server.
+// ControllerRegistryStorage is an implementation of RESTStorage for the api server.
 type ControllerRegistryStorage struct {
 	registry    ControllerRegistry
 	podRegistry PodRegistry
@@ -34,7 +34,7 @@ type ControllerRegistryStorage struct {
 	pollPeriod time.Duration
 }
 
-func MakeControllerRegistryStorage(registry ControllerRegistry, podRegistry PodRegistry) apiserver.RESTStorage {
+func NewControllerRegistryStorage(registry ControllerRegistry, podRegistry PodRegistry) apiserver.RESTStorage {
 	return &ControllerRegistryStorage{
 		registry:    registry,
 		podRegistry: podRegistry,
@@ -42,6 +42,7 @@ func MakeControllerRegistryStorage(registry ControllerRegistry, podRegistry PodR
 	}
 }
 
+// List obtains a list of ReplicationControllers that match selector.
 func (storage *ControllerRegistryStorage) List(selector labels.Selector) (interface{}, error) {
 	result := api.ReplicationControllerList{}
 	controllers, err := storage.registry.ListControllers()
@@ -55,6 +56,7 @@ func (storage *ControllerRegistryStorage) List(selector labels.Selector) (interf
 	return result, err
 }
 
+// Get obtains the ReplicationController specified by its id.
 func (storage *ControllerRegistryStorage) Get(id string) (interface{}, error) {
 	controller, err := storage.registry.GetController(id)
 	if err != nil {
@@ -63,18 +65,21 @@ func (storage *ControllerRegistryStorage) Get(id string) (interface{}, error) {
 	return controller, err
 }
 
+// Delete asynchronously deletes the ReplicationController specified by its id.
 func (storage *ControllerRegistryStorage) Delete(id string) (<-chan interface{}, error) {
 	return apiserver.MakeAsync(func() (interface{}, error) {
 		return api.Status{Status: api.StatusSuccess}, storage.registry.DeleteController(id)
 	}), nil
 }
 
+// Extract deserializes user provided data into an api.ReplicationController.
 func (storage *ControllerRegistryStorage) Extract(body []byte) (interface{}, error) {
 	result := api.ReplicationController{}
 	err := api.DecodeInto(body, &result)
 	return result, err
 }
 
+// Create registers a given new ReplicationController instance to storage.registry.
 func (storage *ControllerRegistryStorage) Create(obj interface{}) (<-chan interface{}, error) {
 	controller, ok := obj.(api.ReplicationController)
 	if !ok {
@@ -95,6 +100,7 @@ func (storage *ControllerRegistryStorage) Create(obj interface{}) (<-chan interf
 	}), nil
 }
 
+// Update replaces a given ReplicationController instance with an existing instance in storage.registry.
 func (storage *ControllerRegistryStorage) Update(obj interface{}) (<-chan interface{}, error) {
 	controller, ok := obj.(api.ReplicationController)
 	if !ok {
diff --git a/pkg/registry/interfaces.go b/pkg/registry/interfaces.go
index f3190b18da4..4c52195625d 100644
--- a/pkg/registry/interfaces.go
+++ b/pkg/registry/interfaces.go
@@ -35,13 +35,13 @@ type PodRegistry interface {
 	DeletePod(podID string) error
 }
 
-// ControllerRegistry is an interface for things that know how to store Controllers.
+// ControllerRegistry is an interface for things that know how to store ReplicationControllers.
 type ControllerRegistry interface {
 	ListControllers() ([]api.ReplicationController, error)
-	GetController(controllerId string) (*api.ReplicationController, error)
+	GetController(controllerID string) (*api.ReplicationController, error)
 	CreateController(controller api.ReplicationController) error
 	UpdateController(controller api.ReplicationController) error
-	DeleteController(controllerId string) error
+	DeleteController(controllerID string) error
 }
 
 // ServiceRegistry is an interface for things that know how to store services.
diff --git a/pkg/registry/memory_registry.go b/pkg/registry/memory_registry.go
index bd0e25cf103..63dee81d0cb 100644
--- a/pkg/registry/memory_registry.go
+++ b/pkg/registry/memory_registry.go
@@ -93,8 +93,8 @@ func (registry *MemoryRegistry) CreateController(controller api.ReplicationContr
 	return nil
 }
 
-func (registry *MemoryRegistry) DeleteController(controllerId string) error {
-	delete(registry.controllerData, controllerId)
+func (registry *MemoryRegistry) DeleteController(controllerID string) error {
+	delete(registry.controllerData, controllerID)
 	return nil
 }