diff --git a/src/Mod/CAM/Gui/Resources/panels/PageOpAdaptiveEdit.ui b/src/Mod/CAM/Gui/Resources/panels/PageOpAdaptiveEdit.ui
index 208c3916df..e20e4fafa4 100644
--- a/src/Mod/CAM/Gui/Resources/panels/PageOpAdaptiveEdit.ui
+++ b/src/Mod/CAM/Gui/Resources/panels/PageOpAdaptiveEdit.ui
@@ -294,14 +294,14 @@ Larger values (further to the right) will calculate faster; smaller values (furt
       <item row="14" column="0">
        <widget class="QLabel" name="label_9">
         <property name="text">
-         <string>Helix ideal diameter percent</string>
+         <string>Helix max diameter percent</string>
         </property>
        </widget>
       </item>
       <item row="14" column="1">
-       <widget class="QSpinBox" name="HelixIdealDiameterPercent">
+       <widget class="QSpinBox" name="HelixMaxDiameterPercent">
         <property name="toolTip">
-         <string>Ideal helix entry diameter, as a percentage of the tool diameter.</string>
+         <string>Maximum (and nominal) helix entry diameter, as a percentage of the tool diameter.</string>
         </property>
         <property name="minimum">
          <number>10</number>
diff --git a/src/Mod/CAM/Path/Op/Adaptive.py b/src/Mod/CAM/Path/Op/Adaptive.py
index 82d899e2d9..b6a69f7fd8 100644
--- a/src/Mod/CAM/Path/Op/Adaptive.py
+++ b/src/Mod/CAM/Path/Op/Adaptive.py
@@ -541,11 +541,9 @@ def Execute(op, obj):
 
     try:
         obj.HelixMinDiameterPercent = max(obj.HelixMinDiameterPercent, 10)
-        obj.HelixIdealDiameterPercent = max(
-            obj.HelixIdealDiameterPercent, obj.HelixMinDiameterPercent
-        )
+        obj.HelixMaxDiameterPercent = max(obj.HelixMaxDiameterPercent, obj.HelixMinDiameterPercent)
 
-        helixDiameter = obj.HelixIdealDiameterPercent / 100 * op.tool.Diameter.Value
+        helixDiameter = obj.HelixMaxDiameterPercent / 100 * op.tool.Diameter.Value
         helixMinDiameter = obj.HelixMinDiameterPercent / 100 * op.tool.Diameter.Value
         topZ = op.stock.Shape.BoundBox.ZMax
         obj.Stopped = False
@@ -710,12 +708,10 @@ def ExecuteModelAware(op, obj):
 
     try:
         obj.HelixMinDiameterPercent = max(obj.HelixMinDiameterPercent, 10)
-        obj.HelixIdealDiameterPercent = max(
-            obj.HelixIdealDiameterPercent, obj.HelixMinDiameterPercent
-        )
+        obj.HelixMaxDiameterPercent = max(obj.HelixMaxDiameterPercent, obj.HelixMinDiameterPercent)
         obj.StepOver = max(obj.StepOver, 1)
 
-        helixDiameter = obj.HelixIdealDiameterPercent / 100 * op.tool.Diameter.Value
+        helixDiameter = obj.HelixMaxDiameterPercent / 100 * op.tool.Diameter.Value
         helixMinDiameter = obj.HelixMinDiameterPercent / 100 * op.tool.Diameter.Value
         topZ = op.stock.Shape.BoundBox.ZMax
         obj.Stopped = False
@@ -1840,11 +1836,11 @@ class PathAdaptive(PathOp.ObjectOp):
         )
         obj.addProperty(
             "App::PropertyPercent",
-            "HelixIdealDiameterPercent",
+            "HelixMaxDiameterPercent",
             "Adaptive",
             QT_TRANSLATE_NOOP(
                 "App::Property",
-                "Ideal helix entry diameter, as a percentage of the tool diameter",
+                "Maximum (and nominal) helix entry diameter, as a percentage of the tool diameter",
             ),
         )
         obj.addProperty(
@@ -1912,7 +1908,7 @@ class PathAdaptive(PathOp.ObjectOp):
         obj.StopProcessing = False
         obj.HelixAngle = 5
         obj.HelixConeAngle = 0
-        obj.HelixIdealDiameterPercent = 100
+        obj.HelixMaxDiameterPercent = 100
         obj.HelixMinDiameterPercent = 10
         obj.AdaptiveInputState = ""
         obj.AdaptiveOutputState = ""
@@ -2008,11 +2004,11 @@ class PathAdaptive(PathOp.ObjectOp):
             obj.removeProperty("HelixDiameterLimit")
             obj.addProperty(
                 "App::PropertyPercent",
-                "HelixIdealDiameterPercent",
+                "HelixMaxDiameterPercent",
                 "Adaptive",
                 QT_TRANSLATE_NOOP(
                     "App::Property",
-                    "Ideal helix entry diameter, as a percentage of the tool diameter",
+                    "Maximum (and nominal) helix entry diameter, as a percentage of the tool diameter",
                 ),
             )
             obj.addProperty(
@@ -2026,7 +2022,7 @@ class PathAdaptive(PathOp.ObjectOp):
             )
             obj.HelixMinDiameterPercent = 10
             if hasattr(obj, "ToolController"):
-                obj.HelixIdealDiameterPercent = int(
+                obj.HelixMaxDiameterPercent = int(
                     75 if oldD == 0 else 100 * oldD / obj.ToolController.Tool.Diameter.Value
                 )
 
@@ -2063,7 +2059,7 @@ def SetupProperties():
         "AdaptiveOutputState",
         "HelixAngle",
         "HelixConeAngle",
-        "HelixIdealDiameterPercent",
+        "HelixMaxDiameterPercent",
         "HelixMinDiameterPercent",
         "UseOutline",
         "OrderCutsByRegion",
diff --git a/src/Mod/CAM/Path/Op/Gui/Adaptive.py b/src/Mod/CAM/Path/Op/Gui/Adaptive.py
index 8f484a3e1b..70c98b3ef4 100644
--- a/src/Mod/CAM/Path/Op/Gui/Adaptive.py
+++ b/src/Mod/CAM/Path/Op/Gui/Adaptive.py
@@ -62,7 +62,7 @@ class TaskPanelOpPage(PathOpGui.TaskPanelPage):
         signals.append(self.form.HelixAngle.valueChanged)
         signals.append(self.form.HelixMaxStepdown.valueChanged)
         signals.append(self.form.HelixConeAngle.valueChanged)
-        signals.append(self.form.HelixIdealDiameterPercent.valueChanged)
+        signals.append(self.form.HelixMaxDiameterPercent.valueChanged)
         signals.append(self.form.HelixMinDiameterPercent.valueChanged)
         signals.append(self.form.LiftDistance.valueChanged)
         signals.append(self.form.KeepToolDownRatio.valueChanged)
@@ -95,7 +95,7 @@ class TaskPanelOpPage(PathOpGui.TaskPanelPage):
             FreeCAD.Units.Quantity(obj.HelixConeAngle, FreeCAD.Units.Angle).UserString
         )
 
-        self.form.HelixIdealDiameterPercent.setValue(obj.HelixIdealDiameterPercent)
+        self.form.HelixMaxDiameterPercent.setValue(obj.HelixMaxDiameterPercent)
         self.form.HelixMinDiameterPercent.setValue(obj.HelixMinDiameterPercent)
 
         self.form.LiftDistance.setProperty("rawValue", obj.LiftDistance.Value)
@@ -128,8 +128,8 @@ class TaskPanelOpPage(PathOpGui.TaskPanelPage):
         if obj.StepOver != self.form.stepOverPercent.value():
             obj.StepOver = self.form.stepOverPercent.value()
 
-        if obj.HelixIdealDiameterPercent != self.form.HelixIdealDiameterPercent.value():
-            obj.HelixIdealDiameterPercent = self.form.HelixIdealDiameterPercent.value()
+        if obj.HelixMaxDiameterPercent != self.form.HelixMaxDiameterPercent.value():
+            obj.HelixMaxDiameterPercent = self.form.HelixMaxDiameterPercent.value()
 
         if obj.HelixMinDiameterPercent != self.form.HelixMinDiameterPercent.value():
             obj.HelixMinDiameterPercent = self.form.HelixMinDiameterPercent.value()