diff --git a/Source/BuilderModes/ClassicModes/BrightnessMode.cs b/Source/BuilderModes/ClassicModes/BrightnessMode.cs
index e87bda2f..23986dc1 100644
--- a/Source/BuilderModes/ClassicModes/BrightnessMode.cs
+++ b/Source/BuilderModes/ClassicModes/BrightnessMode.cs
@@ -569,7 +569,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
 		}
 		
 		// End selection
-		protected override void OnEndSelect()
+		protected override void OnSelectEnd()
 		{
 			// Not stopping from multiselection or modifying
 			if(!selecting && (mode == ModifyMode.None))
@@ -593,7 +593,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
 				}
 			}
 
-			base.OnEndSelect();
+			base.OnSelectEnd();
 		}
 		
 		// This is called wheh selection ends
@@ -691,9 +691,9 @@ namespace CodeImp.DoomBuilder.BuilderModes
 		}
 		
 		// Done editing
-		protected override void OnEndEdit()
+		protected override void OnEditEnd()
 		{
-			base.OnEndEdit();
+			base.OnEditEnd();
 			
 			// Stop editing
 			mode = ModifyMode.None;
diff --git a/Source/BuilderModes/ClassicModes/DragGeometryMode.cs b/Source/BuilderModes/ClassicModes/DragGeometryMode.cs
index 136e76a8..e393e893 100644
--- a/Source/BuilderModes/ClassicModes/DragGeometryMode.cs
+++ b/Source/BuilderModes/ClassicModes/DragGeometryMode.cs
@@ -364,12 +364,12 @@ namespace CodeImp.DoomBuilder.BuilderModes
 		}
 
 		// When edit button is released
-		protected override void OnEndEdit()
+		protected override void OnEditEnd()
 		{
 			// Just return to base mode, Disengage will be called automatically.
 			General.Map.ChangeMode(General.Map.PreviousStableMode.Name);
 
-			base.OnEndEdit();
+			base.OnEditEnd();
 		}
 		
 		// Mouse moving
diff --git a/Source/BuilderModes/ClassicModes/DragThingsMode.cs b/Source/BuilderModes/ClassicModes/DragThingsMode.cs
index 6d513868..f2e992c7 100644
--- a/Source/BuilderModes/ClassicModes/DragThingsMode.cs
+++ b/Source/BuilderModes/ClassicModes/DragThingsMode.cs
@@ -349,12 +349,12 @@ namespace CodeImp.DoomBuilder.BuilderModes
 		}
 
 		// When edit button is released
-		protected override void OnEndEdit()
+		protected override void OnEditEnd()
 		{
 			// Just return to vertices mode, geometry will be merged on disengage.
 			General.Map.ChangeMode(basemode);
 
-			base.OnEndEdit();
+			base.OnEditEnd();
 		}
 
 		// Mouse moving
diff --git a/Source/BuilderModes/ClassicModes/EditSelectionMode.cs b/Source/BuilderModes/ClassicModes/EditSelectionMode.cs
index 0d822fa6..2b6a2ad0 100644
--- a/Source/BuilderModes/ClassicModes/EditSelectionMode.cs
+++ b/Source/BuilderModes/ClassicModes/EditSelectionMode.cs
@@ -946,10 +946,10 @@ namespace CodeImp.DoomBuilder.BuilderModes
 		}
 
 		// When edit button is released
-		protected override void OnEndEdit()
+		protected override void OnEditEnd()
 		{
-			base.OnEndEdit();
-			OnEndSelect();
+			base.OnEditEnd();
+			OnSelectEnd();
 		}
 
 		// When select button is pressed
@@ -1088,9 +1088,9 @@ namespace CodeImp.DoomBuilder.BuilderModes
 		}
 
 		// When selected button is released
-		protected override void OnEndSelect()
+		protected override void OnSelectEnd()
 		{
-			base.OnEndSelect();
+			base.OnSelectEnd();
 			
 			// Remove extension line
 			extensionline = new Line2D();
diff --git a/Source/BuilderModes/ClassicModes/LinedefsMode.cs b/Source/BuilderModes/ClassicModes/LinedefsMode.cs
index 6383b8a8..f60261db 100644
--- a/Source/BuilderModes/ClassicModes/LinedefsMode.cs
+++ b/Source/BuilderModes/ClassicModes/LinedefsMode.cs
@@ -283,7 +283,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
 		}
 
 		// End selection
-		protected override void OnEndSelect()
+		protected override void OnSelectEnd()
 		{
 			// Not stopping from multiselection?
 			if(!selecting)
@@ -304,7 +304,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
 				}
 			}
 
-			base.OnEndSelect();
+			base.OnSelectEnd();
 		}
 		
 		// Start editing
@@ -348,7 +348,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
 		}
 		
 		// Done editing
-		protected override void OnEndEdit()
+		protected override void OnEditEnd()
 		{
 			// Edit pressed in this mode?
 			if(editpressed)
@@ -369,7 +369,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
 			}
 
 			editpressed = false;
-			base.OnEndEdit();
+			base.OnEditEnd();
 		}
 		
 		// Mouse moves
diff --git a/Source/BuilderModes/ClassicModes/MakeSectorMode.cs b/Source/BuilderModes/ClassicModes/MakeSectorMode.cs
index 7e7a8519..40f3ca88 100644
--- a/Source/BuilderModes/ClassicModes/MakeSectorMode.cs
+++ b/Source/BuilderModes/ClassicModes/MakeSectorMode.cs
@@ -277,7 +277,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
 		}
 
 		// Done selecting
