diff --git a/hack/.golint_failures b/hack/.golint_failures
index c028ddbbcc0..230002cb72d 100644
--- a/hack/.golint_failures
+++ b/hack/.golint_failures
@@ -522,8 +522,6 @@ staging/src/k8s.io/apiserver/pkg/server/httplog
 staging/src/k8s.io/apiserver/pkg/server/options
 staging/src/k8s.io/apiserver/pkg/server/storage
 staging/src/k8s.io/apiserver/pkg/storage
-staging/src/k8s.io/apiserver/pkg/storage/errors
-staging/src/k8s.io/apiserver/pkg/storage/etcd
 staging/src/k8s.io/apiserver/pkg/storage/etcd/etcdtest
 staging/src/k8s.io/apiserver/pkg/storage/etcd/metrics
 staging/src/k8s.io/apiserver/pkg/storage/etcd/testing
diff --git a/staging/src/k8s.io/apiserver/pkg/storage/errors/doc.go b/staging/src/k8s.io/apiserver/pkg/storage/errors/doc.go
index 3d3150c5690..e251b61680e 100644
--- a/staging/src/k8s.io/apiserver/pkg/storage/errors/doc.go
+++ b/staging/src/k8s.io/apiserver/pkg/storage/errors/doc.go
@@ -14,5 +14,5 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// Package etcd provides conversion of etcd errors to API errors.
+// Package storage provides conversion of storage errors to API errors.
 package storage // import "k8s.io/apiserver/pkg/storage/errors"
diff --git a/staging/src/k8s.io/apiserver/pkg/storage/etcd/api_object_versioner.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd/api_object_versioner.go
index 471a3313dff..2fed9f486fe 100644
--- a/staging/src/k8s.io/apiserver/pkg/storage/etcd/api_object_versioner.go
+++ b/staging/src/k8s.io/apiserver/pkg/storage/etcd/api_object_versioner.go
@@ -101,7 +101,7 @@ func (a APIObjectVersioner) ParseResourceVersion(resourceVersion string) (uint64
 	return version, nil
 }
 
-// APIObjectVersioner implements Versioner
+// Versioner implements Versioner
 var Versioner storage.Versioner = APIObjectVersioner{}
 
 // CompareResourceVersion compares etcd resource versions.  Outside this API they are all strings,