diff --git a/MatterControlLib/ApplicationView/SceneOperations.cs b/MatterControlLib/ApplicationView/SceneOperations.cs
index 301cadccb..b19bd17e3 100644
--- a/MatterControlLib/ApplicationView/SceneOperations.cs
+++ b/MatterControlLib/ApplicationView/SceneOperations.cs
@@ -1504,7 +1504,7 @@ namespace MatterHackers.MatterControl
 					{
 						return selectedItem is GroupObject3D
 							|| selectedItem.GetType() == typeof(Object3D)
-							|| selectedItem.CanFlatten;
+							|| selectedItem.CanApply;
 					}
 
 					return false;
diff --git a/MatterControlLib/DesignTools/Braille/BrailleCardObject3D.cs b/MatterControlLib/DesignTools/Braille/BrailleCardObject3D.cs
index 409945c54..44fa6e1be 100644
--- a/MatterControlLib/DesignTools/Braille/BrailleCardObject3D.cs
+++ b/MatterControlLib/DesignTools/Braille/BrailleCardObject3D.cs
@@ -55,7 +55,7 @@ namespace MatterHackers.MatterControl.DesignTools
 			return item;
 		}
 
-		public override bool CanFlatten => true;
+		public override bool CanApply => true;
 
 		public char Letter { get; set; } = 'a';
 
diff --git a/MatterControlLib/DesignTools/EditorTools/DesignApps/Parts/ChairFootObject3D.cs b/MatterControlLib/DesignTools/EditorTools/DesignApps/Parts/ChairFootObject3D.cs
index 91f93b12c..55e446f6c 100644
--- a/MatterControlLib/DesignTools/EditorTools/DesignApps/Parts/ChairFootObject3D.cs
+++ b/MatterControlLib/DesignTools/EditorTools/DesignApps/Parts/ChairFootObject3D.cs
@@ -73,7 +73,7 @@ namespace MatterHackers.MatterControl.DesignTools
 
 		//public override bool Persistable { get => PermissionCheckRequest.UserAuthorized(permissionKey); }
 
-		public override bool CanFlatten => Persistable;
+		public override bool CanApply => Persistable;
 
 		public override bool CanEdit => Persistable;
 
diff --git a/MatterControlLib/DesignTools/Obsolete/FitToBoundsObject3D.cs b/MatterControlLib/DesignTools/Obsolete/FitToBoundsObject3D.cs
index abbabf4cf..c8a4ea562 100644
--- a/MatterControlLib/DesignTools/Obsolete/FitToBoundsObject3D.cs
+++ b/MatterControlLib/DesignTools/Obsolete/FitToBoundsObject3D.cs
@@ -99,7 +99,7 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
 			Name = "Fit to Bounds".Localize();
 		}
 
