diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/annotatedWildcards.kt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/annotatedWildcards.kt
index d203e2a7994..006da1e852e 100644
--- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/annotatedWildcards.kt
+++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/annotatedWildcards.kt
@@ -1,14 +1,14 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
 // FILE: A.java
 
-import jspecify.annotations.*;
+import org.jspecify.annotations.*;
 
 public class A<T extends @NotNull Object, E extends @Nullable Object, F extends @NullnessUnknown Object> {
 }
 
 // FILE: B.java
 
-import jspecify.annotations.*;
+import org.jspecify.annotations.*;
 
 public class B {
     public void superAsIs(A<? super CharSequence, ? super CharSequence, ? super CharSequence> a) {}
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/annotatedWildcards.txt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/annotatedWildcards.txt
index f7dcb92598f..91b6b1ccdc1 100644
--- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/annotatedWildcards.txt
+++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/annotatedWildcards.txt
@@ -2,8 +2,8 @@ package
 
 public fun main(/*0*/ aNotNullNotNullNotNull: A<kotlin.String, kotlin.String, kotlin.String>, /*1*/ aNotNullNotNullNull: A<kotlin.String, kotlin.String, kotlin.String?>, /*2*/ aNotNullNullNotNull: A<kotlin.String, kotlin.String?, kotlin.String>, /*3*/ aNotNullNullNull: A<kotlin.String, kotlin.String?, kotlin.String?>, /*4*/ aAnyNotNullNotNullNotNull: A<kotlin.Any, kotlin.Any, kotlin.Any>, /*5*/ aAnyNotNullNotNullNull: A<kotlin.Any, kotlin.Any, kotlin.Any?>, /*6*/ aAnyNotNullNullNotNull: A<kotlin.Any, kotlin.Any?, kotlin.Any>, /*7*/ aAnyNotNullNullNull: A<kotlin.Any, kotlin.Any?, kotlin.Any?>, /*8*/ b: B): kotlin.Unit
 
-public open class A</*0*/ T : @jspecify.annotations.NotNull kotlin.Any, /*1*/ E, /*2*/ F : @jspecify.annotations.NullnessUnknown kotlin.Any!> {
-    public constructor A</*0*/ T : @jspecify.annotations.NotNull kotlin.Any, /*1*/ E, /*2*/ F : @jspecify.annotations.NullnessUnknown kotlin.Any!>()
+public open class A</*0*/ T : @org.jspecify.annotations.NotNull kotlin.Any, /*1*/ E, /*2*/ F : @org.jspecify.annotations.NullnessUnknown kotlin.Any!> {
+    public constructor A</*0*/ T : @org.jspecify.annotations.NotNull kotlin.Any, /*1*/ E, /*2*/ F : @org.jspecify.annotations.NullnessUnknown kotlin.Any!>()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
@@ -13,12 +13,12 @@ public open class B {
     public constructor B()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open fun extendsAsIs(/*0*/ a: A<out kotlin.CharSequence, out kotlin.CharSequence?, out kotlin.CharSequence!>!): kotlin.Unit
-    public open fun extendsNotNull(/*0*/ a: A<out @jspecify.annotations.NotNull kotlin.CharSequence, out @jspecify.annotations.NotNull kotlin.CharSequence, out @jspecify.annotations.NotNull kotlin.CharSequence>!): kotlin.Unit
-    public open fun extendsNullable(/*0*/ a: A<out @jspecify.annotations.Nullable kotlin.CharSequence?, out @jspecify.annotations.Nullable kotlin.CharSequence?, out @jspecify.annotations.Nullable kotlin.CharSequence?>!): kotlin.Unit
+    public open fun extendsNotNull(/*0*/ a: A<out @org.jspecify.annotations.NotNull kotlin.CharSequence, out @org.jspecify.annotations.NotNull kotlin.CharSequence, out @org.jspecify.annotations.NotNull kotlin.CharSequence>!): kotlin.Unit
+    public open fun extendsNullable(/*0*/ a: A<out @org.jspecify.annotations.Nullable kotlin.CharSequence?, out @org.jspecify.annotations.Nullable kotlin.CharSequence?, out @org.jspecify.annotations.Nullable kotlin.CharSequence?>!): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open fun noBounds(/*0*/ a: A<*, *, *>!): kotlin.Unit
     public open fun superAsIs(/*0*/ a: A<in kotlin.CharSequence, in kotlin.CharSequence?, in kotlin.CharSequence!>!): kotlin.Unit
-    public open fun superNotNull(/*0*/ a: A<in @jspecify.annotations.NotNull kotlin.CharSequence, in @jspecify.annotations.NotNull kotlin.CharSequence, in @jspecify.annotations.NotNull kotlin.CharSequence>!): kotlin.Unit
-    public open fun superNullable(/*0*/ a: A<in @jspecify.annotations.Nullable kotlin.CharSequence?, in @jspecify.annotations.Nullable kotlin.CharSequence?, in @jspecify.annotations.Nullable kotlin.CharSequence?>!): kotlin.Unit
+    public open fun superNotNull(/*0*/ a: A<in @org.jspecify.annotations.NotNull kotlin.CharSequence, in @org.jspecify.annotations.NotNull kotlin.CharSequence, in @org.jspecify.annotations.NotNull kotlin.CharSequence>!): kotlin.Unit
+    public open fun superNullable(/*0*/ a: A<in @org.jspecify.annotations.Nullable kotlin.CharSequence?, in @org.jspecify.annotations.Nullable kotlin.CharSequence?, in @org.jspecify.annotations.Nullable kotlin.CharSequence?>!): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/defaults.kt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/defaults.kt
index aac97d39704..92a91d7f78c 100644
--- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/defaults.kt
+++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/defaults.kt
@@ -1,7 +1,7 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
 // FILE: A.java
 
-import jspecify.annotations.*;
+import org.jspecify.annotations.*;
 
 @DefaultNotNull
 public class A {
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/defaults.txt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/defaults.txt
index 9e24e414e8b..ebf64e9da09 100644
--- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/defaults.txt
+++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/defaults.txt
@@ -2,16 +2,16 @@ package
 
 public fun main(/*0*/ a: A): kotlin.Unit
 
-@jspecify.annotations.DefaultNotNull public open class A {
+@org.jspecify.annotations.DefaultNotNull public open class A {
     public constructor A()
     public final var defaultField: kotlin.String
-    @jspecify.annotations.Nullable public final var field: kotlin.String?
+    @org.jspecify.annotations.Nullable public final var field: @org.jspecify.annotations.Nullable kotlin.String?
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open fun everythingNotNullable(/*0*/ x: kotlin.String): kotlin.String
-    @jspecify.annotations.DefaultNullable public open fun everythingNullable(/*0*/ x: kotlin.String?): kotlin.String?
-    @jspecify.annotations.DefaultNullnessUnknown public open fun everythingUnknown(/*0*/ x: kotlin.String!): kotlin.String!
-    public open fun explicitlyNullnessUnknown(/*0*/ @jspecify.annotations.NullnessUnknown x: kotlin.String!): kotlin.String
+    @org.jspecify.annotations.DefaultNullable public open fun everythingNullable(/*0*/ x: kotlin.String?): @org.jspecify.annotations.DefaultNullable kotlin.String?
+    @org.jspecify.annotations.DefaultNullnessUnknown public open fun everythingUnknown(/*0*/ x: kotlin.String!): @org.jspecify.annotations.DefaultNullnessUnknown kotlin.String!
+    public open fun explicitlyNullnessUnknown(/*0*/ @org.jspecify.annotations.NullnessUnknown x: @org.jspecify.annotations.NullnessUnknown kotlin.String!): kotlin.String
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    @jspecify.annotations.DefaultNullable public open fun mixed(/*0*/ @jspecify.annotations.NotNull x: kotlin.String): kotlin.String?
+    @org.jspecify.annotations.DefaultNullable public open fun mixed(/*0*/ @org.jspecify.annotations.NotNull x: @org.jspecify.annotations.NotNull kotlin.String): @org.jspecify.annotations.DefaultNullable kotlin.String?
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/ignoreAnnotations.kt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/ignoreAnnotations.kt
index c380da96501..c6399cd9120 100644
--- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/ignoreAnnotations.kt
+++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/ignoreAnnotations.kt
@@ -2,7 +2,7 @@
 // CODE_ANALYSIS_STATE ignore
 // FILE: A.java
 
-import jspecify.annotations.*;
+import org.jspecify.annotations.*;
 
 public class A {
     @Nullable public String field = null;
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/ignoreAnnotations.txt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/ignoreAnnotations.txt
index 37e017d6354..10bd7f8e480 100644
--- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/ignoreAnnotations.txt
+++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/ignoreAnnotations.txt
@@ -4,13 +4,13 @@ public fun main(/*0*/ a: A): kotlin.Unit
 
 public open class A {
     public constructor A()
-    @jspecify.annotations.Nullable public final var field: kotlin.String!
-    @jspecify.annotations.NotNull public open fun bar(): kotlin.String!
+    @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
-    @jspecify.annotations.DefaultNotNull public open fun everythingNotNullable(/*0*/ x: kotlin.String!): kotlin.String!
-    @jspecify.annotations.DefaultNullable public open fun everythingNullable(/*0*/ x: kotlin.String!): kotlin.String!
-    @jspecify.annotations.DefaultNullnessUnknown public open fun everythingUnknown(/*0*/ x: kotlin.String!): kotlin.String!
-    @jspecify.annotations.Nullable public open fun foo(/*0*/ @jspecify.annotations.NotNull x: kotlin.String!, /*1*/ @jspecify.annotations.NullnessUnknown y: kotlin.CharSequence!): kotlin.String!
+    @org.jspecify.annotations.DefaultNotNull public open fun everythingNotNullable(/*0*/ x: kotlin.String!): @org.jspecify.annotations.DefaultNotNull kotlin.String!
+    @org.jspecify.annotations.DefaultNullable public open fun everythingNullable(/*0*/ x: kotlin.String!): @org.jspecify.annotations.DefaultNullable kotlin.String!
+    @org.jspecify.annotations.DefaultNullnessUnknown public open fun everythingUnknown(/*0*/ x: kotlin.String!): @org.jspecify.annotations.DefaultNullnessUnknown 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.NullnessUnknown y: @org.jspecify.annotations.NullnessUnknown kotlin.CharSequence!): @org.jspecify.annotations.Nullable kotlin.String!
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/nonPlatformTypeParameter.kt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/nonPlatformTypeParameter.kt
index bf43680b83a..fe8ea95df44 100644
--- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/nonPlatformTypeParameter.kt
+++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/nonPlatformTypeParameter.kt
@@ -1,7 +1,7 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
 // FILE: A.java
 
-import jspecify.annotations.*;
+import org.jspecify.annotations.*;
 
 public class A<T extends @Nullable Object> {
     public void foo(T t) {}
@@ -10,7 +10,7 @@ public class A<T extends @Nullable Object> {
 
 // FILE: B.java
 
-import jspecify.annotations.*;
+import org.jspecify.annotations.*;
 
 @DefaultNullable
 public class B<T> {
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/nonPlatformTypeParameter.txt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/nonPlatformTypeParameter.txt
index f5509fb1e25..d6c516a4c1b 100644
--- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/nonPlatformTypeParameter.txt
+++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/nonPlatformTypeParameter.txt
@@ -11,7 +11,7 @@ public open class A</*0*/ T> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-@jspecify.annotations.DefaultNullable public open class B</*0*/ T> {
+@org.jspecify.annotations.DefaultNullable public open class B</*0*/ T> {
     public constructor B</*0*/ T>()
     public open fun </*0*/ E> 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/selfType.kt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/selfType.kt
new file mode 100644
index 00000000000..eb5e0f1afec
--- /dev/null
+++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/selfType.kt
@@ -0,0 +1,48 @@
+// !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
+// FILE: A.java
+
+import org.jspecify.annotations.*;
+
+public class A<T extends @NotNull A<T>> {
+    public void foo(T t) {}
+}
+
+// FILE: B.java
+public class B extends A<B> {}
+
+// FILE: C.java
+import org.jspecify.annotations.*;
+public class C<E extends @NotNull C<E>> extends A<E> {}
+
+// FILE: main.kt
+
+class AK : A<AK>()
+class AKN : A<<!UPPER_BOUND_VIOLATED!>AK?<!>>()
+
+class BK : B()
+
+class CK : C<CK>()
+class CKN : C<<!UPPER_BOUND_VIOLATED!>CK?<!>>()
+
+fun main(
+    ak: AK,
+    akn: AKN,
+    bk: BK,
+    ck: CK,
+    ckn: CKN
+) {
+    ak.foo(ak)
+    ak.foo(<!NULL_FOR_NONNULL_TYPE!>null<!>)
+
+    akn.foo(<!TYPE_MISMATCH!>akn<!>)
+    akn.foo(<!NULL_FOR_NONNULL_TYPE!>null<!>)
+
+    bk.foo(bk)
+    bk.foo(<!NULL_FOR_NONNULL_TYPE!>null<!>)
+
+    ck.foo(ck)
+    ck.foo(<!NULL_FOR_NONNULL_TYPE!>null<!>)
+
+    ckn.foo(<!TYPE_MISMATCH!>ckn<!>)
+    ckn.foo(<!NULL_FOR_NONNULL_TYPE!>null<!>)
+}
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/selfType.txt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/selfType.txt
new file mode 100644
index 00000000000..0ddc94ba0d2
--- /dev/null
+++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/selfType.txt
@@ -0,0 +1,67 @@
+package
+
+public fun main(/*0*/ ak: AK, /*1*/ akn: AKN, /*2*/ bk: BK, /*3*/ ck: CK, /*4*/ ckn: CKN): kotlin.Unit
+
+public open class A</*0*/ T : @org.jspecify.annotations.NotNull A<T!>> {
+    public constructor A</*0*/ T : @org.jspecify.annotations.NotNull A<T!>>()
+    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
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
+
+public final class AK : A<AK> {
+    public constructor AK()
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun foo(/*0*/ t: AK): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
+
+public final class AKN : A<AK?> {
+    public constructor AKN()
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun foo(/*0*/ t: AK): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
+
+public open class B : A<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 foo(/*0*/ t: B): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
+
+public final class BK : B {
+    public constructor BK()
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun foo(/*0*/ t: B): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
+
+public open class C</*0*/ E : @org.jspecify.annotations.NotNull C<E!>> : A<E!> {
+    public constructor C</*0*/ E : @org.jspecify.annotations.NotNull C<E!>>()
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun foo(/*0*/ t: E): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
+
+public final class CK : C<CK> {
+    public constructor CK()
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun foo(/*0*/ t: CK): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
+
+public final class CKN : C<CK?> {
+    public constructor CKN()
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun foo(/*0*/ t: CK): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/simple.kt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/simple.kt
index ac2efa003ec..6e5260b99a1 100644
--- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/simple.kt
+++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/simple.kt
@@ -1,7 +1,7 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
 // FILE: A.java
 
-import jspecify.annotations.*;
+import org.jspecify.annotations.*;
 
 public class A {
     @Nullable public String field = null;
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/simple.txt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/simple.txt
index 30fa5fd05f9..6607178b3f3 100644
--- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/simple.txt
+++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/simple.txt
@@ -4,10 +4,10 @@ public fun main(/*0*/ a: A): kotlin.Unit
 
 public open class A {
     public constructor A()
-    @jspecify.annotations.Nullable public final var field: kotlin.String?
-    @jspecify.annotations.NotNull public open fun bar(): kotlin.String
+    @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
-    @jspecify.annotations.Nullable public open fun foo(/*0*/ @jspecify.annotations.NotNull x: kotlin.String, /*1*/ @jspecify.annotations.NullnessUnknown y: kotlin.CharSequence!): 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.NullnessUnknown y: @org.jspecify.annotations.NullnessUnknown kotlin.CharSequence!): @org.jspecify.annotations.Nullable kotlin.String?
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/typeArgumentsFromParameterBounds.kt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/typeArgumentsFromParameterBounds.kt
index 8a7481bd264..c0d05f251c9 100644
--- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/typeArgumentsFromParameterBounds.kt
+++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/typeArgumentsFromParameterBounds.kt
@@ -1,14 +1,14 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
 // FILE: A.java
 
-import jspecify.annotations.*;
+import org.jspecify.annotations.*;
 
 public class A<T extends @NotNull Object, E extends @Nullable Object, F extends @NullnessUnknown Object> {
 }
 
 // FILE: B.java
 
-import jspecify.annotations.*;
+import org.jspecify.annotations.*;
 
 @DefaultNullable
 public class B {
@@ -17,7 +17,7 @@ public class B {
 
 // FILE: C.java
 
-import jspecify.annotations.*;
+import org.jspecify.annotations.*;
 
 @DefaultNotNull
 public class C {
@@ -26,7 +26,7 @@ public class C {
 
 // FILE: D.java
 
-import jspecify.annotations.*;
+import org.jspecify.annotations.*;
 
 @DefaultUnknownNullness
 public class D {
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/typeArgumentsFromParameterBounds.txt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/typeArgumentsFromParameterBounds.txt
index c7bbfaba312..0b88053485a 100644
--- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/typeArgumentsFromParameterBounds.txt
+++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/typeArgumentsFromParameterBounds.txt
@@ -2,14 +2,14 @@ package
 
 public fun main(/*0*/ aNotNullNotNullNotNull: A<kotlin.String, kotlin.String, kotlin.String>, /*1*/ aNotNullNotNullNull: A<kotlin.String, kotlin.String, kotlin.String?>, /*2*/ aNotNullNullNotNull: A<kotlin.String, kotlin.String?, kotlin.String>, /*3*/ aNotNullNullNull: A<kotlin.String, kotlin.String?, kotlin.String?>, /*4*/ b: B, /*5*/ c: C, /*6*/ d: D): kotlin.Unit
 
-public open class A</*0*/ T : @jspecify.annotations.NotNull kotlin.Any, /*1*/ E, /*2*/ F : @jspecify.annotations.NullnessUnknown kotlin.Any!> {
-    public constructor A</*0*/ T : @jspecify.annotations.NotNull kotlin.Any, /*1*/ E, /*2*/ F : @jspecify.annotations.NullnessUnknown kotlin.Any!>()
+public open class A</*0*/ T : @org.jspecify.annotations.NotNull kotlin.Any, /*1*/ E, /*2*/ F : @org.jspecify.annotations.NullnessUnknown kotlin.Any!> {
+    public constructor A</*0*/ T : @org.jspecify.annotations.NotNull kotlin.Any, /*1*/ E, /*2*/ F : @org.jspecify.annotations.NullnessUnknown kotlin.Any!>()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-@jspecify.annotations.DefaultNullable public open class B {
+@org.jspecify.annotations.DefaultNullable public open class B {
     public constructor B()
     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
@@ -17,7 +17,7 @@ public open class A</*0*/ T : @jspecify.annotations.NotNull kotlin.Any, /*1*/ E,
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-@jspecify.annotations.DefaultNotNull public open class C {
+@org.jspecify.annotations.DefaultNotNull 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/typeParameterBounds.kt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/typeParameterBounds.kt
index 01c5195791c..b2a60477251 100644
--- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/typeParameterBounds.kt
+++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/typeParameterBounds.kt
@@ -1,7 +1,7 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
 // FILE: A.java
 
-import jspecify.annotations.*;
+import org.jspecify.annotations.*;
 
 public class A<T extends @NotNull Object> {
     public void foo(T t) {}
@@ -10,7 +10,7 @@ public class A<T extends @NotNull Object> {
 
 // FILE: B.java
 
-import jspecify.annotations.*;
+import org.jspecify.annotations.*;
 
 @DefaultNotNull
 public class B<T> {
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/typeParameterBounds.txt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/typeParameterBounds.txt
index 175ddb83d32..46aae47ccb0 100644
--- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/typeParameterBounds.txt
+++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/typeParameterBounds.txt
@@ -2,16 +2,16 @@ package
 
 public fun main(/*0*/ a1: A<kotlin.Any?>, /*1*/ a2: A<kotlin.String>, /*2*/ b1: B<kotlin.Any?>, /*3*/ b2: B<kotlin.String>): kotlin.Unit
 
-public open class A</*0*/ T : @jspecify.annotations.NotNull kotlin.Any> {
-    public constructor A</*0*/ T : @jspecify.annotations.NotNull kotlin.Any>()
-    public open fun </*0*/ E : @jspecify.annotations.NotNull kotlin.Any> bar(/*0*/ e: E): kotlin.Unit
+public open class A</*0*/ T : @org.jspecify.annotations.NotNull kotlin.Any> {
+    public constructor A</*0*/ T : @org.jspecify.annotations.NotNull kotlin.Any>()
+    public open fun </*0*/ E : @org.jspecify.annotations.NotNull kotlin.Any> bar(/*0*/ e: E): 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
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-@jspecify.annotations.DefaultNotNull public open class B</*0*/ T : kotlin.Any> {
+@org.jspecify.annotations.DefaultNotNull 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 0091cae1e1a..54c18360638 100644
--- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/unknownNullnessTypeParameter.kt
+++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/unknownNullnessTypeParameter.kt
@@ -1,7 +1,7 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
 // FILE: A.java
 
-import jspecify.annotations.*;
+import org.jspecify.annotations.*;
 
 public class A<T> {
     public void foo(T t) {}
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/unknownNullnessTypeParameter.txt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/unknownNullnessTypeParameter.txt
index d3749530b1f..db743b4fc47 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!>()
-    @jspecify.annotations.DefaultNotNull public open fun bar(/*0*/ s: kotlin.String, /*1*/ t: T!): kotlin.Unit
+    @org.jspecify.annotations.DefaultNotNull 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/annotatedWildcards.kt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/annotatedWildcards.kt
index f40193b3388..4794c08f07b 100644
--- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/annotatedWildcards.kt
+++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/annotatedWildcards.kt
@@ -2,14 +2,14 @@
 // CODE_ANALYSIS_STATE warn
 // FILE: A.java
 
-import jspecify.annotations.*;
+import org.jspecify.annotations.*;
 
 public class A<T extends @NotNull Object, E extends @Nullable Object, F extends @NullnessUnknown Object> {
 }
 
 // FILE: B.java
 
-import jspecify.annotations.*;
+import org.jspecify.annotations.*;
 
 public class B {
     public void superAsIs(A<? super CharSequence, ? super CharSequence, ? super CharSequence> a) {}
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/annotatedWildcards.txt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/annotatedWildcards.txt
index eff6486faab..41f2380a39c 100644
--- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/annotatedWildcards.txt
+++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/annotatedWildcards.txt
@@ -2,8 +2,8 @@ package
 
 public fun main(/*0*/ aNotNullNotNullNotNull: A<kotlin.String, kotlin.String, kotlin.String>, /*1*/ aNotNullNotNullNull: A<kotlin.String, kotlin.String, kotlin.String?>, /*2*/ aNotNullNullNotNull: A<kotlin.String, kotlin.String?, kotlin.String>, /*3*/ aNotNullNullNull: A<kotlin.String, kotlin.String?, kotlin.String?>, /*4*/ aAnyNotNullNotNullNotNull: A<kotlin.Any, kotlin.Any, kotlin.Any>, /*5*/ aAnyNotNullNotNullNull: A<kotlin.Any, kotlin.Any, kotlin.Any?>, /*6*/ aAnyNotNullNullNotNull: A<kotlin.Any, kotlin.Any?, kotlin.Any>, /*7*/ aAnyNotNullNullNull: A<kotlin.Any, kotlin.Any?, kotlin.Any?>, /*8*/ b: B): kotlin.Unit
 
-public open class A</*0*/ T : @jspecify.annotations.NotNull kotlin.Any!, /*1*/ E : @jspecify.annotations.Nullable kotlin.Any!, /*2*/ F : @jspecify.annotations.NullnessUnknown kotlin.Any!> {
-    public constructor A</*0*/ T : @jspecify.annotations.NotNull kotlin.Any!, /*1*/ E : @jspecify.annotations.Nullable kotlin.Any!, /*2*/ F : @jspecify.annotations.NullnessUnknown kotlin.Any!>()
+public open class A</*0*/ T : @org.jspecify.annotations.NotNull kotlin.Any!, /*1*/ E : @org.jspecify.annotations.Nullable kotlin.Any!, /*2*/ F : @org.jspecify.annotations.NullnessUnknown kotlin.Any!> {
+    public constructor A</*0*/ T : @org.jspecify.annotations.NotNull kotlin.Any!, /*1*/ E : @org.jspecify.annotations.Nullable kotlin.Any!, /*2*/ F : @org.jspecify.annotations.NullnessUnknown kotlin.Any!>()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
@@ -13,12 +13,12 @@ public open class B {
     public constructor B()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open fun extendsAsIs(/*0*/ a: A<out kotlin.CharSequence!, out kotlin.CharSequence!, out kotlin.CharSequence!>!): kotlin.Unit
-    public open fun extendsNotNull(/*0*/ a: A<out @jspecify.annotations.NotNull kotlin.CharSequence!, out @jspecify.annotations.NotNull kotlin.CharSequence!, out @jspecify.annotations.NotNull kotlin.CharSequence!>!): kotlin.Unit
-    public open fun extendsNullable(/*0*/ a: A<out @jspecify.annotations.Nullable kotlin.CharSequence!, out @jspecify.annotations.Nullable kotlin.CharSequence!, out @jspecify.annotations.Nullable kotlin.CharSequence!>!): kotlin.Unit
+    public open fun extendsNotNull(/*0*/ a: A<out @org.jspecify.annotations.NotNull kotlin.CharSequence!, out @org.jspecify.annotations.NotNull kotlin.CharSequence!, out @org.jspecify.annotations.NotNull kotlin.CharSequence!>!): kotlin.Unit
+    public open fun extendsNullable(/*0*/ a: A<out @org.jspecify.annotations.Nullable kotlin.CharSequence!, out @org.jspecify.annotations.Nullable kotlin.CharSequence!, out @org.jspecify.annotations.Nullable kotlin.CharSequence!>!): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open fun noBounds(/*0*/ a: A<*, *, *>!): kotlin.Unit
     public open fun superAsIs(/*0*/ a: A<in kotlin.CharSequence!, in kotlin.CharSequence!, in kotlin.CharSequence!>!): kotlin.Unit
-    public open fun superNotNull(/*0*/ a: A<in @jspecify.annotations.NotNull kotlin.CharSequence!, in @jspecify.annotations.NotNull kotlin.CharSequence!, in @jspecify.annotations.NotNull kotlin.CharSequence!>!): kotlin.Unit
-    public open fun superNullable(/*0*/ a: A<in @jspecify.annotations.Nullable kotlin.CharSequence!, in @jspecify.annotations.Nullable kotlin.CharSequence!, in @jspecify.annotations.Nullable kotlin.CharSequence!>!): kotlin.Unit
+    public open fun superNotNull(/*0*/ a: A<in @org.jspecify.annotations.NotNull kotlin.CharSequence!, in @org.jspecify.annotations.NotNull kotlin.CharSequence!, in @org.jspecify.annotations.NotNull kotlin.CharSequence!>!): kotlin.Unit
+    public open fun superNullable(/*0*/ a: A<in @org.jspecify.annotations.Nullable kotlin.CharSequence!, in @org.jspecify.annotations.Nullable kotlin.CharSequence!, in @org.jspecify.annotations.Nullable kotlin.CharSequence!>!): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/defaults.kt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/defaults.kt
index f2b15fcc6c6..7656b0a2a68 100644
--- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/defaults.kt
+++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/defaults.kt
@@ -2,7 +2,7 @@
 // CODE_ANALYSIS_STATE warn
 // FILE: A.java
 
-import jspecify.annotations.*;
+import org.jspecify.annotations.*;
 
 @DefaultNotNull
 public class A {
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/defaults.txt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/defaults.txt
index 01a316942d7..95a2cdcbf65 100644
--- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/defaults.txt
+++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/defaults.txt
@@ -2,16 +2,16 @@ package
 
 public fun main(/*0*/ a: A): kotlin.Unit
 
-@jspecify.annotations.DefaultNotNull public open class A {
+@org.jspecify.annotations.DefaultNotNull public open class A {
     public constructor A()
     public final var defaultField: kotlin.String!
-    @jspecify.annotations.Nullable public final var field: kotlin.String!
+    @org.jspecify.annotations.Nullable public final var field: @org.jspecify.annotations.Nullable kotlin.String!
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open fun everythingNotNullable(/*0*/ x: kotlin.String!): kotlin.String!
-    @jspecify.annotations.DefaultNullable public open fun everythingNullable(/*0*/ x: kotlin.String!): kotlin.String!
-    @jspecify.annotations.DefaultNullnessUnknown public open fun everythingUnknown(/*0*/ x: kotlin.String!): kotlin.String!
-    public open fun explicitlyNullnessUnknown(/*0*/ @jspecify.annotations.NullnessUnknown x: kotlin.String!): kotlin.String!
+    @org.jspecify.annotations.DefaultNullable public open fun everythingNullable(/*0*/ x: kotlin.String!): @org.jspecify.annotations.DefaultNullable kotlin.String!
+    @org.jspecify.annotations.DefaultNullnessUnknown public open fun everythingUnknown(/*0*/ x: kotlin.String!): @org.jspecify.annotations.DefaultNullnessUnknown kotlin.String!
+    public open fun explicitlyNullnessUnknown(/*0*/ @org.jspecify.annotations.NullnessUnknown x: @org.jspecify.annotations.NullnessUnknown kotlin.String!): kotlin.String!
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    @jspecify.annotations.DefaultNullable public open fun mixed(/*0*/ @jspecify.annotations.NotNull x: kotlin.String!): kotlin.String!
+    @org.jspecify.annotations.DefaultNullable public open fun mixed(/*0*/ @org.jspecify.annotations.NotNull x: @org.jspecify.annotations.NotNull kotlin.String!): @org.jspecify.annotations.DefaultNullable kotlin.String!
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/nonPlatformTypeParameter.kt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/nonPlatformTypeParameter.kt
index 5af1a774f0b..9ffe3e92745 100644
--- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/nonPlatformTypeParameter.kt
+++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/nonPlatformTypeParameter.kt
@@ -2,7 +2,7 @@
 // CODE_ANALYSIS_STATE warn
 // FILE: A.java
 
-import jspecify.annotations.*;
+import org.jspecify.annotations.*;
 
 public class A<T extends @Nullable Object> {
     public void foo(T t) {}
@@ -11,7 +11,7 @@ public class A<T extends @Nullable Object> {
 
 // FILE: B.java
 
-import jspecify.annotations.*;
+import org.jspecify.annotations.*;
 
 @DefaultNullable
 public class B<T> {
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/nonPlatformTypeParameter.txt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/nonPlatformTypeParameter.txt
index b33c1d298c9..edcb601d7e5 100644
--- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/nonPlatformTypeParameter.txt
+++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/nonPlatformTypeParameter.txt
@@ -2,16 +2,16 @@ package
 
 public fun main(/*0*/ a1: A<kotlin.Any?>, /*1*/ a2: A<kotlin.String>, /*2*/ b1: B<kotlin.Any?>, /*3*/ b2: B<kotlin.String>): kotlin.Unit
 
-public open class A</*0*/ T : @jspecify.annotations.Nullable kotlin.Any!> {
-    public constructor A</*0*/ T : @jspecify.annotations.Nullable kotlin.Any!>()
-    public open fun </*0*/ E : @jspecify.annotations.Nullable kotlin.Any!> bar(/*0*/ e: E!): kotlin.Unit
+public open class A</*0*/ T : @org.jspecify.annotations.Nullable kotlin.Any!> {
+    public constructor A</*0*/ T : @org.jspecify.annotations.Nullable kotlin.Any!>()
+    public open fun </*0*/ E : @org.jspecify.annotations.Nullable kotlin.Any!> bar(/*0*/ e: E!): 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
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-@jspecify.annotations.DefaultNullable public open class B</*0*/ T : kotlin.Any!> {
+@org.jspecify.annotations.DefaultNullable 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/simple.kt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/simple.kt
index 5abcb92e706..97cd708e06c 100644
--- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/simple.kt
+++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/simple.kt
@@ -2,7 +2,7 @@
 // CODE_ANALYSIS_STATE warn
 // FILE: A.java
 
-import jspecify.annotations.*;
+import org.jspecify.annotations.*;
 
 public class A {
     @Nullable public String field = null;
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/simple.txt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/simple.txt
index 6465a2936c6..7eaff58916c 100644
--- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/simple.txt
+++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/simple.txt
@@ -4,10 +4,10 @@ public fun main(/*0*/ a: A): kotlin.Unit
 
 public open class A {
     public constructor A()
-    @jspecify.annotations.Nullable public final var field: kotlin.String!
-    @jspecify.annotations.NotNull public open fun bar(): kotlin.String!
+    @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
-    @jspecify.annotations.Nullable public open fun foo(/*0*/ @jspecify.annotations.NotNull x: kotlin.String!, /*1*/ @jspecify.annotations.NullnessUnknown y: kotlin.CharSequence!): 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.NullnessUnknown y: @org.jspecify.annotations.NullnessUnknown kotlin.CharSequence!): @org.jspecify.annotations.Nullable kotlin.String!
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/typeArgumentsFromParameterBounds.kt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/typeArgumentsFromParameterBounds.kt
index e5911cbb72b..2ac02618e2e 100644
--- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/typeArgumentsFromParameterBounds.kt
+++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/typeArgumentsFromParameterBounds.kt
@@ -2,14 +2,14 @@
 // CODE_ANALYSIS_STATE warn
 // FILE: A.java
 
-import jspecify.annotations.*;
+import org.jspecify.annotations.*;
 
 public class A<T extends @NotNull Object, E extends @Nullable Object, F extends @NullnessUnknown Object> {
 }
 
 // FILE: B.java
 
-import jspecify.annotations.*;
+import org.jspecify.annotations.*;
 
 @DefaultNullable
 public class B {
@@ -18,7 +18,7 @@ public class B {
 
 // FILE: C.java
 
-import jspecify.annotations.*;
+import org.jspecify.annotations.*;
 
 @DefaultNotNull
 public class C {
@@ -27,7 +27,7 @@ public class C {
 
 // FILE: D.java
 
-import jspecify.annotations.*;
+import org.jspecify.annotations.*;
 
 @DefaultNullnessUnknown
 public class D {
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/typeArgumentsFromParameterBounds.txt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/typeArgumentsFromParameterBounds.txt
index 59254108ab4..94badfa0556 100644
--- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/typeArgumentsFromParameterBounds.txt
+++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/typeArgumentsFromParameterBounds.txt
@@ -2,14 +2,14 @@ package
 
 public fun main(/*0*/ aNotNullNotNullNotNull: A<kotlin.String, kotlin.String, kotlin.String>, /*1*/ aNotNullNotNullNull: A<kotlin.String, kotlin.String, kotlin.String?>, /*2*/ aNotNullNullNotNull: A<kotlin.String, kotlin.String?, kotlin.String>, /*3*/ aNotNullNullNull: A<kotlin.String, kotlin.String?, kotlin.String?>, /*4*/ b: B, /*5*/ c: C, /*6*/ d: D): kotlin.Unit
 
-public open class A</*0*/ T : @jspecify.annotations.NotNull kotlin.Any!, /*1*/ E : @jspecify.annotations.Nullable kotlin.Any!, /*2*/ F : @jspecify.annotations.NullnessUnknown kotlin.Any!> {
-    public constructor A</*0*/ T : @jspecify.annotations.NotNull kotlin.Any!, /*1*/ E : @jspecify.annotations.Nullable kotlin.Any!, /*2*/ F : @jspecify.annotations.NullnessUnknown kotlin.Any!>()
+public open class A</*0*/ T : @org.jspecify.annotations.NotNull kotlin.Any!, /*1*/ E : @org.jspecify.annotations.Nullable kotlin.Any!, /*2*/ F : @org.jspecify.annotations.NullnessUnknown kotlin.Any!> {
+    public constructor A</*0*/ T : @org.jspecify.annotations.NotNull kotlin.Any!, /*1*/ E : @org.jspecify.annotations.Nullable kotlin.Any!, /*2*/ F : @org.jspecify.annotations.NullnessUnknown kotlin.Any!>()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-@jspecify.annotations.DefaultNullable public open class B {
+@org.jspecify.annotations.DefaultNullable public open class B {
     public constructor B()
     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
@@ -17,7 +17,7 @@ public open class A</*0*/ T : @jspecify.annotations.NotNull kotlin.Any!, /*1*/ E
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-@jspecify.annotations.DefaultNotNull public open class C {
+@org.jspecify.annotations.DefaultNotNull 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 : @jspecify.annotations.NotNull kotlin.Any!, /*1*/ E
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-@jspecify.annotations.DefaultNullnessUnknown public open class D {
+@org.jspecify.annotations.DefaultNullnessUnknown 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/warnings/typeParameterBounds.kt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/typeParameterBounds.kt
index c7dbd329a0e..a430cb95713 100644
--- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/typeParameterBounds.kt
+++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/typeParameterBounds.kt
@@ -2,7 +2,7 @@
 // CODE_ANALYSIS_STATE warn
 // FILE: A.java
 
-import jspecify.annotations.*;
+import org.jspecify.annotations.*;
 
 public class A<T extends @NotNull Object> {
     public void foo(T t) {}
@@ -11,7 +11,7 @@ public class A<T extends @NotNull Object> {
 
 // FILE: B.java
 
-import jspecify.annotations.*;
+import org.jspecify.annotations.*;
 
 @DefaultNotNull
 public class B<T> {
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/typeParameterBounds.txt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/typeParameterBounds.txt
index a48a2b051a7..20ed2e3cee7 100644
--- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/typeParameterBounds.txt
+++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/typeParameterBounds.txt
@@ -2,16 +2,16 @@ package
 
 public fun main(/*0*/ a1: A<kotlin.Any?>, /*1*/ a2: A<kotlin.String>, /*2*/ b1: B<kotlin.Any?>, /*3*/ b2: B<kotlin.String>): kotlin.Unit
 
-public open class A</*0*/ T : @jspecify.annotations.NotNull kotlin.Any!> {
-    public constructor A</*0*/ T : @jspecify.annotations.NotNull kotlin.Any!>()
-    public open fun </*0*/ E : @jspecify.annotations.NotNull kotlin.Any!> bar(/*0*/ e: E!): kotlin.Unit
+public open class A</*0*/ T : @org.jspecify.annotations.NotNull kotlin.Any!> {
+    public constructor A</*0*/ T : @org.jspecify.annotations.NotNull kotlin.Any!>()
+    public open fun </*0*/ E : @org.jspecify.annotations.NotNull kotlin.Any!> bar(/*0*/ e: E!): 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
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-@jspecify.annotations.DefaultNotNull public open class B</*0*/ T : kotlin.Any!> {
+@org.jspecify.annotations.DefaultNotNull 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 e5599a99eed..6938226956b 100644
--- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/unknownNullnessTypeParameter.kt
+++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/unknownNullnessTypeParameter.kt
@@ -2,7 +2,7 @@
 // CODE_ANALYSIS_STATE warn
 // FILE: A.java
 
-import jspecify.annotations.*;
+import org.jspecify.annotations.*;
 
 public class A<T> {
     public void foo(T t) {}
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/unknownNullnessTypeParameter.txt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/unknownNullnessTypeParameter.txt
index 46780c3daf6..f8b6dc015bc 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!>()
-    @jspecify.annotations.DefaultNotNull public open fun bar(/*0*/ s: kotlin.String!, /*1*/ t: T!): kotlin.Unit
+    @org.jspecify.annotations.DefaultNotNull 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 7104d835cb1..05bfb8689ae 100644
--- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/wildcardsWithDefault.kt
+++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/wildcardsWithDefault.kt
@@ -2,14 +2,14 @@
 // CODE_ANALYSIS_STATE warn
 // FILE: A.java
 
-import jspecify.annotations.*;
+import org.jspecify.annotations.*;
 
 public class A<T extends @NotNull Object, E extends @Nullable Object, F extends @NullnessUnknown Object> {
 }
 
 // FILE: B.java
 
-import jspecify.annotations.*;
+import org.jspecify.annotations.*;
 
 public class B {
     @DefaultNotNull
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/wildcardsWithDefault.txt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/wildcardsWithDefault.txt
index 62847236483..c8aecbb1265 100644
--- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/wildcardsWithDefault.txt
+++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/wildcardsWithDefault.txt
@@ -2,8 +2,8 @@ package
 
 public fun main(/*0*/ aNotNullNotNullNotNull: A<kotlin.String, kotlin.String, kotlin.String>, /*1*/ aNotNullNotNullNull: A<kotlin.String, kotlin.String, kotlin.String?>, /*2*/ aNotNullNullNotNull: A<kotlin.String, kotlin.String?, kotlin.String>, /*3*/ aNotNullNullNull: A<kotlin.String, kotlin.String?, kotlin.String?>, /*4*/ b: B): kotlin.Unit
 
-public open class A</*0*/ T : @jspecify.annotations.NotNull kotlin.Any!, /*1*/ E : @jspecify.annotations.Nullable kotlin.Any!, /*2*/ F : @jspecify.annotations.NullnessUnknown kotlin.Any!> {
-    public constructor A</*0*/ T : @jspecify.annotations.NotNull kotlin.Any!, /*1*/ E : @jspecify.annotations.Nullable kotlin.Any!, /*2*/ F : @jspecify.annotations.NullnessUnknown kotlin.Any!>()
+public open class A</*0*/ T : @org.jspecify.annotations.NotNull kotlin.Any!, /*1*/ E : @org.jspecify.annotations.Nullable kotlin.Any!, /*2*/ F : @org.jspecify.annotations.NullnessUnknown kotlin.Any!> {
+    public constructor A</*0*/ T : @org.jspecify.annotations.NotNull kotlin.Any!, /*1*/ E : @org.jspecify.annotations.Nullable kotlin.Any!, /*2*/ F : @org.jspecify.annotations.NullnessUnknown kotlin.Any!>()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
@@ -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
-    @jspecify.annotations.DefaultNotNull public open fun noBoundsNotNull(/*0*/ a: A<*, *, *>!): kotlin.Unit
-    @jspecify.annotations.DefaultNullable public open fun noBoundsNullable(/*0*/ a: A<*, *, *>!): kotlin.Unit
+    @org.jspecify.annotations.DefaultNotNull 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 72bdba8dacb..81a0dcef91a 100644
--- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/wildcardsWithDefault.kt
+++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/wildcardsWithDefault.kt
@@ -1,14 +1,14 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
 // FILE: A.java
 
-import jspecify.annotations.*;
+import org.jspecify.annotations.*;
 
 public class A<T extends @NotNull Object, E extends @Nullable Object, F extends @NullnessUnknown Object> {
 }
 
 // FILE: B.java
 
-import jspecify.annotations.*;
+import org.jspecify.annotations.*;
 
 public class B {
     @DefaultNotNull
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/wildcardsWithDefault.txt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/wildcardsWithDefault.txt
index 3fb57827e60..f9bf76b8aa3 100644
--- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/wildcardsWithDefault.txt
+++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/wildcardsWithDefault.txt
@@ -2,8 +2,8 @@ package
 
 public fun main(/*0*/ aNotNullNotNullNotNull: A<kotlin.String, kotlin.String, kotlin.String>, /*1*/ aNotNullNotNullNull: A<kotlin.String, kotlin.String, kotlin.String?>, /*2*/ aNotNullNullNotNull: A<kotlin.String, kotlin.String?, kotlin.String>, /*3*/ aNotNullNullNull: A<kotlin.String, kotlin.String?, kotlin.String?>, /*4*/ b: B): kotlin.Unit
 
-public open class A</*0*/ T : @jspecify.annotations.NotNull kotlin.Any, /*1*/ E, /*2*/ F : @jspecify.annotations.NullnessUnknown kotlin.Any!> {
-    public constructor A</*0*/ T : @jspecify.annotations.NotNull kotlin.Any, /*1*/ E, /*2*/ F : @jspecify.annotations.NullnessUnknown kotlin.Any!>()
+public open class A</*0*/ T : @org.jspecify.annotations.NotNull kotlin.Any, /*1*/ E, /*2*/ F : @org.jspecify.annotations.NullnessUnknown kotlin.Any!> {
+    public constructor A</*0*/ T : @org.jspecify.annotations.NotNull kotlin.Any, /*1*/ E, /*2*/ F : @org.jspecify.annotations.NullnessUnknown kotlin.Any!>()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
@@ -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
-    @jspecify.annotations.DefaultNotNull public open fun noBoundsNotNull(/*0*/ a: A<out @jspecify.annotations.NotNull kotlin.Any, out @jspecify.annotations.Nullable kotlin.Any, out @jspecify.annotations.NullnessUnknown kotlin.Any>): kotlin.Unit
-    @jspecify.annotations.DefaultNullable public open fun noBoundsNullable(/*0*/ a: A<out @jspecify.annotations.NotNull kotlin.Any, *, *>?): kotlin.Unit
+    @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.NullnessUnknown 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/compiler/tests-java8/tests/org/jetbrains/kotlin/checkers/ForeignJava8AnnotationsNoAnnotationInClasspathTestGenerated.java b/compiler/tests-java8/tests/org/jetbrains/kotlin/checkers/ForeignJava8AnnotationsNoAnnotationInClasspathTestGenerated.java
index d0f526a9048..04b1f39b5a4 100644
--- a/compiler/tests-java8/tests/org/jetbrains/kotlin/checkers/ForeignJava8AnnotationsNoAnnotationInClasspathTestGenerated.java
+++ b/compiler/tests-java8/tests/org/jetbrains/kotlin/checkers/ForeignJava8AnnotationsNoAnnotationInClasspathTestGenerated.java
@@ -75,6 +75,11 @@ public class ForeignJava8AnnotationsNoAnnotationInClasspathTestGenerated extends
             runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/nonPlatformTypeParameter.kt");
         }
 
+        @TestMetadata("selfType.kt")
+        public void testSelfType() throws Exception {
+            runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/selfType.kt");
+        }
+
         @TestMetadata("simple.kt")
         public void testSimple() throws Exception {
             runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/simple.kt");
diff --git a/compiler/tests-java8/tests/org/jetbrains/kotlin/checkers/ForeignJava8AnnotationsNoAnnotationInClasspathWithPsiClassReadingTestGenerated.java b/compiler/tests-java8/tests/org/jetbrains/kotlin/checkers/ForeignJava8AnnotationsNoAnnotationInClasspathWithPsiClassReadingTestGenerated.java
index 16f385a607d..40b484d2b85 100644
--- a/compiler/tests-java8/tests/org/jetbrains/kotlin/checkers/ForeignJava8AnnotationsNoAnnotationInClasspathWithPsiClassReadingTestGenerated.java
+++ b/compiler/tests-java8/tests/org/jetbrains/kotlin/checkers/ForeignJava8AnnotationsNoAnnotationInClasspathWithPsiClassReadingTestGenerated.java
@@ -75,6 +75,11 @@ public class ForeignJava8AnnotationsNoAnnotationInClasspathWithPsiClassReadingTe
             runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/nonPlatformTypeParameter.kt");
         }
 
+        @TestMetadata("selfType.kt")
+        public void testSelfType() throws Exception {
+            runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/selfType.kt");
+        }
+
         @TestMetadata("simple.kt")
         public void testSimple() throws Exception {
             runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/simple.kt");
diff --git a/compiler/tests-java8/tests/org/jetbrains/kotlin/checkers/ForeignJava8AnnotationsTestGenerated.java b/compiler/tests-java8/tests/org/jetbrains/kotlin/checkers/ForeignJava8AnnotationsTestGenerated.java
index 82089913b2e..db6e23b57df 100644
--- a/compiler/tests-java8/tests/org/jetbrains/kotlin/checkers/ForeignJava8AnnotationsTestGenerated.java
+++ b/compiler/tests-java8/tests/org/jetbrains/kotlin/checkers/ForeignJava8AnnotationsTestGenerated.java
@@ -75,6 +75,11 @@ public class ForeignJava8AnnotationsTestGenerated extends AbstractForeignJava8An
             runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/nonPlatformTypeParameter.kt");
         }
 
+        @TestMetadata("selfType.kt")
+        public void testSelfType() throws Exception {
+            runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/selfType.kt");
+        }
+
         @TestMetadata("simple.kt")
         public void testSimple() throws Exception {
             runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/simple.kt");
diff --git a/compiler/tests-java8/tests/org/jetbrains/kotlin/checkers/javac/JavacForeignJava8AnnotationsTestGenerated.java b/compiler/tests-java8/tests/org/jetbrains/kotlin/checkers/javac/JavacForeignJava8AnnotationsTestGenerated.java
index a88f2ec664b..dde61069832 100644
--- a/compiler/tests-java8/tests/org/jetbrains/kotlin/checkers/javac/JavacForeignJava8AnnotationsTestGenerated.java
+++ b/compiler/tests-java8/tests/org/jetbrains/kotlin/checkers/javac/JavacForeignJava8AnnotationsTestGenerated.java
@@ -75,6 +75,11 @@ public class JavacForeignJava8AnnotationsTestGenerated extends AbstractJavacFore
             runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/nonPlatformTypeParameter.kt");
         }
 
+        @TestMetadata("selfType.kt")
+        public void testSelfType() throws Exception {
+            runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/selfType.kt");
+        }
+
         @TestMetadata("simple.kt")
         public void testSimple() throws Exception {
             runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/simple.kt");
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 a8a00937884..f5f1a937c3a 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
@@ -18,13 +18,13 @@ package org.jetbrains.kotlin.load.java
 
 import org.jetbrains.kotlin.name.FqName
 
-val JSPECIFY_NULLABLE = FqName("jspecify.annotations.Nullable")
-val JSPECIFY_NOT_NULL = FqName("jspecify.annotations.NotNull")
-val JSPECIFY_NULLNESS_UNKNOWN = FqName("jspecify.annotations.NullnessUnknown")
+val JSPECIFY_NULLABLE = FqName("org.jspecify.annotations.Nullable")
+val JSPECIFY_NOT_NULL = FqName("org.jspecify.annotations.NotNull")
+val JSPECIFY_NULLNESS_UNKNOWN = FqName("org.jspecify.annotations.NullnessUnknown")
 
-val JSPECIFY_DEFAULT_NULLABLE = FqName("jspecify.annotations.DefaultNullable")
-val JSPECIFY_DEFAULT_NOT_NULL = FqName("jspecify.annotations.DefaultNotNull")
-val JSPECIFY_DEFAULT_NULLNESS_UNKNOWN = FqName("jspecify.annotations.DefaultNullnessUnknown")
+val JSPECIFY_DEFAULT_NULLABLE = FqName("org.jspecify.annotations.DefaultNullable")
+val JSPECIFY_DEFAULT_NOT_NULL = FqName("org.jspecify.annotations.DefaultNotNull")
+val JSPECIFY_DEFAULT_NULLNESS_UNKNOWN = FqName("org.jspecify.annotations.DefaultNullnessUnknown")
 
 val NULLABLE_ANNOTATIONS = listOf(
     JvmAnnotationNames.JETBRAINS_NULLABLE_ANNOTATION,
diff --git a/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaTypeParameterDescriptor.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaTypeParameterDescriptor.kt
index 058a2499a0c..9f60ddd0041 100644
--- a/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaTypeParameterDescriptor.kt
+++ b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaTypeParameterDescriptor.kt
@@ -45,7 +45,7 @@ class LazyJavaTypeParameterDescriptor(
     override val annotations = LazyJavaAnnotations(c, javaTypeParameter)
 
     override fun resolveUpperBounds(): List<KotlinType> {
-        return computeNotEnhancedBounds().let { c.components.signatureEnhancement.enhanceTypeParameterBounds(this, it, c) }
+        return computeNotEnhancedBounds()
     }
 
     private fun computeNotEnhancedBounds(): List<KotlinType> {
@@ -63,6 +63,10 @@ class LazyJavaTypeParameterDescriptor(
         }
     }
 
+    override fun processBoundsWithoutCycles(bounds: List<KotlinType>): List<KotlinType> {
+        return c.components.signatureEnhancement.enhanceTypeParameterBounds(this, bounds, c)
+    }
+
     override fun reportSupertypeLoopError(type: KotlinType) {
         // Do nothing
     }
diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/AbstractTypeParameterDescriptor.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/AbstractTypeParameterDescriptor.java
index 0114ad669a0..112f4ad0754 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/AbstractTypeParameterDescriptor.java
+++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/AbstractTypeParameterDescriptor.java
@@ -136,6 +136,11 @@ public abstract class AbstractTypeParameterDescriptor extends DeclarationDescrip
         return (TypeParameterDescriptor) super.getOriginal();
     }
 
+    @NotNull
+    protected List<KotlinType> processBoundsWithoutCycles(@NotNull List<KotlinType> bounds) {
+        return bounds;
+    }
+
     @Override
     public <R, D> R accept(DeclarationDescriptorVisitor<R, D> visitor, D data) {
         return visitor.visitTypeParameterDescriptor(this, data);
@@ -206,6 +211,12 @@ public abstract class AbstractTypeParameterDescriptor extends DeclarationDescrip
             AbstractTypeParameterDescriptor.this.reportSupertypeLoopError(type);
         }
 
+        @NotNull
+        @Override
+        protected List<KotlinType> processSupertypesWithoutCycles(@NotNull List<KotlinType> supertypes) {
+            return processBoundsWithoutCycles(supertypes);
+        }
+
         @Nullable
         @Override
         protected KotlinType defaultSupertypeIfEmpty() {
diff --git a/core/descriptors/src/org/jetbrains/kotlin/types/AbstractTypeConstructor.kt b/core/descriptors/src/org/jetbrains/kotlin/types/AbstractTypeConstructor.kt
index e8d41c01853..eaa3c5b2e25 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/types/AbstractTypeConstructor.kt
+++ b/core/descriptors/src/org/jetbrains/kotlin/types/AbstractTypeConstructor.kt
@@ -17,7 +17,9 @@
 package org.jetbrains.kotlin.types
 
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns
-import org.jetbrains.kotlin.descriptors.*
+import org.jetbrains.kotlin.descriptors.ClassifierDescriptor
+import org.jetbrains.kotlin.descriptors.SupertypeLoopChecker
+import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor
 import org.jetbrains.kotlin.storage.StorageManager
 import org.jetbrains.kotlin.types.checker.KotlinTypeRefiner
 import org.jetbrains.kotlin.types.checker.refineTypes
@@ -105,7 +107,8 @@ abstract class AbstractTypeConstructor(storageManager: StorageManager) : TypeCon
                 )
             }
 
-            supertypes.supertypesWithoutCycles = (resultWithoutCycles as? List<KotlinType>) ?: resultWithoutCycles.toList()
+            supertypes.supertypesWithoutCycles =
+                processSupertypesWithoutCycles(resultWithoutCycles as? List<KotlinType> ?: resultWithoutCycles.toList())
         })
 
     private fun TypeConstructor.computeNeighbours(useCompanions: Boolean): Collection<KotlinType> =
@@ -118,6 +121,8 @@ abstract class AbstractTypeConstructor(storageManager: StorageManager) : TypeCon
     protected abstract val supertypeLoopChecker: SupertypeLoopChecker
     protected open fun reportSupertypeLoopError(type: KotlinType) {}
 
+    protected open fun processSupertypesWithoutCycles(supertypes: List<@JvmSuppressWildcards KotlinType>): List<KotlinType> = supertypes
+
     // TODO: overload in AbstractTypeParameterDescriptor?
     protected open fun reportScopesLoopError(type: KotlinType) {}
     protected open val shouldReportCyclicScopeWithCompanionWarning: Boolean = false
diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxTestGenerated.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxTestGenerated.java
index 22e0177c5bb..bd72fe2dbaa 100644
--- a/js/js.tests/test/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxTestGenerated.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxTestGenerated.java
@@ -18253,6 +18253,11 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
                 runTest("compiler/testData/codegen/box/ranges/expression/emptyRange.kt");
             }
 
+            @TestMetadata("inexactDownToMinValue.kt")
+            public void testInexactDownToMinValue() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/expression/inexactDownToMinValue.kt");
+            }
+
             @TestMetadata("inexactSteppedDownTo.kt")
             public void testInexactSteppedDownTo() throws Exception {
                 runTest("compiler/testData/codegen/box/ranges/expression/inexactSteppedDownTo.kt");
@@ -18263,6 +18268,26 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
                 runTest("compiler/testData/codegen/box/ranges/expression/inexactSteppedRange.kt");
             }
 
+            @TestMetadata("inexactToMaxValue.kt")
+            public void testInexactToMaxValue() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/expression/inexactToMaxValue.kt");
+            }
+
+            @TestMetadata("maxValueMinusTwoToMaxValue.kt")
+            public void testMaxValueMinusTwoToMaxValue() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/expression/maxValueMinusTwoToMaxValue.kt");
+            }
+
+            @TestMetadata("maxValueToMaxValue.kt")
+            public void testMaxValueToMaxValue() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/expression/maxValueToMaxValue.kt");
+            }
+
+            @TestMetadata("maxValueToMinValue.kt")
+            public void testMaxValueToMinValue() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/expression/maxValueToMinValue.kt");
+            }
+
             @TestMetadata("oneElementDownTo.kt")
             public void testOneElementDownTo() throws Exception {
                 runTest("compiler/testData/codegen/box/ranges/expression/oneElementDownTo.kt");
@@ -18278,6 +18303,41 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
                 runTest("compiler/testData/codegen/box/ranges/expression/openRange.kt");
             }
 
+            @TestMetadata("overflowZeroDownToMaxValue.kt")
+            public void testOverflowZeroDownToMaxValue() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/expression/overflowZeroDownToMaxValue.kt");
+            }
+
+            @TestMetadata("overflowZeroToMinValue.kt")
+            public void testOverflowZeroToMinValue() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/expression/overflowZeroToMinValue.kt");
+            }
+
+            @TestMetadata("progressionDownToMinValue.kt")
+            public void testProgressionDownToMinValue() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/expression/progressionDownToMinValue.kt");
+            }
+
+            @TestMetadata("progressionMaxValueMinusTwoToMaxValue.kt")
+            public void testProgressionMaxValueMinusTwoToMaxValue() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/expression/progressionMaxValueMinusTwoToMaxValue.kt");
+            }
+
+            @TestMetadata("progressionMaxValueToMaxValue.kt")
+            public void testProgressionMaxValueToMaxValue() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/expression/progressionMaxValueToMaxValue.kt");
+            }
+
+            @TestMetadata("progressionMaxValueToMinValue.kt")
+            public void testProgressionMaxValueToMinValue() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/expression/progressionMaxValueToMinValue.kt");
+            }
+
+            @TestMetadata("progressionMinValueToMinValue.kt")
+            public void testProgressionMinValueToMinValue() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/expression/progressionMinValueToMinValue.kt");
+            }
+
             @TestMetadata("reversedBackSequence.kt")
             public void testReversedBackSequence() throws Exception {
                 runTest("compiler/testData/codegen/box/ranges/expression/reversedBackSequence.kt");
@@ -18875,6 +18935,11 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
                 runTest("compiler/testData/codegen/box/ranges/literal/emptyRange.kt");
             }
 
+            @TestMetadata("inexactDownToMinValue.kt")
+            public void testInexactDownToMinValue() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/literal/inexactDownToMinValue.kt");
+            }
+
             @TestMetadata("inexactSteppedDownTo.kt")
             public void testInexactSteppedDownTo() throws Exception {
                 runTest("compiler/testData/codegen/box/ranges/literal/inexactSteppedDownTo.kt");
@@ -18920,11 +18985,21 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
                 runTest("compiler/testData/codegen/box/ranges/literal/openRange.kt");
             }
 
+            @TestMetadata("overflowZeroDownToMaxValue.kt")
+            public void testOverflowZeroDownToMaxValue() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/literal/overflowZeroDownToMaxValue.kt");
+            }
+
             @TestMetadata("overflowZeroToMinValue.kt")
             public void testOverflowZeroToMinValue() throws Exception {
                 runTest("compiler/testData/codegen/box/ranges/literal/overflowZeroToMinValue.kt");
             }
 
+            @TestMetadata("progressionDownToMinValue.kt")
+            public void testProgressionDownToMinValue() throws Exception {
+                runTest("compiler/testData/codegen/box/ranges/literal/progressionDownToMinValue.kt");
+            }
+
             @TestMetadata("progressionMaxValueMinusTwoToMaxValue.kt")
             public void testProgressionMaxValueMinusTwoToMaxValue() throws Exception {
                 runTest("compiler/testData/codegen/box/ranges/literal/progressionMaxValueMinusTwoToMaxValue.kt");
diff --git a/third-party/jdk8-annotations/jspecify/annotations/DefaultNotNull.java b/third-party/jdk8-annotations/org/jspecify/annotations/DefaultNotNull.java
similarity index 60%
rename from third-party/jdk8-annotations/jspecify/annotations/DefaultNotNull.java
rename to third-party/jdk8-annotations/org/jspecify/annotations/DefaultNotNull.java
index 975baa347be..ee36dda8c99 100644
--- a/third-party/jdk8-annotations/jspecify/annotations/DefaultNotNull.java
+++ b/third-party/jdk8-annotations/org/jspecify/annotations/DefaultNotNull.java
@@ -3,14 +3,17 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package jspecify.annotations;
+package org.jspecify.annotations;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+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 {
 
-}
+}
\ No newline at end of file
diff --git a/third-party/jdk8-annotations/jspecify/annotations/DefaultNullable.java b/third-party/jdk8-annotations/org/jspecify/annotations/DefaultNullable.java
similarity index 61%
rename from third-party/jdk8-annotations/jspecify/annotations/DefaultNullable.java
rename to third-party/jdk8-annotations/org/jspecify/annotations/DefaultNullable.java
index d7bc86d5ca4..fac37e8dc72 100644
--- a/third-party/jdk8-annotations/jspecify/annotations/DefaultNullable.java
+++ b/third-party/jdk8-annotations/org/jspecify/annotations/DefaultNullable.java
@@ -3,14 +3,17 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package jspecify.annotations;
+package org.jspecify.annotations;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+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 DefaultNullable {
 
 }
diff --git a/third-party/jdk8-annotations/jspecify/annotations/DefaultNullnessUnknown.java b/third-party/jdk8-annotations/org/jspecify/annotations/DefaultNullnessUnknown.java
similarity index 61%
rename from third-party/jdk8-annotations/jspecify/annotations/DefaultNullnessUnknown.java
rename to third-party/jdk8-annotations/org/jspecify/annotations/DefaultNullnessUnknown.java
index da18425e8de..be9abc4e00f 100644
--- a/third-party/jdk8-annotations/jspecify/annotations/DefaultNullnessUnknown.java
+++ b/third-party/jdk8-annotations/org/jspecify/annotations/DefaultNullnessUnknown.java
@@ -3,14 +3,17 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package jspecify.annotations;
+package org.jspecify.annotations;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+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 DefaultNullnessUnknown {
 
 }
diff --git a/third-party/jdk8-annotations/jspecify/annotations/NotNull.java b/third-party/jdk8-annotations/org/jspecify/annotations/NotNull.java
similarity index 50%
rename from third-party/jdk8-annotations/jspecify/annotations/NotNull.java
rename to third-party/jdk8-annotations/org/jspecify/annotations/NotNull.java
index 73ca7121955..6aba65c00ce 100644
--- a/third-party/jdk8-annotations/jspecify/annotations/NotNull.java
+++ b/third-party/jdk8-annotations/org/jspecify/annotations/NotNull.java
@@ -1,11 +1,14 @@
-package jspecify.annotations;
+package org.jspecify.annotations;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.lang.annotation.ElementType;
 
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.FIELD, ElementType.METHOD, ElementType.TYPE_USE, ElementType.PARAMETER})
 public @interface NotNull {
 
 }
diff --git a/third-party/jdk8-annotations/jspecify/annotations/Nullable.java b/third-party/jdk8-annotations/org/jspecify/annotations/Nullable.java
similarity index 50%
rename from third-party/jdk8-annotations/jspecify/annotations/Nullable.java
rename to third-party/jdk8-annotations/org/jspecify/annotations/Nullable.java
index f14b0abf0f9..95e816c94fc 100644
--- a/third-party/jdk8-annotations/jspecify/annotations/Nullable.java
+++ b/third-party/jdk8-annotations/org/jspecify/annotations/Nullable.java
@@ -1,11 +1,14 @@
-package jspecify.annotations;
+package org.jspecify.annotations;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.lang.annotation.ElementType;
 
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.FIELD, ElementType.METHOD, ElementType.TYPE_USE, ElementType.PARAMETER})
 public @interface Nullable {
 
 }
diff --git a/third-party/jdk8-annotations/jspecify/annotations/NullnessUnknown.java b/third-party/jdk8-annotations/org/jspecify/annotations/NullnessUnknown.java
similarity index 67%
rename from third-party/jdk8-annotations/jspecify/annotations/NullnessUnknown.java
rename to third-party/jdk8-annotations/org/jspecify/annotations/NullnessUnknown.java
index 72a6dffe56a..cf8e2c2ef99 100644
--- a/third-party/jdk8-annotations/jspecify/annotations/NullnessUnknown.java
+++ b/third-party/jdk8-annotations/org/jspecify/annotations/NullnessUnknown.java
@@ -3,14 +3,17 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package jspecify.annotations;
+package org.jspecify.annotations;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.lang.annotation.ElementType;
 
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.FIELD, ElementType.METHOD, ElementType.TYPE_USE, ElementType.PARAMETER})
 public @interface NullnessUnknown {
 
 }