diff --git a/pkg/registry/interfaces.go b/pkg/registry/interfaces.go
index f3190b18da4..3a6752509bd 100644
--- a/pkg/registry/interfaces.go
+++ b/pkg/registry/interfaces.go
@@ -38,10 +38,10 @@ type PodRegistry interface {
 // ControllerRegistry is an interface for things that know how to store Controllers.
 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
 }