diff --git a/build.gradle.kts b/build.gradle.kts
index ebfd5909..78cca081 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -82,6 +82,7 @@ dependencies {
     compileOnly("org.projectlombok:lombok:latest.release")
     annotationProcessor("org.projectlombok:lombok:latest.release")
     compileOnly("org.openrewrite:rewrite-java:latest.release")
+    implementation("org.jspecify:jspecify:latest.release")
 
     // Needed for annotation processing tests
     testImplementation(files(tools))
diff --git a/src/main/java/org/openrewrite/java/template/internal/JavacResolution.java b/src/main/java/org/openrewrite/java/template/internal/JavacResolution.java
index f47e3b49..14390199 100644
--- a/src/main/java/org/openrewrite/java/template/internal/JavacResolution.java
+++ b/src/main/java/org/openrewrite/java/template/internal/JavacResolution.java
@@ -30,7 +30,7 @@
 import com.sun.tools.javac.tree.TreeScanner;
 import com.sun.tools.javac.util.Context;
 import com.sun.tools.javac.util.Log;
-import org.openrewrite.internal.lang.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import javax.tools.JavaFileObject;
 import java.lang.reflect.Field;
diff --git a/src/main/java/org/openrewrite/java/template/internal/MinimumViableParentheses.java b/src/main/java/org/openrewrite/java/template/internal/MinimumViableParentheses.java
index e8983ed7..040ec898 100644
--- a/src/main/java/org/openrewrite/java/template/internal/MinimumViableParentheses.java
+++ b/src/main/java/org/openrewrite/java/template/internal/MinimumViableParentheses.java
@@ -17,10 +17,10 @@
 
 import lombok.EqualsAndHashCode;
 import lombok.Value;
+import org.jspecify.annotations.Nullable;
 import org.openrewrite.ExecutionContext;
 import org.openrewrite.SourceFile;
 import org.openrewrite.Tree;
-import org.openrewrite.internal.lang.Nullable;
 import org.openrewrite.java.JavaVisitor;
 import org.openrewrite.java.cleanup.UnnecessaryParenthesesVisitor;
 import org.openrewrite.java.tree.Expression;
diff --git a/src/main/java/org/openrewrite/java/template/internal/package-info.java b/src/main/java/org/openrewrite/java/template/internal/package-info.java
index e26730eb..de2ade54 100644
--- a/src/main/java/org/openrewrite/java/template/internal/package-info.java
+++ b/src/main/java/org/openrewrite/java/template/internal/package-info.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-@NonNullApi
+@NullMarked
 package org.openrewrite.java.template.internal;
 
-import org.openrewrite.internal.lang.NonNullApi;
+import org.jspecify.annotations.NullMarked;
diff --git a/src/main/java/org/openrewrite/java/template/package-info.java b/src/main/java/org/openrewrite/java/template/package-info.java
index 1d435666..47e918d9 100644
--- a/src/main/java/org/openrewrite/java/template/package-info.java
+++ b/src/main/java/org/openrewrite/java/template/package-info.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-@NonNullApi
+@NullMarked
 package org.openrewrite.java.template;
 
-import org.openrewrite.internal.lang.NonNullApi;
+import org.jspecify.annotations.NullMarked;
diff --git a/src/main/java/org/openrewrite/java/template/processor/RefasterTemplateProcessor.java b/src/main/java/org/openrewrite/java/template/processor/RefasterTemplateProcessor.java
index d46ea226..0ca3537e 100644
--- a/src/main/java/org/openrewrite/java/template/processor/RefasterTemplateProcessor.java
+++ b/src/main/java/org/openrewrite/java/template/processor/RefasterTemplateProcessor.java
@@ -26,7 +26,7 @@
 import com.sun.tools.javac.tree.*;
 import com.sun.tools.javac.tree.JCTree.JCCompilationUnit;
 import com.sun.tools.javac.util.Context;
-import org.openrewrite.internal.lang.Nullable;
+import org.jspecify.annotations.Nullable;
 import org.openrewrite.java.template.internal.ImportDetector;
 import org.openrewrite.java.template.internal.JavacResolution;
 import org.openrewrite.java.template.internal.TemplateCode;
@@ -669,7 +669,7 @@ private Class<? extends JCTree> getType(JCTree.JCMethodDecl method) {
         return returnExpression != null ? returnExpression.getClass() : method.getBody().getStatements().last().getClass();
     }
 
-    private @Nullable JCTree.JCExpression getReturnExpression(JCTree.JCMethodDecl method) {
+    private JCTree.@Nullable JCExpression getReturnExpression(JCTree.JCMethodDecl method) {
         JCTree.JCStatement statement = method.getBody().getStatements().last();
         if (statement instanceof JCTree.JCReturn) {
             return ((JCTree.JCReturn) statement).expr;
@@ -935,7 +935,7 @@ private boolean resolve() {
             return method != null;
         }
 
-        private @Nullable JCTree.JCMethodDecl resolve(JCTree.JCMethodDecl method) {
+        private JCTree.@Nullable JCMethodDecl resolve(JCTree.JCMethodDecl method) {
             JavacResolution res = new JavacResolution(context);
             try {
                 classDecl.defs = classDecl.defs.prepend(method);
diff --git a/src/test/resources/refaster/ArraysRecipe.java b/src/test/resources/refaster/ArraysRecipe.java
index 7703ba76..953c9f8a 100644
--- a/src/test/resources/refaster/ArraysRecipe.java
+++ b/src/test/resources/refaster/ArraysRecipe.java
@@ -15,11 +15,11 @@
  */
 package foo;
 
+import org.jspecify.annotations.NullMarked;
 import org.openrewrite.ExecutionContext;
 import org.openrewrite.Preconditions;
 import org.openrewrite.Recipe;
 import org.openrewrite.TreeVisitor;
-import org.openrewrite.internal.lang.NonNullApi;
 import org.openrewrite.java.JavaParser;
 import org.openrewrite.java.JavaTemplate;
 import org.openrewrite.java.JavaVisitor;
@@ -39,7 +39,7 @@
  * OpenRewrite recipe created for Refaster template {@code Arrays}.
  */
 @SuppressWarnings("all")
-@NonNullApi
+@NullMarked
 @Generated("org.openrewrite.java.template.processor.RefasterTemplateProcessor")
 public class ArraysRecipe extends Recipe {
 
diff --git a/src/test/resources/refaster/CharacterEscapeAnnotationRecipe.java b/src/test/resources/refaster/CharacterEscapeAnnotationRecipe.java
index f1cc77d1..6512ccde 100644
--- a/src/test/resources/refaster/CharacterEscapeAnnotationRecipe.java
+++ b/src/test/resources/refaster/CharacterEscapeAnnotationRecipe.java
@@ -15,11 +15,11 @@
  */
 package foo;
 
+import org.jspecify.annotations.NullMarked;
 import org.openrewrite.ExecutionContext;
 import org.openrewrite.Preconditions;
 import org.openrewrite.Recipe;
 import org.openrewrite.TreeVisitor;
-import org.openrewrite.internal.lang.NonNullApi;
 import org.openrewrite.java.JavaParser;
 import org.openrewrite.java.JavaTemplate;
 import org.openrewrite.java.JavaVisitor;
@@ -39,7 +39,7 @@
  * OpenRewrite recipe created for Refaster template {@code CharacterEscapeAnnotation}.
  */
 @SuppressWarnings("all")
-@NonNullApi
+@NullMarked
 @Generated("org.openrewrite.java.template.processor.RefasterTemplateProcessor")
 public class CharacterEscapeAnnotationRecipe extends Recipe {
 
diff --git a/src/test/resources/refaster/EscapesRecipes.java b/src/test/resources/refaster/EscapesRecipes.java
index 4ebdb5b8..3d56a747 100644
--- a/src/test/resources/refaster/EscapesRecipes.java
+++ b/src/test/resources/refaster/EscapesRecipes.java
@@ -15,11 +15,11 @@
  */
 package foo;
 
+import org.jspecify.annotations.NullMarked;
 import org.openrewrite.ExecutionContext;
 import org.openrewrite.Preconditions;
 import org.openrewrite.Recipe;
 import org.openrewrite.TreeVisitor;
-import org.openrewrite.internal.lang.NonNullApi;
 import org.openrewrite.java.JavaParser;
 import org.openrewrite.java.JavaTemplate;
 import org.openrewrite.java.JavaVisitor;
@@ -67,7 +67,7 @@ public List<Recipe> getRecipeList() {
      * OpenRewrite recipe created for Refaster template {@code Escapes.ConstantsFormat}.
      */
     @SuppressWarnings("all")
-    @NonNullApi
+    @NullMarked
     @Generated("org.openrewrite.java.template.processor.RefasterTemplateProcessor")
     public static class ConstantsFormatRecipe extends Recipe {
 
@@ -129,7 +129,7 @@ public J visitMethodInvocation(J.MethodInvocation elem, ExecutionContext ctx) {
      * OpenRewrite recipe created for Refaster template {@code Escapes.Split}.
      */
     @SuppressWarnings("all")
-    @NonNullApi
+    @NullMarked
     @Generated("org.openrewrite.java.template.processor.RefasterTemplateProcessor")
     public static class SplitRecipe extends Recipe {
 
diff --git a/src/test/resources/refaster/FindListAddRecipe.java b/src/test/resources/refaster/FindListAddRecipe.java
index caaaafb2..a555f719 100644
--- a/src/test/resources/refaster/FindListAddRecipe.java
+++ b/src/test/resources/refaster/FindListAddRecipe.java
@@ -15,11 +15,11 @@
  */
 package foo;
 
+import org.jspecify.annotations.NullMarked;
 import org.openrewrite.ExecutionContext;
 import org.openrewrite.Preconditions;
 import org.openrewrite.Recipe;
 import org.openrewrite.TreeVisitor;
-import org.openrewrite.internal.lang.NonNullApi;
 import org.openrewrite.java.JavaParser;
 import org.openrewrite.java.JavaTemplate;
 import org.openrewrite.java.JavaVisitor;
@@ -40,7 +40,7 @@
  * OpenRewrite recipe created for Refaster template {@code FindListAdd}.
  */
 @SuppressWarnings("all")
-@NonNullApi
+@NullMarked
 @Generated("org.openrewrite.java.template.processor.RefasterTemplateProcessor")
 public class FindListAddRecipe extends Recipe {
 
diff --git a/src/test/resources/refaster/GenericsRecipes.java b/src/test/resources/refaster/GenericsRecipes.java
index 0ec34848..97759d65 100644
--- a/src/test/resources/refaster/GenericsRecipes.java
+++ b/src/test/resources/refaster/GenericsRecipes.java
@@ -15,11 +15,11 @@
  */
 package foo;
 
+import org.jspecify.annotations.NullMarked;
 import org.openrewrite.ExecutionContext;
 import org.openrewrite.Preconditions;
 import org.openrewrite.Recipe;
 import org.openrewrite.TreeVisitor;
-import org.openrewrite.internal.lang.NonNullApi;
 import org.openrewrite.java.JavaParser;
 import org.openrewrite.java.JavaTemplate;
 import org.openrewrite.java.JavaVisitor;
@@ -66,7 +66,7 @@ public List<Recipe> getRecipeList() {
      * OpenRewrite recipe created for Refaster template {@code Generics.FirstElement}.
      */
     @SuppressWarnings("all")
-    @NonNullApi
+    @NullMarked
     @Generated("org.openrewrite.java.template.processor.RefasterTemplateProcessor")
     public static class FirstElementRecipe extends Recipe {
 
diff --git a/src/test/resources/refaster/MatchingRecipes.java b/src/test/resources/refaster/MatchingRecipes.java
index 3f83f1b9..5037e0ab 100644
--- a/src/test/resources/refaster/MatchingRecipes.java
+++ b/src/test/resources/refaster/MatchingRecipes.java
@@ -15,11 +15,11 @@
  */
 package foo;
 
+import org.jspecify.annotations.NullMarked;
 import org.openrewrite.ExecutionContext;
 import org.openrewrite.Preconditions;
 import org.openrewrite.Recipe;
 import org.openrewrite.TreeVisitor;
-import org.openrewrite.internal.lang.NonNullApi;
 import org.openrewrite.java.JavaParser;
 import org.openrewrite.java.JavaTemplate;
 import org.openrewrite.java.JavaVisitor;
@@ -71,7 +71,7 @@ public List<Recipe> getRecipeList() {
      * OpenRewrite recipe created for Refaster template {@code Matching.StringIsEmpty}.
      */
     @SuppressWarnings("all")
-    @NonNullApi
+    @NullMarked
     @Generated("org.openrewrite.java.template.processor.RefasterTemplateProcessor")
     public static class StringIsEmptyRecipe extends Recipe {
 
diff --git a/src/test/resources/refaster/MethodThrowsRecipe.java b/src/test/resources/refaster/MethodThrowsRecipe.java
index 7ff3d20a..4820dee8 100644
--- a/src/test/resources/refaster/MethodThrowsRecipe.java
+++ b/src/test/resources/refaster/MethodThrowsRecipe.java
@@ -15,11 +15,11 @@
  */
 package foo;
 
+import org.jspecify.annotations.NullMarked;
 import org.openrewrite.ExecutionContext;
 import org.openrewrite.Preconditions;
 import org.openrewrite.Recipe;
 import org.openrewrite.TreeVisitor;
-import org.openrewrite.internal.lang.NonNullApi;
 import org.openrewrite.java.JavaParser;
 import org.openrewrite.java.JavaTemplate;
 import org.openrewrite.java.JavaVisitor;
@@ -38,7 +38,7 @@
  * OpenRewrite recipe created for Refaster template {@code MethodThrows}.
  */
 @SuppressWarnings("all")
-@NonNullApi
+@NullMarked
 @Generated("org.openrewrite.java.template.processor.RefasterTemplateProcessor")
 public class MethodThrowsRecipe extends Recipe {
 
diff --git a/src/test/resources/refaster/MultipleDereferencesRecipes.java b/src/test/resources/refaster/MultipleDereferencesRecipes.java
index 9b7aba22..6c276caa 100644
--- a/src/test/resources/refaster/MultipleDereferencesRecipes.java
+++ b/src/test/resources/refaster/MultipleDereferencesRecipes.java
@@ -15,11 +15,11 @@
  */
 package foo;
 
+import org.jspecify.annotations.NullMarked;
 import org.openrewrite.ExecutionContext;
 import org.openrewrite.Preconditions;
 import org.openrewrite.Recipe;
 import org.openrewrite.TreeVisitor;
-import org.openrewrite.internal.lang.NonNullApi;
 import org.openrewrite.java.JavaParser;
 import org.openrewrite.java.JavaTemplate;
 import org.openrewrite.java.JavaVisitor;
@@ -68,7 +68,7 @@ public List<Recipe> getRecipeList() {
      * OpenRewrite recipe created for Refaster template {@code MultipleDereferences.VoidType}.
      */
     @SuppressWarnings("all")
-    @NonNullApi
+    @NullMarked
     @Generated("org.openrewrite.java.template.processor.RefasterTemplateProcessor")
     public static class VoidTypeRecipe extends Recipe {
 
@@ -127,7 +127,7 @@ public J visitMethodInvocation(J.MethodInvocation elem, ExecutionContext ctx) {
      * OpenRewrite recipe created for Refaster template {@code MultipleDereferences.StringIsEmpty}.
      */
     @SuppressWarnings("all")
-    @NonNullApi
+    @NullMarked
     @Generated("org.openrewrite.java.template.processor.RefasterTemplateProcessor")
     public static class StringIsEmptyRecipe extends Recipe {
 
@@ -182,7 +182,7 @@ public J visitMethodInvocation(J.MethodInvocation elem, ExecutionContext ctx) {
      * OpenRewrite recipe created for Refaster template {@code MultipleDereferences.EqualsItself}.
      */
     @SuppressWarnings("all")
-    @NonNullApi
+    @NullMarked
     @Generated("org.openrewrite.java.template.processor.RefasterTemplateProcessor")
     public static class EqualsItselfRecipe extends Recipe {
 
diff --git a/src/test/resources/refaster/NestedPreconditionsRecipe.java b/src/test/resources/refaster/NestedPreconditionsRecipe.java
index fc34b8f5..40f46988 100644
--- a/src/test/resources/refaster/NestedPreconditionsRecipe.java
+++ b/src/test/resources/refaster/NestedPreconditionsRecipe.java
@@ -15,11 +15,11 @@
  */
 package foo;
 
+import org.jspecify.annotations.NullMarked;
 import org.openrewrite.ExecutionContext;
 import org.openrewrite.Preconditions;
 import org.openrewrite.Recipe;
 import org.openrewrite.TreeVisitor;
-import org.openrewrite.internal.lang.NonNullApi;
 import org.openrewrite.java.JavaParser;
 import org.openrewrite.java.JavaTemplate;
 import org.openrewrite.java.JavaVisitor;
@@ -38,7 +38,7 @@
  * OpenRewrite recipe created for Refaster template {@code NestedPreconditions}.
  */
 @SuppressWarnings("all")
-@NonNullApi
+@NullMarked
 @Generated("org.openrewrite.java.template.processor.RefasterTemplateProcessor")
 public class NestedPreconditionsRecipe extends Recipe {
 
diff --git a/src/test/resources/refaster/ParametersRecipes.java b/src/test/resources/refaster/ParametersRecipes.java
index 4c9b7068..9277510f 100644
--- a/src/test/resources/refaster/ParametersRecipes.java
+++ b/src/test/resources/refaster/ParametersRecipes.java
@@ -15,11 +15,11 @@
  */
 package foo;
 
+import org.jspecify.annotations.NullMarked;
 import org.openrewrite.ExecutionContext;
 import org.openrewrite.Preconditions;
 import org.openrewrite.Recipe;
 import org.openrewrite.TreeVisitor;
-import org.openrewrite.internal.lang.NonNullApi;
 import org.openrewrite.java.JavaParser;
 import org.openrewrite.java.JavaTemplate;
 import org.openrewrite.java.JavaVisitor;
@@ -67,7 +67,7 @@ public List<Recipe> getRecipeList() {
      * OpenRewrite recipe created for Refaster template {@code Parameters.Reuse}.
      */
     @SuppressWarnings("all")
-    @NonNullApi
+    @NullMarked
     @Generated("org.openrewrite.java.template.processor.RefasterTemplateProcessor")
     public static class ReuseRecipe extends Recipe {
 
@@ -119,7 +119,7 @@ public J visitBinary(J.Binary elem, ExecutionContext ctx) {
      * OpenRewrite recipe created for Refaster template {@code Parameters.Order}.
      */
     @SuppressWarnings("all")
-    @NonNullApi
+    @NullMarked
     @Generated("org.openrewrite.java.template.processor.RefasterTemplateProcessor")
     public static class OrderRecipe extends Recipe {
 
diff --git a/src/test/resources/refaster/PicnicRulesRecipes.java b/src/test/resources/refaster/PicnicRulesRecipes.java
index ba73c718..8cdf9fdb 100644
--- a/src/test/resources/refaster/PicnicRulesRecipes.java
+++ b/src/test/resources/refaster/PicnicRulesRecipes.java
@@ -15,11 +15,11 @@
  */
 package foo;
 
+import org.jspecify.annotations.NullMarked;
 import org.openrewrite.ExecutionContext;
 import org.openrewrite.Preconditions;
 import org.openrewrite.Recipe;
 import org.openrewrite.TreeVisitor;
-import org.openrewrite.internal.lang.NonNullApi;
 import org.openrewrite.java.JavaParser;
 import org.openrewrite.java.JavaTemplate;
 import org.openrewrite.java.JavaVisitor;
@@ -66,7 +66,7 @@ public List<Recipe> getRecipeList() {
      * OpenRewrite recipe created for Refaster template {@code PicnicRules.NestedRule}.
      */
     @SuppressWarnings("all")
-    @NonNullApi
+    @NullMarked
     @Generated("org.openrewrite.java.template.processor.RefasterTemplateProcessor")
     public static class NestedRuleRecipe extends Recipe {
 
diff --git a/src/test/resources/refaster/RefasterAnyOfRecipes.java b/src/test/resources/refaster/RefasterAnyOfRecipes.java
index d1711b59..9d32c614 100644
--- a/src/test/resources/refaster/RefasterAnyOfRecipes.java
+++ b/src/test/resources/refaster/RefasterAnyOfRecipes.java
@@ -15,11 +15,11 @@
  */
 package foo;
 
+import org.jspecify.annotations.NullMarked;
 import org.openrewrite.ExecutionContext;
 import org.openrewrite.Preconditions;
 import org.openrewrite.Recipe;
 import org.openrewrite.TreeVisitor;
-import org.openrewrite.internal.lang.NonNullApi;
 import org.openrewrite.java.JavaParser;
 import org.openrewrite.java.JavaTemplate;
 import org.openrewrite.java.JavaVisitor;
@@ -68,7 +68,7 @@ public List<Recipe> getRecipeList() {
      * OpenRewrite recipe created for Refaster template {@code RefasterAnyOf.StringIsEmpty}.
      */
     @SuppressWarnings("all")
-    @NonNullApi
+    @NullMarked
     @Generated("org.openrewrite.java.template.processor.RefasterTemplateProcessor")
     public static class StringIsEmptyRecipe extends Recipe {
 
@@ -134,7 +134,7 @@ public J visitMethodInvocation(J.MethodInvocation elem, ExecutionContext ctx) {
      * OpenRewrite recipe created for Refaster template {@code RefasterAnyOf.EmptyList}.
      */
     @SuppressWarnings("all")
-    @NonNullApi
+    @NullMarked
     @Generated("org.openrewrite.java.template.processor.RefasterTemplateProcessor")
     public static class EmptyListRecipe extends Recipe {
 
@@ -214,7 +214,7 @@ public J visitMethodInvocation(J.MethodInvocation elem, ExecutionContext ctx) {
      * OpenRewrite recipe created for Refaster template {@code RefasterAnyOf.NewStringFromCharArraySubSequence}.
      */
     @SuppressWarnings("all")
-    @NonNullApi
+    @NullMarked
     @Generated("org.openrewrite.java.template.processor.RefasterTemplateProcessor")
     public static class NewStringFromCharArraySubSequenceRecipe extends Recipe {
 
diff --git a/src/test/resources/refaster/ShouldAddImportsRecipes.java b/src/test/resources/refaster/ShouldAddImportsRecipes.java
index cdcb5146..e17d7b2d 100644
--- a/src/test/resources/refaster/ShouldAddImportsRecipes.java
+++ b/src/test/resources/refaster/ShouldAddImportsRecipes.java
@@ -15,11 +15,11 @@
  */
 package foo;
 
+import org.jspecify.annotations.NullMarked;
 import org.openrewrite.ExecutionContext;
 import org.openrewrite.Preconditions;
 import org.openrewrite.Recipe;
 import org.openrewrite.TreeVisitor;
-import org.openrewrite.internal.lang.NonNullApi;
 import org.openrewrite.java.JavaParser;
 import org.openrewrite.java.JavaTemplate;
 import org.openrewrite.java.JavaVisitor;
@@ -71,7 +71,7 @@ public List<Recipe> getRecipeList() {
      * OpenRewrite recipe created for Refaster template {@code ShouldAddImports.StringValueOf}.
      */
     @SuppressWarnings("all")
-    @NonNullApi
+    @NullMarked
     @Generated("org.openrewrite.java.template.processor.RefasterTemplateProcessor")
     public static class StringValueOfRecipe extends Recipe {
 
@@ -126,7 +126,7 @@ public J visitMethodInvocation(J.MethodInvocation elem, ExecutionContext ctx) {
      * OpenRewrite recipe created for Refaster template {@code ShouldAddImports.ObjectsEquals}.
      */
     @SuppressWarnings("all")
-    @NonNullApi
+    @NullMarked
     @Generated("org.openrewrite.java.template.processor.RefasterTemplateProcessor")
     public static class ObjectsEqualsRecipe extends Recipe {
 
@@ -199,7 +199,7 @@ public J visitMethodInvocation(J.MethodInvocation elem, ExecutionContext ctx) {
      * OpenRewrite recipe created for Refaster template {@code ShouldAddImports.StaticImportObjectsHash}.
      */
     @SuppressWarnings("all")
-    @NonNullApi
+    @NullMarked
     @Generated("org.openrewrite.java.template.processor.RefasterTemplateProcessor")
     public static class StaticImportObjectsHashRecipe extends Recipe {
 
@@ -255,7 +255,7 @@ public J visitMethodInvocation(J.MethodInvocation elem, ExecutionContext ctx) {
      * OpenRewrite recipe created for Refaster template {@code ShouldAddImports.FileExists}.
      */
     @SuppressWarnings("all")
-    @NonNullApi
+    @NullMarked
     @Generated("org.openrewrite.java.template.processor.RefasterTemplateProcessor")
     public static class FileExistsRecipe extends Recipe {
 
@@ -314,7 +314,7 @@ public J visitMethodInvocation(J.MethodInvocation elem, ExecutionContext ctx) {
      * OpenRewrite recipe created for Refaster template {@code ShouldAddImports.FindStringIsEmpty}.
      */
     @SuppressWarnings("all")
-    @NonNullApi
+    @NullMarked
     @Generated("org.openrewrite.java.template.processor.RefasterTemplateProcessor")
     public static class FindStringIsEmptyRecipe extends Recipe {
 
diff --git a/src/test/resources/refaster/ShouldSupportNestedClassesRecipes.java b/src/test/resources/refaster/ShouldSupportNestedClassesRecipes.java
index b021f0a8..1a554ff8 100644
--- a/src/test/resources/refaster/ShouldSupportNestedClassesRecipes.java
+++ b/src/test/resources/refaster/ShouldSupportNestedClassesRecipes.java
@@ -15,11 +15,11 @@
  */
 package foo;
 
+import org.jspecify.annotations.NullMarked;
 import org.openrewrite.ExecutionContext;
 import org.openrewrite.Preconditions;
 import org.openrewrite.Recipe;
 import org.openrewrite.TreeVisitor;
-import org.openrewrite.internal.lang.NonNullApi;
 import org.openrewrite.java.JavaParser;
 import org.openrewrite.java.JavaTemplate;
 import org.openrewrite.java.JavaVisitor;
@@ -68,7 +68,7 @@ public List<Recipe> getRecipeList() {
      * OpenRewrite recipe created for Refaster template {@code ShouldSupportNestedClasses.NestedClass}.
      */
     @SuppressWarnings("all")
-    @NonNullApi
+    @NullMarked
     @Generated("org.openrewrite.java.template.processor.RefasterTemplateProcessor")
     public static class NestedClassRecipe extends Recipe {
 
@@ -123,7 +123,7 @@ public J visitBinary(J.Binary elem, ExecutionContext ctx) {
      * OpenRewrite recipe created for Refaster template {@code ShouldSupportNestedClasses.AnotherClass}.
      */
     @SuppressWarnings("all")
-    @NonNullApi
+    @NullMarked
     @Generated("org.openrewrite.java.template.processor.RefasterTemplateProcessor")
     public static class AnotherClassRecipe extends Recipe {
 
diff --git a/src/test/resources/refaster/SimplifyBooleansRecipe.java b/src/test/resources/refaster/SimplifyBooleansRecipe.java
index 727ad80c..c9c78fd2 100644
--- a/src/test/resources/refaster/SimplifyBooleansRecipe.java
+++ b/src/test/resources/refaster/SimplifyBooleansRecipe.java
@@ -15,11 +15,11 @@
  */
 package foo;
 
+import org.jspecify.annotations.NullMarked;
 import org.openrewrite.ExecutionContext;
 import org.openrewrite.Preconditions;
 import org.openrewrite.Recipe;
 import org.openrewrite.TreeVisitor;
-import org.openrewrite.internal.lang.NonNullApi;
 import org.openrewrite.java.JavaParser;
 import org.openrewrite.java.JavaTemplate;
 import org.openrewrite.java.JavaVisitor;
@@ -39,7 +39,7 @@
  * OpenRewrite recipe created for Refaster template {@code SimplifyBooleans}.
  */
 @SuppressWarnings("all")
-@NonNullApi
+@NullMarked
 @Generated("org.openrewrite.java.template.processor.RefasterTemplateProcessor")
 public class SimplifyBooleansRecipe extends Recipe {
 
diff --git a/src/test/resources/refaster/SimplifyTernaryRecipes.java b/src/test/resources/refaster/SimplifyTernaryRecipes.java
index 7cda1da1..a8b89470 100644
--- a/src/test/resources/refaster/SimplifyTernaryRecipes.java
+++ b/src/test/resources/refaster/SimplifyTernaryRecipes.java
@@ -15,11 +15,11 @@
  */
 package foo;
 
+import org.jspecify.annotations.NullMarked;
 import org.openrewrite.ExecutionContext;
 import org.openrewrite.Preconditions;
 import org.openrewrite.Recipe;
 import org.openrewrite.TreeVisitor;
-import org.openrewrite.internal.lang.NonNullApi;
 import org.openrewrite.java.JavaParser;
 import org.openrewrite.java.JavaTemplate;
 import org.openrewrite.java.JavaVisitor;
@@ -67,7 +67,7 @@ public List<Recipe> getRecipeList() {
      * OpenRewrite recipe created for Refaster template {@code SimplifyTernary.SimplifyTernaryTrueFalse}.
      */
     @SuppressWarnings("all")
-    @NonNullApi
+    @NullMarked
     @Generated("org.openrewrite.java.template.processor.RefasterTemplateProcessor")
     public static class SimplifyTernaryTrueFalseRecipe extends Recipe {
 
@@ -119,7 +119,7 @@ public J visitTernary(J.Ternary elem, ExecutionContext ctx) {
      * OpenRewrite recipe created for Refaster template {@code SimplifyTernary.SimplifyTernaryFalseTrue}.
      */
     @SuppressWarnings("all")
-    @NonNullApi
+    @NullMarked
     @Generated("org.openrewrite.java.template.processor.RefasterTemplateProcessor")
     public static class SimplifyTernaryFalseTrueRecipe extends Recipe {
 
diff --git a/src/test/resources/refaster/UnnamedPackageRecipe.java b/src/test/resources/refaster/UnnamedPackageRecipe.java
index 5a454e4e..7f522555 100644
--- a/src/test/resources/refaster/UnnamedPackageRecipe.java
+++ b/src/test/resources/refaster/UnnamedPackageRecipe.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import org.jspecify.annotations.NullMarked;
 import org.openrewrite.ExecutionContext;
 import org.openrewrite.Preconditions;
 import org.openrewrite.Recipe;
 import org.openrewrite.TreeVisitor;
-import org.openrewrite.internal.lang.NonNullApi;
 import org.openrewrite.java.JavaParser;
 import org.openrewrite.java.JavaTemplate;
 import org.openrewrite.java.JavaVisitor;
@@ -37,7 +37,7 @@
  * OpenRewrite recipe created for Refaster template {@code UnnamedPackage}.
  */
 @SuppressWarnings("all")
-@NonNullApi
+@NullMarked
 @Generated("org.openrewrite.java.template.processor.RefasterTemplateProcessor")
 public class UnnamedPackageRecipe extends Recipe {
 
diff --git a/src/test/resources/refaster/UseStringIsEmptyRecipe.java b/src/test/resources/refaster/UseStringIsEmptyRecipe.java
index 1e2bd4d4..82464232 100644
--- a/src/test/resources/refaster/UseStringIsEmptyRecipe.java
+++ b/src/test/resources/refaster/UseStringIsEmptyRecipe.java
@@ -15,11 +15,11 @@
  */
 package foo;
 
+import org.jspecify.annotations.NullMarked;
 import org.openrewrite.ExecutionContext;
 import org.openrewrite.Preconditions;
 import org.openrewrite.Recipe;
 import org.openrewrite.TreeVisitor;
-import org.openrewrite.internal.lang.NonNullApi;
 import org.openrewrite.java.JavaParser;
 import org.openrewrite.java.JavaTemplate;
 import org.openrewrite.java.JavaVisitor;
@@ -39,7 +39,7 @@
  * OpenRewrite recipe created for Refaster template {@code UseStringIsEmpty}.
  */
 @SuppressWarnings("all")
-@NonNullApi
+@NullMarked
 @Generated("org.openrewrite.java.template.processor.RefasterTemplateProcessor")
 public class UseStringIsEmptyRecipe extends Recipe {