-		public override void Flatten(UndoBuffer undoBuffer)
+		public override void Apply(UndoBuffer undoBuffer)
 		{
 			using (RebuildLock())
 			{
@@ -124,7 +124,7 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
 			Parent?.Invalidate(new InvalidateArgs(this, InvalidateType.Children));
 		}
 
-		public override void Remove(UndoBuffer undoBuffer)
+		public override void Cancel(UndoBuffer undoBuffer)
 		{
 			using (RebuildLock())
 			{
diff --git a/MatterControlLib/DesignTools/Operations/AlignObject3D.cs b/MatterControlLib/DesignTools/Operations/AlignObject3D.cs
index 102992511..bf3a1578c 100644
--- a/MatterControlLib/DesignTools/Operations/AlignObject3D.cs
+++ b/MatterControlLib/DesignTools/Operations/AlignObject3D.cs
@@ -215,7 +215,7 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
 		[Slider(-20, 20, useSnappingGrid: true)]
 		public DoubleOrExpression ZOffset { get; set; } = 0;
 
-		public override bool CanFlatten => true;
+		public override bool CanApply => true;
 
 		private List<Aabb> CurrentChildrenBounds
 		{
@@ -391,14 +391,14 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
 			return Task.CompletedTask;
 		}
 
-		public override void Remove(UndoBuffer undoBuffer)
+		public override void Cancel(UndoBuffer undoBuffer)
 		{
 			using (RebuildLock())
 			{
 				// put everything back to where it was before the arrange started
 				ResetPositions();
 
-				base.Remove(undoBuffer);
+				base.Cancel(undoBuffer);
 			}
 
 			Invalidate(InvalidateType.Children);
diff --git a/MatterControlLib/DesignTools/Operations/ArrayAdvancedObject3D.cs b/MatterControlLib/DesignTools/Operations/ArrayAdvancedObject3D.cs
index e5058a48e..0653a3a87 100644
--- a/MatterControlLib/DesignTools/Operations/ArrayAdvancedObject3D.cs
+++ b/MatterControlLib/DesignTools/Operations/ArrayAdvancedObject3D.cs
@@ -43,7 +43,7 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
 			Name = "Advanced Array".Localize();
 		}
 
-		public override bool CanFlatten => true;
+		public override bool CanApply => true;
 
 		public override IntOrExpression Count { get; set; } = 3;
 
diff --git a/MatterControlLib/DesignTools/Operations/ArrayLinearObject3D.cs b/MatterControlLib/DesignTools/Operations/ArrayLinearObject3D.cs
index 02ad761f6..8262e8827 100644
--- a/MatterControlLib/DesignTools/Operations/ArrayLinearObject3D.cs
+++ b/MatterControlLib/DesignTools/Operations/ArrayLinearObject3D.cs
@@ -47,7 +47,7 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
 			Name = "Linear Array".Localize();
 		}
 
-		public override bool CanFlatten => true;
+		public override bool CanApply => true;
 
 		[Slider(2, 10, Easing.EaseType.Quadratic, snapDistance: 1)]
 		public override IntOrExpression Count { get; set; } = 3;
diff --git a/MatterControlLib/DesignTools/Operations/ArrayObject3D.cs b/MatterControlLib/DesignTools/Operations/ArrayObject3D.cs
index c4b492acf..a8a2408c6 100644
--- a/MatterControlLib/DesignTools/Operations/ArrayObject3D.cs
+++ b/MatterControlLib/DesignTools/Operations/ArrayObject3D.cs
@@ -36,7 +36,7 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
 	{
 		public abstract IntOrExpression Count { get; set; }
 
-        public override void Flatten(Agg.UI.UndoBuffer undoBuffer)
+        public override void Apply(Agg.UI.UndoBuffer undoBuffer)
         {
 			// convert [index] expressions to their constant values
 			foreach (var item in this.Descendants((item) => !(item is ArrayObject3D)))
@@ -47,8 +47,8 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
 				}
 			}
 
-			// then call base flatten
-			base.Flatten(undoBuffer);
+			// then call base apply
+			base.Apply(undoBuffer);
         }
 
         internal void ProcessIndexExpressions()
diff --git a/MatterControlLib/DesignTools/Operations/ArrayRadialObject3D.cs b/MatterControlLib/DesignTools/Operations/ArrayRadialObject3D.cs
index cdee91d9e..e75809068 100644
--- a/MatterControlLib/DesignTools/Operations/ArrayRadialObject3D.cs
+++ b/MatterControlLib/DesignTools/Operations/ArrayRadialObject3D.cs
@@ -52,7 +52,7 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
 		[DisplayName("Rotate About")]
 		public DirectionAxis Axis { get; set; } = new DirectionAxis() { Origin = Vector3.NegativeInfinity, Normal = Vector3.UnitZ };
 
-		public override bool CanFlatten => true;
+		public override bool CanApply => true;
 
 		public override IntOrExpression Count { get; set; } = 3;
 
diff --git a/MatterControlLib/DesignTools/Operations/FindSliceObject3D.cs b/MatterControlLib/DesignTools/Operations/FindSliceObject3D.cs
index df1a76665..3cab8d9cc 100644
--- a/MatterControlLib/DesignTools/Operations/FindSliceObject3D.cs
+++ b/MatterControlLib/DesignTools/Operations/FindSliceObject3D.cs
@@ -80,14 +80,14 @@ namespace MatterHackers.MatterControl.DesignTools
 			return (mesh, slice);
 		}
 
-		public override void Flatten(UndoBuffer undoBuffer)
+		public override void Apply(UndoBuffer undoBuffer)
 		{
 			var newPathObject = new PathObject3D()
 			{
 				VertexSource = new VertexStorage(this.VertexSource)
 			};
 
-			base.Flatten(undoBuffer, new IObject3D[] { newPathObject });
+			base.Apply(undoBuffer, new IObject3D[] { newPathObject });
 		}
 
 		private void RemoveFacesAboveCut(Mesh mesh)
