diff --git a/src/main/java/org/openrewrite/java/migrate/AddJDeprScanPlugin.java b/src/main/java/org/openrewrite/java/migrate/AddJDeprScanPlugin.java
index 0b0dece8f5..5233102f49 100644
--- a/src/main/java/org/openrewrite/java/migrate/AddJDeprScanPlugin.java
+++ b/src/main/java/org/openrewrite/java/migrate/AddJDeprScanPlugin.java
@@ -17,9 +17,9 @@
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
+import org.jspecify.annotations.Nullable;
 import org.openrewrite.*;
 import org.openrewrite.internal.StringUtils;
-import org.openrewrite.internal.lang.Nullable;
 import org.openrewrite.maven.AddPlugin;
 import org.openrewrite.maven.MavenIsoVisitor;
 import org.openrewrite.maven.MavenVisitor;
diff --git a/src/main/java/org/openrewrite/java/migrate/AddMissingMethodImplementation.java b/src/main/java/org/openrewrite/java/migrate/AddMissingMethodImplementation.java
index 7e67c2bdd8..5f1185d267 100644
--- a/src/main/java/org/openrewrite/java/migrate/AddMissingMethodImplementation.java
+++ b/src/main/java/org/openrewrite/java/migrate/AddMissingMethodImplementation.java
@@ -18,7 +18,6 @@
 import lombok.EqualsAndHashCode;
 import lombok.Value;
 import org.openrewrite.*;
-import org.openrewrite.internal.lang.NonNull;
 import org.openrewrite.java.JavaIsoVisitor;
 import org.openrewrite.java.JavaTemplate;
 import org.openrewrite.java.MethodMatcher;
