diff --git a/patches/api/0002-POM-changes.patch b/patches/api/0002-Build-system-changes.patch
similarity index 92%
rename from patches/api/0002-POM-changes.patch
rename to patches/api/0002-Build-system-changes.patch
index 6eff19161e..012a45883a 100644
--- a/patches/api/0002-POM-changes.patch
+++ b/patches/api/0002-Build-system-changes.patch
@@ -1,14 +1,14 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 00:16:08 +0100
-Subject: [PATCH] POM changes
+Subject: [PATCH] Build system changes
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 35b57f52fcfd91cff04dc60c3a8a16b31f775fc0..20c8a34b299ba455c29b4e31d311de0b3a063288 100644
+index 35b57f52fcfd91cff04dc60c3a8a16b31f775fc0..328fe3d7708b0e93dad080c7689d0d7cde138288 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -16,10 +16,12 @@ dependencies {
+@@ -16,12 +16,14 @@ dependencies {
      api("com.google.code.gson:gson:2.8.0")
      api("net.md-5:bungeecord-chat:1.16-R0.4")
      api("org.yaml:snakeyaml:1.29")
@@ -19,8 +19,11 @@ index 35b57f52fcfd91cff04dc60c3a8a16b31f775fc0..20c8a34b299ba455c29b4e31d311de0b
      compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.0")
 +    compileOnly("com.google.code.findbugs:jsr305:1.3.9") // Paper
  
-     val annotations = "org.jetbrains:annotations-java5:21.0.1"
+-    val annotations = "org.jetbrains:annotations-java5:21.0.1"
++    val annotations = "org.jetbrains:annotations:21.0.1" // Paper - we don't want Java 5 annotations...
      compileOnly(annotations)
+     testCompileOnly(annotations)
+ 
 diff --git a/pom.xml b/pom.xml
 index 10eeaef61be733e63f6680f1675e0b527eb30fd9..e5802bcb6fc2376cff2ee8b3069150127312b154 100644
 --- a/pom.xml