diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/v1_8_boat/MixinAbstractBoatEntity.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/r1_8_boat/MixinAbstractBoatEntity.java
similarity index 99%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/v1_8_boat/MixinAbstractBoatEntity.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/r1_8_boat/MixinAbstractBoatEntity.java
index a0106f55..63f1015a 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/v1_8_boat/MixinAbstractBoatEntity.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/r1_8_boat/MixinAbstractBoatEntity.java
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.entity.v1_8_boat;
+package com.viaversion.viafabricplus.injection.mixin.features.entity.r1_8_boat;
 
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/v1_8_boat/MixinEntityModels.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/r1_8_boat/MixinEntityModels.java
similarity index 99%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/v1_8_boat/MixinEntityModels.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/r1_8_boat/MixinEntityModels.java
index 084ca748..2aeaa88c 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/v1_8_boat/MixinEntityModels.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/r1_8_boat/MixinEntityModels.java
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.entity.v1_8_boat;
+package com.viaversion.viafabricplus.injection.mixin.features.entity.r1_8_boat;
 
 import com.google.common.collect.ImmutableMap;
 import com.viaversion.viafabricplus.features.entity.v1_8_boat.BoatModel1_8;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/v1_8_boat/MixinEntityRenderDispatcher.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/r1_8_boat/MixinEntityRenderDispatcher.java
similarity index 99%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/v1_8_boat/MixinEntityRenderDispatcher.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/r1_8_boat/MixinEntityRenderDispatcher.java
index 6fe6a03a..c588bcec 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/v1_8_boat/MixinEntityRenderDispatcher.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/r1_8_boat/MixinEntityRenderDispatcher.java
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.entity.v1_8_boat;
+package com.viaversion.viafabricplus.injection.mixin.features.entity.r1_8_boat;
 
 import com.llamalad7.mixinextras.sugar.Local;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/interaction/v1_18_2_block_ack_emulation/MixinClientPlayerInteractionManager.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/interaction/r1_18_2_block_ack_emulation/MixinClientPlayerInteractionManager.java
similarity index 98%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/interaction/v1_18_2_block_ack_emulation/MixinClientPlayerInteractionManager.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/interaction/r1_18_2_block_ack_emulation/MixinClientPlayerInteractionManager.java
index 089bbfb0..3beb2cbc 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/interaction/v1_18_2_block_ack_emulation/MixinClientPlayerInteractionManager.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/interaction/r1_18_2_block_ack_emulation/MixinClientPlayerInteractionManager.java
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.interaction.v1_18_2_block_ack_emulation;
+package com.viaversion.viafabricplus.injection.mixin.features.interaction.r1_18_2_block_ack_emulation;
 
 import com.viaversion.viafabricplus.features.interaction.v1_18_2_block_ack_emulation.ClientPlayerInteractionManager1_18_2;
 import com.viaversion.viafabricplus.injection.access.IClientPlayerInteractionManager;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/interaction/v1_18_2_block_ack_emulation/MixinWorldPacketRewriter1_19.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/interaction/r1_18_2_block_ack_emulation/MixinWorldPacketRewriter1_19.java
similarity index 98%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/interaction/v1_18_2_block_ack_emulation/MixinWorldPacketRewriter1_19.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/interaction/r1_18_2_block_ack_emulation/MixinWorldPacketRewriter1_19.java
index 5d69511b..36eac3e7 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/interaction/v1_18_2_block_ack_emulation/MixinWorldPacketRewriter1_19.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/interaction/r1_18_2_block_ack_emulation/MixinWorldPacketRewriter1_19.java
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.interaction.v1_18_2_block_ack_emulation;
+package com.viaversion.viafabricplus.injection.mixin.features.interaction.r1_18_2_block_ack_emulation;
 
 import com.viaversion.viafabricplus.base.sync_tasks.SyncTasks;
 import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/v1_14_4_enchantment_tooltip/MixinItemStack.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/r1_14_4_enchantment_tooltip/MixinItemStack.java
similarity index 99%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/v1_14_4_enchantment_tooltip/MixinItemStack.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/r1_14_4_enchantment_tooltip/MixinItemStack.java
index 4961e784..987a1989 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/v1_14_4_enchantment_tooltip/MixinItemStack.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/r1_14_4_enchantment_tooltip/MixinItemStack.java
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.item.v1_14_4_enchantment_tooltip;
+package com.viaversion.viafabricplus.injection.mixin.features.item.r1_14_4_enchantment_tooltip;
 
 import com.viaversion.viafabricplus.features.item.tooltip_changes.Enchantments1_14_4;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/movement/v1_5_2_vehicle_movement/MixinClientPlayerEntity.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/movement/r1_5_2_vehicle_movement/MixinClientPlayerEntity.java