@@ -35,19 +34,16 @@ public class AddMissingMethodImplementation extends Recipe {
     @Option(displayName = "Fully Qualified Class Name",
             description = "A fully qualified class being implemented with missing method.",
             example = "com.yourorg.FooBar")
-    @NonNull
     String fullyQualifiedClassName;
 
     @Option(displayName = "Method Pattern",
             description = "A method pattern for matching required method definition.",
             example = "*..* hello(..)")
-    @NonNull
     String methodPattern;
 
     @Option(displayName = "Method Template",
             description = "Template of method to add",
             example = "public String hello() { return \\\"Hello from #{}!\\\"; }")
-    @NonNull
     String methodTemplateString;
 
     @Override
diff --git a/src/main/java/org/openrewrite/java/migrate/JpaCacheProperties.java b/src/main/java/org/openrewrite/java/migrate/JpaCacheProperties.java
index 1a3b297c10..a4bb27b11a 100644
--- a/src/main/java/org/openrewrite/java/migrate/JpaCacheProperties.java
+++ b/src/main/java/org/openrewrite/java/migrate/JpaCacheProperties.java
@@ -17,9 +17,9 @@
 
 import lombok.EqualsAndHashCode;
 import lombok.Value;
+import org.jspecify.annotations.Nullable;
 import org.openrewrite.*;
 import org.openrewrite.internal.ListUtils;
-import org.openrewrite.internal.lang.Nullable;
 import org.openrewrite.xml.XPathMatcher;
 import org.openrewrite.xml.XmlVisitor;
 import org.openrewrite.xml.tree.Content;
@@ -55,15 +55,15 @@ class SharedDataHolder {
     boolean sharedCacheModePropertyUnspecified;
     boolean sharedCacheModeElementUnspecified;
 
-    @Nullable Xml.Tag sharedCacheModeElement;
+    Xml.@Nullable Tag sharedCacheModeElement;
 
-    @Nullable Xml.Tag propertiesElement;
+    Xml.@Nullable Tag propertiesElement;
 
-    @Nullable Xml.Tag sharedCacheModeProperty;
+    Xml.@Nullable Tag sharedCacheModeProperty;
 
-    @Nullable Xml.Tag openJPACacheProperty;
+    Xml.@Nullable Tag openJPACacheProperty;
 
-    @Nullable Xml.Tag eclipselinkCacheProperty;
+    Xml.@Nullable Tag eclipselinkCacheProperty;
 
     // Flag in the following conditions:
     //   an openjpa.DataCache property is present
@@ -271,7 +271,7 @@ private void getDataCacheProps(Xml.Tag puNode, SharedDataHolder sdh) {
         }
     }
 
-    private @Nullable String getTextContent(@Nullable Xml.Tag node) {
+    private @Nullable String getTextContent(Xml.@Nullable Tag node) {
         if (node != null) {
             String textContent = null;
             Optional<String> optionalValue = node.getValue();
diff --git a/src/main/java/org/openrewrite/java/migrate/RemoveMethodInvocation.java b/src/main/java/org/openrewrite/java/migrate/RemoveMethodInvocation.java
index 1fcdb108bd..af13051428 100644
--- a/src/main/java/org/openrewrite/java/migrate/RemoveMethodInvocation.java
+++ b/src/main/java/org/openrewrite/java/migrate/RemoveMethodInvocation.java
@@ -21,7 +21,6 @@
 import org.openrewrite.Option;
 import org.openrewrite.Recipe;
 import org.openrewrite.TreeVisitor;
-import org.openrewrite.internal.lang.NonNull;
 import org.openrewrite.java.MethodMatcher;
 import org.openrewrite.staticanalysis.RemoveMethodCallVisitor;
 
@@ -31,7 +30,6 @@ public class RemoveMethodInvocation extends Recipe {
     @Option(displayName = "Method Pattern",
             description = "A method pattern for matching required method definition.",
             example = "*..* hello(..)")
-    @NonNull
     String methodPattern;
 
     @Override
diff --git a/src/main/java/org/openrewrite/java/migrate/ReplaceAWTGetPeerMethod.java b/src/main/java/org/openrewrite/java/migrate/ReplaceAWTGetPeerMethod.java
index 6b4e490452..385b180c47 100644
--- a/src/main/java/org/openrewrite/java/migrate/ReplaceAWTGetPeerMethod.java
+++ b/src/main/java/org/openrewrite/java/migrate/ReplaceAWTGetPeerMethod.java
@@ -18,8 +18,8 @@
 
 import lombok.EqualsAndHashCode;
 import lombok.Value;
+import org.jspecify.annotations.Nullable;
 import org.openrewrite.*;
-import org.openrewrite.internal.lang.Nullable;
 import org.openrewrite.java.ChangeMethodName;
 import org.openrewrite.java.JavaVisitor;
 import org.openrewrite.java.MethodMatcher;
@@ -77,7 +77,7 @@ public J visitBinary(J.Binary binary, ExecutionContext ctx) {
                 return bi;
             }
 
-            private @Nullable J.MethodInvocation findMatchingMethodInvocation(J.Binary binaryCondition) {
+            private J.@Nullable MethodInvocation findMatchingMethodInvocation(J.Binary binaryCondition) {
                 J.MethodInvocation mi = null;
                 if (binaryCondition.getOperator() == J.Binary.Type.NotEqual) {
                     if (binaryCondition.getLeft() instanceof J.MethodInvocation &&
diff --git a/src/main/java/org/openrewrite/java/migrate/ReplaceStringLiteralValue.java b/src/main/java/org/openrewrite/java/migrate/ReplaceStringLiteralValue.java
index 15d9ce36dd..ba29260068 100644
--- a/src/main/java/org/openrewrite/java/migrate/ReplaceStringLiteralValue.java
+++ b/src/main/java/org/openrewrite/java/migrate/ReplaceStringLiteralValue.java
@@ -19,11 +19,11 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.Value;
+import org.jspecify.annotations.NonNull;
 import org.openrewrite.ExecutionContext;
 import org.openrewrite.Option;
 import org.openrewrite.Recipe;
 import org.openrewrite.TreeVisitor;
-import org.openrewrite.internal.lang.NonNull;
 import org.openrewrite.java.JavaIsoVisitor;
 import org.openrewrite.java.tree.J;
 import org.openrewrite.java.tree.JavaType;
diff --git a/src/main/java/org/openrewrite/java/migrate/UseTabsOrSpaces.java b/src/main/java/org/openrewrite/java/migrate/UseTabsOrSpaces.java
index e63b9578b4..9477571a35 100644
--- a/src/main/java/org/openrewrite/java/migrate/UseTabsOrSpaces.java
+++ b/src/main/java/org/openrewrite/java/migrate/UseTabsOrSpaces.java
@@ -17,8 +17,8 @@
 
 import lombok.EqualsAndHashCode;
 import lombok.Value;
+import org.jspecify.annotations.Nullable;
 import org.openrewrite.*;
-import org.openrewrite.internal.lang.Nullable;
 import org.openrewrite.java.JavaIsoVisitor;
 import org.openrewrite.java.format.NormalizeTabsOrSpacesVisitor;
 import org.openrewrite.java.style.IntelliJ;
diff --git a/src/main/java/org/openrewrite/java/migrate/guava/AbstractNoGuavaImmutableOf.java b/src/main/java/org/openrewrite/java/migrate/guava/AbstractNoGuavaImmutableOf.java
index edf579c12a..ec1e9c9f6d 100644
--- a/src/main/java/org/openrewrite/java/migrate/guava/AbstractNoGuavaImmutableOf.java
+++ b/src/main/java/org/openrewrite/java/migrate/guava/AbstractNoGuavaImmutableOf.java
@@ -15,11 +15,11 @@
  */
 package org.openrewrite.java.migrate.guava;
 
+import org.jspecify.annotations.Nullable;
 import org.openrewrite.ExecutionContext;
 import org.openrewrite.Preconditions;
 import org.openrewrite.Recipe;
 import org.openrewrite.TreeVisitor;
-import org.openrewrite.internal.lang.Nullable;
 import org.openrewrite.java.JavaTemplate;
 import org.openrewrite.java.JavaVisitor;
 import org.openrewrite.java.MethodMatcher;
diff --git a/src/main/java/org/openrewrite/java/migrate/guava/NoGuavaCreateTempDir.java b/src/main/java/org/openrewrite/java/migrate/guava/NoGuavaCreateTempDir.java
index de9ea8936b..c2ba679e27 100644
--- a/src/main/java/org/openrewrite/java/migrate/guava/NoGuavaCreateTempDir.java
+++ b/src/main/java/org/openrewrite/java/migrate/guava/NoGuavaCreateTempDir.java
@@ -15,8 +15,8 @@
  */
 package org.openrewrite.java.migrate.guava;
 
+import org.jspecify.annotations.Nullable;
 import org.openrewrite.*;
-import org.openrewrite.internal.lang.Nullable;
 import org.openrewrite.java.JavaIsoVisitor;
 import org.openrewrite.java.JavaTemplate;
 import org.openrewrite.java.MethodMatcher;
@@ -84,7 +84,7 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
             return mi;
         }
 
-        private boolean isIOExceptionOrException(@Nullable JavaType.FullyQualified fqCatch) {
+        private boolean isIOExceptionOrException(JavaType.@Nullable FullyQualified fqCatch) {
             return fqCatch != null &&
                     ("java.io.IOException".matches(fqCatch.getFullyQualifiedName())
                             || "java.lang.Exception".matches(fqCatch.getFullyQualifiedName()));
diff --git a/src/main/java/org/openrewrite/java/migrate/guava/PreferJavaStringJoinVisitor.java b/src/main/java/org/openrewrite/java/migrate/guava/PreferJavaStringJoinVisitor.java
index fc07f417e1..1a5ff7aa73 100644
--- a/src/main/java/org/openrewrite/java/migrate/guava/PreferJavaStringJoinVisitor.java
+++ b/src/main/java/org/openrewrite/java/migrate/guava/PreferJavaStringJoinVisitor.java
@@ -15,8 +15,8 @@
  */
 package org.openrewrite.java.migrate.guava;
 
+import org.jspecify.annotations.Nullable;
 import org.openrewrite.ExecutionContext;
-import org.openrewrite.internal.lang.Nullable;
 import org.openrewrite.java.JavaIsoVisitor;
 import org.openrewrite.java.JavaTemplate;
 import org.openrewrite.java.MethodMatcher;
diff --git a/src/main/java/org/openrewrite/java/migrate/guava/package-info.java b/src/main/java/org/openrewrite/java/migrate/guava/package-info.java
index 0dfe794f12..e2f9b62a93 100644
--- a/src/main/java/org/openrewrite/java/migrate/guava/package-info.java
+++ b/src/main/java/org/openrewrite/java/migrate/guava/package-info.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-@NonNullApi
+@NullMarked
 @NonNullFields
 package org.openrewrite.java.migrate.guava;
 
-import org.openrewrite.internal.lang.NonNullApi;
+import org.jspecify.annotations.NullMarked;
 import org.openrewrite.internal.lang.NonNullFields;
diff --git a/src/main/java/org/openrewrite/java/migrate/io/package-info.java b/src/main/java/org/openrewrite/java/migrate/io/package-info.java
index 1b91cb7566..e34b551d35 100644
--- a/src/main/java/org/openrewrite/java/migrate/io/package-info.java
+++ b/src/main/java/org/openrewrite/java/migrate/io/package-info.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-@NonNullApi
+@NullMarked
 @NonNullFields
 package org.openrewrite.java.migrate.io;
 
-import org.openrewrite.internal.lang.NonNullApi;
+import org.jspecify.annotations.NullMarked;
 import org.openrewrite.internal.lang.NonNullFields;
diff --git a/src/main/java/org/openrewrite/java/migrate/jakarta/package-info.java b/src/main/java/org/openrewrite/java/migrate/jakarta/package-info.java
index 51449e1658..80b9214c40 100644
--- a/src/main/java/org/openrewrite/java/migrate/jakarta/package-info.java
+++ b/src/main/java/org/openrewrite/java/migrate/jakarta/package-info.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-@NonNullApi
+@NullMarked
 @NonNullFields
 package org.openrewrite.java.migrate.jakarta;
 
-import org.openrewrite.internal.lang.NonNullApi;
+import org.jspecify.annotations.NullMarked;
 import org.openrewrite.internal.lang.NonNullFields;
diff --git a/src/main/java/org/openrewrite/java/migrate/javax/AddJaxbRuntime.java b/src/main/java/org/openrewrite/java/migrate/javax/AddJaxbRuntime.java
index 60a09e5755..02f51bed27 100644
--- a/src/main/java/org/openrewrite/java/migrate/javax/AddJaxbRuntime.java
+++ b/src/main/java/org/openrewrite/java/migrate/javax/AddJaxbRuntime.java
@@ -17,13 +17,13 @@
 
 import lombok.EqualsAndHashCode;
 import lombok.Value;
+import org.jspecify.annotations.Nullable;
 import org.openrewrite.*;
 import org.openrewrite.gradle.marker.GradleDependencyConfiguration;
 import org.openrewrite.gradle.marker.GradleProject;
 import org.openrewrite.gradle.search.FindGradleProject;
 import org.openrewrite.groovy.GroovyIsoVisitor;
 import org.openrewrite.groovy.tree.G;
-import org.openrewrite.internal.lang.Nullable;
 import org.openrewrite.java.JavaIsoVisitor;
 import org.openrewrite.java.search.UsesType;
 import org.openrewrite.java.tree.J;
diff --git a/src/main/java/org/openrewrite/java/migrate/javax/AddJaxwsRuntime.java b/src/main/java/org/openrewrite/java/migrate/javax/AddJaxwsRuntime.java
index 63af06dd78..92b29df1b9 100644
--- a/src/main/java/org/openrewrite/java/migrate/javax/AddJaxwsRuntime.java
+++ b/src/main/java/org/openrewrite/java/migrate/javax/AddJaxwsRuntime.java
@@ -17,6 +17,7 @@
 
 import lombok.EqualsAndHashCode;
 import lombok.Value;
+import org.jspecify.annotations.Nullable;
 import org.openrewrite.ExecutionContext;
 import org.openrewrite.Preconditions;
 import org.openrewrite.Recipe;
@@ -26,7 +27,6 @@
 import org.openrewrite.gradle.search.FindGradleProject;
 import org.openrewrite.groovy.GroovyIsoVisitor;
 import org.openrewrite.groovy.tree.G;
-import org.openrewrite.internal.lang.Nullable;
 import org.openrewrite.maven.AddDependencyVisitor;
 import org.openrewrite.maven.MavenIsoVisitor;
 import org.openrewrite.maven.tree.MavenResolutionResult;
diff --git a/src/main/java/org/openrewrite/java/migrate/javax/AddScopeToInjectedClass.java b/src/main/java/org/openrewrite/java/migrate/javax/AddScopeToInjectedClass.java
index d246bf9c4b..68e03bd0c3 100644
--- a/src/main/java/org/openrewrite/java/migrate/javax/AddScopeToInjectedClass.java
+++ b/src/main/java/org/openrewrite/java/migrate/javax/AddScopeToInjectedClass.java
@@ -15,10 +15,10 @@
  */
 package org.openrewrite.java.migrate.javax;
 
+import org.jspecify.annotations.Nullable;
 import org.openrewrite.ExecutionContext;
 import org.openrewrite.ScanningRecipe;
 import org.openrewrite.TreeVisitor;
-import org.openrewrite.internal.lang.Nullable;
 import org.openrewrite.java.AnnotationMatcher;
 import org.openrewrite.java.JavaIsoVisitor;
 import org.openrewrite.java.tree.J;
@@ -62,7 +62,7 @@ public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDecl, Ex
 
             private final AnnotationMatcher matcher = new AnnotationMatcher('@' + JAVAX_INJECT_INJECT);
 
-            private boolean variableTypeRequiresScope(@Nullable JavaType.Variable memberVariable) {
+            private boolean variableTypeRequiresScope(JavaType.@Nullable Variable memberVariable) {
                 if (memberVariable == null) {
                     return false;
                 }
diff --git a/src/main/java/org/openrewrite/java/migrate/javax/HttpSessionInvalidate.java b/src/main/java/org/openrewrite/java/migrate/javax/HttpSessionInvalidate.java
index 0b5410238f..6845f5dc4c 100644
--- a/src/main/java/org/openrewrite/java/migrate/javax/HttpSessionInvalidate.java
+++ b/src/main/java/org/openrewrite/java/migrate/javax/HttpSessionInvalidate.java
@@ -17,11 +17,11 @@
 
 import lombok.EqualsAndHashCode;
 import lombok.Value;
+import org.jspecify.annotations.Nullable;
 import org.openrewrite.ExecutionContext;
 import org.openrewrite.Preconditions;
 import org.openrewrite.Recipe;
 import org.openrewrite.TreeVisitor;
-import org.openrewrite.internal.lang.Nullable;
 import org.openrewrite.java.*;
 import org.openrewrite.java.search.UsesMethod;
 import org.openrewrite.java.search.UsesType;
diff --git a/src/main/java/org/openrewrite/java/migrate/javax/RemoveEmbeddableId.java b/src/main/java/org/openrewrite/java/migrate/javax/RemoveEmbeddableId.java
index 5405a9d1f4..7a6df74849 100644
--- a/src/main/java/org/openrewrite/java/migrate/javax/RemoveEmbeddableId.java
+++ b/src/main/java/org/openrewrite/java/migrate/javax/RemoveEmbeddableId.java
@@ -15,11 +15,11 @@
  */
 package org.openrewrite.java.migrate.javax;
 
+import org.jspecify.annotations.Nullable;
 import org.openrewrite.ExecutionContext;
 import org.openrewrite.Preconditions;
 import org.openrewrite.ScanningRecipe;
 import org.openrewrite.TreeVisitor;
-import org.openrewrite.internal.lang.Nullable;
 import org.openrewrite.java.JavaIsoVisitor;
 import org.openrewrite.java.RemoveAnnotation;
 import org.openrewrite.java.search.FindAnnotations;
diff --git a/src/main/java/org/openrewrite/java/migrate/javax/package-info.java b/src/main/java/org/openrewrite/java/migrate/javax/package-info.java
index e0579ae0f3..877c2d3c97 100644
--- a/src/main/java/org/openrewrite/java/migrate/javax/package-info.java
+++ b/src/main/java/org/openrewrite/java/migrate/javax/package-info.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-@NonNullApi
+@NullMarked
 @NonNullFields
 package org.openrewrite.java.migrate.javax;
 
-import org.openrewrite.internal.lang.NonNullApi;
+import org.jspecify.annotations.NullMarked;
 import org.openrewrite.internal.lang.NonNullFields;
diff --git a/src/main/java/org/openrewrite/java/migrate/lang/MigrateClassNewInstanceToGetDeclaredConstructorNewInstance.java b/src/main/java/org/openrewrite/java/migrate/lang/MigrateClassNewInstanceToGetDeclaredConstructorNewInstance.java
index d75d9ff70b..a00193aa02 100644
--- a/src/main/java/org/openrewrite/java/migrate/lang/MigrateClassNewInstanceToGetDeclaredConstructorNewInstance.java
+++ b/src/main/java/org/openrewrite/java/migrate/lang/MigrateClassNewInstanceToGetDeclaredConstructorNewInstance.java
@@ -15,11 +15,11 @@
  */
 package org.openrewrite.java.migrate.lang;
 
+import org.jspecify.annotations.Nullable;
 import org.openrewrite.ExecutionContext;
 import org.openrewrite.Preconditions;
 import org.openrewrite.Recipe;
 import org.openrewrite.TreeVisitor;
-import org.openrewrite.internal.lang.Nullable;
 import org.openrewrite.java.ChangeMethodName;
 import org.openrewrite.java.JavaIsoVisitor;
 import org.openrewrite.java.MethodMatcher;
diff --git a/src/main/java/org/openrewrite/java/migrate/lang/UseTextBlocks.java b/src/main/java/org/openrewrite/java/migrate/lang/UseTextBlocks.java
index 326793ea39..75311d3ac9 100644
--- a/src/main/java/org/openrewrite/java/migrate/lang/UseTextBlocks.java
+++ b/src/main/java/org/openrewrite/java/migrate/lang/UseTextBlocks.java
@@ -17,9 +17,9 @@
 
 import lombok.EqualsAndHashCode;
 import lombok.Value;
+import org.jspecify.annotations.Nullable;
 import org.openrewrite.*;
 import org.openrewrite.internal.StringUtils;
-import org.openrewrite.internal.lang.Nullable;
 import org.openrewrite.java.JavaVisitor;
 import org.openrewrite.java.search.HasJavaVersion;
 import org.openrewrite.java.style.IntelliJ;
diff --git a/src/main/java/org/openrewrite/java/migrate/lang/package-info.java b/src/main/java/org/openrewrite/java/migrate/lang/package-info.java
index b1185cbb30..bf26d36964 100644
--- a/src/main/java/org/openrewrite/java/migrate/lang/package-info.java
+++ b/src/main/java/org/openrewrite/java/migrate/lang/package-info.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-@NonNullApi
+@NullMarked
 @NonNullFields
 package org.openrewrite.java.migrate.lang;
 
-import org.openrewrite.internal.lang.NonNullApi;
+import org.jspecify.annotations.NullMarked;
 import org.openrewrite.internal.lang.NonNullFields;
diff --git a/src/main/java/org/openrewrite/java/migrate/lang/var/UseVarForGenericsConstructors.java b/src/main/java/org/openrewrite/java/migrate/lang/var/UseVarForGenericsConstructors.java
index 5d6558fc13..1018723142 100644
--- a/src/main/java/org/openrewrite/java/migrate/lang/var/UseVarForGenericsConstructors.java
+++ b/src/main/java/org/openrewrite/java/migrate/lang/var/UseVarForGenericsConstructors.java
@@ -15,8 +15,8 @@
  */
 package org.openrewrite.java.migrate.lang.var;
 
+import org.jspecify.annotations.Nullable;
 import org.openrewrite.*;
-import org.openrewrite.internal.lang.Nullable;
 import org.openrewrite.java.JavaIsoVisitor;
 import org.openrewrite.java.JavaParser;
 import org.openrewrite.java.JavaTemplate;
@@ -150,7 +150,7 @@ private static boolean hasBounds(JavaType type) {
          * @param variable to extract from
          * @return may be empty list of type parameters
          */
-        private List<JavaType> extractParameters(@Nullable JavaType.Variable variable) {
+        private List<JavaType> extractParameters(JavaType.@Nullable Variable variable) {
             if (variable != null && variable.getType() instanceof JavaType.Parameterized) {
                 return ((JavaType.Parameterized) variable.getType()).getTypeParameters();
             } else {
diff --git a/src/main/java/org/openrewrite/java/migrate/lang/var/package-info.java b/src/main/java/org/openrewrite/java/migrate/lang/var/package-info.java
index 1b3c480a94..f3de1be078 100644
--- a/src/main/java/org/openrewrite/java/migrate/lang/var/package-info.java
+++ b/src/main/java/org/openrewrite/java/migrate/lang/var/package-info.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-@NonNullApi
+@NullMarked
 @NonNullFields
 package org.openrewrite.java.migrate.lang.var;
 
-import org.openrewrite.internal.lang.NonNullApi;
+import org.jspecify.annotations.NullMarked;
 import org.openrewrite.internal.lang.NonNullFields;
diff --git a/src/main/java/org/openrewrite/java/migrate/logging/package-info.java b/src/main/java/org/openrewrite/java/migrate/logging/package-info.java
index f1d75b82ec..5c6732e191 100644
--- a/src/main/java/org/openrewrite/java/migrate/logging/package-info.java
+++ b/src/main/java/org/openrewrite/java/migrate/logging/package-info.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-@NonNullApi
+@NullMarked
 @NonNullFields
 package org.openrewrite.java.migrate.logging;
 
-import org.openrewrite.internal.lang.NonNullApi;
+import org.jspecify.annotations.NullMarked;
 import org.openrewrite.internal.lang.NonNullFields;
diff --git a/src/main/java/org/openrewrite/java/migrate/lombok/LombokValueToRecord.java b/src/main/java/org/openrewrite/java/migrate/lombok/LombokValueToRecord.java
index fda458ebe6..6bef69b7b6 100644
--- a/src/main/java/org/openrewrite/java/migrate/lombok/LombokValueToRecord.java
+++ b/src/main/java/org/openrewrite/java/migrate/lombok/LombokValueToRecord.java
@@ -18,9 +18,9 @@
 import lombok.EqualsAndHashCode;
 import lombok.RequiredArgsConstructor;
 import lombok.Value;
+import org.jspecify.annotations.Nullable;
 import org.openrewrite.*;
 import org.openrewrite.internal.ListUtils;
-import org.openrewrite.internal.lang.Nullable;
 import org.openrewrite.java.AnnotationMatcher;
 import org.openrewrite.java.JavaIsoVisitor;
 import org.openrewrite.java.JavaTemplate;
diff --git a/src/main/java/org/openrewrite/java/migrate/lombok/package-info.java b/src/main/java/org/openrewrite/java/migrate/lombok/package-info.java
index 9cd6002811..44ec952f77 100644
--- a/src/main/java/org/openrewrite/java/migrate/lombok/package-info.java
+++ b/src/main/java/org/openrewrite/java/migrate/lombok/package-info.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-@NonNullApi
+@NullMarked
 @NonNullFields
 package org.openrewrite.java.migrate.lombok;
 
-import org.openrewrite.internal.lang.NonNullApi;
+import org.jspecify.annotations.NullMarked;
 import org.openrewrite.internal.lang.NonNullFields;
diff --git a/src/main/java/org/openrewrite/java/migrate/maven/package-info.java b/src/main/java/org/openrewrite/java/migrate/maven/package-info.java
index 824bc7b1db..c62729a8e7 100644
--- a/src/main/java/org/openrewrite/java/migrate/maven/package-info.java
+++ b/src/main/java/org/openrewrite/java/migrate/maven/package-info.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-@NonNullApi
+@NullMarked
 @NonNullFields
 package org.openrewrite.java.migrate.maven;
 
-import org.openrewrite.internal.lang.NonNullApi;
+import org.jspecify.annotations.NullMarked;
 import org.openrewrite.internal.lang.NonNullFields;
diff --git a/src/main/java/org/openrewrite/java/migrate/metrics/package-info.java b/src/main/java/org/openrewrite/java/migrate/metrics/package-info.java
index a70c83b464..8d750a96b3 100644
--- a/src/main/java/org/openrewrite/java/migrate/metrics/package-info.java
+++ b/src/main/java/org/openrewrite/java/migrate/metrics/package-info.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-@NonNullApi
+@NullMarked
 @NonNullFields
 package org.openrewrite.java.migrate.metrics;
 
-import org.openrewrite.internal.lang.NonNullApi;
+import org.jspecify.annotations.NullMarked;
 import org.openrewrite.internal.lang.NonNullFields;
diff --git a/src/main/java/org/openrewrite/java/migrate/net/package-info.java b/src/main/java/org/openrewrite/java/migrate/net/package-info.java
index 6bf7018d88..f90e9e1cd2 100644
--- a/src/main/java/org/openrewrite/java/migrate/net/package-info.java
+++ b/src/main/java/org/openrewrite/java/migrate/net/package-info.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-@NonNullApi
+@NullMarked
 @NonNullFields
 package org.openrewrite.java.migrate.net;
 
-import org.openrewrite.internal.lang.NonNullApi;
+import org.jspecify.annotations.NullMarked;
 import org.openrewrite.internal.lang.NonNullFields;
diff --git a/src/main/java/org/openrewrite/java/migrate/package-info.java b/src/main/java/org/openrewrite/java/migrate/package-info.java
index dfde30b515..da66312438 100644
--- a/src/main/java/org/openrewrite/java/migrate/package-info.java
+++ b/src/main/java/org/openrewrite/java/migrate/package-info.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-@NonNullApi
+@NullMarked
 @NonNullFields
 package org.openrewrite.java.migrate;
 
-import org.openrewrite.internal.lang.NonNullApi;
+import org.jspecify.annotations.NullMarked;
 import org.openrewrite.internal.lang.NonNullFields;
diff --git a/src/main/java/org/openrewrite/java/migrate/search/AboutJavaVersion.java b/src/main/java/org/openrewrite/java/migrate/search/AboutJavaVersion.java
index 1bf292bde4..68138dbfdb 100644
--- a/src/main/java/org/openrewrite/java/migrate/search/AboutJavaVersion.java
+++ b/src/main/java/org/openrewrite/java/migrate/search/AboutJavaVersion.java
@@ -18,8 +18,8 @@
 import io.micrometer.core.instrument.util.StringUtils;
 import lombok.EqualsAndHashCode;
 import lombok.Value;
+import org.jspecify.annotations.Nullable;
 import org.openrewrite.*;
-import org.openrewrite.internal.lang.Nullable;
 import org.openrewrite.java.marker.JavaProject;
 import org.openrewrite.java.marker.JavaSourceSet;
 import org.openrewrite.java.marker.JavaVersion;
diff --git a/src/main/java/org/openrewrite/java/migrate/search/package-info.java b/src/main/java/org/openrewrite/java/migrate/search/package-info.java
index c4d48e1e1e..b85e10ea5e 100644
--- a/src/main/java/org/openrewrite/java/migrate/search/package-info.java
+++ b/src/main/java/org/openrewrite/java/migrate/search/package-info.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-@NonNullApi
+@NullMarked
 @NonNullFields
 package org.openrewrite.java.migrate.search;
 
-import org.openrewrite.internal.lang.NonNullApi;
+import org.jspecify.annotations.NullMarked;
 import org.openrewrite.internal.lang.NonNullFields;
diff --git a/src/main/java/org/openrewrite/java/migrate/sql/package-info.java b/src/main/java/org/openrewrite/java/migrate/sql/package-info.java
index df397e87af..97aa56da82 100644
--- a/src/main/java/org/openrewrite/java/migrate/sql/package-info.java
+++ b/src/main/java/org/openrewrite/java/migrate/sql/package-info.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-@NonNullApi
+@NullMarked
 @NonNullFields
 package org.openrewrite.java.migrate.sql;
 
-import org.openrewrite.internal.lang.NonNullApi;
+import org.jspecify.annotations.NullMarked;
 import org.openrewrite.internal.lang.NonNullFields;
diff --git a/src/main/java/org/openrewrite/java/migrate/util/ReplaceStreamCollectWithToList.java b/src/main/java/org/openrewrite/java/migrate/util/ReplaceStreamCollectWithToList.java
index 8647ccc80a..f09cabb21d 100644
--- a/src/main/java/org/openrewrite/java/migrate/util/ReplaceStreamCollectWithToList.java
+++ b/src/main/java/org/openrewrite/java/migrate/util/ReplaceStreamCollectWithToList.java
@@ -18,8 +18,8 @@
 import lombok.EqualsAndHashCode;
 import lombok.RequiredArgsConstructor;
 import lombok.Value;
+import org.jspecify.annotations.Nullable;
 import org.openrewrite.*;
-import org.openrewrite.internal.lang.Nullable;
 import org.openrewrite.java.JavaIsoVisitor;
 import org.openrewrite.java.JavaTemplate;
 import org.openrewrite.java.MethodMatcher;
diff --git a/src/main/java/org/openrewrite/java/migrate/util/UseEnumSetOf.java b/src/main/java/org/openrewrite/java/migrate/util/UseEnumSetOf.java
index ac7aeb3dae..978f9b8139 100644
--- a/src/main/java/org/openrewrite/java/migrate/util/UseEnumSetOf.java
+++ b/src/main/java/org/openrewrite/java/migrate/util/UseEnumSetOf.java
@@ -15,8 +15,8 @@
  */
 package org.openrewrite.java.migrate.util;
 
+import org.jspecify.annotations.Nullable;
 import org.openrewrite.*;
-import org.openrewrite.internal.lang.Nullable;
 import org.openrewrite.java.JavaIsoVisitor;
 import org.openrewrite.java.JavaTemplate;
 import org.openrewrite.java.MethodMatcher;
diff --git a/src/main/java/org/openrewrite/java/migrate/util/package-info.java b/src/main/java/org/openrewrite/java/migrate/util/package-info.java
index 088d4a8d8e..471bbecb42 100644
--- a/src/main/java/org/openrewrite/java/migrate/util/package-info.java
+++ b/src/main/java/org/openrewrite/java/migrate/util/package-info.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-@NonNullApi
+@NullMarked
 @NonNullFields
 package org.openrewrite.java.migrate.util;
 
-import org.openrewrite.internal.lang.NonNullApi;
+import org.jspecify.annotations.NullMarked;
 import org.openrewrite.internal.lang.NonNullFields;