diff --git a/src/main/java/com/viaversion/fabric/common/handler/FabricDecodeHandler.java b/src/main/java/com/viaversion/fabric/common/handler/FabricDecodeHandler.java
index 9e60ba7..a075df8 100644
--- a/src/main/java/com/viaversion/fabric/common/handler/FabricDecodeHandler.java
+++ b/src/main/java/com/viaversion/fabric/common/handler/FabricDecodeHandler.java
@@ -49,15 +49,15 @@ public class FabricDecodeHandler extends MessageToMessageDecoder<ByteBuf> {
         int decoderIndex = ctx.pipeline().names().indexOf("decompress");
         if (decoderIndex == -1) return;
 
-        if (decoderIndex > ctx.pipeline().names().indexOf("via-decoder")) {
-            ChannelHandler encoder = ctx.pipeline().get("via-encoder");
-            ChannelHandler decoder = ctx.pipeline().get("via-decoder");
+        if (decoderIndex > ctx.pipeline().names().indexOf(CommonTransformer.HANDLER_DECODER_NAME)) {
+            ChannelHandler encoder = ctx.pipeline().get(CommonTransformer.HANDLER_ENCODER_NAME);
+            ChannelHandler decoder = ctx.pipeline().get(CommonTransformer.HANDLER_DECODER_NAME);
 
             ctx.pipeline().remove(encoder);
             ctx.pipeline().remove(decoder);
 
-            ctx.pipeline().addAfter("compress", "via-encoder", encoder);
-            ctx.pipeline().addAfter("decompress", "via-decoder", decoder);
+            ctx.pipeline().addAfter("compress", CommonTransformer.HANDLER_ENCODER_NAME, encoder);
+            ctx.pipeline().addAfter("decompress", CommonTransformer.HANDLER_DECODER_NAME, decoder);
         }
     }
 
diff --git a/viafabric-mc114/src/main/java/com/viaversion/fabric/mc114/ViaFabric.java b/viafabric-mc114/src/main/java/com/viaversion/fabric/mc114/ViaFabric.java
index f1c914d..6a8a779 100644
--- a/viafabric-mc114/src/main/java/com/viaversion/fabric/mc114/ViaFabric.java
+++ b/viafabric-mc114/src/main/java/com/viaversion/fabric/mc114/ViaFabric.java
@@ -9,7 +9,7 @@ import com.viaversion.fabric.common.config.VFConfig;
 import com.viaversion.fabric.common.platform.FabricInjector;
 import com.viaversion.fabric.common.protocol.HostnameParserProtocol;
 import com.viaversion.fabric.common.util.JLoggerToLog4j;
-import com.viaversion.fabric.mc114.commands.VRCommandHandler;
+import com.viaversion.fabric.mc114.commands.VFCommandHandler;
 import com.viaversion.fabric.mc114.platform.FabricPlatform;
 import com.viaversion.fabric.mc114.platform.VFLoader;
 import com.viaversion.viaversion.ViaManagerImpl;
@@ -48,10 +48,10 @@ public class ViaFabric implements ModInitializer {
                 .then(
                         RequiredArgumentBuilder
                                 .<S, String>argument("args", StringArgumentType.greedyString())
-                                .executes(((VRCommandHandler) Via.getManager().getCommandHandler())::execute)
-                                .suggests(((VRCommandHandler) Via.getManager().getCommandHandler())::suggestion)
+                                .executes(((VFCommandHandler) Via.getManager().getCommandHandler())::execute)
+                                .suggests(((VFCommandHandler) Via.getManager().getCommandHandler())::suggestion)
                 )
-                .executes(((VRCommandHandler) Via.getManager().getCommandHandler())::execute);
+                .executes(((VFCommandHandler) Via.getManager().getCommandHandler())::execute);
     }
 
     @Override
@@ -61,7 +61,7 @@ public class ViaFabric implements ModInitializer {
         Via.init(ViaManagerImpl.builder()
                 .injector(new FabricInjector())
                 .loader(new VFLoader())
-                .commandHandler(new VRCommandHandler())
+                .commandHandler(new VFCommandHandler())
                 .platform(platform).build());
 
         platform.init();
diff --git a/viafabric-mc114/src/main/java/com/viaversion/fabric/mc114/commands/VRCommandHandler.java b/viafabric-mc114/src/main/java/com/viaversion/fabric/mc114/commands/VFCommandHandler.java
similarity index 97%
rename from viafabric-mc114/src/main/java/com/viaversion/fabric/mc114/commands/VRCommandHandler.java
rename to viafabric-mc114/src/main/java/com/viaversion/fabric/mc114/commands/VFCommandHandler.java
index 6405dd8..cd42836 100644
--- a/viafabric-mc114/src/main/java/com/viaversion/fabric/mc114/commands/VRCommandHandler.java
+++ b/viafabric-mc114/src/main/java/com/viaversion/fabric/mc114/commands/VFCommandHandler.java
@@ -10,7 +10,7 @@ import com.viaversion.viaversion.commands.ViaCommandHandler;
 
 import java.util.concurrent.CompletableFuture;
 
-public class VRCommandHandler extends ViaCommandHandler {
+public class VFCommandHandler extends ViaCommandHandler {
     {
         try {
             registerSubCommand(new LeakDetectSubCommand());
diff --git a/viafabric-mc114/src/main/java/com/viaversion/fabric/mc114/platform/VFLoader.java b/viafabric-mc114/src/main/java/com/viaversion/fabric/mc114/platform/VFLoader.java
index 5a32364..bcc96fe 100644
--- a/viafabric-mc114/src/main/java/com/viaversion/fabric/mc114/platform/VFLoader.java
+++ b/viafabric-mc114/src/main/java/com/viaversion/fabric/mc114/platform/VFLoader.java
@@ -1,8 +1,8 @@
 package com.viaversion.fabric.mc114.platform;
 
-import com.viaversion.fabric.mc114.providers.VRHandItemProvider;
+import com.viaversion.fabric.mc114.providers.VFHandItemProvider;
 import com.viaversion.fabric.mc114.providers.FabricVersionProvider;
-import com.viaversion.fabric.mc114.providers.VRPlayerLookTargetProvider;
+import com.viaversion.fabric.mc114.providers.VFPlayerLookTargetProvider;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.providers.PlayerLookTargetProvider;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.loader.api.FabricLoader;
@@ -20,15 +20,14 @@ public class VFLoader implements ViaPlatformLoader {
         Via.getManager().getProviders().use(VersionProvider.class, new FabricVersionProvider());
 
         if (Via.getPlatform().getConf().isItemCache()) {
-            VRHandItemProvider handProvider = new VRHandItemProvider();
+            VFHandItemProvider handProvider = new VFHandItemProvider();
             if (FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT) {
                 handProvider.registerClientTick();
             }
             Via.getManager().getProviders().use(HandItemProvider.class, handProvider);
         }
-        if (FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT) {
-            Via.getManager().getProviders().use(PlayerLookTargetProvider.class, new VRPlayerLookTargetProvider());
-        }
+
+        Via.getManager().getProviders().use(PlayerLookTargetProvider.class, new VFPlayerLookTargetProvider());
     }
 
     @Override
diff --git a/viafabric-mc114/src/main/java/com/viaversion/fabric/mc114/providers/VRHandItemProvider.java b/viafabric-mc114/src/main/java/com/viaversion/fabric/mc114/providers/VFHandItemProvider.java
similarity index 97%
rename from viafabric-mc114/src/main/java/com/viaversion/fabric/mc114/providers/VRHandItemProvider.java
rename to viafabric-mc114/src/main/java/com/viaversion/fabric/mc114/providers/VFHandItemProvider.java
index 5ef1a89..2728342 100644
--- a/viafabric-mc114/src/main/java/com/viaversion/fabric/mc114/providers/VRHandItemProvider.java
+++ b/viafabric-mc114/src/main/java/com/viaversion/fabric/mc114/providers/VFHandItemProvider.java
@@ -15,7 +15,7 @@ import com.viaversion.viaversion.api.minecraft.item.DataItem;
 import com.viaversion.viaversion.api.minecraft.item.Item;
 import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.HandItemProvider;
 
-public class VRHandItemProvider extends HandItemProvider {
+public class VFHandItemProvider extends HandItemProvider {
     public Item clientItem = null;
 
     @Override
diff --git a/viafabric-mc114/src/main/java/com/viaversion/fabric/mc114/providers/VRPlayerLookTargetProvider.java b/viafabric-mc114/src/main/java/com/viaversion/fabric/mc114/providers/VFPlayerLookTargetProvider.java
similarity index 93%
rename from viafabric-mc114/src/main/java/com/viaversion/fabric/mc114/providers/VRPlayerLookTargetProvider.java
rename to viafabric-mc114/src/main/java/com/viaversion/fabric/mc114/providers/VFPlayerLookTargetProvider.java
index 38784ab..376c1da 100644
--- a/viafabric-mc114/src/main/java/com/viaversion/fabric/mc114/providers/VRPlayerLookTargetProvider.java
+++ b/viafabric-mc114/src/main/java/com/viaversion/fabric/mc114/providers/VFPlayerLookTargetProvider.java
@@ -8,7 +8,7 @@ import net.minecraft.util.hit.BlockHitResult;
 import net.minecraft.util.hit.HitResult;
 import net.minecraft.util.math.BlockPos;
 
-public class VRPlayerLookTargetProvider extends PlayerLookTargetProvider {
+public class VFPlayerLookTargetProvider extends PlayerLookTargetProvider {
 
     @Override
     public Position getPlayerLookTarget(UserConnection info) {
diff --git a/viafabric-mc115/src/main/java/com/viaversion/fabric/mc115/ViaFabric.java b/viafabric-mc115/src/main/java/com/viaversion/fabric/mc115/ViaFabric.java
index 55ab8dd..b61a48a 100644
--- a/viafabric-mc115/src/main/java/com/viaversion/fabric/mc115/ViaFabric.java
+++ b/viafabric-mc115/src/main/java/com/viaversion/fabric/mc115/ViaFabric.java
@@ -9,7 +9,7 @@ import com.viaversion.fabric.common.config.VFConfig;
 import com.viaversion.fabric.common.platform.FabricInjector;
 import com.viaversion.fabric.common.protocol.HostnameParserProtocol;
 import com.viaversion.fabric.common.util.JLoggerToLog4j;
-import com.viaversion.fabric.mc115.commands.VRCommandHandler;
+import com.viaversion.fabric.mc115.commands.VFCommandHandler;
 import com.viaversion.fabric.mc115.platform.FabricPlatform;
 import com.viaversion.fabric.mc115.platform.VFLoader;
 import com.viaversion.viaversion.ViaManagerImpl;
@@ -48,10 +48,10 @@ public class ViaFabric implements ModInitializer {
                 .then(
                         RequiredArgumentBuilder
                                 .<S, String>argument("args", StringArgumentType.greedyString())
-                                .executes(((VRCommandHandler) Via.getManager().getCommandHandler())::execute)
-                                .suggests(((VRCommandHandler) Via.getManager().getCommandHandler())::suggestion)
+                                .executes(((VFCommandHandler) Via.getManager().getCommandHandler())::execute)
+                                .suggests(((VFCommandHandler) Via.getManager().getCommandHandler())::suggestion)
                 )
-                .executes(((VRCommandHandler) Via.getManager().getCommandHandler())::execute);
+                .executes(((VFCommandHandler) Via.getManager().getCommandHandler())::execute);
     }
 
     @Override
@@ -61,7 +61,7 @@ public class ViaFabric implements ModInitializer {
         Via.init(ViaManagerImpl.builder()
                 .injector(new FabricInjector())
                 .loader(new VFLoader())
-                .commandHandler(new VRCommandHandler())
+                .commandHandler(new VFCommandHandler())
                 .platform(platform).build());
 
         platform.init();
diff --git a/viafabric-mc115/src/main/java/com/viaversion/fabric/mc115/commands/VRCommandHandler.java b/viafabric-mc115/src/main/java/com/viaversion/fabric/mc115/commands/VFCommandHandler.java
similarity index 97%
rename from viafabric-mc115/src/main/java/com/viaversion/fabric/mc115/commands/VRCommandHandler.java
rename to viafabric-mc115/src/main/java/com/viaversion/fabric/mc115/commands/VFCommandHandler.java
index 87907bd..1182a6e 100644
--- a/viafabric-mc115/src/main/java/com/viaversion/fabric/mc115/commands/VRCommandHandler.java
+++ b/viafabric-mc115/src/main/java/com/viaversion/fabric/mc115/commands/VFCommandHandler.java
@@ -10,7 +10,7 @@ import com.viaversion.viaversion.commands.ViaCommandHandler;
 
 import java.util.concurrent.CompletableFuture;
 
-public class VRCommandHandler extends ViaCommandHandler {
+public class VFCommandHandler extends ViaCommandHandler {
     {
         try {
             registerSubCommand(new LeakDetectSubCommand());
diff --git a/viafabric-mc115/src/main/java/com/viaversion/fabric/mc115/platform/VFLoader.java b/viafabric-mc115/src/main/java/com/viaversion/fabric/mc115/platform/VFLoader.java
index 72a93e5..57c6594 100644
--- a/viafabric-mc115/src/main/java/com/viaversion/fabric/mc115/platform/VFLoader.java
+++ b/viafabric-mc115/src/main/java/com/viaversion/fabric/mc115/platform/VFLoader.java
@@ -1,8 +1,8 @@
 package com.viaversion.fabric.mc115.platform;
 
-import com.viaversion.fabric.mc115.providers.VRHandItemProvider;
+import com.viaversion.fabric.mc115.providers.VFHandItemProvider;
 import com.viaversion.fabric.mc115.providers.FabricVersionProvider;
-import com.viaversion.fabric.mc115.providers.VRPlayerLookTargetProvider;
+import com.viaversion.fabric.mc115.providers.VFPlayerLookTargetProvider;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.providers.PlayerLookTargetProvider;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.loader.api.FabricLoader;
@@ -20,15 +20,14 @@ public class VFLoader implements ViaPlatformLoader {
         Via.getManager().getProviders().use(VersionProvider.class, new FabricVersionProvider());
 
         if (Via.getPlatform().getConf().isItemCache()) {
-            VRHandItemProvider handProvider = new VRHandItemProvider();
+            VFHandItemProvider handProvider = new VFHandItemProvider();
             if (FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT) {
                 handProvider.registerClientTick();
             }
             Via.getManager().getProviders().use(HandItemProvider.class, handProvider);
         }
-        if (FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT) {
-            Via.getManager().getProviders().use(PlayerLookTargetProvider.class, new VRPlayerLookTargetProvider());
-        }
+
+        Via.getManager().getProviders().use(PlayerLookTargetProvider.class, new VFPlayerLookTargetProvider());
     }
 
     @Override
diff --git a/viafabric-mc115/src/main/java/com/viaversion/fabric/mc115/providers/VRHandItemProvider.java b/viafabric-mc115/src/main/java/com/viaversion/fabric/mc115/providers/VFHandItemProvider.java
similarity index 97%
rename from viafabric-mc115/src/main/java/com/viaversion/fabric/mc115/providers/VRHandItemProvider.java
rename to viafabric-mc115/src/main/java/com/viaversion/fabric/mc115/providers/VFHandItemProvider.java
index 088e44d..4541d07 100644
--- a/viafabric-mc115/src/main/java/com/viaversion/fabric/mc115/providers/VRHandItemProvider.java
+++ b/viafabric-mc115/src/main/java/com/viaversion/fabric/mc115/providers/VFHandItemProvider.java
@@ -15,7 +15,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.registry.Registry;
 
-public class VRHandItemProvider extends HandItemProvider {
+public class VFHandItemProvider extends HandItemProvider {
     public Item clientItem = null;
 
     @Override
diff --git a/viafabric-mc115/src/main/java/com/viaversion/fabric/mc115/providers/VRPlayerLookTargetProvider.java b/viafabric-mc115/src/main/java/com/viaversion/fabric/mc115/providers/VFPlayerLookTargetProvider.java
similarity index 93%
rename from viafabric-mc115/src/main/java/com/viaversion/fabric/mc115/providers/VRPlayerLookTargetProvider.java
rename to viafabric-mc115/src/main/java/com/viaversion/fabric/mc115/providers/VFPlayerLookTargetProvider.java
index 5d112ec..9593567 100644
--- a/viafabric-mc115/src/main/java/com/viaversion/fabric/mc115/providers/VRPlayerLookTargetProvider.java
+++ b/viafabric-mc115/src/main/java/com/viaversion/fabric/mc115/providers/VFPlayerLookTargetProvider.java
@@ -8,7 +8,7 @@ import net.minecraft.util.hit.BlockHitResult;
 import net.minecraft.util.hit.HitResult;
 import net.minecraft.util.math.BlockPos;
 
-public class VRPlayerLookTargetProvider extends PlayerLookTargetProvider {
+public class VFPlayerLookTargetProvider extends PlayerLookTargetProvider {
 
     @Override
     public Position getPlayerLookTarget(UserConnection info) {
diff --git a/viafabric-mc116/src/main/java/com/viaversion/fabric/mc116/ViaFabric.java b/viafabric-mc116/src/main/java/com/viaversion/fabric/mc116/ViaFabric.java
index cc95474..251b2bf 100644
--- a/viafabric-mc116/src/main/java/com/viaversion/fabric/mc116/ViaFabric.java
+++ b/viafabric-mc116/src/main/java/com/viaversion/fabric/mc116/ViaFabric.java
@@ -9,7 +9,7 @@ import com.viaversion.fabric.common.config.VFConfig;
 import com.viaversion.fabric.common.platform.FabricInjector;
 import com.viaversion.fabric.common.protocol.HostnameParserProtocol;
 import com.viaversion.fabric.common.util.JLoggerToLog4j;
-import com.viaversion.fabric.mc116.commands.VRCommandHandler;
+import com.viaversion.fabric.mc116.commands.VFCommandHandler;
 import com.viaversion.fabric.mc116.platform.FabricPlatform;
 import com.viaversion.fabric.mc116.platform.VFLoader;
 import com.viaversion.viaversion.ViaManagerImpl;
@@ -50,10 +50,10 @@ public class ViaFabric implements ModInitializer {
                 .then(
                         RequiredArgumentBuilder
                                 .<S, String>argument("args", StringArgumentType.greedyString())
-                                .executes(((VRCommandHandler) Via.getManager().getCommandHandler())::execute)
-                                .suggests(((VRCommandHandler) Via.getManager().getCommandHandler())::suggestion)
+                                .executes(((VFCommandHandler) Via.getManager().getCommandHandler())::execute)
+                                .suggests(((VFCommandHandler) Via.getManager().getCommandHandler())::suggestion)
                 )
-                .executes(((VRCommandHandler) Via.getManager().getCommandHandler())::execute);
+                .executes(((VFCommandHandler) Via.getManager().getCommandHandler())::execute);
     }
 
     @Override
@@ -63,7 +63,7 @@ public class ViaFabric implements ModInitializer {
         Via.init(ViaManagerImpl.builder()
                 .injector(new FabricInjector())
                 .loader(new VFLoader())
-                .commandHandler(new VRCommandHandler())
+                .commandHandler(new VFCommandHandler())
                 .platform(platform).build());
 
         platform.init();
diff --git a/viafabric-mc116/src/main/java/com/viaversion/fabric/mc116/commands/VRCommandHandler.java b/viafabric-mc116/src/main/java/com/viaversion/fabric/mc116/commands/VFCommandHandler.java
similarity index 97%
rename from viafabric-mc116/src/main/java/com/viaversion/fabric/mc116/commands/VRCommandHandler.java
rename to viafabric-mc116/src/main/java/com/viaversion/fabric/mc116/commands/VFCommandHandler.java
index 01d7bee..ce56f1a 100644
--- a/viafabric-mc116/src/main/java/com/viaversion/fabric/mc116/commands/VRCommandHandler.java
+++ b/viafabric-mc116/src/main/java/com/viaversion/fabric/mc116/commands/VFCommandHandler.java
@@ -10,7 +10,7 @@ import com.viaversion.viaversion.commands.ViaCommandHandler;
 
 import java.util.concurrent.CompletableFuture;
 
-public class VRCommandHandler extends ViaCommandHandler {
+public class VFCommandHandler extends ViaCommandHandler {
     {
         try {
             registerSubCommand(new LeakDetectSubCommand());
diff --git a/viafabric-mc116/src/main/java/com/viaversion/fabric/mc116/platform/VFLoader.java b/viafabric-mc116/src/main/java/com/viaversion/fabric/mc116/platform/VFLoader.java
index 0b79357..790f053 100644
--- a/viafabric-mc116/src/main/java/com/viaversion/fabric/mc116/platform/VFLoader.java
+++ b/viafabric-mc116/src/main/java/com/viaversion/fabric/mc116/platform/VFLoader.java
@@ -1,9 +1,9 @@
 package com.viaversion.fabric.mc116.platform;
 
-import com.viaversion.fabric.mc116.providers.VRHandItemProvider;
+import com.viaversion.fabric.mc116.providers.VFHandItemProvider;
 import com.viaversion.fabric.mc116.providers.FabricVersionProvider;
-import com.viaversion.fabric.mc116.providers.VRPlayerAbilitiesProvider;
-import com.viaversion.fabric.mc116.providers.VRPlayerLookTargetProvider;
+import com.viaversion.fabric.mc116.providers.VFPlayerAbilitiesProvider;
+import com.viaversion.fabric.mc116.providers.VFPlayerLookTargetProvider;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.providers.PlayerLookTargetProvider;
 import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.provider.PlayerAbilitiesProvider;
 import net.fabricmc.api.EnvType;
@@ -22,16 +22,15 @@ public class VFLoader implements ViaPlatformLoader {
         Via.getManager().getProviders().use(VersionProvider.class, new FabricVersionProvider());
 
         if (Via.getPlatform().getConf().isItemCache()) {
-            VRHandItemProvider handProvider = new VRHandItemProvider();
+            VFHandItemProvider handProvider = new VFHandItemProvider();
             if (FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT) {
                 handProvider.registerClientTick();
             }
             Via.getManager().getProviders().use(HandItemProvider.class, handProvider);
         }
-        if (FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT) {
-            Via.getManager().getProviders().use(PlayerAbilitiesProvider.class, new VRPlayerAbilitiesProvider());
-            Via.getManager().getProviders().use(PlayerLookTargetProvider.class, new VRPlayerLookTargetProvider());
-        }
+
+        Via.getManager().getProviders().use(PlayerAbilitiesProvider.class, new VFPlayerAbilitiesProvider());
+        Via.getManager().getProviders().use(PlayerLookTargetProvider.class, new VFPlayerLookTargetProvider());
     }
 
     @Override
diff --git a/viafabric-mc116/src/main/java/com/viaversion/fabric/mc116/providers/VRHandItemProvider.java b/viafabric-mc116/src/main/java/com/viaversion/fabric/mc116/providers/VFHandItemProvider.java
similarity index 97%
rename from viafabric-mc116/src/main/java/com/viaversion/fabric/mc116/providers/VRHandItemProvider.java
rename to viafabric-mc116/src/main/java/com/viaversion/fabric/mc116/providers/VFHandItemProvider.java
index ffa63a0..2cfd1c9 100644
--- a/viafabric-mc116/src/main/java/com/viaversion/fabric/mc116/providers/VRHandItemProvider.java
+++ b/viafabric-mc116/src/main/java/com/viaversion/fabric/mc116/providers/VFHandItemProvider.java
@@ -15,7 +15,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.registry.Registry;
 
-public class VRHandItemProvider extends HandItemProvider {
+public class VFHandItemProvider extends HandItemProvider {
     public Item clientItem = null;
 
     @Override
diff --git a/viafabric-mc116/src/main/java/com/viaversion/fabric/mc116/providers/VRPlayerAbilitiesProvider.java b/viafabric-mc116/src/main/java/com/viaversion/fabric/mc116/providers/VFPlayerAbilitiesProvider.java
similarity index 92%
rename from viafabric-mc116/src/main/java/com/viaversion/fabric/mc116/providers/VRPlayerAbilitiesProvider.java
rename to viafabric-mc116/src/main/java/com/viaversion/fabric/mc116/providers/VFPlayerAbilitiesProvider.java
index b496db7..9ec926d 100644
--- a/viafabric-mc116/src/main/java/com/viaversion/fabric/mc116/providers/VRPlayerAbilitiesProvider.java
+++ b/viafabric-mc116/src/main/java/com/viaversion/fabric/mc116/providers/VFPlayerAbilitiesProvider.java
@@ -4,7 +4,7 @@ import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.provider.PlayerAbilitiesProvider;
 import net.minecraft.client.MinecraftClient;
 
-public class VRPlayerAbilitiesProvider extends PlayerAbilitiesProvider {
+public class VFPlayerAbilitiesProvider extends PlayerAbilitiesProvider {
 
     @Override
     public float getFlyingSpeed(UserConnection connection) {
diff --git a/viafabric-mc116/src/main/java/com/viaversion/fabric/mc116/providers/VRPlayerLookTargetProvider.java b/viafabric-mc116/src/main/java/com/viaversion/fabric/mc116/providers/VFPlayerLookTargetProvider.java
similarity index 93%
rename from viafabric-mc116/src/main/java/com/viaversion/fabric/mc116/providers/VRPlayerLookTargetProvider.java
rename to viafabric-mc116/src/main/java/com/viaversion/fabric/mc116/providers/VFPlayerLookTargetProvider.java
index 8120adc..d739cf5 100644
--- a/viafabric-mc116/src/main/java/com/viaversion/fabric/mc116/providers/VRPlayerLookTargetProvider.java
+++ b/viafabric-mc116/src/main/java/com/viaversion/fabric/mc116/providers/VFPlayerLookTargetProvider.java
@@ -8,7 +8,7 @@ import net.minecraft.util.hit.BlockHitResult;
 import net.minecraft.util.hit.HitResult;
 import net.minecraft.util.math.BlockPos;
 
-public class VRPlayerLookTargetProvider extends PlayerLookTargetProvider {
+public class VFPlayerLookTargetProvider extends PlayerLookTargetProvider {
 
     @Override
     public Position getPlayerLookTarget(UserConnection info) {
diff --git a/viafabric-mc117/src/main/java/com/viaversion/fabric/mc117/ViaFabric.java b/viafabric-mc117/src/main/java/com/viaversion/fabric/mc117/ViaFabric.java
index 8d43147..55a41a3 100644
--- a/viafabric-mc117/src/main/java/com/viaversion/fabric/mc117/ViaFabric.java
+++ b/viafabric-mc117/src/main/java/com/viaversion/fabric/mc117/ViaFabric.java
@@ -9,7 +9,7 @@ import com.viaversion.fabric.common.config.VFConfig;
 import com.viaversion.fabric.common.platform.FabricInjector;
 import com.viaversion.fabric.common.protocol.HostnameParserProtocol;
 import com.viaversion.fabric.common.util.JLoggerToLog4j;
-import com.viaversion.fabric.mc117.commands.VRCommandHandler;
+import com.viaversion.fabric.mc117.commands.VFCommandHandler;
 import com.viaversion.fabric.mc117.platform.FabricPlatform;
 import com.viaversion.fabric.mc117.platform.VFLoader;
 import com.viaversion.viaversion.ViaManagerImpl;
@@ -50,10 +50,10 @@ public class ViaFabric implements ModInitializer {
                 .then(
                         RequiredArgumentBuilder
                                 .<S, String>argument("args", StringArgumentType.greedyString())
-                                .executes(((VRCommandHandler) Via.getManager().getCommandHandler())::execute)
-                                .suggests(((VRCommandHandler) Via.getManager().getCommandHandler())::suggestion)
+                                .executes(((VFCommandHandler) Via.getManager().getCommandHandler())::execute)
+                                .suggests(((VFCommandHandler) Via.getManager().getCommandHandler())::suggestion)
                 )
-                .executes(((VRCommandHandler) Via.getManager().getCommandHandler())::execute);
+                .executes(((VFCommandHandler) Via.getManager().getCommandHandler())::execute);
     }
 
     @Override
@@ -63,7 +63,7 @@ public class ViaFabric implements ModInitializer {
         Via.init(ViaManagerImpl.builder()
                 .injector(new FabricInjector())
                 .loader(new VFLoader())
-                .commandHandler(new VRCommandHandler())
+                .commandHandler(new VFCommandHandler())
                 .platform(platform).build());
 
         platform.init();
diff --git a/viafabric-mc117/src/main/java/com/viaversion/fabric/mc117/commands/VRCommandHandler.java b/viafabric-mc117/src/main/java/com/viaversion/fabric/mc117/commands/VFCommandHandler.java
similarity index 97%
rename from viafabric-mc117/src/main/java/com/viaversion/fabric/mc117/commands/VRCommandHandler.java
rename to viafabric-mc117/src/main/java/com/viaversion/fabric/mc117/commands/VFCommandHandler.java
index fb0ef71..ae83347 100644
--- a/viafabric-mc117/src/main/java/com/viaversion/fabric/mc117/commands/VRCommandHandler.java
+++ b/viafabric-mc117/src/main/java/com/viaversion/fabric/mc117/commands/VFCommandHandler.java
@@ -10,7 +10,7 @@ import com.viaversion.viaversion.commands.ViaCommandHandler;
 
 import java.util.concurrent.CompletableFuture;
 
-public class VRCommandHandler extends ViaCommandHandler {
+public class VFCommandHandler extends ViaCommandHandler {
     {
         try {
             registerSubCommand(new LeakDetectSubCommand());
diff --git a/viafabric-mc117/src/main/java/com/viaversion/fabric/mc117/platform/VFLoader.java b/viafabric-mc117/src/main/java/com/viaversion/fabric/mc117/platform/VFLoader.java
index e272118..5e04167 100644
--- a/viafabric-mc117/src/main/java/com/viaversion/fabric/mc117/platform/VFLoader.java
+++ b/viafabric-mc117/src/main/java/com/viaversion/fabric/mc117/platform/VFLoader.java
@@ -1,9 +1,9 @@
 package com.viaversion.fabric.mc117.platform;
 
-import com.viaversion.fabric.mc117.providers.VRHandItemProvider;
+import com.viaversion.fabric.mc117.providers.VFHandItemProvider;
 import com.viaversion.fabric.mc117.providers.FabricVersionProvider;
-import com.viaversion.fabric.mc117.providers.VRPlayerAbilitiesProvider;
-import com.viaversion.fabric.mc117.providers.VRPlayerLookTargetProvider;
+import com.viaversion.fabric.mc117.providers.VFPlayerAbilitiesProvider;
+import com.viaversion.fabric.mc117.providers.VFPlayerLookTargetProvider;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.providers.PlayerLookTargetProvider;
 import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.provider.PlayerAbilitiesProvider;
 import net.fabricmc.api.EnvType;
@@ -22,16 +22,15 @@ public class VFLoader implements ViaPlatformLoader {
         Via.getManager().getProviders().use(VersionProvider.class, new FabricVersionProvider());
 
         if (Via.getPlatform().getConf().isItemCache()) {
-            VRHandItemProvider handProvider = new VRHandItemProvider();
+            VFHandItemProvider handProvider = new VFHandItemProvider();
             if (FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT) {
                 handProvider.registerClientTick();
             }
             Via.getManager().getProviders().use(HandItemProvider.class, handProvider);
         }
-        if (FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT) {
-            Via.getManager().getProviders().use(PlayerAbilitiesProvider.class, new VRPlayerAbilitiesProvider());
-            Via.getManager().getProviders().use(PlayerLookTargetProvider.class, new VRPlayerLookTargetProvider());
-        }
+
+        Via.getManager().getProviders().use(PlayerAbilitiesProvider.class, new VFPlayerAbilitiesProvider());
+        Via.getManager().getProviders().use(PlayerLookTargetProvider.class, new VFPlayerLookTargetProvider());
     }
 
     @Override
diff --git a/viafabric-mc117/src/main/java/com/viaversion/fabric/mc117/providers/VRHandItemProvider.java b/viafabric-mc117/src/main/java/com/viaversion/fabric/mc117/providers/VFHandItemProvider.java
similarity index 97%
rename from viafabric-mc117/src/main/java/com/viaversion/fabric/mc117/providers/VRHandItemProvider.java
rename to viafabric-mc117/src/main/java/com/viaversion/fabric/mc117/providers/VFHandItemProvider.java
index 840864d..8e1f6b8 100644
--- a/viafabric-mc117/src/main/java/com/viaversion/fabric/mc117/providers/VRHandItemProvider.java
+++ b/viafabric-mc117/src/main/java/com/viaversion/fabric/mc117/providers/VFHandItemProvider.java
@@ -15,7 +15,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.registry.Registry;
 
-public class VRHandItemProvider extends HandItemProvider {
+public class VFHandItemProvider extends HandItemProvider {
     public Item clientItem = null;
 
     @Override
diff --git a/viafabric-mc117/src/main/java/com/viaversion/fabric/mc117/providers/VRPlayerAbilitiesProvider.java b/viafabric-mc117/src/main/java/com/viaversion/fabric/mc117/providers/VFPlayerAbilitiesProvider.java
similarity index 92%
rename from viafabric-mc117/src/main/java/com/viaversion/fabric/mc117/providers/VRPlayerAbilitiesProvider.java
rename to viafabric-mc117/src/main/java/com/viaversion/fabric/mc117/providers/VFPlayerAbilitiesProvider.java
index 2e9e935..71e6a66 100644
--- a/viafabric-mc117/src/main/java/com/viaversion/fabric/mc117/providers/VRPlayerAbilitiesProvider.java
+++ b/viafabric-mc117/src/main/java/com/viaversion/fabric/mc117/providers/VFPlayerAbilitiesProvider.java
@@ -4,7 +4,7 @@ import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.provider.PlayerAbilitiesProvider;
 import net.minecraft.client.MinecraftClient;
 
-public class VRPlayerAbilitiesProvider extends PlayerAbilitiesProvider {
+public class VFPlayerAbilitiesProvider extends PlayerAbilitiesProvider {
 
     @Override
     public float getFlyingSpeed(UserConnection connection) {
diff --git a/viafabric-mc117/src/main/java/com/viaversion/fabric/mc117/providers/VRPlayerLookTargetProvider.java b/viafabric-mc117/src/main/java/com/viaversion/fabric/mc117/providers/VFPlayerLookTargetProvider.java
similarity index 93%
rename from viafabric-mc117/src/main/java/com/viaversion/fabric/mc117/providers/VRPlayerLookTargetProvider.java
rename to viafabric-mc117/src/main/java/com/viaversion/fabric/mc117/providers/VFPlayerLookTargetProvider.java
index c7a044e..8cf35c2 100644
--- a/viafabric-mc117/src/main/java/com/viaversion/fabric/mc117/providers/VRPlayerLookTargetProvider.java
+++ b/viafabric-mc117/src/main/java/com/viaversion/fabric/mc117/providers/VFPlayerLookTargetProvider.java
@@ -8,7 +8,7 @@ import net.minecraft.util.hit.BlockHitResult;
 import net.minecraft.util.hit.HitResult;
 import net.minecraft.util.math.BlockPos;
 
-public class VRPlayerLookTargetProvider extends PlayerLookTargetProvider {
+public class VFPlayerLookTargetProvider extends PlayerLookTargetProvider {
 
     @Override
     public Position getPlayerLookTarget(UserConnection info) {
diff --git a/viafabric-mc118/src/main/java/com/viaversion/fabric/mc118/ViaFabric.java b/viafabric-mc118/src/main/java/com/viaversion/fabric/mc118/ViaFabric.java
index 6c2f0fb..db968ef 100644
--- a/viafabric-mc118/src/main/java/com/viaversion/fabric/mc118/ViaFabric.java
+++ b/viafabric-mc118/src/main/java/com/viaversion/fabric/mc118/ViaFabric.java
@@ -9,7 +9,7 @@ import com.viaversion.fabric.common.config.VFConfig;
 import com.viaversion.fabric.common.platform.FabricInjector;
 import com.viaversion.fabric.common.protocol.HostnameParserProtocol;
 import com.viaversion.fabric.common.util.JLoggerToLog4j;
-import com.viaversion.fabric.mc118.commands.VRCommandHandler;
+import com.viaversion.fabric.mc118.commands.VFCommandHandler;
 import com.viaversion.fabric.mc118.platform.FabricPlatform;
 import com.viaversion.fabric.mc118.platform.VFLoader;
 import com.viaversion.viaversion.ViaManagerImpl;
@@ -50,10 +50,10 @@ public class ViaFabric implements ModInitializer {
                 .then(
                         RequiredArgumentBuilder
                                 .<S, String>argument("args", StringArgumentType.greedyString())
-                                .executes(((VRCommandHandler) Via.getManager().getCommandHandler())::execute)
-                                .suggests(((VRCommandHandler) Via.getManager().getCommandHandler())::suggestion)
+                                .executes(((VFCommandHandler) Via.getManager().getCommandHandler())::execute)
+                                .suggests(((VFCommandHandler) Via.getManager().getCommandHandler())::suggestion)
                 )
-                .executes(((VRCommandHandler) Via.getManager().getCommandHandler())::execute);
+                .executes(((VFCommandHandler) Via.getManager().getCommandHandler())::execute);
     }
 
     @Override
@@ -63,7 +63,7 @@ public class ViaFabric implements ModInitializer {
         Via.init(ViaManagerImpl.builder()
                 .injector(new FabricInjector())
                 .loader(new VFLoader())
-                .commandHandler(new VRCommandHandler())
+                .commandHandler(new VFCommandHandler())
                 .platform(platform).build());
 
         platform.init();
diff --git a/viafabric-mc118/src/main/java/com/viaversion/fabric/mc118/commands/VRCommandHandler.java b/viafabric-mc118/src/main/java/com/viaversion/fabric/mc118/commands/VFCommandHandler.java
similarity index 97%
rename from viafabric-mc118/src/main/java/com/viaversion/fabric/mc118/commands/VRCommandHandler.java
rename to viafabric-mc118/src/main/java/com/viaversion/fabric/mc118/commands/VFCommandHandler.java
index ffa54d0..8f56eed 100644
--- a/viafabric-mc118/src/main/java/com/viaversion/fabric/mc118/commands/VRCommandHandler.java
+++ b/viafabric-mc118/src/main/java/com/viaversion/fabric/mc118/commands/VFCommandHandler.java
@@ -10,7 +10,7 @@ import com.viaversion.viaversion.commands.ViaCommandHandler;
 
 import java.util.concurrent.CompletableFuture;
 
-public class VRCommandHandler extends ViaCommandHandler {
+public class VFCommandHandler extends ViaCommandHandler {
     {
         try {
             registerSubCommand(new LeakDetectSubCommand());
diff --git a/viafabric-mc118/src/main/java/com/viaversion/fabric/mc118/platform/VFLoader.java b/viafabric-mc118/src/main/java/com/viaversion/fabric/mc118/platform/VFLoader.java
index cd14ae7..49e5e6b 100644
--- a/viafabric-mc118/src/main/java/com/viaversion/fabric/mc118/platform/VFLoader.java
+++ b/viafabric-mc118/src/main/java/com/viaversion/fabric/mc118/platform/VFLoader.java
@@ -1,9 +1,9 @@
 package com.viaversion.fabric.mc118.platform;
 
-import com.viaversion.fabric.mc118.providers.VRHandItemProvider;
+import com.viaversion.fabric.mc118.providers.VFHandItemProvider;
 import com.viaversion.fabric.mc118.providers.FabricVersionProvider;
-import com.viaversion.fabric.mc118.providers.VRPlayerAbilitiesProvider;
-import com.viaversion.fabric.mc118.providers.VRPlayerLookTargetProvider;
+import com.viaversion.fabric.mc118.providers.VFPlayerAbilitiesProvider;
+import com.viaversion.fabric.mc118.providers.VFPlayerLookTargetProvider;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.providers.PlayerLookTargetProvider;
 import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.provider.PlayerAbilitiesProvider;
 import net.fabricmc.api.EnvType;
@@ -22,16 +22,15 @@ public class VFLoader implements ViaPlatformLoader {
         Via.getManager().getProviders().use(VersionProvider.class, new FabricVersionProvider());
 
         if (Via.getPlatform().getConf().isItemCache()) {
-            VRHandItemProvider handProvider = new VRHandItemProvider();
+            VFHandItemProvider handProvider = new VFHandItemProvider();
             if (FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT) {
                 handProvider.registerClientTick();
             }
             Via.getManager().getProviders().use(HandItemProvider.class, handProvider);
         }
-        if (FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT) {
-            Via.getManager().getProviders().use(PlayerAbilitiesProvider.class, new VRPlayerAbilitiesProvider());
-            Via.getManager().getProviders().use(PlayerLookTargetProvider.class, new VRPlayerLookTargetProvider());
-        }
+
+        Via.getManager().getProviders().use(PlayerAbilitiesProvider.class, new VFPlayerAbilitiesProvider());
+        Via.getManager().getProviders().use(PlayerLookTargetProvider.class, new VFPlayerLookTargetProvider());
     }
 
     @Override
diff --git a/viafabric-mc118/src/main/java/com/viaversion/fabric/mc118/providers/VRHandItemProvider.java b/viafabric-mc118/src/main/java/com/viaversion/fabric/mc118/providers/VFHandItemProvider.java
similarity index 97%
rename from viafabric-mc118/src/main/java/com/viaversion/fabric/mc118/providers/VRHandItemProvider.java
rename to viafabric-mc118/src/main/java/com/viaversion/fabric/mc118/providers/VFHandItemProvider.java
index 5f0d51f..8a5299d 100644
--- a/viafabric-mc118/src/main/java/com/viaversion/fabric/mc118/providers/VRHandItemProvider.java
+++ b/viafabric-mc118/src/main/java/com/viaversion/fabric/mc118/providers/VFHandItemProvider.java
@@ -15,7 +15,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.registry.Registry;
 
-public class VRHandItemProvider extends HandItemProvider {
+public class VFHandItemProvider extends HandItemProvider {
     public Item clientItem = null;
 
     @Override
diff --git a/viafabric-mc118/src/main/java/com/viaversion/fabric/mc118/providers/VRPlayerAbilitiesProvider.java b/viafabric-mc118/src/main/java/com/viaversion/fabric/mc118/providers/VFPlayerAbilitiesProvider.java
similarity index 92%
rename from viafabric-mc118/src/main/java/com/viaversion/fabric/mc118/providers/VRPlayerAbilitiesProvider.java
rename to viafabric-mc118/src/main/java/com/viaversion/fabric/mc118/providers/VFPlayerAbilitiesProvider.java
index 04272cc..b54da35 100644
--- a/viafabric-mc118/src/main/java/com/viaversion/fabric/mc118/providers/VRPlayerAbilitiesProvider.java
+++ b/viafabric-mc118/src/main/java/com/viaversion/fabric/mc118/providers/VFPlayerAbilitiesProvider.java
@@ -4,7 +4,7 @@ import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.provider.PlayerAbilitiesProvider;
 import net.minecraft.client.MinecraftClient;
 
-public class VRPlayerAbilitiesProvider extends PlayerAbilitiesProvider {
+public class VFPlayerAbilitiesProvider extends PlayerAbilitiesProvider {
 
     @Override
     public float getFlyingSpeed(UserConnection connection) {
diff --git a/viafabric-mc118/src/main/java/com/viaversion/fabric/mc118/providers/VRPlayerLookTargetProvider.java b/viafabric-mc118/src/main/java/com/viaversion/fabric/mc118/providers/VFPlayerLookTargetProvider.java
similarity index 93%
rename from viafabric-mc118/src/main/java/com/viaversion/fabric/mc118/providers/VRPlayerLookTargetProvider.java
rename to viafabric-mc118/src/main/java/com/viaversion/fabric/mc118/providers/VFPlayerLookTargetProvider.java
index 29622a6..d95a95d 100644
--- a/viafabric-mc118/src/main/java/com/viaversion/fabric/mc118/providers/VRPlayerLookTargetProvider.java
+++ b/viafabric-mc118/src/main/java/com/viaversion/fabric/mc118/providers/VFPlayerLookTargetProvider.java
@@ -8,7 +8,7 @@ import net.minecraft.util.hit.BlockHitResult;
 import net.minecraft.util.hit.HitResult;
 import net.minecraft.util.math.BlockPos;
 
-public class VRPlayerLookTargetProvider extends PlayerLookTargetProvider {
+public class VFPlayerLookTargetProvider extends PlayerLookTargetProvider {
 
     @Override
     public Position getPlayerLookTarget(UserConnection info) {
diff --git a/viafabric-mc119/src/main/java/com/viaversion/fabric/mc119/ViaFabric.java b/viafabric-mc119/src/main/java/com/viaversion/fabric/mc119/ViaFabric.java
index e7a1d2f..ea322d3 100644
--- a/viafabric-mc119/src/main/java/com/viaversion/fabric/mc119/ViaFabric.java
+++ b/viafabric-mc119/src/main/java/com/viaversion/fabric/mc119/ViaFabric.java
@@ -9,7 +9,7 @@ import com.viaversion.fabric.common.config.VFConfig;
 import com.viaversion.fabric.common.platform.FabricInjector;
 import com.viaversion.fabric.common.protocol.HostnameParserProtocol;
 import com.viaversion.fabric.common.util.JLoggerToLog4j;
-import com.viaversion.fabric.mc119.commands.VRCommandHandler;
+import com.viaversion.fabric.mc119.commands.VFCommandHandler;
 import com.viaversion.fabric.mc119.platform.FabricPlatform;
 import com.viaversion.fabric.mc119.platform.VFLoader;
 import com.viaversion.viaversion.ViaManagerImpl;
@@ -50,10 +50,10 @@ public class ViaFabric implements ModInitializer {
                 .then(
                         RequiredArgumentBuilder
                                 .<S, String>argument("args", StringArgumentType.greedyString())
-                                .executes(((VRCommandHandler) Via.getManager().getCommandHandler())::execute)
-                                .suggests(((VRCommandHandler) Via.getManager().getCommandHandler())::suggestion)
+                                .executes(((VFCommandHandler) Via.getManager().getCommandHandler())::execute)
+                                .suggests(((VFCommandHandler) Via.getManager().getCommandHandler())::suggestion)
                 )
-                .executes(((VRCommandHandler) Via.getManager().getCommandHandler())::execute);
+                .executes(((VFCommandHandler) Via.getManager().getCommandHandler())::execute);
     }
 
     @Override
@@ -63,7 +63,7 @@ public class ViaFabric implements ModInitializer {
         Via.init(ViaManagerImpl.builder()
                 .injector(new FabricInjector())
                 .loader(new VFLoader())
-                .commandHandler(new VRCommandHandler())
+                .commandHandler(new VFCommandHandler())
                 .platform(platform).build());
 
         platform.init();
diff --git a/viafabric-mc119/src/main/java/com/viaversion/fabric/mc119/commands/VRCommandHandler.java b/viafabric-mc119/src/main/java/com/viaversion/fabric/mc119/commands/VFCommandHandler.java
similarity index 97%
rename from viafabric-mc119/src/main/java/com/viaversion/fabric/mc119/commands/VRCommandHandler.java
rename to viafabric-mc119/src/main/java/com/viaversion/fabric/mc119/commands/VFCommandHandler.java
index cffd134..81e1408 100644
--- a/viafabric-mc119/src/main/java/com/viaversion/fabric/mc119/commands/VRCommandHandler.java
+++ b/viafabric-mc119/src/main/java/com/viaversion/fabric/mc119/commands/VFCommandHandler.java
@@ -10,7 +10,7 @@ import com.viaversion.viaversion.commands.ViaCommandHandler;
 
 import java.util.concurrent.CompletableFuture;
 
-public class VRCommandHandler extends ViaCommandHandler {
+public class VFCommandHandler extends ViaCommandHandler {
     {
         try {
             registerSubCommand(new LeakDetectSubCommand());
diff --git a/viafabric-mc119/src/main/java/com/viaversion/fabric/mc119/platform/VFLoader.java b/viafabric-mc119/src/main/java/com/viaversion/fabric/mc119/platform/VFLoader.java
index 9e6a322..275ef76 100644
--- a/viafabric-mc119/src/main/java/com/viaversion/fabric/mc119/platform/VFLoader.java
+++ b/viafabric-mc119/src/main/java/com/viaversion/fabric/mc119/platform/VFLoader.java
@@ -1,9 +1,9 @@
 package com.viaversion.fabric.mc119.platform;
 
-import com.viaversion.fabric.mc119.providers.VRHandItemProvider;
+import com.viaversion.fabric.mc119.providers.VFHandItemProvider;
 import com.viaversion.fabric.mc119.providers.FabricVersionProvider;
-import com.viaversion.fabric.mc119.providers.VRPlayerAbilitiesProvider;
-import com.viaversion.fabric.mc119.providers.VRPlayerLookTargetProvider;
+import com.viaversion.fabric.mc119.providers.VFPlayerAbilitiesProvider;
+import com.viaversion.fabric.mc119.providers.VFPlayerLookTargetProvider;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.providers.PlayerLookTargetProvider;
 import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.provider.PlayerAbilitiesProvider;
 import net.fabricmc.api.EnvType;
@@ -22,16 +22,15 @@ public class VFLoader implements ViaPlatformLoader {
         Via.getManager().getProviders().use(VersionProvider.class, new FabricVersionProvider());
 
         if (Via.getPlatform().getConf().isItemCache()) {
-            VRHandItemProvider handProvider = new VRHandItemProvider();
+            VFHandItemProvider handProvider = new VFHandItemProvider();
             if (FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT) {
                 handProvider.registerClientTick();
             }
             Via.getManager().getProviders().use(HandItemProvider.class, handProvider);
         }
-        if (FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT) {
-            Via.getManager().getProviders().use(PlayerAbilitiesProvider.class, new VRPlayerAbilitiesProvider());
-            Via.getManager().getProviders().use(PlayerLookTargetProvider.class, new VRPlayerLookTargetProvider());
-        }
+
+        Via.getManager().getProviders().use(PlayerAbilitiesProvider.class, new VFPlayerAbilitiesProvider());
+        Via.getManager().getProviders().use(PlayerLookTargetProvider.class, new VFPlayerLookTargetProvider());
     }
 
     @Override
diff --git a/viafabric-mc119/src/main/java/com/viaversion/fabric/mc119/providers/VRHandItemProvider.java b/viafabric-mc119/src/main/java/com/viaversion/fabric/mc119/providers/VFHandItemProvider.java
similarity index 97%
rename from viafabric-mc119/src/main/java/com/viaversion/fabric/mc119/providers/VRHandItemProvider.java
rename to viafabric-mc119/src/main/java/com/viaversion/fabric/mc119/providers/VFHandItemProvider.java
index fc69d4b..436aad1 100644
--- a/viafabric-mc119/src/main/java/com/viaversion/fabric/mc119/providers/VRHandItemProvider.java
+++ b/viafabric-mc119/src/main/java/com/viaversion/fabric/mc119/providers/VFHandItemProvider.java
@@ -15,7 +15,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.registry.Registries;
 import net.minecraft.util.Identifier;
 
-public class VRHandItemProvider extends HandItemProvider {
+public class VFHandItemProvider extends HandItemProvider {
     public Item clientItem = null;
 
     @Override
diff --git a/viafabric-mc119/src/main/java/com/viaversion/fabric/mc119/providers/VRPlayerAbilitiesProvider.java b/viafabric-mc119/src/main/java/com/viaversion/fabric/mc119/providers/VFPlayerAbilitiesProvider.java
similarity index 92%
rename from viafabric-mc119/src/main/java/com/viaversion/fabric/mc119/providers/VRPlayerAbilitiesProvider.java
rename to viafabric-mc119/src/main/java/com/viaversion/fabric/mc119/providers/VFPlayerAbilitiesProvider.java
index b11a47c..94a5c70 100644
--- a/viafabric-mc119/src/main/java/com/viaversion/fabric/mc119/providers/VRPlayerAbilitiesProvider.java
+++ b/viafabric-mc119/src/main/java/com/viaversion/fabric/mc119/providers/VFPlayerAbilitiesProvider.java
@@ -4,7 +4,7 @@ import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.provider.PlayerAbilitiesProvider;
 import net.minecraft.client.MinecraftClient;
 
-public class VRPlayerAbilitiesProvider extends PlayerAbilitiesProvider {
+public class VFPlayerAbilitiesProvider extends PlayerAbilitiesProvider {
 
     @Override
     public float getFlyingSpeed(UserConnection connection) {
diff --git a/viafabric-mc119/src/main/java/com/viaversion/fabric/mc119/providers/VRPlayerLookTargetProvider.java b/viafabric-mc119/src/main/java/com/viaversion/fabric/mc119/providers/VFPlayerLookTargetProvider.java
similarity index 92%
rename from viafabric-mc119/src/main/java/com/viaversion/fabric/mc119/providers/VRPlayerLookTargetProvider.java
rename to viafabric-mc119/src/main/java/com/viaversion/fabric/mc119/providers/VFPlayerLookTargetProvider.java
index 07c954b..d388f4d 100644
--- a/viafabric-mc119/src/main/java/com/viaversion/fabric/mc119/providers/VRPlayerLookTargetProvider.java
+++ b/viafabric-mc119/src/main/java/com/viaversion/fabric/mc119/providers/VFPlayerLookTargetProvider.java
@@ -7,7 +7,7 @@ import net.minecraft.client.MinecraftClient;
 import net.minecraft.util.hit.BlockHitResult;
 import net.minecraft.util.math.BlockPos;
 
-public class VRPlayerLookTargetProvider extends PlayerLookTargetProvider {
+public class VFPlayerLookTargetProvider extends PlayerLookTargetProvider {
 
     @Override
     public Position getPlayerLookTarget(UserConnection info) {
diff --git a/viafabric-mc120/src/main/java/com/viaversion/fabric/mc120/ViaFabric.java b/viafabric-mc120/src/main/java/com/viaversion/fabric/mc120/ViaFabric.java
index 6317ff6..64f1f93 100644
--- a/viafabric-mc120/src/main/java/com/viaversion/fabric/mc120/ViaFabric.java
+++ b/viafabric-mc120/src/main/java/com/viaversion/fabric/mc120/ViaFabric.java
@@ -9,7 +9,7 @@ import com.viaversion.fabric.common.config.VFConfig;
 import com.viaversion.fabric.common.platform.FabricInjector;
 import com.viaversion.fabric.common.protocol.HostnameParserProtocol;
 import com.viaversion.fabric.common.util.JLoggerToLog4j;
-import com.viaversion.fabric.mc120.commands.VRCommandHandler;
+import com.viaversion.fabric.mc120.commands.VFCommandHandler;
 import com.viaversion.fabric.mc120.platform.FabricPlatform;
 import com.viaversion.fabric.mc120.platform.VFLoader;
 import com.viaversion.viaversion.ViaManagerImpl;
@@ -50,10 +50,10 @@ public class ViaFabric implements ModInitializer {
                 .then(
                         RequiredArgumentBuilder
                                 .<S, String>argument("args", StringArgumentType.greedyString())
-                                .executes(((VRCommandHandler) Via.getManager().getCommandHandler())::execute)
-                                .suggests(((VRCommandHandler) Via.getManager().getCommandHandler())::suggestion)
+                                .executes(((VFCommandHandler) Via.getManager().getCommandHandler())::execute)
+                                .suggests(((VFCommandHandler) Via.getManager().getCommandHandler())::suggestion)
                 )
-                .executes(((VRCommandHandler) Via.getManager().getCommandHandler())::execute);
+                .executes(((VFCommandHandler) Via.getManager().getCommandHandler())::execute);
     }
 
     @Override
@@ -63,7 +63,7 @@ public class ViaFabric implements ModInitializer {
         Via.init(ViaManagerImpl.builder()
                 .injector(new FabricInjector())
                 .loader(new VFLoader())
-                .commandHandler(new VRCommandHandler())
+                .commandHandler(new VFCommandHandler())
                 .platform(platform).build());
 
         platform.init();
diff --git a/viafabric-mc120/src/main/java/com/viaversion/fabric/mc120/commands/VRCommandHandler.java b/viafabric-mc120/src/main/java/com/viaversion/fabric/mc120/commands/VFCommandHandler.java
similarity index 97%
rename from viafabric-mc120/src/main/java/com/viaversion/fabric/mc120/commands/VRCommandHandler.java
rename to viafabric-mc120/src/main/java/com/viaversion/fabric/mc120/commands/VFCommandHandler.java
index 33dadcb..a805977 100644
--- a/viafabric-mc120/src/main/java/com/viaversion/fabric/mc120/commands/VRCommandHandler.java
+++ b/viafabric-mc120/src/main/java/com/viaversion/fabric/mc120/commands/VFCommandHandler.java
@@ -10,7 +10,7 @@ import com.viaversion.viaversion.commands.ViaCommandHandler;
 
 import java.util.concurrent.CompletableFuture;
 
-public class VRCommandHandler extends ViaCommandHandler {
+public class VFCommandHandler extends ViaCommandHandler {
     {
         try {
             registerSubCommand(new LeakDetectSubCommand());
diff --git a/viafabric-mc120/src/main/java/com/viaversion/fabric/mc120/platform/VFLoader.java b/viafabric-mc120/src/main/java/com/viaversion/fabric/mc120/platform/VFLoader.java
index 97f8e8d..002384a 100644
--- a/viafabric-mc120/src/main/java/com/viaversion/fabric/mc120/platform/VFLoader.java
+++ b/viafabric-mc120/src/main/java/com/viaversion/fabric/mc120/platform/VFLoader.java
@@ -1,9 +1,9 @@
 package com.viaversion.fabric.mc120.platform;
 
-import com.viaversion.fabric.mc120.providers.VRHandItemProvider;
+import com.viaversion.fabric.mc120.providers.VFHandItemProvider;
 import com.viaversion.fabric.mc120.providers.FabricVersionProvider;
-import com.viaversion.fabric.mc120.providers.VRPlayerAbilitiesProvider;
-import com.viaversion.fabric.mc120.providers.VRPlayerLookTargetProvider;
+import com.viaversion.fabric.mc120.providers.VFPlayerAbilitiesProvider;
+import com.viaversion.fabric.mc120.providers.VFPlayerLookTargetProvider;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.providers.PlayerLookTargetProvider;
 import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.provider.PlayerAbilitiesProvider;
 import net.fabricmc.api.EnvType;
@@ -22,16 +22,15 @@ public class VFLoader implements ViaPlatformLoader {
         Via.getManager().getProviders().use(VersionProvider.class, new FabricVersionProvider());
 
         if (Via.getPlatform().getConf().isItemCache()) {
-            VRHandItemProvider handProvider = new VRHandItemProvider();
+            VFHandItemProvider handProvider = new VFHandItemProvider();
             if (FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT) {
                 handProvider.registerClientTick();
             }
             Via.getManager().getProviders().use(HandItemProvider.class, handProvider);
         }
-        if (FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT) {
-            Via.getManager().getProviders().use(PlayerAbilitiesProvider.class, new VRPlayerAbilitiesProvider());
-            Via.getManager().getProviders().use(PlayerLookTargetProvider.class, new VRPlayerLookTargetProvider());
-        }
+
+        Via.getManager().getProviders().use(PlayerAbilitiesProvider.class, new VFPlayerAbilitiesProvider());
+        Via.getManager().getProviders().use(PlayerLookTargetProvider.class, new VFPlayerLookTargetProvider());
     }
 
     @Override
diff --git a/viafabric-mc120/src/main/java/com/viaversion/fabric/mc120/providers/VRHandItemProvider.java b/viafabric-mc120/src/main/java/com/viaversion/fabric/mc120/providers/VFHandItemProvider.java
similarity index 97%
rename from viafabric-mc120/src/main/java/com/viaversion/fabric/mc120/providers/VRHandItemProvider.java
rename to viafabric-mc120/src/main/java/com/viaversion/fabric/mc120/providers/VFHandItemProvider.java
index 89601ee..dfcc3b7 100644
--- a/viafabric-mc120/src/main/java/com/viaversion/fabric/mc120/providers/VRHandItemProvider.java
+++ b/viafabric-mc120/src/main/java/com/viaversion/fabric/mc120/providers/VFHandItemProvider.java
@@ -15,7 +15,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.registry.Registries;
 import net.minecraft.util.Identifier;
 
-public class VRHandItemProvider extends HandItemProvider {
+public class VFHandItemProvider extends HandItemProvider {
     public Item clientItem = null;
 
     @Override
diff --git a/viafabric-mc120/src/main/java/com/viaversion/fabric/mc120/providers/VRPlayerAbilitiesProvider.java b/viafabric-mc120/src/main/java/com/viaversion/fabric/mc120/providers/VFPlayerAbilitiesProvider.java
similarity index 92%
rename from viafabric-mc120/src/main/java/com/viaversion/fabric/mc120/providers/VRPlayerAbilitiesProvider.java
rename to viafabric-mc120/src/main/java/com/viaversion/fabric/mc120/providers/VFPlayerAbilitiesProvider.java
index 5b10236..0bd6360 100644
--- a/viafabric-mc120/src/main/java/com/viaversion/fabric/mc120/providers/VRPlayerAbilitiesProvider.java
+++ b/viafabric-mc120/src/main/java/com/viaversion/fabric/mc120/providers/VFPlayerAbilitiesProvider.java
@@ -4,7 +4,7 @@ import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.provider.PlayerAbilitiesProvider;
 import net.minecraft.client.MinecraftClient;
 
-public class VRPlayerAbilitiesProvider extends PlayerAbilitiesProvider {
+public class VFPlayerAbilitiesProvider extends PlayerAbilitiesProvider {
 
     @Override
     public float getFlyingSpeed(UserConnection connection) {
diff --git a/viafabric-mc120/src/main/java/com/viaversion/fabric/mc120/providers/VRPlayerLookTargetProvider.java b/viafabric-mc120/src/main/java/com/viaversion/fabric/mc120/providers/VFPlayerLookTargetProvider.java
similarity index 92%
rename from viafabric-mc120/src/main/java/com/viaversion/fabric/mc120/providers/VRPlayerLookTargetProvider.java
rename to viafabric-mc120/src/main/java/com/viaversion/fabric/mc120/providers/VFPlayerLookTargetProvider.java
index dcae364..b1382c6 100644
--- a/viafabric-mc120/src/main/java/com/viaversion/fabric/mc120/providers/VRPlayerLookTargetProvider.java
+++ b/viafabric-mc120/src/main/java/com/viaversion/fabric/mc120/providers/VFPlayerLookTargetProvider.java
@@ -7,7 +7,7 @@ import net.minecraft.client.MinecraftClient;
 import net.minecraft.util.hit.BlockHitResult;
 import net.minecraft.util.math.BlockPos;
 
-public class VRPlayerLookTargetProvider extends PlayerLookTargetProvider {
+public class VFPlayerLookTargetProvider extends PlayerLookTargetProvider {
 
     @Override
     public Position getPlayerLookTarget(UserConnection info) {
diff --git a/viafabric-mc18/src/main/java/com/viaversion/fabric/mc18/ViaFabric.java b/viafabric-mc18/src/main/java/com/viaversion/fabric/mc18/ViaFabric.java
index 8b48d20..f115766 100644
--- a/viafabric-mc18/src/main/java/com/viaversion/fabric/mc18/ViaFabric.java
+++ b/viafabric-mc18/src/main/java/com/viaversion/fabric/mc18/ViaFabric.java
@@ -7,7 +7,7 @@ import com.viaversion.fabric.common.platform.FabricInjector;
 import com.viaversion.fabric.common.protocol.HostnameParserProtocol;
 import com.viaversion.fabric.common.util.JLoggerToLog4j;
 import com.viaversion.fabric.mc18.commands.NMSCommandImpl;
-import com.viaversion.fabric.mc18.commands.VRCommandHandler;
+import com.viaversion.fabric.mc18.commands.VFCommandHandler;
 import com.viaversion.fabric.mc18.platform.FabricPlatform;
 import com.viaversion.fabric.mc18.platform.VFLoader;
 import com.viaversion.viaversion.ViaManagerImpl;
@@ -47,7 +47,7 @@ public class ViaFabric implements ModInitializer {
         Via.init(ViaManagerImpl.builder()
                 .injector(new FabricInjector())
                 .loader(new VFLoader())
-                .commandHandler(new VRCommandHandler())
+                .commandHandler(new VFCommandHandler())
                 .platform(platform).build());
 
         platform.init();
diff --git a/viafabric-mc18/src/main/java/com/viaversion/fabric/mc18/commands/VRCommandHandler.java b/viafabric-mc18/src/main/java/com/viaversion/fabric/mc18/commands/VFCommandHandler.java
similarity index 85%
rename from viafabric-mc18/src/main/java/com/viaversion/fabric/mc18/commands/VRCommandHandler.java
rename to viafabric-mc18/src/main/java/com/viaversion/fabric/mc18/commands/VFCommandHandler.java
index 3abc31f..40f2d80 100644
--- a/viafabric-mc18/src/main/java/com/viaversion/fabric/mc18/commands/VRCommandHandler.java
+++ b/viafabric-mc18/src/main/java/com/viaversion/fabric/mc18/commands/VFCommandHandler.java
@@ -3,7 +3,7 @@ package com.viaversion.fabric.mc18.commands;
 import com.viaversion.fabric.common.commands.subs.LeakDetectSubCommand;
 import com.viaversion.viaversion.commands.ViaCommandHandler;
 
-public class VRCommandHandler extends ViaCommandHandler {
+public class VFCommandHandler extends ViaCommandHandler {
     {
         try {
             registerSubCommand(new LeakDetectSubCommand());
diff --git a/viafabric-mc18/src/main/java/com/viaversion/fabric/mc18/platform/VFLoader.java b/viafabric-mc18/src/main/java/com/viaversion/fabric/mc18/platform/VFLoader.java
index 4f80645..351eafa 100644
--- a/viafabric-mc18/src/main/java/com/viaversion/fabric/mc18/platform/VFLoader.java
+++ b/viafabric-mc18/src/main/java/com/viaversion/fabric/mc18/platform/VFLoader.java
@@ -1,6 +1,6 @@
 package com.viaversion.fabric.mc18.platform;
 
-import com.viaversion.fabric.mc18.providers.VRHandItemProvider;
+import com.viaversion.fabric.mc18.providers.VFHandItemProvider;
 import com.viaversion.fabric.mc18.providers.FabricVersionProvider;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.loader.api.FabricLoader;
@@ -18,7 +18,7 @@ public class VFLoader implements ViaPlatformLoader {
         Via.getManager().getProviders().use(VersionProvider.class, new FabricVersionProvider());
 
         if (Via.getPlatform().getConf().isItemCache()) {
-            VRHandItemProvider handProvider = new VRHandItemProvider();
+            VFHandItemProvider handProvider = new VFHandItemProvider();
             if (FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT) {
                 handProvider.registerClientTick();
             }
diff --git a/viafabric-mc18/src/main/java/com/viaversion/fabric/mc18/providers/VRHandItemProvider.java b/viafabric-mc18/src/main/java/com/viaversion/fabric/mc18/providers/VFHandItemProvider.java
similarity index 97%
rename from viafabric-mc18/src/main/java/com/viaversion/fabric/mc18/providers/VRHandItemProvider.java
rename to viafabric-mc18/src/main/java/com/viaversion/fabric/mc18/providers/VFHandItemProvider.java
index d7509c3..b62609b 100644
--- a/viafabric-mc18/src/main/java/com/viaversion/fabric/mc18/providers/VRHandItemProvider.java
+++ b/viafabric-mc18/src/main/java/com/viaversion/fabric/mc18/providers/VFHandItemProvider.java
@@ -18,7 +18,7 @@ import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 
-public class VRHandItemProvider extends HandItemProvider {
+public class VFHandItemProvider extends HandItemProvider {
     public final Map<UUID, Item> serverPlayers = new ConcurrentHashMap<>();
     public Item clientItem = null;