diff --git a/MachineTool/DemoBuildMachineTool.cs b/MachineTool/DemoBuildMachineTool.cs
index ecc3457..a95e53a 100644
--- a/MachineTool/DemoBuildMachineTool.cs
+++ b/MachineTool/DemoBuildMachineTool.cs
@@ -21,7 +21,7 @@ namespace Sample.MachineTool
     /// ### Source Code
     /// [!code-csharp[SampleCode](~/../Hi.Sample/MachineTool/DemoBuildMachineTool.cs)]
     /// </remarks>
-    public class DemoBuildMachineTool : IGetCodeXyzabcMachineTool
+    public class DemoBuildMachineTool
     {
         /// <summary>
         /// Registers this type's deserializer with the given <see cref="XFactory"/>
@@ -37,7 +37,7 @@ namespace Sample.MachineTool
         /// Generates an XYZ-ABC machine tool instance from embedded resources.
         /// </summary>
         /// <returns>A configured machine tool model.</returns>
-        public static CodeXyzabcMachineTool GenXyzabcMachineTool()
+        public static GeneralXyzabcMachineTool GenXyzabcMachineTool()
         {
             CodeXyzabcChain chain = new CodeXyzabcChain("[O][Y][X][C][w];[O][Z][B][S][t]");
             if (chain.ToolBuckleTransformer is StaticTranslation st)
@@ -56,7 +56,7 @@ namespace Sample.MachineTool
             chain.AnchorToSolid.BuildAnchorToSolid(
                 chain.Asmb.GetDescendantAnchors(), solidMap);
 
-            CodeXyzabcMachineTool dst = new CodeXyzabcMachineTool(chain);
+            GeneralXyzabcMachineTool dst = new GeneralXyzabcMachineTool(chain);
             dst.GenerateCollisionIndexPairs();
             return dst;
         }
@@ -64,7 +64,7 @@ namespace Sample.MachineTool
         /// <summary>
         /// The cached machine tool instance.
         /// </summary>
-        CodeXyzabcMachineTool MachineTool { get; }
+        GeneralXyzabcMachineTool MachineTool { get; }
 
         /// <summary>
         /// Default constructor that initializes the machine tool model.
@@ -81,9 +81,15 @@ namespace Sample.MachineTool
         /// <inheritdoc/>
         public XElement ToXElement() => new XElement(XName);
         #endregion
-        /// <inheritdoc/>
-        public CodeXyzabcMachineTool GetXyzabcMachineTool() => MachineTool;
-        /// <inheritdoc/>
+        /// <summary>
+        /// Gets the built machine tool.
+        /// </summary>
+        /// <returns>Machine tool.</returns>
+        public GeneralXyzabcMachineTool GetXyzabcMachineTool() => MachineTool;
+        /// <summary>
+        /// Gets the machine tool as a machining chain.
+        /// </summary>
+        /// <returns>Machining chain.</returns>
         public IMachiningChain GetMachiningChain() => MachineTool;
     }
 }
diff --git a/MachineTool/DemoBuildMachineToolWithoutGeometrys.cs b/MachineTool/DemoBuildMachineToolWithoutGeometrys.cs
index 37adc5a..d813812 100644
--- a/MachineTool/DemoBuildMachineToolWithoutGeometrys.cs
+++ b/MachineTool/DemoBuildMachineToolWithoutGeometrys.cs
@@ -18,12 +18,12 @@ public static class DemoBuildMachineToolWithoutGeometrys
 	/// Generates an empty machine tool with basic configuration.
 	/// </summary>
 	/// <returns>A configured but empty machine tool without solids.</returns>
-	public static CodeXyzabcMachineTool GenEmptyMachineTool()
+	public static GeneralXyzabcMachineTool GenEmptyMachineTool()
 	{
 		CodeXyzabcChain chain = new CodeXyzabcChain("[O][C][w];[O][X][Y][Z][B][S][t]");
 		if (chain.ToolBuckleTransformer is StaticTranslation st)
 			st.Trans = new Vec3d(-200, 200, 400);
-		CodeXyzabcMachineTool xyzabcMachineTool = new CodeXyzabcMachineTool(chain);
+		GeneralXyzabcMachineTool xyzabcMachineTool = new GeneralXyzabcMachineTool(chain);
 		return xyzabcMachineTool;
 	}
 }
diff --git a/Machining/DemoBuildGeomOnlyMachiningProject.cs b/Machining/DemoBuildGeomOnlyMachiningProject.cs
index 5c3dd89..4241418 100644
--- a/Machining/DemoBuildGeomOnlyMachiningProject.cs
+++ b/Machining/DemoBuildGeomOnlyMachiningProject.cs
@@ -86,7 +86,7 @@ public static class DemoBuildGeomOnlyMachiningProject
 
 		IProgress<object> progress = null;
 		localProjectService.MachiningChain
-				= XFactory.GenByFile<CodeXyzabcMachineTool>(
+				= XFactory.GenByFile<GeneralXyzabcMachineTool>(
 					"Resource", "MachineTool/Table-B1.default/Table-B1.mt", progress);
 		localProjectService.MachiningChainFile = "Table-B1.default/Table-B1.mt";
 
diff --git a/Machining/DemoBuildMachiningProject.cs b/Machining/DemoBuildMachiningProject.cs
index 1344537..1912e03 100644
--- a/Machining/DemoBuildMachiningProject.cs
+++ b/Machining/DemoBuildMachiningProject.cs
@@ -206,7 +206,7 @@ public static class DemoBuildMachiningProject
 
 		#region ConfigureMachineChain
 		localProjectService.MachiningChain
-			= XFactory.GenByFile<CodeXyzabcMachineTool>(
+			= XFactory.GenByFile<GeneralXyzabcMachineTool>(
 				"Resource", "MachineTool/Table-B1.default/Table-B1.mt", progress);
 		#endregion