diff --git a/MatterControlLib/DesignTools/Operations/GroupObject3D.cs b/MatterControlLib/DesignTools/Operations/GroupObject3D.cs
index 5c00c84dc..ba3f088b0 100644
--- a/MatterControlLib/DesignTools/Operations/GroupObject3D.cs
+++ b/MatterControlLib/DesignTools/Operations/GroupObject3D.cs
@@ -34,7 +34,7 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
 {
 	public class GroupObject3D : Object3D
 	{
-		public override bool CanFlatten => true;
+		public override bool CanApply => true;
 
 		public GroupObject3D()
 		{
diff --git a/MatterControlLib/DesignTools/Operations/Image/ImageToPathObject3D.cs b/MatterControlLib/DesignTools/Operations/Image/ImageToPathObject3D.cs
index e84076bb1..fe63731b3 100644
--- a/MatterControlLib/DesignTools/Operations/Image/ImageToPathObject3D.cs
+++ b/MatterControlLib/DesignTools/Operations/Image/ImageToPathObject3D.cs
@@ -214,9 +214,9 @@ namespace MatterHackers.MatterControl.DesignTools
 			this.DrawPath();
 		}
 
-		public override bool CanFlatten => true;
+		public override bool CanApply => true;
 
-		public override void Flatten(UndoBuffer undoBuffer)
+		public override void Apply(UndoBuffer undoBuffer)
 		{
 			this.FlattenToPathObject(undoBuffer);
 		}
diff --git a/MatterControlLib/DesignTools/Operations/Image/ImageToPathObject3D_2.cs b/MatterControlLib/DesignTools/Operations/Image/ImageToPathObject3D_2.cs
index f64515784..fd6a81f1d 100644
--- a/MatterControlLib/DesignTools/Operations/Image/ImageToPathObject3D_2.cs
+++ b/MatterControlLib/DesignTools/Operations/Image/ImageToPathObject3D_2.cs
@@ -185,12 +185,12 @@ namespace MatterHackers.MatterControl.DesignTools
 			this.DrawPath();
 		}
 
-		public override bool CanFlatten => true;
+		public override bool CanApply => true;
 
 		[HideFromEditor]
 		public int NumLineLoops { get; set; }
 
-		public override void Flatten(UndoBuffer undoBuffer)
+		public override void Apply(UndoBuffer undoBuffer)
 		{
 			this.FlattenToPathObject(undoBuffer);
 		}
diff --git a/MatterControlLib/DesignTools/Operations/Path/LinearExtrudeObject3D.cs b/MatterControlLib/DesignTools/Operations/Path/LinearExtrudeObject3D.cs
index eccd48449..56ebb6036 100644
--- a/MatterControlLib/DesignTools/Operations/Path/LinearExtrudeObject3D.cs
+++ b/MatterControlLib/DesignTools/Operations/Path/LinearExtrudeObject3D.cs
@@ -73,7 +73,7 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
 		public IntOrExpression BevelSteps { get; set; } = 1;
 #endif
 
-		public override bool CanFlatten => true;
+		public override bool CanApply => true;
 
 		[JsonIgnore]
 		private IVertexSource VertexSource
@@ -90,11 +90,11 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
 			}
 		}
 
-		public override void Flatten(UndoBuffer undoBuffer)
+		public override void Apply(UndoBuffer undoBuffer)
 		{
 			if (Mesh == null)
 			{
-				Remove(undoBuffer);
+				Cancel(undoBuffer);
 			}
 			else
 			{
diff --git a/MatterControlLib/DesignTools/Operations/Path/MergePathObject3D.cs b/MatterControlLib/DesignTools/Operations/Path/MergePathObject3D.cs
index 8ab65a45f..da51e82f8 100644
--- a/MatterControlLib/DesignTools/Operations/Path/MergePathObject3D.cs
+++ b/MatterControlLib/DesignTools/Operations/Path/MergePathObject3D.cs
@@ -62,9 +62,9 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
 			this.DrawPath();
 		}
 
-		public override bool CanFlatten => true;
+		public override bool CanApply => true;
 
-		public override void Flatten(UndoBuffer undoBuffer)
+		public override void Apply(UndoBuffer undoBuffer)
 		{
 			this.FlattenToPathObject(undoBuffer);
 		}
diff --git a/MatterControlLib/DesignTools/Operations/Path/RevolveObject3D.cs b/MatterControlLib/DesignTools/Operations/Path/RevolveObject3D.cs
index 6f4a8f65e..e0b1e1abd 100644
--- a/MatterControlLib/DesignTools/Operations/Path/RevolveObject3D.cs
+++ b/MatterControlLib/DesignTools/Operations/Path/RevolveObject3D.cs
@@ -63,7 +63,7 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
 		[Slider(3, 360, Easing.EaseType.Quadratic, snapDistance: 1)]
 		public IntOrExpression Sides { get; set; } = 30;
 
-		public override bool CanFlatten => true;
+		public override bool CanApply => true;
 
 		[JsonIgnore]
 		private IVertexSource VertexSource
@@ -80,11 +80,11 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
 			}
 		}
 
