From 9f716ba37c0656d89d2041a49db0ad7bd8e62ee9 Mon Sep 17 00:00:00 2001
From: Victor Petukhov <victor.petukhov@jetbrains.com>
Date: Thu, 8 Oct 2020 11:52:39 +0300
Subject: [PATCH] Jspecify: Rename DefaultNotNull to DefaultNonNull

---
 compiler/testData/cli/jvm/jspecify/A.java                     | 2 +-
 .../foreignAnnotationsJava8/tests/jspecify/defaults.kt        | 2 +-
 .../foreignAnnotationsJava8/tests/jspecify/defaults.txt       | 2 +-
 .../tests/jspecify/ignoreAnnotations.kt                       | 2 +-
 .../tests/jspecify/ignoreAnnotations.txt                      | 2 +-
 .../tests/jspecify/typeArgumentsFromParameterBounds.kt        | 2 +-
 .../tests/jspecify/typeArgumentsFromParameterBounds.txt       | 4 ++--
 .../tests/jspecify/typeParameterBounds.kt                     | 2 +-
 .../tests/jspecify/typeParameterBounds.txt                    | 2 +-
 .../tests/jspecify/unknownNullnessTypeParameter.kt            | 2 +-
 .../tests/jspecify/unknownNullnessTypeParameter.txt           | 2 +-
 .../tests/jspecify/warnings/defaults.kt                       | 2 +-
 .../tests/jspecify/warnings/defaults.txt                      | 2 +-
 .../jspecify/warnings/typeArgumentsFromParameterBounds.kt     | 2 +-
 .../jspecify/warnings/typeArgumentsFromParameterBounds.txt    | 2 +-
 .../tests/jspecify/warnings/typeParameterBounds.kt            | 2 +-
 .../tests/jspecify/warnings/typeParameterBounds.txt           | 2 +-
 .../tests/jspecify/warnings/unknownNullnessTypeParameter.kt   | 2 +-
 .../tests/jspecify/warnings/unknownNullnessTypeParameter.txt  | 2 +-
 .../tests/jspecify/warnings/wildcardsWithDefault.kt           | 2 +-
 .../tests/jspecify/warnings/wildcardsWithDefault.txt          | 2 +-
 .../tests/jspecify/wildcardsWithDefault.kt                    | 2 +-
 .../tests/jspecify/wildcardsWithDefault.txt                   | 2 +-
 .../src/org/jetbrains/kotlin/load/java/JvmAnnotationNames.kt  | 2 +-
 .../annotations/{DefaultNotNull.java => DefaultNonNull.java}  | 2 +-
 25 files changed, 26 insertions(+), 26 deletions(-)
 rename third-party/jdk8-annotations/org/jspecify/annotations/{DefaultNotNull.java => DefaultNonNull.java} (94%)

