diff --git a/RotationSolver/Commands/RSCommandType.cs b/RotationSolver/Commands/RSCommandType.cs
index d2773dc83..81baa4503 100644
--- a/RotationSolver/Commands/RSCommandType.cs
+++ b/RotationSolver/Commands/RSCommandType.cs
@@ -11,7 +11,7 @@ internal enum SpecialCommandType : byte
         RaiseShirk,
         MoveForward,
         MoveBack,
-        AntiRepulsion,
+        AntiKnockback,
         Burst,
     }
 
diff --git a/RotationSolver/Helpers/TargetFilter.cs b/RotationSolver/Helpers/TargetFilter.cs
index b756a68e0..d63c45c87 100644
--- a/RotationSolver/Helpers/TargetFilter.cs
+++ b/RotationSolver/Helpers/TargetFilter.cs
@@ -61,7 +61,8 @@ internal static BattleChara FindTargetForMoving(IEnumerable<BattleChara> charas,
         if (mustUse)
         {
             var tar = charas.OrderBy(DistanceToPlayer).FirstOrDefault();
-            if (tar?.DistanceToPlayer() < 1) return tar;
+            if(tar == null) return null;
+            if (tar.DistanceToPlayer() < 1) return tar;
             return null;
         }
 
diff --git a/RotationSolver/Localization/EnumTranslations.cs b/RotationSolver/Localization/EnumTranslations.cs
index 590b092c8..759a4b126 100644
--- a/RotationSolver/Localization/EnumTranslations.cs
+++ b/RotationSolver/Localization/EnumTranslations.cs
@@ -119,7 +119,7 @@ internal static class EnumTranslations
         },
         SpecialCommandType.MoveForward => "Start Move Forward",
         SpecialCommandType.MoveBack => "Start Move Back",
-        SpecialCommandType.AntiRepulsion => "Start AntiRepulsion",
+        SpecialCommandType.AntiKnockback => "Start AntiKnockback",
         SpecialCommandType.Burst => "Start Break",
         SpecialCommandType.EndSpecial => "End Special",
         _ => string.Empty,
@@ -154,7 +154,7 @@ internal static class EnumTranslations
         },
         SpecialCommandType.MoveForward => "Move Forward",
         SpecialCommandType.MoveBack => "Move Back",
-        SpecialCommandType.AntiRepulsion => "AntiRepulsion",
+        SpecialCommandType.AntiKnockback => "AntiKnockback",
         SpecialCommandType.Burst => "Break",
         SpecialCommandType.EndSpecial => "End Special",
         _ => string.Empty,
@@ -178,7 +178,7 @@ internal static class EnumTranslations
         SpecialCommandType.RaiseShirk => LocalizationManager.RightLang.Configwindow_HelpItem_RaiseShirk,
         SpecialCommandType.MoveForward => LocalizationManager.RightLang.Configwindow_HelpItem_MoveForward,
         SpecialCommandType.MoveBack => LocalizationManager.RightLang.Configwindow_HelpItem_MoveBack,
-        SpecialCommandType.AntiRepulsion => LocalizationManager.RightLang.Configwindow_HelpItem_AntiRepulsion,
+        SpecialCommandType.AntiKnockback => LocalizationManager.RightLang.Configwindow_HelpItem_AntiKnockback,
         SpecialCommandType.Burst => LocalizationManager.RightLang.Configwindow_HelpItem_Break,
         SpecialCommandType.EndSpecial => LocalizationManager.RightLang.Configwindow_HelpItem_EndSpecial,
         _ => string.Empty,
diff --git a/RotationSolver/Localization/Localization.json b/RotationSolver/Localization/Localization.json
index 5b2971f9b..b9e9e86f6 100644
--- a/RotationSolver/Localization/Localization.json
+++ b/RotationSolver/Localization/Localization.json
@@ -23,7 +23,7 @@
   "Configwindow_HelpItem_DefenseSingle": "Open a window to use one or more single defense.",
   "Configwindow_HelpItem_EsunaShield": "Open a window to use Esuna,tank stance actions or True North.",
   "Configwindow_HelpItem_RaiseShirk": "Open a window to use Raise or Shirk.",
-  "Configwindow_HelpItem_AntiRepulsion": "Open a window to use knockback-penalty actions.",
+  "Configwindow_HelpItem_AntiKnockback": "Open a window to use knockback-penalty actions.",
   "Configwindow_HelpItem_Break": "Open a window to use break-combo.",
   "Configwindow_HelpItem_MoveForward": "Open a window to move forward.",
   "Configwindow_HelpItem_MoveBack": "Open a window to move back.",
diff --git a/RotationSolver/Localization/Strings.cs b/RotationSolver/Localization/Strings.cs
index 83480813a..c83ae19d1 100644
--- a/RotationSolver/Localization/Strings.cs
+++ b/RotationSolver/Localization/Strings.cs
@@ -60,7 +60,7 @@ internal class Strings
     public string Configwindow_HelpItem_RaiseShirk { get; set; }
         = "Open a window to use Raise or Shirk.";
 
-    public string Configwindow_HelpItem_AntiRepulsion { get; set; }
+    public string Configwindow_HelpItem_AntiKnockback { get; set; }
         = "Open a window to use knockback-penalty actions.";
 
     public string Configwindow_HelpItem_Break { get; set; }
diff --git a/RotationSolver/Rotations/CustomRotation/CustomRotation_Ability.cs b/RotationSolver/Rotations/CustomRotation/CustomRotation_Ability.cs
index 8a9a861b9..2378dda27 100644
--- a/RotationSolver/Rotations/CustomRotation/CustomRotation_Ability.cs
+++ b/RotationSolver/Rotations/CustomRotation/CustomRotation_Ability.cs
@@ -108,7 +108,7 @@ private bool AntiRepulsion(JobRole role, SpecialCommandType specialType, out IAc
     {
         act = null;
 
-        if (specialType != SpecialCommandType.AntiRepulsion) return false;
+        if (specialType != SpecialCommandType.AntiKnockback) return false;
 
         switch (role)
         {
diff --git a/RotationSolver/Windows/RotationConfigWindow_Help.cs b/RotationSolver/Windows/RotationConfigWindow_Help.cs
index 36d2fe918..e1e2269c6 100644
--- a/RotationSolver/Windows/RotationConfigWindow_Help.cs
+++ b/RotationSolver/Windows/RotationConfigWindow_Help.cs
@@ -73,7 +73,7 @@ private void DrawHelpTab()
                 SpecialCommandType.RaiseShirk.DisplayCommandHelp(getHelp: EnumTranslations.ToHelp);
                 ImGui.Separator();
 
-                SpecialCommandType.AntiRepulsion.DisplayCommandHelp(getHelp: EnumTranslations.ToHelp);
+                SpecialCommandType.AntiKnockback.DisplayCommandHelp(getHelp: EnumTranslations.ToHelp);
                 ImGui.Separator();
 
                 SpecialCommandType.Burst.DisplayCommandHelp(getHelp: EnumTranslations.ToHelp);