diff --git a/hack/.golint_failures b/hack/.golint_failures
index a478eb3a07a..f739029d400 100644
--- a/hack/.golint_failures
+++ b/hack/.golint_failures
@@ -136,7 +136,6 @@ pkg/registry/core/namespace/storage
 pkg/registry/core/node
 pkg/registry/core/persistentvolume
 pkg/registry/core/persistentvolumeclaim
-pkg/registry/core/replicationcontroller
 pkg/registry/core/replicationcontroller/storage
 pkg/registry/core/rest
 pkg/registry/core/secret
diff --git a/pkg/registry/core/replicationcontroller/doc.go b/pkg/registry/core/replicationcontroller/doc.go
index c1538e4414a..c9d419a25e9 100644
--- a/pkg/registry/core/replicationcontroller/doc.go
+++ b/pkg/registry/core/replicationcontroller/doc.go
@@ -14,6 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// Package controller provides Registry interface and it's RESTStorage
+// Package replicationcontroller provides Registry interface and it's RESTStorage
 // implementation for storing ReplicationController api objects.
 package replicationcontroller // import "k8s.io/kubernetes/pkg/registry/core/replicationcontroller"
diff --git a/pkg/registry/core/replicationcontroller/strategy.go b/pkg/registry/core/replicationcontroller/strategy.go
index f52bab09358..2bbdad49a53 100644
--- a/pkg/registry/core/replicationcontroller/strategy.go
+++ b/pkg/registry/core/replicationcontroller/strategy.go
@@ -170,7 +170,7 @@ func ControllerToSelectableFields(controller *api.ReplicationController) fields.
 func GetAttrs(obj runtime.Object) (labels.Set, fields.Set, error) {
 	rc, ok := obj.(*api.ReplicationController)
 	if !ok {
-		return nil, nil, fmt.Errorf("given object is not a replication controller.")
+		return nil, nil, fmt.Errorf("given object is not a replication controller")
 	}
 	return labels.Set(rc.ObjectMeta.Labels), ControllerToSelectableFields(rc), nil
 }
@@ -190,6 +190,7 @@ type rcStatusStrategy struct {
 	rcStrategy
 }
 
+// StatusStrategy is the default logic invoked when updating object status.
 var StatusStrategy = rcStatusStrategy{Strategy}
 
 func (rcStatusStrategy) PrepareForUpdate(ctx context.Context, obj, old runtime.Object) {