diff --git a/paper-api/checkstyle.xml b/paper-api/checkstyle.xml
index 1d1e06c82..feb3b07e3 100644
--- a/paper-api/checkstyle.xml
+++ b/paper-api/checkstyle.xml
@@ -55,6 +55,10 @@
 
         <!-- See https://checkstyle.org/filters/index.html -->
         <module name="SuppressionCommentFilter"/>
+        <module name="SuppressionCommentFilter">
+            <property name="offCommentFormat" value="Spigot start"/>
+            <property name="onCommentFormat" value="Spigot end"/>
+        </module>
 
         <!-- See https://checkstyle.org/checks/imports/index.html -->
         <module name="AvoidStarImport">
diff --git a/paper-api/pom.xml b/paper-api/pom.xml
index 99f799314..57b74c3a5 100644
--- a/paper-api/pom.xml
+++ b/paper-api/pom.xml
@@ -3,14 +3,14 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.bukkit</groupId>
-    <artifactId>bukkit</artifactId>
+    <groupId>org.spigotmc</groupId>
+    <artifactId>spigot-api</artifactId>
     <version>1.21.4-R0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
-    <name>Bukkit</name>
+    <name>Spigot-API</name>
     <url>https://www.spigotmc.org/</url>
-    <description>A plugin API for Minecraft servers.</description>
+    <description>An enhanced plugin API for Minecraft servers.</description>
 
     <properties>
         <skipTests>true</skipTests>