diff --git a/pkg/endpoints/handlers/negotiation/doc.go b/pkg/endpoints/handlers/negotiation/doc.go
index 784d544c0..759db7a08 100644
--- a/pkg/endpoints/handlers/negotiation/doc.go
+++ b/pkg/endpoints/handlers/negotiation/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package negotation contains media type negotiation logic.
-package negotiation // import "k8s.io/apiserver/pkg/api/handlers/negotiation"
+package negotiation // import "k8s.io/apiserver/pkg/endpoints/handlers/negotiation"
diff --git a/pkg/endpoints/request/context_test.go b/pkg/endpoints/request/context_test.go
index a6d25bc5f..c5e56564a 100644
--- a/pkg/endpoints/request/context_test.go
+++ b/pkg/endpoints/request/context_test.go
@@ -21,7 +21,7 @@ import (
 
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apiserver/pkg/authentication/user"
-	genericapirequest "k8s.io/apiserver/pkg/api/request"
+	genericapirequest "k8s.io/apiserver/pkg/endpoints/request"
 	"k8s.io/kubernetes/pkg/api"
 )
 
diff --git a/pkg/endpoints/request/doc.go b/pkg/endpoints/request/doc.go
index 2576c52c9..96da6f2b9 100644
--- a/pkg/endpoints/request/doc.go
+++ b/pkg/endpoints/request/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // Package request contains everything around extracting info from
 // a http request object.
 // TODO: this package is temporary. Handlers must move into pkg/apiserver/handlers to avoid dependency cycle
-package request // import "k8s.io/apiserver/pkg/api/request"
+package request // import "k8s.io/apiserver/pkg/endpoints/request"
diff --git a/pkg/server/healthz/doc.go b/pkg/server/healthz/doc.go
index a1549e2fb..06e67f6fe 100644
--- a/pkg/server/healthz/doc.go
+++ b/pkg/server/healthz/doc.go
@@ -16,6 +16,6 @@ limitations under the License.
 
 // Package healthz implements basic http server health checking.
 // Usage:
-//   import "k8s.io/apiserver/pkg/healthz"
+//   import "k8s.io/apiserver/pkg/server/healthz"
 //   healthz.DefaultHealthz()
-package healthz // import "k8s.io/apiserver/pkg/healthz"
+package healthz // import "k8s.io/apiserver/pkg/server/healthz"
diff --git a/pkg/server/httplog/doc.go b/pkg/server/httplog/doc.go
index ade3e974f..caa6572c7 100644
--- a/pkg/server/httplog/doc.go
+++ b/pkg/server/httplog/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package httplog contains a helper object and functions to maintain a log
 // along with an http response.
-package httplog // import "k8s.io/apiserver/pkg/httplog"
+package httplog // import "k8s.io/apiserver/pkg/server/httplog"