-		public override void Flatten(UndoBuffer undoBuffer)
+		public override void Apply(UndoBuffer undoBuffer)
 		{
 			if (Mesh == null)
 			{
-				Remove(undoBuffer);
+				Cancel(undoBuffer);
 			}
 			else
 			{
diff --git a/MatterControlLib/DesignTools/Operations/TransformWrapperObject3D.cs b/MatterControlLib/DesignTools/Operations/TransformWrapperObject3D.cs
index 8954c5659..83ff91846 100644
--- a/MatterControlLib/DesignTools/Operations/TransformWrapperObject3D.cs
+++ b/MatterControlLib/DesignTools/Operations/TransformWrapperObject3D.cs
@@ -48,7 +48,7 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
 			Name = "Transform Wrapper".Localize();
 		}
 
-		public override bool CanFlatten => true;
+		public override bool CanApply => true;
 
 		[JsonIgnore]
 		public AscendableSafeList<IObject3D> UntransformedChildren
@@ -77,7 +77,7 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
 			}
 		}
 
-		public override void Flatten(UndoBuffer undoBuffer)
+		public override void Apply(UndoBuffer undoBuffer)
 		{
 			using (RebuildLock())
 			{
@@ -104,7 +104,7 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
 			Invalidate(InvalidateType.Children);
 		}
 
-		public override void Remove(UndoBuffer undoBuffer)
+		public override void Cancel(UndoBuffer undoBuffer)
 		{
 			using (RebuildLock())
 			{
diff --git a/MatterControlLib/DesignTools/Primitives/BaseObject3D.cs b/MatterControlLib/DesignTools/Primitives/BaseObject3D.cs
index 162a15fb3..038b81f24 100644
--- a/MatterControlLib/DesignTools/Primitives/BaseObject3D.cs
+++ b/MatterControlLib/DesignTools/Primitives/BaseObject3D.cs
@@ -75,7 +75,7 @@ namespace MatterHackers.MatterControl.DesignTools
 			Name = "Base".Localize();
 		}
 
-		public override bool CanFlatten => true;
+		public override bool CanApply => true;
 
 		[EnumDisplay(Mode = EnumDisplayAttribute.PresentationMode.Tabs)]
 		public BaseTypes BaseType { get; set; } = BaseTypes.Circle;
@@ -109,7 +109,7 @@ namespace MatterHackers.MatterControl.DesignTools
 		[EnumDisplay(Mode = EnumDisplayAttribute.PresentationMode.Buttons)]
 		public CenteringTypes Centering { get; set; } = CenteringTypes.Weighted;
 
-		public override void Remove(UndoBuffer undoBuffer)
+		public override void Cancel(UndoBuffer undoBuffer)
 		{
 			using (RebuildLock())
 			{
@@ -127,7 +127,7 @@ namespace MatterHackers.MatterControl.DesignTools
 				}
 			}
 
-			base.Remove(undoBuffer);
+			base.Cancel(undoBuffer);
 		}
 
 		private (IVertexSource vertexSource, double height) meshVertexCache;
diff --git a/MatterControlLib/DesignTools/Primitives/ComponentObject3D.cs b/MatterControlLib/DesignTools/Primitives/ComponentObject3D.cs
index 05d861312..dca3cfaea 100644
--- a/MatterControlLib/DesignTools/Primitives/ComponentObject3D.cs
+++ b/MatterControlLib/DesignTools/Primitives/ComponentObject3D.cs
@@ -54,7 +54,7 @@ namespace MatterHackers.MatterControl.DesignTools
 		{
 		}
 
-		public override bool CanFlatten => !Finalized || Persistable;
+		public override bool CanApply => !Finalized || Persistable;
 
 		public override bool Persistable => ApplicationController.Instance.UserHasPermission(this);
 
@@ -85,7 +85,7 @@ namespace MatterHackers.MatterControl.DesignTools
 		[Description("MatterHackers Internal Use")]
 		public bool ProOnly { get; set; }
 
-		public override void Flatten(UndoBuffer undoBuffer)
+		public override void Apply(UndoBuffer undoBuffer)
 		{
 			// we want to end up with just a group of all the visible mesh objects
 			using (RebuildLock())
@@ -132,7 +132,7 @@ namespace MatterHackers.MatterControl.DesignTools
 			Invalidate(InvalidateType.Children);
 		}
 
-		public override void Remove(UndoBuffer undoBuffer)
+		public override void Cancel(UndoBuffer undoBuffer)
 		{
 			// Custom remove for ImageConverter
 			if (this.ComponentID == ImageConverterComponentID)
@@ -190,7 +190,7 @@ namespace MatterHackers.MatterControl.DesignTools
 				else
 				{
 					// remove the component and leave the inside parts
-					base.Remove(undoBuffer);
+					base.Cancel(undoBuffer);
 				}
 			}
 		}
