diff --git a/spring-graphql-boot-starter-webflux/src/main/java/org/springframework/graphql/reactive/package-info.java b/spring-graphql-boot-starter-webflux/src/main/java/org/springframework/graphql/reactive/package-info.java
new file mode 100644
index 00000000..93ba6435
--- /dev/null
+++ b/spring-graphql-boot-starter-webflux/src/main/java/org/springframework/graphql/reactive/package-info.java
@@ -0,0 +1,6 @@
+@NonNullApi
+@NonNullFields
+package org.springframework.graphql.reactive;
+
+import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-graphql-boot-starter-webmvc/src/main/java/org/springframework/graphql/servlet/package-info.java b/spring-graphql-boot-starter-webmvc/src/main/java/org/springframework/graphql/servlet/package-info.java
new file mode 100644
index 00000000..b58e8344
--- /dev/null
+++ b/spring-graphql-boot-starter-webmvc/src/main/java/org/springframework/graphql/servlet/package-info.java
@@ -0,0 +1,6 @@
+@NonNullApi
+@NonNullFields
+package org.springframework.graphql.servlet;
+
+import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-graphql-common/src/main/java/org/springframework/graphql/GraphQLHandler.java b/spring-graphql-common/src/main/java/org/springframework/graphql/GraphQLHandler.java
index 68fedac6..bfe43ace 100644
--- a/spring-graphql-common/src/main/java/org/springframework/graphql/GraphQLHandler.java
+++ b/spring-graphql-common/src/main/java/org/springframework/graphql/GraphQLHandler.java
@@ -19,7 +19,7 @@ public class GraphQLHandler {
         this.interceptor = interceptor;
     }
 
-    public Mono<GraphQLResponseBody> graphqlPOST(GraphQLRequestBody body, HttpHeaders httpHeaders) {
+    public Mono<GraphQLResponse> graphqlPOST(GraphQLRequestBody body, HttpHeaders httpHeaders) {
         String query = body.getQuery();
         ExecutionInput input = ExecutionInput.newExecutionInput()
                 .query(query)
@@ -33,15 +33,15 @@ public class GraphQLHandler {
                 .flatMap(result -> toResponseBody(result, httpHeaders));
     }
 
-    private Mono<GraphQLResponseBody> toResponseBody(ExecutionResult executionResult, HttpHeaders httpHeaders) {
+    private Mono<GraphQLResponse> toResponseBody(ExecutionResult executionResult, HttpHeaders httpHeaders) {
         Map<String, Object> responseBodyRaw = executionResult.toSpecification();
         Object data = responseBodyRaw.get("data");
         List<Map<String, Object>> errors = (List<Map<String, Object>>) responseBodyRaw.get("errors");
         Map<String, Object> extensions = (Map<String, Object>) responseBodyRaw.get("extensions");
-        GraphQLResponseBody responseBody = new GraphQLResponseBody(data,
+        GraphQLResponse responseBody = new GraphQLResponse(data,
                 errors,
                 extensions);
-        Mono<GraphQLResponseBody> graphQLResponseBodyMono = interceptor.customizeResponseBody(responseBody, executionResult, httpHeaders);
+        Mono<GraphQLResponse> graphQLResponseBodyMono = interceptor.customizeResponseBody(responseBody, executionResult, httpHeaders);
         return graphQLResponseBodyMono;
     }
 
diff --git a/spring-graphql-common/src/main/java/org/springframework/graphql/GraphQLInterceptor.java b/spring-graphql-common/src/main/java/org/springframework/graphql/GraphQLInterceptor.java
index d23ccd86..a4f8d761 100644
--- a/spring-graphql-common/src/main/java/org/springframework/graphql/GraphQLInterceptor.java
+++ b/spring-graphql-common/src/main/java/org/springframework/graphql/GraphQLInterceptor.java
@@ -15,8 +15,8 @@ public interface GraphQLInterceptor {
         return Mono.just(result);
     }
 
-    default Mono<GraphQLResponseBody> customizeResponseBody(GraphQLResponseBody graphQLResponseBody, ExecutionResult executionResult, HttpHeaders httpHeader) {
-        return Mono.just(graphQLResponseBody);
+    default Mono<GraphQLResponse> customizeResponseBody(GraphQLResponse graphQLResponse, ExecutionResult executionResult, HttpHeaders httpHeader) {
+        return Mono.just(graphQLResponse);
     }
 
 }
\ No newline at end of file
diff --git a/spring-graphql-common/src/main/java/org/springframework/graphql/GraphQLResponseBody.java b/spring-graphql-common/src/main/java/org/springframework/graphql/GraphQLResponse.java
similarity index 78%
rename from spring-graphql-common/src/main/java/org/springframework/graphql/GraphQLResponseBody.java
rename to spring-graphql-common/src/main/java/org/springframework/graphql/GraphQLResponse.java
index c84fab74..7e4f3554 100644
--- a/spring-graphql-common/src/main/java/org/springframework/graphql/GraphQLResponseBody.java
+++ b/spring-graphql-common/src/main/java/org/springframework/graphql/GraphQLResponse.java
@@ -3,13 +3,13 @@ package org.springframework.graphql;
 import java.util.List;
 import java.util.Map;
 
-public class GraphQLResponseBody {
+public class GraphQLResponse {
 
     private final Object data;
     private final List<Map<String, Object>> errors;
     private final Map<String, Object> extensions;
 
-    public GraphQLResponseBody(Object data, List<Map<String, Object>> errors, Map<String, Object> extensions) {
+    public GraphQLResponse(Object data, List<Map<String, Object>> errors, Map<String, Object> extensions) {
         this.data = data;
         this.errors = errors;
         this.extensions = extensions;
diff --git a/spring-graphql-common/src/main/java/org/springframework/graphql/package-info.java b/spring-graphql-common/src/main/java/org/springframework/graphql/package-info.java
new file mode 100644
index 00000000..10e5aa2f
--- /dev/null
+++ b/spring-graphql-common/src/main/java/org/springframework/graphql/package-info.java
@@ -0,0 +1,6 @@
+@NonNullApi
+@NonNullFields
+package org.springframework.graphql;
+
+import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-graphql-webflux/src/main/java/org/springframework/graphql/reactive/components/package-info.java b/spring-graphql-webflux/src/main/java/org/springframework/graphql/reactive/components/package-info.java
new file mode 100644
index 00000000..f60fdeab
--- /dev/null
+++ b/spring-graphql-webflux/src/main/java/org/springframework/graphql/reactive/components/package-info.java
@@ -0,0 +1,6 @@
+@NonNullApi
+@NonNullFields
+package org.springframework.graphql.reactive.components;
+
+import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-graphql-webmvc/src/main/java/org/springframework/graphql/servlet/components/package-info.java b/spring-graphql-webmvc/src/main/java/org/springframework/graphql/servlet/components/package-info.java
new file mode 100644
index 00000000..588911a7
--- /dev/null
+++ b/spring-graphql-webmvc/src/main/java/org/springframework/graphql/servlet/components/package-info.java
@@ -0,0 +1,6 @@
+@NonNullApi
+@NonNullFields
+package org.springframework.graphql.servlet.components;
+
+import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;