diff --git a/CommandWhitelistBukkit/pom.xml b/CommandWhitelistBukkit/pom.xml
index c5ec6ff..bd18cb6 100644
--- a/CommandWhitelistBukkit/pom.xml
+++ b/CommandWhitelistBukkit/pom.xml
@@ -11,7 +11,7 @@
 
     <artifactId>Bukkit</artifactId>
     <packaging>jar</packaging>
-    <name>CommandWhitelist</name>
+    <name>CommandWhitelist-Bukkit</name>
 
     <description>You decide what commands players can use or tab complete on your server!</description>
     <properties>
@@ -42,7 +42,7 @@
                             <goal>shade</goal>
                         </goals>
                         <configuration>
-                            <finalName>${project.name}-${project.artifactId}-${project.parent.version}</finalName>
+                            <finalName>${project.name}-${project.parent.version}</finalName>
                             <createDependencyReducedPom>false</createDependencyReducedPom>
                             <relocations>
                                 <relocation>
@@ -72,13 +72,17 @@
             <id>dmulloy2-repo</id>
             <url>https://repo.dmulloy2.net/nexus/repository/public/</url>
         </repository>
+        <repository>
+            <id>papermc</id>
+            <url>https://papermc.io/repo/repository/maven-public/</url>
+        </repository>
     </repositories>
 
     <dependencies>
         <dependency>
-            <groupId>com.destroystokyo.paper</groupId>
+            <groupId>io.papermc.paper</groupId>
             <artifactId>paper-api</artifactId>
-            <version>1.16.5-R0.1-SNAPSHOT</version>
+            <version>1.17.1-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/CommandWhitelistCommon/pom.xml b/CommandWhitelistCommon/pom.xml
index 9b4cb96..cef399d 100644
--- a/CommandWhitelistCommon/pom.xml
+++ b/CommandWhitelistCommon/pom.xml
@@ -11,7 +11,7 @@
 
     <artifactId>Common</artifactId>
     <packaging>jar</packaging>
-    <name>CommandWhitelist</name>
+    <name>CommandWhitelist-Common</name>
 
     <description>You decide what commands players can use or tab complete on your server!</description>
     <properties>
@@ -43,7 +43,7 @@
                         </goals>
                         <configuration>
                             <createDependencyReducedPom>false</createDependencyReducedPom>
-                            <finalName>${project.name}-${project.artifactId}-${project.parent.version}</finalName>
+                            <finalName>${project.name}-${project.parent.version}</finalName>
                         </configuration>
                     </execution>
                 </executions>
@@ -66,6 +66,10 @@
             <id>velocitypowered-repo</id>
             <url>https://repo.velocitypowered.com/releases/</url>
         </repository>
+        <repository>
+            <id>papermc</id>
+            <url>https://papermc.io/repo/repository/maven-public/</url>
+        </repository>
     </repositories>
 
     <dependencies>
@@ -82,9 +86,9 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>com.destroystokyo.paper</groupId>
+            <groupId>io.papermc.paper</groupId>
             <artifactId>paper-api</artifactId>
-            <version>1.16.5-R0.1-SNAPSHOT</version>
+            <version>1.17.1-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/CommandWhitelistVelocity/pom.xml b/CommandWhitelistVelocity/pom.xml
index 4942606..2eac89a 100644
--- a/CommandWhitelistVelocity/pom.xml
+++ b/CommandWhitelistVelocity/pom.xml
@@ -11,7 +11,7 @@
 
     <artifactId>Velocity</artifactId>
     <packaging>jar</packaging>
-    <name>CommandWhitelist</name>
+    <name>CommandWhitelist-Velocity</name>
 
     <description>You decide what commands players can use or tab complete on your server!</description>
     <properties>
@@ -43,7 +43,7 @@
                         </goals>
                         <configuration>
                             <createDependencyReducedPom>false</createDependencyReducedPom>
-                            <finalName>${project.name}-${project.artifactId}-${project.parent.version}</finalName>
+                            <finalName>${project.name}-${project.parent.version}</finalName>
                             <relocations>
                                 <relocation>
                                     <pattern>org.bstats</pattern>
diff --git a/CommandWhitelistWaterfall/pom.xml b/CommandWhitelistWaterfall/pom.xml
index 26a50e6..9162d5d 100644
--- a/CommandWhitelistWaterfall/pom.xml
+++ b/CommandWhitelistWaterfall/pom.xml
@@ -11,7 +11,7 @@
 
     <artifactId>Waterfall</artifactId>
     <packaging>jar</packaging>
-    <name>CommandWhitelist</name>
+    <name>CommandWhitelist-Waterfall</name>
 
     <description>You decide what commands players can use or tab complete on your server!</description>
     <properties>
@@ -43,7 +43,7 @@
                         </goals>
                         <configuration>
                             <createDependencyReducedPom>false</createDependencyReducedPom>
-                            <finalName>${project.name}-${project.artifactId}-${project.parent.version}</finalName>
+                            <finalName>${project.name}-${project.parent.version}</finalName>
                             <relocations>
                                 <relocation>
                                     <pattern>org.bstats</pattern>
@@ -75,18 +75,18 @@
     </repositories>
 
     <dependencies>
-        <dependency>
-            <groupId>io.github.waterfallmc</groupId>
-            <artifactId>waterfall-api</artifactId>
-            <version>1.17-R0.1-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>eu.endermite.commandwhitelist</groupId>
             <artifactId>Common</artifactId>
             <version>${project.parent.version}</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>io.github.waterfallmc</groupId>
+            <artifactId>waterfall-api</artifactId>
+            <version>1.17-R0.1-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-platform-bungeecord</artifactId>