diff --git a/MatterControlLib/DesignTools/Primitives/DescriptionObject3D.cs b/MatterControlLib/DesignTools/Primitives/DescriptionObject3D.cs
index ce4ec1016..14be2f8f1 100644
--- a/MatterControlLib/DesignTools/Primitives/DescriptionObject3D.cs
+++ b/MatterControlLib/DesignTools/Primitives/DescriptionObject3D.cs
@@ -183,14 +183,14 @@ namespace MatterHackers.MatterControl.DesignTools
 			}
 		}
 
-		public override void Remove(UndoBuffer undoBuffer)
+		public override void Cancel(UndoBuffer undoBuffer)
 		{
 			if (markdownWidget != null)
 			{
 				markdownWidget.Close();
 			}
 
-			base.Remove(undoBuffer);
+			base.Cancel(undoBuffer);
 		}
 
 		public override async void OnInvalidate(InvalidateArgs invalidateArgs)
diff --git a/MatterControlLib/DesignTools/Primitives/ImageObject3D.cs b/MatterControlLib/DesignTools/Primitives/ImageObject3D.cs
index 82a1c72b8..564200665 100644
--- a/MatterControlLib/DesignTools/Primitives/ImageObject3D.cs
+++ b/MatterControlLib/DesignTools/Primitives/ImageObject3D.cs
@@ -72,7 +72,7 @@ namespace MatterHackers.MatterControl.DesignTools
 			Name = "Image".Localize();
 		}
 
-		public override bool CanFlatten => false;
+		public override bool CanApply => false;
 
 		[GoogleSearch]
 		public string ImageSearch { get; set; } = "";
diff --git a/MatterControlLib/DesignTools/Primitives/OperationSourceContainerObject3D.cs b/MatterControlLib/DesignTools/Primitives/OperationSourceContainerObject3D.cs
index 4d1084d89..ac84b95c8 100644
--- a/MatterControlLib/DesignTools/Primitives/OperationSourceContainerObject3D.cs
+++ b/MatterControlLib/DesignTools/Primitives/OperationSourceContainerObject3D.cs
@@ -62,7 +62,7 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
 			set => base.Mesh = value;
 		}
 
-		public override bool CanFlatten => true;
+		public override bool CanApply => true;
 
 		public override bool Persistable
 		{
@@ -114,12 +114,12 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
 			}
 		}
 
-		public override void Flatten(UndoBuffer undoBuffer)
+		public override void Apply(UndoBuffer undoBuffer)
 		{
-			Flatten(undoBuffer, null);
+			Apply(undoBuffer, null);
 		}
 
