diff --git a/.golangci.yml b/.golangci.yml
index 39edabb..9a27a9f 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -36,6 +36,7 @@ linters:
     - ireturn           # "accept interfaces, return structs" isn't ironclad
     - lll               # don't want hard limits for line length
     - maintidx          # covered by gocyclo
+    - nilnil            # allow this
     - nlreturn          # generous whitespace violates house style
     - testifylint       # does not want us to use assert
     - testpackage       # internal tests are fine
@@ -65,12 +66,6 @@ issues:
         - gocritic
       path: check/location.go
       text: "commentFormatting"
-    - linters:
-        - nilnil
-      path: check/rule.go
-    - linters:
-        - nilnil
-      path: check/response_writer.go
     - linters:
         - unparam
       path: check/category_spec.go
@@ -80,9 +75,6 @@ issues:
     - linters:
         - unparam
       path: check/response.go
-    - linters:
-        - nilnil
-      path: check/checktest/checktest.go
     - linters:
         - varnamelen
       path: check/internal/example
diff --git a/check/server.go b/check/server.go
index 656fcac..e41dc77 100644
--- a/check/server.go
+++ b/check/server.go
@@ -16,7 +16,6 @@ package check
 
 import (
 	"buf.build/go/bufplugin/info"
-	"buf.build/go/bufplugin/internal/gen/buf/plugin/check/v1/v1pluginrpc"
 	checkv1pluginrpc "buf.build/go/bufplugin/internal/gen/buf/plugin/check/v1/v1pluginrpc"
 	infov1pluginrpc "buf.build/go/bufplugin/internal/gen/buf/plugin/info/v1/v1pluginrpc"
 	"pluginrpc.com/pluginrpc"
@@ -71,7 +70,7 @@ func NewServer(spec *Spec, options ...ServerOption) (pluginrpc.Server, error) {
 
 	serverRegistrar := pluginrpc.NewServerRegistrar()
 	handler := pluginrpc.NewHandler(pluginrpcSpec)
-	checkServiceServer := v1pluginrpc.NewCheckServiceServer(handler, checkServiceHandler)
+	checkServiceServer := checkv1pluginrpc.NewCheckServiceServer(handler, checkServiceHandler)
 	checkv1pluginrpc.RegisterCheckServiceServer(serverRegistrar, checkServiceServer)
 	if pluginInfoServiceHandler != nil {
 		pluginInfoServiceServer := infov1pluginrpc.NewPluginInfoServiceServer(handler, pluginInfoServiceHandler)