diff --git a/src/main/java/dev/isxander/controlify/fixes/boatfix/AnalogBoatInput.java b/src/main/java/dev/isxander/controlify/fixes/boatfix/AnalogBoatInput.java
index 8b3dc48..036e5c3 100644
--- a/src/main/java/dev/isxander/controlify/fixes/boatfix/AnalogBoatInput.java
+++ b/src/main/java/dev/isxander/controlify/fixes/boatfix/AnalogBoatInput.java
@@ -6,5 +6,5 @@ import dev.isxander.controlify.mixins.feature.patches.boatfix.BoatMixin;
  * @see BoatMixin
  */
 public interface AnalogBoatInput {
-    void setAnalogInput(float forward, float right);
+    void controlify$setAnalogInput(float forward, float right);
 }
diff --git a/src/main/java/dev/isxander/controlify/mixins/feature/patches/boatfix/BoatMixin.java b/src/main/java/dev/isxander/controlify/mixins/feature/patches/boatfix/BoatMixin.java
index dcac80b..156c1cc 100644
--- a/src/main/java/dev/isxander/controlify/mixins/feature/patches/boatfix/BoatMixin.java
+++ b/src/main/java/dev/isxander/controlify/mixins/feature/patches/boatfix/BoatMixin.java
@@ -50,7 +50,7 @@ public abstract class BoatMixin implements AnalogBoatInput {
     }
 
     @Override
-    public void setAnalogInput(float forward, float right) {
+    public void controlify$setAnalogInput(float forward, float right) {
         this.usingAnalogInput = true;
 
         this.analogForward = forward;
diff --git a/src/main/java/dev/isxander/controlify/mixins/feature/patches/boatfix/LocalPlayerMixin.java b/src/main/java/dev/isxander/controlify/mixins/feature/patches/boatfix/LocalPlayerMixin.java
index 8c13de3..c1c1387 100644
--- a/src/main/java/dev/isxander/controlify/mixins/feature/patches/boatfix/LocalPlayerMixin.java
+++ b/src/main/java/dev/isxander/controlify/mixins/feature/patches/boatfix/LocalPlayerMixin.java
@@ -18,8 +18,8 @@ public class LocalPlayerMixin {
 
     @WrapOperation(method = "rideTick", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/vehicle/Boat;setInput(ZZZZ)V"))
     private void useAnalogInput(Boat boat, boolean pressingLeft, boolean pressingRight, boolean pressingForward, boolean pressingBack, Operation<Void> original) {
-        if (ControlifyApi.get().currentInputMode().isController() && !Controlify.instance().config().globalSettings().keyboardMovement) {
-            ((AnalogBoatInput) boat).setAnalogInput(
+        if (ControlifyApi.get().currentInputMode().isController() && !Controlify.instance().config().globalSettings().shouldUseKeyboardMovement()) {
+            ((AnalogBoatInput) boat).controlify$setAnalogInput(
                     input.forwardImpulse,
                     -input.leftImpulse
             );
diff --git a/src/main/resources/controlify.mixins.json b/src/main/resources/controlify.mixins.json
index 3bc17d3..d2690e7 100644
--- a/src/main/resources/controlify.mixins.json
+++ b/src/main/resources/controlify.mixins.json
@@ -35,8 +35,6 @@
     "feature.bind.ToggleKeyMappingAccessor",
     "feature.chatkbheight.ChatComponentMixin",
     "feature.chatkbheight.ChatScreenMixin",
-    "feature.patches.boatfix.BoatMixin",
-    "feature.patches.boatfix.LocalPlayerMixin",
     "feature.guide.ingame.ClientPacketListenerMixin",
     "feature.guide.ingame.GuiMixin",
     "feature.guide.screen.AbstractButtonMixin",
@@ -45,6 +43,8 @@
     "feature.guide.screen.TabNavigationBarMixin",
     "feature.input.MinecraftMixin",
     "feature.oofinput.GameRendererMixin",
+    "feature.patches.boatfix.BoatMixin",
+    "feature.patches.boatfix.LocalPlayerMixin",
     "feature.reacharound.GameRendererMixin",
     "feature.rumble.blockbreak.MultiPlayerGameModeMixin",
     "feature.rumble.damage.LocalPlayerMixin",