diff --git a/Disp/HeidenhainCoordinateEntryDisplayee.cs b/Disp/HeidenhainCoordinateEntryDisplayee.cs
index 7e747b1..482c8ee 100644
--- a/Disp/HeidenhainCoordinateEntryDisplayee.cs
+++ b/Disp/HeidenhainCoordinateEntryDisplayee.cs
@@ -60,9 +60,9 @@ namespace Sample.Disp
                 return;
 
             ////Console.WriteLine($"B: {CoordinateIndex}; {coordinateMove}");
-            Vec3d mcXyz_AttacherAtTableBuckleZero = MillingEquipmentFunc?.Invoke()
-                ?.GetMachinePositionAtTableBuckleZero();
-            if (mcXyz_AttacherAtTableBuckleZero == null)
+            Vec3d mcXyz_AttacherAtTableMountZero = MillingEquipmentFunc?.Invoke()
+                ?.GetMachinePositionAtTableMountZero();
+            if (mcXyz_AttacherAtTableMountZero == null)
                 return;
 
             Vec3d coordinateMove;
@@ -85,7 +85,7 @@ namespace Sample.Disp
             //Console.WriteLine($"text: [{text}]");
 
             bind.ModelMatStack.Push();
-            bind.ModelMatStack.Trans(coordinateMove - mcXyz_AttacherAtTableBuckleZero);
+            bind.ModelMatStack.Trans(coordinateMove - mcXyz_AttacherAtTableMountZero);
             CoordinateDrawing.Display(bind, text);
             bind.ModelMatStack.Pop();
         }
@@ -96,9 +96,9 @@ namespace Sample.Disp
             if (ncEnv == null || NcEnv.CncBrand != CncBrand.Heidenhain)
                 return;
 
-            Vec3d mcXyz_AttacherAtTableBuckleZero = MillingEquipmentFunc?.Invoke()
-                ?.GetMachinePositionAtTableBuckleZero();
-            if (mcXyz_AttacherAtTableBuckleZero == null)
+            Vec3d mcXyz_AttacherAtTableMountZero = MillingEquipmentFunc?.Invoke()
+                ?.GetMachinePositionAtTableMountZero();
+            if (mcXyz_AttacherAtTableMountZero == null)
                 return;
             Vec3d coordinateMove;
             if (HeidenhainCycleDef247Q339 == 0 && HeidenhainCycleDef7Arg == null)
@@ -107,13 +107,13 @@ namespace Sample.Disp
                 HeidenhainCycleDef247Q339, HeidenhainCycleDef7Arg, ncEnv);
 
 
-            dst.Expand(-mcXyz_AttacherAtTableBuckleZero + coordinateMove);
+            dst.Expand(-mcXyz_AttacherAtTableMountZero + coordinateMove);
         }
         /// <inheritdoc/>
         public Anchor GetAnchor()
         {
             return MillingEquipmentFunc?.Invoke()?.GetMachiningChain()
-                ?.GetTableBuckle()?.GetAnchor();
+                ?.GetTableMount()?.GetAnchor();
         }
     }
 }
diff --git a/Disp/IsoCoordinateEntryDisplayee.cs b/Disp/IsoCoordinateEntryDisplayee.cs
index b1d6bf4..0dbd8a7 100644
--- a/Disp/IsoCoordinateEntryDisplayee.cs
+++ b/Disp/IsoCoordinateEntryDisplayee.cs
@@ -82,7 +82,7 @@ public class IsoCoordinateEntryDisplayee : IAnchoredDisplayee
 		dst.Expand(attacherPos);
 	}
 	/// <inheritdoc/>