-		protected void Flatten(UndoBuffer undoBuffer, IEnumerable<IObject3D> extraItems)
+		protected void Apply(UndoBuffer undoBuffer, IEnumerable<IObject3D> extraItems)
 		{
 			using (RebuildLock())
 			{
@@ -159,7 +159,7 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
 				}
 
 				// add flatten to the name to show what happened
-				newChildren[0].Name = this.Name + " - " + "Flattened".Localize();
+				newChildren[0].Name = this.Name;
 
 				// and replace us with the children
 				var replaceCommand = new ReplaceCommand(new[] { this }, newChildren);
@@ -211,7 +211,7 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
 			}
 		}
 
-		public override void Remove(UndoBuffer undoBuffer)
+		public override void Cancel(UndoBuffer undoBuffer)
 		{
 			using (RebuildLock())
 			{
@@ -304,7 +304,7 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
 
 	public class OperationSourceObject3D : Object3D
 	{
-		public override bool CanFlatten => true;
+		public override bool CanApply => true;
 
 		public OperationSourceObject3D()
 		{
diff --git a/MatterControlLib/DesignTools/Primitives/TemperatureTowerObject3D.cs b/MatterControlLib/DesignTools/Primitives/TemperatureTowerObject3D.cs
index ffebecc87..086b4a18c 100644
--- a/MatterControlLib/DesignTools/Primitives/TemperatureTowerObject3D.cs
+++ b/MatterControlLib/DesignTools/Primitives/TemperatureTowerObject3D.cs
@@ -50,7 +50,7 @@ namespace MatterHackers.MatterControl.DesignTools
 	{
 		private static Mesh shape = null;
 
-		public override bool CanFlatten => true;
+		public override bool CanApply => true;
 
 		public TemperatureTowerObject3D()
 		{
diff --git a/MatterControlLib/DesignTools/Primitives/TextObject3D.cs b/MatterControlLib/DesignTools/Primitives/TextObject3D.cs
index 2baab4722..281384a09 100644
--- a/MatterControlLib/DesignTools/Primitives/TextObject3D.cs
+++ b/MatterControlLib/DesignTools/Primitives/TextObject3D.cs
@@ -80,9 +80,9 @@ namespace MatterHackers.MatterControl.DesignTools
 		[JsonConverter(typeof(StringEnumConverter))]
 		public NamedTypeFace Font { get; set; } = NamedTypeFace.Nunito_Bold;
 
-		public override bool CanFlatten => true;
+		public override bool CanApply => true;
 
-		public override void Flatten(UndoBuffer undoBuffer)
+		public override void Apply(UndoBuffer undoBuffer)
 		{
 			// change this from a text object to a group
 			var newContainer = new GroupObject3D();
@@ -96,7 +96,7 @@ namespace MatterHackers.MatterControl.DesignTools
 			}
 
 			undoBuffer.AddAndDo(new ReplaceCommand(new[] { this }, new[] { newContainer }));
-			newContainer.Name = this.Name + " - " + "Flattened".Localize();
+			newContainer.Name = this.Name;
 		}
 
 		public override async void OnInvalidate(InvalidateArgs invalidateArgs)
diff --git a/MatterControlLib/DesignTools/Primitives/TextPathObject3D.cs b/MatterControlLib/DesignTools/Primitives/TextPathObject3D.cs
index 288fe10d4..80a88c777 100644
--- a/MatterControlLib/DesignTools/Primitives/TextPathObject3D.cs
+++ b/MatterControlLib/DesignTools/Primitives/TextPathObject3D.cs
@@ -73,11 +73,11 @@ namespace MatterHackers.MatterControl.DesignTools
 		[JsonConverter(typeof(StringEnumConverter))]
 		public NamedTypeFace Font { get; set; } = new NamedTypeFace();
 
-		public override bool CanFlatten => true;
+		public override bool CanApply => true;
 
 		public IVertexSource VertexSource { get; set; } = new VertexStorage();
 
-		public override void Flatten(UndoBuffer undoBuffer)
+		public override void Apply(UndoBuffer undoBuffer)
 		{
 			// change this from a text object to a group
 			var newContainer = new GroupObject3D();
diff --git a/MatterControlLib/DesignTools/Primitives/XyCalibrationFaceObject3D.cs b/MatterControlLib/DesignTools/Primitives/XyCalibrationFaceObject3D.cs
index 35ae1b009..0ed810b85 100644
--- a/MatterControlLib/DesignTools/Primitives/XyCalibrationFaceObject3D.cs
+++ b/MatterControlLib/DesignTools/Primitives/XyCalibrationFaceObject3D.cs
@@ -53,7 +53,7 @@ namespace MatterHackers.MatterControl.DesignTools
 		[DisplayName("Material")]
 		public int CalibrationMaterialIndex { get; set; } = 1;
 
-		public override bool CanFlatten => true;
+		public override bool CanApply => true;
 
 		public double ChangingHeight { get; set; } = .4;
 
diff --git a/MatterControlLib/DesignTools/Primitives/XyCalibrationTabObject3D.cs b/MatterControlLib/DesignTools/Primitives/XyCalibrationTabObject3D.cs
index 8975379aa..e45cb223e 100644
--- a/MatterControlLib/DesignTools/Primitives/XyCalibrationTabObject3D.cs
+++ b/MatterControlLib/DesignTools/Primitives/XyCalibrationTabObject3D.cs
@@ -51,7 +51,7 @@ namespace MatterHackers.MatterControl.DesignTools
 		[DisplayName("Material")]
 		public int CalibrationMaterialIndex { get; set; } = 1;
 
-		public override bool CanFlatten => true;
+		public override bool CanApply => true;
 
 		public double ChangeHeight { get; set; } = .4;
 
diff --git a/MatterControlLib/PartPreviewWindow/SelectedObjectPanel.cs b/MatterControlLib/PartPreviewWindow/SelectedObjectPanel.cs
index a014349dd..6759857f4 100644
--- a/MatterControlLib/PartPreviewWindow/SelectedObjectPanel.cs
+++ b/MatterControlLib/PartPreviewWindow/SelectedObjectPanel.cs
@@ -88,20 +88,20 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 
 			// put in a make permanent button
 			var icon = StaticData.Instance.LoadIcon("apply.png", 16, 16).SetToColor(theme.TextColor).SetPreMultiply();
-			flattenButton = new IconButton(icon, theme)
+			applyButton = new IconButton(icon, theme)
 			{
 				Margin = theme.ButtonSpacing,
 				ToolTipText = "Apply".Localize(),
 				Enabled = true
 			};
-			flattenButton.Click += (s, e) =>
+			applyButton.Click += (s, e) =>
 			{
-				if (this.item.CanFlatten)
+				if (this.item.CanApply)
 				{
 					var item = this.item;
 					using (new SelectionMaintainer(view3DWidget.Scene))
 					{
-						item.Flatten(view3DWidget.Scene.UndoBuffer);
+						item.Apply(view3DWidget.Scene.UndoBuffer);
 					}
 				}
 				else
@@ -110,24 +110,24 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 					sceneContext.Scene.UngroupSelection();
 				}
 			};
-			toolbar.AddChild(flattenButton);
+			toolbar.AddChild(applyButton);
 
 			// put in a remove button
-			removeButton = new IconButton(StaticData.Instance.LoadIcon("cancel.png", 16, 16).SetToColor(theme.TextColor).SetPreMultiply(), theme)
+			cancelButton = new IconButton(StaticData.Instance.LoadIcon("cancel.png", 16, 16).SetToColor(theme.TextColor).SetPreMultiply(), theme)
 			{
 				Margin = theme.ButtonSpacing,
 				ToolTipText = "Cancel".Localize(),
 				Enabled = scene.SelectedItem != null
 			};
-			removeButton.Click += (s, e) =>
+			cancelButton.Click += (s, e) =>
 			{
 				var item = this.item;
 				using (new SelectionMaintainer(view3DWidget.Scene))
 				{
-					item.Remove(view3DWidget.Scene.UndoBuffer);
+					item.Cancel(view3DWidget.Scene.UndoBuffer);
 				}
 			};
-			toolbar.AddChild(removeButton);
+			toolbar.AddChild(cancelButton);
 
 			overflowButton = new OverflowBar.OverflowMenuButton(theme)
 			{
@@ -171,8 +171,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 		public GuiWidget ContentPanel { get; set; }
 
 		private readonly JsonPathContext pathGetter = new JsonPathContext();
-		private readonly IconButton flattenButton;
-		private readonly IconButton removeButton;
+		private readonly IconButton applyButton;
+		private readonly IconButton cancelButton;
 		private readonly OverflowBar.OverflowMenuButton overflowButton;
 		private readonly InteractiveScene scene;
 		private readonly FlowLayoutWidget primaryActionsPanel;
@@ -472,11 +472,11 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 
 			var selectedItem = scene.SelectedItem;
 
-			flattenButton.Enabled = selectedItem != null
+			applyButton.Enabled = selectedItem != null
 				&& (selectedItem is GroupObject3D
 				|| (selectedItem.GetType() == typeof(Object3D) && selectedItem.Children.Any())
-				|| selectedItem.CanFlatten);
-			removeButton.Enabled = selectedItem != null;
+				|| selectedItem.CanApply);
+			cancelButton.Enabled = selectedItem != null;
 			overflowButton.Enabled = selectedItem != null;
 			if (selectedItem == null)
 			{
diff --git a/MatterControlLib/PartPreviewWindow/View3D/Actions/MeshWrapperObject3D.cs b/MatterControlLib/PartPreviewWindow/View3D/Actions/MeshWrapperObject3D.cs
index 8c4935730..e432e8554 100644
--- a/MatterControlLib/PartPreviewWindow/View3D/Actions/MeshWrapperObject3D.cs
+++ b/MatterControlLib/PartPreviewWindow/View3D/Actions/MeshWrapperObject3D.cs
@@ -45,9 +45,9 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.View3D
 		{
 		}
 
-		public override bool CanFlatten => true;
+		public override bool CanApply => true;
 
-		public override void Flatten(UndoBuffer undoBuffer)
+		public override void Apply(UndoBuffer undoBuffer)
 		{
 			using (RebuildLock())
 			{
@@ -160,7 +160,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.View3D
 				.Select((mw) => (mw.Children.First(), mw));
 		}
 
-		public override void Remove(UndoBuffer undoBuffer)
+		public override void Cancel(UndoBuffer undoBuffer)
 		{
 			using (RebuildLock())
 			{
@@ -172,7 +172,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.View3D
 					var meshWrappers = thisClone.Descendants().Where(o => o.OwnerID == thisClone.ID).ToArray();
 					foreach (var meshWrapper in meshWrappers)
 					{
-						meshWrapper.Remove(null);
+						meshWrapper.Cancel(null);
 					}
 					foreach (var child in thisClone.Children)
 					{
@@ -218,7 +218,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.View3D
 						while (remove is ModifiedMeshObject3D)
 						{
 							var hold = remove;
-							remove.Remove(null);
+							remove.Cancel(null);
 							remove = hold.Parent;
 						}
 					}
diff --git a/MatterControlLib/PartPreviewWindow/View3D/Actions/SubtractPathObject3D.cs b/MatterControlLib/PartPreviewWindow/View3D/Actions/SubtractPathObject3D.cs
index 39d55e3cb..136372511 100644
--- a/MatterControlLib/PartPreviewWindow/View3D/Actions/SubtractPathObject3D.cs
+++ b/MatterControlLib/PartPreviewWindow/View3D/Actions/SubtractPathObject3D.cs
@@ -90,9 +90,9 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.View3D
 			}
 		}
 
-		public override bool CanFlatten => true;
+		public override bool CanApply => true;
 
-		public override void Flatten(UndoBuffer undoBuffer)
+		public override void Apply(UndoBuffer undoBuffer)
 		{
 			this.FlattenToPathObject(undoBuffer);
 		}
diff --git a/MatterControlLib/PartPreviewWindow/View3D/SceneActions.cs b/MatterControlLib/PartPreviewWindow/View3D/SceneActions.cs
index bfd07a243..1039dbc72 100644
--- a/MatterControlLib/PartPreviewWindow/View3D/SceneActions.cs
+++ b/MatterControlLib/PartPreviewWindow/View3D/SceneActions.cs
@@ -56,9 +56,9 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 			var selectedItem = scene.SelectedItem;
 			if (selectedItem != null)
 			{
-				if (selectedItem.CanFlatten)
+				if (selectedItem.CanApply)
 				{
-					selectedItem.Flatten(scene.UndoBuffer);
+					selectedItem.Apply(scene.UndoBuffer);
 					scene.SelectedItem = null;
 					return;
 				}
diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp
index a9861d4a5..0c7af4c78 160000
--- a/Submodules/agg-sharp
+++ b/Submodules/agg-sharp
@@ -1 +1 @@
-Subproject commit a9861d4a5c96a88232a3c266cefbd217c43ed9fc
+Subproject commit 0c7af4c7815c45b357f9a065188bf1a1befdf712