diff --git a/pkg/accesscontrol/access_control.go b/pkg/accesscontrol/access_control.go
index fb91a326..391cc7e0 100644
--- a/pkg/accesscontrol/access_control.go
+++ b/pkg/accesscontrol/access_control.go
@@ -1,7 +1,7 @@
 package accesscontrol
 
 import (
-	"github.com/rancher/apiserver/pkg/server"
+	apiserver "github.com/rancher/apiserver/pkg/server"
 	"github.com/rancher/apiserver/pkg/types"
 	"github.com/rancher/steve/pkg/attributes"
 	"github.com/rancher/wrangler/pkg/kv"
@@ -9,7 +9,7 @@ import (
 )
 
 type AccessControl struct {
-	server.SchemaBasedAccess
+	apiserver.SchemaBasedAccess
 }
 
 func NewAccessControl() *AccessControl {
diff --git a/pkg/schema/collection.go b/pkg/schema/collection.go
index 48f23eae..405b495a 100644
--- a/pkg/schema/collection.go
+++ b/pkg/schema/collection.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/rancher/apiserver/pkg/server"
+	apiserver "github.com/rancher/apiserver/pkg/server"
 	"github.com/rancher/apiserver/pkg/types"
 	"github.com/rancher/steve/pkg/accesscontrol"
 	"github.com/rancher/steve/pkg/attributes"
@@ -55,7 +55,7 @@ type Template struct {
 	StoreFactory func(types.Store) types.Store
 }
 
-func WrapServer(factory Factory, server *server.Server) http.Handler {
+func WrapServer(factory Factory, server *apiserver.Server) http.Handler {
 	return http.HandlerFunc(func(rw http.ResponseWriter, req *http.Request) {
 		user, ok := request.UserFrom(req.Context())
 		if !ok {
diff --git a/pkg/server/handler/apiserver.go b/pkg/server/handler/apiserver.go
index aaf1a655..e0333acc 100644
--- a/pkg/server/handler/apiserver.go
+++ b/pkg/server/handler/apiserver.go
@@ -3,7 +3,6 @@ package handler
 import (
 	"net/http"
 
-	"github.com/rancher/apiserver/pkg/server"
 	apiserver "github.com/rancher/apiserver/pkg/server"
 	"github.com/rancher/apiserver/pkg/types"
 	"github.com/rancher/apiserver/pkg/urlbuilder"
@@ -26,7 +25,7 @@ func New(cfg *rest.Config, sf schema.Factory, authMiddleware auth.Middleware, ne
 
 	a := &apiServer{
 		sf:     sf,
-		server: server.DefaultAPIServer(),
+		server: apiserver.DefaultAPIServer(),
 	}
 	a.server.AccessControl = accesscontrol.NewAccessControl()
 
@@ -55,7 +54,7 @@ func New(cfg *rest.Config, sf schema.Factory, authMiddleware auth.Middleware, ne
 
 type apiServer struct {
 	sf     schema.Factory
-	server *server.Server
+	server *apiserver.Server
 }
 
 func (a *apiServer) common(rw http.ResponseWriter, req *http.Request) (*types.APIRequest, bool) {