-	/// <returns>Table Buckle if existed; otherwise, return null.</returns>
+	/// <returns>Table Mount if existed; otherwise, return null.</returns>
 	public Anchor GetAnchor()
 	{
 		return MillingEquipmentFunc?.Invoke()?.GetMachiningChain()?.GetAnchor();
diff --git a/MachineTool/DemoBuildMachineTool.cs b/MachineTool/DemoBuildMachineTool.cs
index 6c93ea1..845d6be 100644
--- a/MachineTool/DemoBuildMachineTool.cs
+++ b/MachineTool/DemoBuildMachineTool.cs
@@ -41,7 +41,7 @@ namespace Sample.MachineTool
         {
             GeneralXyzabcMachineTool dst = GeneralXyzabcMachineTool.CreateFromChainCode(
                 "[O][Y][X][C][w];[O][Z][B][S][t]");
-            if (dst.ToolBuckleTransformer is StaticTranslation st)
+            if (dst.ToolMountTransformer is StaticTranslation st)
                 st.Trans = new Vec3d(-72.40, 72.40, 176.44);
             dst.TransformerB.Pivot = new Vec3d(-72.4, -177.4, 225.94);
             Dictionary<string, Solid> solidMap = new Dictionary<string, Solid>()
diff --git a/MachineTool/DemoBuildMachineToolWithoutGeometrys.cs b/MachineTool/DemoBuildMachineToolWithoutGeometrys.cs
index bf9c378..5e47a25 100644
--- a/MachineTool/DemoBuildMachineToolWithoutGeometrys.cs
+++ b/MachineTool/DemoBuildMachineToolWithoutGeometrys.cs
@@ -22,7 +22,7 @@ public static class DemoBuildMachineToolWithoutGeometrys
 	{
 		GeneralXyzabcMachineTool xyzabcMachineTool = GeneralXyzabcMachineTool.CreateFromChainCode(
 			"[O][C][w];[O][X][Y][Z][B][S][t]");
-		if (xyzabcMachineTool.ToolBuckleTransformer is StaticTranslation st)
+		if (xyzabcMachineTool.ToolMountTransformer is StaticTranslation st)
 			st.Trans = new Vec3d(-200, 200, 400);
 		return xyzabcMachineTool;
 	}
diff --git a/Machining/DemoBuildGeomOnlyMachiningProject.cs b/Machining/DemoBuildGeomOnlyMachiningProject.cs
index 660cd39..86f4e19 100644
--- a/Machining/DemoBuildGeomOnlyMachiningProject.cs
+++ b/Machining/DemoBuildGeomOnlyMachiningProject.cs
@@ -71,16 +71,16 @@ public static class DemoBuildGeomOnlyMachiningProject
 		};
 
 		//The fixture topology is free; the default shape has one branch from the
-		//geometry anchor to each buckle, so the workpiece buckle is placed by the
+		//geometry anchor to each mount, so the workpiece mount is placed by the
 		//transformer of the branch to it: on top of the 10 mm thick fixture geom.
 		Fixture fixture = Fixture.CreateDefault();
 		fixture.Geom = new Box3d(new Vec3d(-40, -40, 0), new Vec3d(40, 40, 10));
-		Branch.Get(fixture.GeomAnchor, fixture.WorkpieceBuckle).Transformer
+		Branch.Get(fixture.GeomAnchor, fixture.WorkpieceMount).Transformer
 			= new StaticTranslation(new Vec3d(0, 0, 10));
 		localProjectService.Fixture = fixture;
 
 		//The default shape already leads from the geometry anchor to the fixture
-		//buckle and to program zero by zero translations.
+		//mount and to program zero by zero translations.
 		Workpiece workpiece = Workpiece.CreateDefault();
 		workpiece.InitResolution = 0.25;
 		workpiece.InitGeom = new Box3d(0, 0, -50, 70, 50, 0);
diff --git a/Machining/DemoBuildMachiningProject.cs b/Machining/DemoBuildMachiningProject.cs
index 1f591e9..0bd9ad0 100644
--- a/Machining/DemoBuildMachiningProject.cs
+++ b/Machining/DemoBuildMachiningProject.cs
@@ -184,18 +184,18 @@ public static class DemoBuildMachiningProject
 
 		#region ConfigureFixture
 		//The fixture topology is free; the default shape has one branch from the
-		//geometry anchor to each buckle, so the workpiece buckle is placed by the
+		//geometry anchor to each mount, so the workpiece mount is placed by the
 		//transformer of the branch to it: on top of the 10 mm thick fixture geom.
 		Fixture fixture = Fixture.CreateDefault();
 		fixture.Geom = new Box3d(new Vec3d(-40, -40, 0), new Vec3d(40, 40, 10));
-		Branch.Get(fixture.GeomAnchor, fixture.WorkpieceBuckle).Transformer
+		Branch.Get(fixture.GeomAnchor, fixture.WorkpieceMount).Transformer
 			= new StaticTranslation(new Vec3d(0, 0, 10));
 		localProjectService.Fixture = fixture;
 		#endregion
 
 		#region ConfigureWorkpiece
 		//The default shape already leads from the geometry anchor to the fixture
-		//buckle and to program zero by zero translations.
+		//mount and to program zero by zero translations.
 		Workpiece workpiece = Workpiece.CreateDefault();
 		workpiece.InitResolution = 0.25;
 		workpiece.InitGeom = new Box3d(0, 0, -50, 70, 50, 0);