similarity index 99%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/movement/v1_5_2_vehicle_movement/MixinClientPlayerEntity.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/movement/r1_5_2_vehicle_movement/MixinClientPlayerEntity.java
index 331e5742..da4dbbd0 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/movement/v1_5_2_vehicle_movement/MixinClientPlayerEntity.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/movement/r1_5_2_vehicle_movement/MixinClientPlayerEntity.java
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.movement.v1_5_2_vehicle_movement;
+package com.viaversion.viafabricplus.injection.mixin.features.movement.r1_5_2_vehicle_movement;
 
 import com.mojang.authlib.GameProfile;
 import com.viaversion.viafabricplus.injection.access.base.IClientConnection;
diff --git a/src/main/resources/viafabricplus.mixins.json b/src/main/resources/viafabricplus.mixins.json
index 2f65506f..8c4c9035 100644
--- a/src/main/resources/viafabricplus.mixins.json
+++ b/src/main/resources/viafabricplus.mixins.json
@@ -112,9 +112,9 @@
     "features.entity.riding_offset.MixinCamelEntity",
     "features.entity.riding_offset.MixinEntity",
     "features.entity.riding_offset.MixinLivingEntity",
-    "features.entity.v1_8_boat.MixinAbstractBoatEntity",
-    "features.entity.v1_8_boat.MixinEntityModels",
-    "features.entity.v1_8_boat.MixinEntityRenderDispatcher",
+    "features.entity.r1_8_boat.MixinAbstractBoatEntity",
+    "features.entity.r1_8_boat.MixinEntityModels",
+    "features.entity.r1_8_boat.MixinEntityRenderDispatcher",
     "features.execute_inputs_sync.MixinKeyboard",
     "features.execute_inputs_sync.MixinMinecraftClient",
     "features.execute_inputs_sync.MixinMouse",
@@ -135,8 +135,8 @@
     "features.interaction.replace_block_item_use_logic.MixinClientPlayerInteractionManager",
     "features.interaction.replace_block_item_use_logic.MixinItemPlacementContext",
     "features.interaction.replace_block_item_use_logic.MixinMinecraftClient",
-    "features.interaction.v1_18_2_block_ack_emulation.MixinClientPlayerInteractionManager",
-    "features.interaction.v1_18_2_block_ack_emulation.MixinWorldPacketRewriter1_19",
+    "features.interaction.r1_18_2_block_ack_emulation.MixinClientPlayerInteractionManager",
+    "features.interaction.r1_18_2_block_ack_emulation.MixinWorldPacketRewriter1_19",
     "features.item.attack_damage.MixinItemPacketRewriter1_9",
     "features.item.attack_damage.MixinItemStack",
     "features.item.cooldown.MixinItemCooldownManager",
@@ -159,7 +159,7 @@
     "features.item.negative_item_count.MixinDrawContext",
     "features.item.sword_blocking.MixinBlockItemPacketRewriter1_21_4",
     "features.item.sword_blocking.MixinSwordItem",
-    "features.item.v1_14_4_enchantment_tooltip.MixinItemStack",
+    "features.item.r1_14_4_enchantment_tooltip.MixinItemStack",
     "features.large_container.MixinItemPacketRewriter1_14",
     "features.legacy_tab_completion.MixinAbstractCommandBlockScreen",
     "features.legacy_tab_completion.MixinChatInputSuggestor",
@@ -190,7 +190,7 @@
     "features.movement.slowdown_calculation.MixinClientPlayerEntity",
     "features.movement.slowdown_calculation.MixinEnderEyeItem",
     "features.movement.sprinting_sneaking_condition.MixinClientPlayerEntity",
-    "features.movement.v1_5_2_vehicle_movement.MixinClientPlayerEntity",
+    "features.movement.r1_5_2_vehicle_movement.MixinClientPlayerEntity",
     "features.movement.water_movement.MixinClientPlayerEntity",
     "features.movement.water_movement.MixinEntity",
     "features.movement.water_movement.MixinFlowableFluid",