-		protected override void OnEndSelect()
+		protected override void OnSelectEnd()
 		{
 			// Select was pressed in this mode?
 			if(selectpressed && (editside == nearestside) && (nearestside != null))
@@ -309,7 +309,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
 			}
 
 			selectpressed = false;
-			base.OnEndSelect();
+			base.OnSelectEnd();
 		}
 		
 		// Start editing
@@ -322,7 +322,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
 		}
 
 		// Done editing
-		protected override void OnEndEdit()
+		protected override void OnEditEnd()
 		{
 			// Edit was pressed in this mode?
 			if(editpressed && (editside == nearestside) && (nearestside != null))
@@ -365,7 +365,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
 			}
 			
 			editpressed = false;
-			base.OnEndEdit();
+			base.OnEditEnd();
 		}
 
 		// Mouse moves
diff --git a/Source/BuilderModes/ClassicModes/SectorsMode.cs b/Source/BuilderModes/ClassicModes/SectorsMode.cs
index 7c99f483..685f5aa4 100644
--- a/Source/BuilderModes/ClassicModes/SectorsMode.cs
+++ b/Source/BuilderModes/ClassicModes/SectorsMode.cs
@@ -371,7 +371,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
 		}
 
 		// End selection
-		protected override void OnEndSelect()
+		protected override void OnSelectEnd()
 		{
 			// Not stopping from multiselection?
 			if(!selecting)
@@ -390,7 +390,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
 				}
 			}
 
-			base.OnEndSelect();
+			base.OnSelectEnd();
 		}
 
 		// Start editing
@@ -433,7 +433,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
 		}
 
 		// Done editing
-		protected override void OnEndEdit()
+		protected override void OnEditEnd()
 		{
 			// Edit pressed in this mode?
 			if(editpressed)
@@ -458,7 +458,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
 			}
 
 			editpressed = false;
-			base.OnEndEdit();
+			base.OnEditEnd();
 		}
 		
 		// Mouse moves
diff --git a/Source/BuilderModes/ClassicModes/ThingsMode.cs b/Source/BuilderModes/ClassicModes/ThingsMode.cs
index 7e31e665..a970da60 100644
--- a/Source/BuilderModes/ClassicModes/ThingsMode.cs
+++ b/Source/BuilderModes/ClassicModes/ThingsMode.cs
@@ -273,7 +273,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
 		}
 
 		// End selection
-		protected override void OnEndSelect()
+		protected override void OnSelectEnd()
 		{
 			// Not ending from a multi-selection?
 			if(!selecting)
@@ -292,7 +292,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
 				}
 			}
 
-			base.OnEndSelect();
+			base.OnSelectEnd();
 		}
 
 		// Start editing
@@ -327,7 +327,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
 		}
 
 		// Done editing
-		protected override void OnEndEdit()
+		protected override void OnEditEnd()
 		{
 			// Edit pressed in this mode?
 			if(editpressed)
@@ -351,7 +351,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
 			}
 
 			editpressed = false;
-			base.OnEndEdit();
+			base.OnEditEnd();
 		}
 
 		// Mouse moves
diff --git a/Source/BuilderModes/ClassicModes/VerticesMode.cs b/Source/BuilderModes/ClassicModes/VerticesMode.cs
index 40cbd670..97e43239 100644
--- a/Source/BuilderModes/ClassicModes/VerticesMode.cs
+++ b/Source/BuilderModes/ClassicModes/VerticesMode.cs
@@ -211,7 +211,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
 		}
 		
 		// End selection
-		protected override void OnEndSelect()
+		protected override void OnSelectEnd()
 		{
 			// Not stopping from multiselection?
 			if(!selecting)
@@ -229,7 +229,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
 				}
 			}
 
-			base.OnEndSelect();
+			base.OnSelectEnd();
 		}
 		
 		// Start editing
@@ -281,10 +281,10 @@ namespace CodeImp.DoomBuilder.BuilderModes
 		}
 		
 		// Done editing
-		protected override void OnEndEdit()
+		protected override void OnEditEnd()
 		{
 			editpressed = false;
-			base.OnEndEdit();
+			base.OnEditEnd();
 		}
 		
 		// Mouse moves
diff --git a/Source/Editing/ClassicMode.cs b/Source/Editing/ClassicMode.cs
index 2c027b27..4d542c1f 100644
--- a/Source/Editing/ClassicMode.cs
+++ b/Source/Editing/ClassicMode.cs
@@ -447,7 +447,7 @@ namespace CodeImp.DoomBuilder.Editing
 		/// (in Doom Builder 1, this was always the right mousebutton)
 		/// </summary>
 		[EndAction("classicedit", BaseAction = true)]
-		protected virtual void OnEndEdit()
+		protected virtual void OnEditEnd()
 		{
 		}
 
@@ -465,7 +465,7 @@ namespace CodeImp.DoomBuilder.Editing
 		/// (in Doom Builder 1, this was always the left mousebutton)
 		/// </summary>
 		[EndAction("classicselect", BaseAction = true)]
-		protected virtual void OnEndSelect()
+		protected virtual void OnSelectEnd()
 		{
 			if(selecting) OnEndMultiSelection();
 		}