diff --git a/api/pom.xml b/api/pom.xml
index 258e3c2a..7a130848 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -26,17 +26,17 @@
     </build>
 
     <dependencies>
-        <dependency>
-            <groupId>org.geysermc</groupId>
-            <artifactId>common</artifactId>
-            <version>${geyser.version}</version>
-        </dependency>
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-transport</artifactId>
             <version>4.1.49.Final</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.geysermc</groupId>
+            <artifactId>common</artifactId>
+            <version>${geyser.version}</version>
+        </dependency>
     </dependencies>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/bungee/pom.xml b/bungee/pom.xml
index 34e81076..5d740807 100644
--- a/bungee/pom.xml
+++ b/bungee/pom.xml
@@ -53,16 +53,25 @@
             <groupId>org.geysermc.floodgate</groupId>
             <artifactId>common</artifactId>
             <version>${project.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.google.code.gson</groupId>
-                    <artifactId>gson</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.yaml</groupId>
-                    <artifactId>snakeyaml</artifactId>
-                </exclusion>
-            </exclusions>
+        </dependency>
+        <!-- the following common dependencies are already present on the platform -->
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.8.5</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>21.0</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.yaml</groupId>
+            <artifactId>snakeyaml</artifactId>
+            <version>1.27</version>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 
diff --git a/common/pom.xml b/common/pom.xml
index 30d4130b..c8825b6a 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -26,11 +26,6 @@
     </build>
 
     <dependencies>
-        <dependency>
-            <groupId>org.geysermc.floodgate</groupId>
-            <artifactId>api</artifactId>
-            <version>${project.parent.version}</version>
-        </dependency>
         <dependency>
             <groupId>com.google.inject</groupId>
             <artifactId>guice</artifactId>
@@ -53,21 +48,33 @@
             <artifactId>okhttp</artifactId>
             <version>3.13.0</version>
         </dependency>
-        <dependency>
-            <groupId>org.yaml</groupId>
-            <artifactId>snakeyaml</artifactId>
-            <version>1.27</version>
-        </dependency>
         <dependency>
             <groupId>com.nukkitx.fastutil</groupId>
             <artifactId>fastutil-short-object-maps</artifactId>
             <version>8.3.1</version>
         </dependency>
+        <dependency>
+            <groupId>org.geysermc.floodgate</groupId>
+            <artifactId>api</artifactId>
+            <version>${project.parent.version}</version>
+        </dependency>
 <!--        <dependency> todo -->
 <!--            <groupId>com.mojang</groupId>-->
 <!--            <artifactId>brigadier</artifactId>-->
 <!--            <version>1.0.17</version>-->
 <!--        </dependency>-->
+        <dependency>
+            <groupId>org.yaml</groupId>
+            <artifactId>snakeyaml</artifactId>
+            <version>1.27</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.8.5</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/spigot/pom.xml b/spigot/pom.xml
index ed37ae41..10c1edc8 100644
--- a/spigot/pom.xml
+++ b/spigot/pom.xml
@@ -60,16 +60,25 @@
             <groupId>org.geysermc.floodgate</groupId>
             <artifactId>common</artifactId>
             <version>${project.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.google.code.gson</groupId>
-                    <artifactId>gson</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.yaml</groupId>
-                    <artifactId>snakeyaml</artifactId>
-                </exclusion>
-            </exclusions>
+        </dependency>
+        <!-- the following common dependencies are already present on the platform -->
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.8.5</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>21.0</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.yaml</groupId>
+            <artifactId>snakeyaml</artifactId>
+            <version>1.27</version>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 
diff --git a/velocity/pom.xml b/velocity/pom.xml
index 20d8b96a..558be82b 100644
--- a/velocity/pom.xml
+++ b/velocity/pom.xml
@@ -45,24 +45,39 @@
         </dependency>
         <dependency>
             <groupId>io.netty</groupId>
-            <artifactId>netty-all</artifactId>
-            <version>4.1.45.Final</version>
+            <artifactId>netty-transport</artifactId>
+            <version>4.1.43.Final</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-codec</artifactId>
+            <version>4.1.43.Final</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.geysermc.floodgate</groupId>
             <artifactId>common</artifactId>
             <version>${project.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.google.code.gson</groupId>
-                    <artifactId>gson</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.yaml</groupId>
-                    <artifactId>snakeyaml</artifactId>
-                </exclusion>
-            </exclusions>
+        </dependency>
+        <!-- the following common dependencies are already present on the platform -->
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.8.5</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>21.0</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.yaml</groupId>
+            <artifactId>snakeyaml</artifactId>
+            <version>1.27</version>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 
diff --git a/velocity/src/main/java/org/geysermc/floodgate/listener/VelocityPluginMessageListener.java b/velocity/src/main/java/org/geysermc/floodgate/listener/VelocityPluginMessageHandler.java
similarity index 97%
rename from velocity/src/main/java/org/geysermc/floodgate/listener/VelocityPluginMessageListener.java
rename to velocity/src/main/java/org/geysermc/floodgate/listener/VelocityPluginMessageHandler.java
index 43da364e..5e0a9d9e 100644
--- a/velocity/src/main/java/org/geysermc/floodgate/listener/VelocityPluginMessageListener.java
+++ b/velocity/src/main/java/org/geysermc/floodgate/listener/VelocityPluginMessageHandler.java
@@ -45,8 +45,7 @@ import org.geysermc.floodgate.api.logger.FloodgateLogger;
 import org.geysermc.floodgate.platform.pluginmessage.PluginMessageHandler;
 import org.geysermc.floodgate.util.RawSkin;
 
-//todo naming of this class is different between platforms
-public class VelocityPluginMessageListener extends PluginMessageHandler {
+public class VelocityPluginMessageHandler extends PluginMessageHandler {
     private ProxyServer proxy;
     private FloodgateLogger logger;
     private ChannelIdentifier formChannel;
diff --git a/velocity/src/main/java/org/geysermc/floodgate/module/VelocityPlatformModule.java b/velocity/src/main/java/org/geysermc/floodgate/module/VelocityPlatformModule.java
index 04e99dbd..cb4755bd 100644
--- a/velocity/src/main/java/org/geysermc/floodgate/module/VelocityPlatformModule.java
+++ b/velocity/src/main/java/org/geysermc/floodgate/module/VelocityPlatformModule.java
@@ -44,7 +44,7 @@ import org.geysermc.floodgate.crypto.FloodgateCipher;
 import org.geysermc.floodgate.inject.CommonPlatformInjector;
 import org.geysermc.floodgate.inject.velocity.VelocityInjector;
 import org.geysermc.floodgate.listener.VelocityListenerRegistration;
-import org.geysermc.floodgate.listener.VelocityPluginMessageListener;
+import org.geysermc.floodgate.listener.VelocityPluginMessageHandler;
 import org.geysermc.floodgate.logger.Slf4jFloodgateLogger;
 import org.geysermc.floodgate.platform.command.CommandRegistration;
 import org.geysermc.floodgate.platform.command.CommandUtil;
@@ -110,7 +110,7 @@ public final class VelocityPlatformModule extends AbstractModule {
     @Provides
     @Singleton
     public PluginMessageHandler pluginMessageHandler() {
-        return new VelocityPluginMessageListener();
+        return new VelocityPluginMessageHandler();
     }
 
     /*