diff --git a/compiler/testData/cli/jvm/jspecify/A.java b/compiler/testData/cli/jvm/jspecify/A.java
index bcc31435060..efb95d977bf 100644
--- a/compiler/testData/cli/jvm/jspecify/A.java
+++ b/compiler/testData/cli/jvm/jspecify/A.java
@@ -1,4 +1,4 @@
-@org.jspecify.annotations.DefaultNotNull
+@org.jspecify.annotations.DefaultNonNull
 public class A {
     public void foo(String x) {}
 
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/defaults.kt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/defaults.kt
index dffa595aee2..453c490b656 100644
--- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/defaults.kt
+++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/defaults.kt
@@ -3,7 +3,7 @@
 
 import org.jspecify.annotations.*;
 
-@DefaultNotNull
+@DefaultNonNull
 public class A {
     public String defaultField = "";
     @Nullable public String field = null;
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/defaults.txt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/defaults.txt
index 866e8013252..5ede9fb49ab 100644
--- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/defaults.txt
+++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/defaults.txt
@@ -2,7 +2,7 @@ package
 
 public fun main(/*0*/ a: A): kotlin.Unit
 
-@org.jspecify.annotations.DefaultNotNull public open class A {
+@org.jspecify.annotations.DefaultNonNull public open class A {
     public constructor A()
     public final var defaultField: kotlin.String
     @org.jspecify.annotations.Nullable public final var field: @org.jspecify.annotations.Nullable kotlin.String?
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/ignoreAnnotations.kt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/ignoreAnnotations.kt
index b1f175ffd44..4acf07de7db 100644
--- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/ignoreAnnotations.kt
+++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/ignoreAnnotations.kt
@@ -17,7 +17,7 @@ public class A {
         return "";
     }
 
-    @DefaultNotNull
+    @DefaultNonNull
     public String everythingNotNullable(String x) { return ""; }
 
     @DefaultNullable
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/ignoreAnnotations.txt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/ignoreAnnotations.txt
index 097823ad6f3..7b6187da88f 100644
--- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/ignoreAnnotations.txt
+++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/ignoreAnnotations.txt
@@ -7,7 +7,7 @@ public open class A {
     @org.jspecify.annotations.Nullable public final var field: @org.jspecify.annotations.Nullable kotlin.String!
     @org.jspecify.annotations.NotNull public open fun bar(): @org.jspecify.annotations.NotNull kotlin.String!
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    @org.jspecify.annotations.DefaultNotNull public open fun everythingNotNullable(/*0*/ x: kotlin.String!): @org.jspecify.annotations.DefaultNotNull kotlin.String!
+    @org.jspecify.annotations.DefaultNonNull public open fun everythingNotNullable(/*0*/ x: kotlin.String!): @org.jspecify.annotations.DefaultNonNull kotlin.String!
     @org.jspecify.annotations.DefaultNullable public open fun everythingNullable(/*0*/ x: kotlin.String!): @org.jspecify.annotations.DefaultNullable kotlin.String!
     @org.jspecify.annotations.DefaultNullnessUnspecified public open fun everythingUnknown(/*0*/ x: kotlin.String!): @org.jspecify.annotations.DefaultNullnessUnspecified kotlin.String!
     @org.jspecify.annotations.Nullable public open fun foo(/*0*/ @org.jspecify.annotations.NotNull x: @org.jspecify.annotations.NotNull kotlin.String!, /*1*/ @org.jspecify.annotations.NullnessUnspecified y: @org.jspecify.annotations.NullnessUnspecified kotlin.CharSequence!): @org.jspecify.annotations.Nullable kotlin.String!
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/typeArgumentsFromParameterBounds.kt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/typeArgumentsFromParameterBounds.kt
index 51a5ab27255..db2949195c1 100644
--- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/typeArgumentsFromParameterBounds.kt
+++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/typeArgumentsFromParameterBounds.kt
@@ -19,7 +19,7 @@ public class B {
 
 import org.jspecify.annotations.*;
 
-@DefaultNotNull
+@DefaultNonNull
 public class C {
     public void bar(A<String, String, String> a) {}
 }
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/typeArgumentsFromParameterBounds.txt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/typeArgumentsFromParameterBounds.txt
index cfc16087441..7cf40b21642 100644
--- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/typeArgumentsFromParameterBounds.txt
+++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/typeArgumentsFromParameterBounds.txt
@@ -17,7 +17,7 @@ public open class A</*0*/ T : @org.jspecify.annotations.NotNull kotlin.Any, /*1*
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-@org.jspecify.annotations.DefaultNotNull public open class C {
+@org.jspecify.annotations.DefaultNonNull public open class C {
     public constructor C()
     public open fun bar(/*0*/ a: A<kotlin.String, kotlin.String, kotlin.String>): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -25,7 +25,7 @@ public open class A</*0*/ T : @org.jspecify.annotations.NotNull kotlin.Any, /*1*
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-@DefaultUnknownNullness /* annotation class not found */ public open class D {
+@org.jspecify.annotations.DefaultNullnessUnspecified public open class D {
     public constructor D()
     public open fun bar(/*0*/ a: A<kotlin.String, kotlin.String?, kotlin.String!>!): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/typeParameterBounds.kt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/typeParameterBounds.kt
index b2a60477251..06efc43f383 100644
--- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/typeParameterBounds.kt
+++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/typeParameterBounds.kt
@@ -12,7 +12,7 @@ public class A<T extends @NotNull Object> {
 
 import org.jspecify.annotations.*;
 
-@DefaultNotNull
+@DefaultNonNull
 public class B<T> {
     public void foo(T t) {}
     public <E> void bar(E e) {}
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/typeParameterBounds.txt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/typeParameterBounds.txt
index 46aae47ccb0..10d2abf0375 100644
--- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/typeParameterBounds.txt
+++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/typeParameterBounds.txt
@@ -11,7 +11,7 @@ public open class A</*0*/ T : @org.jspecify.annotations.NotNull kotlin.Any> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-@org.jspecify.annotations.DefaultNotNull public open class B</*0*/ T : kotlin.Any> {
+@org.jspecify.annotations.DefaultNonNull public open class B</*0*/ T : kotlin.Any> {
     public constructor B</*0*/ T : kotlin.Any>()
     public open fun </*0*/ E : kotlin.Any> bar(/*0*/ e: E): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/unknownNullnessTypeParameter.kt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/unknownNullnessTypeParameter.kt
index 54c18360638..c0ab5f3952f 100644
--- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/unknownNullnessTypeParameter.kt
+++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/unknownNullnessTypeParameter.kt
@@ -6,7 +6,7 @@ import org.jspecify.annotations.*;
 public class A<T> {
     public void foo(T t) {}
 
-    @DefaultNotNull
+    @DefaultNonNull
     public void bar(String s, T t) {} // t should not become not nullable
 }
 
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/unknownNullnessTypeParameter.txt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/unknownNullnessTypeParameter.txt
index db743b4fc47..bc77034ed4c 100644
--- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/unknownNullnessTypeParameter.txt
+++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/unknownNullnessTypeParameter.txt
@@ -4,7 +4,7 @@ public fun main(/*0*/ a1: A<kotlin.Int>, /*1*/ a2: A<kotlin.Int?>): kotlin.Unit
 
 public open class A</*0*/ T : kotlin.Any!> {
     public constructor A</*0*/ T : kotlin.Any!>()
-    @org.jspecify.annotations.DefaultNotNull public open fun bar(/*0*/ s: kotlin.String, /*1*/ t: T!): kotlin.Unit
+    @org.jspecify.annotations.DefaultNonNull public open fun bar(/*0*/ s: kotlin.String, /*1*/ t: T!): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open fun foo(/*0*/ t: T!): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/defaults.kt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/defaults.kt
index 7c278d13a70..1f7a5b64136 100644
--- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/defaults.kt
+++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/defaults.kt
@@ -4,7 +4,7 @@
 
 import org.jspecify.annotations.*;
 
-@DefaultNotNull
+@DefaultNonNull
 public class A {
     public String defaultField = "";
     @Nullable public String field = null;
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/defaults.txt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/defaults.txt
index 3e24752045e..78cb9129551 100644
--- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/defaults.txt
+++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/defaults.txt
@@ -2,7 +2,7 @@ package
 
 public fun main(/*0*/ a: A): kotlin.Unit
 
-@org.jspecify.annotations.DefaultNotNull public open class A {
+@org.jspecify.annotations.DefaultNonNull public open class A {
     public constructor A()
     public final var defaultField: kotlin.String!
     @org.jspecify.annotations.Nullable public final var field: @org.jspecify.annotations.Nullable kotlin.String!
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/typeArgumentsFromParameterBounds.kt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/typeArgumentsFromParameterBounds.kt
index 58f69fdd7de..bd0fec11eb7 100644
--- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/typeArgumentsFromParameterBounds.kt
+++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/typeArgumentsFromParameterBounds.kt
@@ -20,7 +20,7 @@ public class B {
 
 import org.jspecify.annotations.*;
 
-@DefaultNotNull
+@DefaultNonNull
 public class C {
     public void bar(A<String, String, String> a) {}
 }
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/typeArgumentsFromParameterBounds.txt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/typeArgumentsFromParameterBounds.txt
index afefd178767..9dd3fd88101 100644
--- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/typeArgumentsFromParameterBounds.txt
+++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/typeArgumentsFromParameterBounds.txt
@@ -17,7 +17,7 @@ public open class A</*0*/ T : @org.jspecify.annotations.NotNull kotlin.Any!, /*1
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-@org.jspecify.annotations.DefaultNotNull public open class C {
+@org.jspecify.annotations.DefaultNonNull public open class C {
     public constructor C()
     public open fun bar(/*0*/ a: A<kotlin.String!, kotlin.String!, kotlin.String!>!): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/typeParameterBounds.kt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/typeParameterBounds.kt
index 76cf41bb410..64ad9e6639d 100644
--- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/typeParameterBounds.kt
+++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/typeParameterBounds.kt
@@ -13,7 +13,7 @@ public class A<T extends @NotNull Object> {
 
 import org.jspecify.annotations.*;
 
-@DefaultNotNull
+@DefaultNonNull
 public class B<T> {
     public void foo(T t) {}
     public <E> void bar(E e) {}
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/typeParameterBounds.txt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/typeParameterBounds.txt
index 20ed2e3cee7..e697f8356e3 100644
--- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/typeParameterBounds.txt
+++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/typeParameterBounds.txt
@@ -11,7 +11,7 @@ public open class A</*0*/ T : @org.jspecify.annotations.NotNull kotlin.Any!> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-@org.jspecify.annotations.DefaultNotNull public open class B</*0*/ T : kotlin.Any!> {
+@org.jspecify.annotations.DefaultNonNull public open class B</*0*/ T : kotlin.Any!> {
     public constructor B</*0*/ T : kotlin.Any!>()
     public open fun </*0*/ E : kotlin.Any!> bar(/*0*/ e: E!): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/unknownNullnessTypeParameter.kt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/unknownNullnessTypeParameter.kt
index 2013f6a1933..a9985354f47 100644
--- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/unknownNullnessTypeParameter.kt
+++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/unknownNullnessTypeParameter.kt
@@ -7,7 +7,7 @@ import org.jspecify.annotations.*;
 public class A<T> {
     public void foo(T t) {}
 
-    @DefaultNotNull
+    @DefaultNonNull
     public void bar(String s, T t) {} // t should not become not nullable
 }
 
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/unknownNullnessTypeParameter.txt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/unknownNullnessTypeParameter.txt
index f8b6dc015bc..89e71a05c40 100644
--- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/unknownNullnessTypeParameter.txt
+++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/unknownNullnessTypeParameter.txt
@@ -4,7 +4,7 @@ public fun main(/*0*/ a1: A<kotlin.Int>, /*1*/ a2: A<kotlin.Int?>): kotlin.Unit
 
 public open class A</*0*/ T : kotlin.Any!> {
     public constructor A</*0*/ T : kotlin.Any!>()
-    @org.jspecify.annotations.DefaultNotNull public open fun bar(/*0*/ s: kotlin.String!, /*1*/ t: T!): kotlin.Unit
+    @org.jspecify.annotations.DefaultNonNull public open fun bar(/*0*/ s: kotlin.String!, /*1*/ t: T!): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open fun foo(/*0*/ t: T!): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/wildcardsWithDefault.kt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/wildcardsWithDefault.kt
index fda5849b745..7dd94cb1796 100644
--- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/wildcardsWithDefault.kt
+++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/wildcardsWithDefault.kt
@@ -12,7 +12,7 @@ public class A<T extends @NotNull Object, E extends @Nullable Object, F extends
 import org.jspecify.annotations.*;
 
 public class B {
-    @DefaultNotNull
+    @DefaultNonNull
     public void noBoundsNotNull(A<?, ?, ?> a) {}
     @DefaultNullable
     public void noBoundsNullable(A<?, ?, ?> a) {}
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/wildcardsWithDefault.txt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/wildcardsWithDefault.txt
index 97f1cbbe7c3..d8eab98439d 100644
--- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/wildcardsWithDefault.txt
+++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/wildcardsWithDefault.txt
@@ -13,7 +13,7 @@ public open class B {
     public constructor B()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    @org.jspecify.annotations.DefaultNotNull public open fun noBoundsNotNull(/*0*/ a: A<*, *, *>!): kotlin.Unit
+    @org.jspecify.annotations.DefaultNonNull public open fun noBoundsNotNull(/*0*/ a: A<*, *, *>!): kotlin.Unit
     @org.jspecify.annotations.DefaultNullable public open fun noBoundsNullable(/*0*/ a: A<*, *, *>!): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/wildcardsWithDefault.kt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/wildcardsWithDefault.kt
index a58e14cb1a7..4b8fa530958 100644
--- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/wildcardsWithDefault.kt
+++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/wildcardsWithDefault.kt
@@ -11,7 +11,7 @@ public class A<T extends @NotNull Object, E extends @Nullable Object, F extends
 import org.jspecify.annotations.*;
 
 public class B {
-    @DefaultNotNull
+    @DefaultNonNull
     public void noBoundsNotNull(A<?, ?, ?> a) {}
     @DefaultNullable
     public void noBoundsNullable(A<?, ?, ?> a) {}
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/wildcardsWithDefault.txt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/wildcardsWithDefault.txt
index 5b05a94efcd..770c6e11772 100644
--- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/wildcardsWithDefault.txt
+++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/wildcardsWithDefault.txt
@@ -13,7 +13,7 @@ public open class B {
     public constructor B()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    @org.jspecify.annotations.DefaultNotNull public open fun noBoundsNotNull(/*0*/ a: A<out @org.jspecify.annotations.NotNull kotlin.Any, out @org.jspecify.annotations.Nullable kotlin.Any, out @org.jspecify.annotations.NullnessUnspecified kotlin.Any>): kotlin.Unit
+    @org.jspecify.annotations.DefaultNonNull public open fun noBoundsNotNull(/*0*/ a: A<out @org.jspecify.annotations.NotNull kotlin.Any, out @org.jspecify.annotations.Nullable kotlin.Any, out @org.jspecify.annotations.NullnessUnspecified kotlin.Any>): kotlin.Unit
     @org.jspecify.annotations.DefaultNullable public open fun noBoundsNullable(/*0*/ a: A<out @org.jspecify.annotations.NotNull kotlin.Any, *, *>?): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/core/compiler.common.jvm/src/org/jetbrains/kotlin/load/java/JvmAnnotationNames.kt b/core/compiler.common.jvm/src/org/jetbrains/kotlin/load/java/JvmAnnotationNames.kt
index 31bb7beb2ee..3f0c8270559 100644
--- a/core/compiler.common.jvm/src/org/jetbrains/kotlin/load/java/JvmAnnotationNames.kt
+++ b/core/compiler.common.jvm/src/org/jetbrains/kotlin/load/java/JvmAnnotationNames.kt
@@ -23,7 +23,7 @@ val JSPECIFY_NOT_NULL = FqName("org.jspecify.annotations.NotNull")
 val JSPECIFY_NULLNESS_UNKNOWN = FqName("org.jspecify.annotations.NullnessUnspecified")
 
 val JSPECIFY_DEFAULT_NULLABLE = FqName("org.jspecify.annotations.DefaultNullable")
-val JSPECIFY_DEFAULT_NOT_NULL = FqName("org.jspecify.annotations.DefaultNotNull")
+val JSPECIFY_DEFAULT_NOT_NULL = FqName("org.jspecify.annotations.DefaultNonNull")
 val JSPECIFY_DEFAULT_NULLNESS_UNKNOWN = FqName("org.jspecify.annotations.DefaultNullnessUnspecified")
 
 val NULLABLE_ANNOTATIONS = listOf(
diff --git a/third-party/jdk8-annotations/org/jspecify/annotations/DefaultNotNull.java b/third-party/jdk8-annotations/org/jspecify/annotations/DefaultNonNull.java
similarity index 94%
rename from third-party/jdk8-annotations/org/jspecify/annotations/DefaultNotNull.java
rename to third-party/jdk8-annotations/org/jspecify/annotations/DefaultNonNull.java
index ee36dda8c99..dcd4dbdd05a 100644
--- a/third-party/jdk8-annotations/org/jspecify/annotations/DefaultNotNull.java
+++ b/third-party/jdk8-annotations/org/jspecify/annotations/DefaultNonNull.java
@@ -14,6 +14,6 @@ import java.lang.annotation.ElementType;
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.FIELD, ElementType.METHOD, ElementType.TYPE_USE, ElementType.PARAMETER, ElementType.CONSTRUCTOR, ElementType.PACKAGE, ElementType.TYPE})
-public @interface DefaultNotNull {
+public @interface DefaultNonNull {
 
 }
\ No newline at end of file