diff --git a/CSharp/Libraries/UniversalEditor.UserInterface/Dialogs/CustomOptionsDialog.cs b/CSharp/Libraries/UniversalEditor.UserInterface/Dialogs/CustomOptionsDialog.cs
index 62900d95..9fea1189 100644
--- a/CSharp/Libraries/UniversalEditor.UserInterface/Dialogs/CustomOptionsDialog.cs
+++ b/CSharp/Libraries/UniversalEditor.UserInterface/Dialogs/CustomOptionsDialog.cs
@@ -35,10 +35,10 @@ namespace UniversalEditor.UserInterface.Dialogs
 		{
 			this.Layout = new GridLayout();
 
-			Button cmdOK = new Button(ButtonStockType.OK);
+			Button cmdOK = new Button(StockType.OK);
 			cmdOK.Click += cmdOK_Click;
 			Buttons.Add(cmdOK);
-			Buttons.Add(new Button(ButtonStockType.Cancel));
+			Buttons.Add(new Button(StockType.Cancel));
 
 			Buttons[0].ResponseValue = (int)DialogResult.OK;
 			Buttons[1].ResponseValue = (int)DialogResult.Cancel;
diff --git a/CSharp/Libraries/UniversalEditor.UserInterface/Dialogs/DocumentPropertiesDialog.cs b/CSharp/Libraries/UniversalEditor.UserInterface/Dialogs/DocumentPropertiesDialog.cs
index 660244d0..75a42a4a 100644
--- a/CSharp/Libraries/UniversalEditor.UserInterface/Dialogs/DocumentPropertiesDialog.cs
+++ b/CSharp/Libraries/UniversalEditor.UserInterface/Dialogs/DocumentPropertiesDialog.cs
@@ -59,13 +59,13 @@ namespace UniversalEditor.UserInterface.Dialogs
 				case DocumentPropertiesDialogMode.Open:
 				{
 					this.Text = "Open Document";
-					this.Buttons [0].StockType = ButtonStockType.Open;
+					this.Buttons [0].StockType = StockType.Open;
 					break;
 				}
 				case DocumentPropertiesDialogMode.Save:
 				{
 					this.Text = "Save Document";
-					this.Buttons [0].StockType = ButtonStockType.Save;
+					this.Buttons [0].StockType = StockType.Save;
 					break;
 				}
 			}
diff --git a/CSharp/Libraries/UniversalEditor.UserInterface/Dialogs/DocumentPropertiesDialogV2.cs b/CSharp/Libraries/UniversalEditor.UserInterface/Dialogs/DocumentPropertiesDialogV2.cs
index f2302a4c..5bd2b5c9 100644
--- a/CSharp/Libraries/UniversalEditor.UserInterface/Dialogs/DocumentPropertiesDialogV2.cs
+++ b/CSharp/Libraries/UniversalEditor.UserInterface/Dialogs/DocumentPropertiesDialogV2.cs
@@ -48,13 +48,13 @@ namespace UniversalEditor.UserInterface.Dialogs
 				case DocumentPropertiesDialogMode.Open:
 				{
 					this.Text = "Open Document";
-					this.Buttons [0].StockType = ButtonStockType.Open;
+					this.Buttons [0].StockType = StockType.Open;
 					break;
 				}
 				case DocumentPropertiesDialogMode.Save:
 				{
 					this.Text = "Save Document";
-					this.Buttons [0].StockType = ButtonStockType.Save;
+					this.Buttons [0].StockType = StockType.Save;
 					break;
 				}
 			}
@@ -285,9 +285,9 @@ namespace UniversalEditor.UserInterface.Dialogs
 			}
 			this.Controls.Add (sidebar, new BoxLayout.Constraints(true, true));
 
-			this.Buttons.Add (new Button (ButtonStockType.OK));
+			this.Buttons.Add (new Button (StockType.OK));
 			this.Buttons [0].ResponseValue = (int)DialogResult.OK;
-			this.Buttons.Add (new Button (ButtonStockType.Cancel));
+			this.Buttons.Add (new Button (StockType.Cancel));
 			this.Buttons [1].ResponseValue = (int)DialogResult.Cancel;
 
 			switch (Mode)
@@ -295,13 +295,13 @@ namespace UniversalEditor.UserInterface.Dialogs
 				case DocumentPropertiesDialogMode.Open:
 				{
 					this.Text = "Open Document";
-					this.Buttons [0].StockType = ButtonStockType.Open;
+					this.Buttons [0].StockType = StockType.Open;
 					break;
 				}
 				case DocumentPropertiesDialogMode.Save:
 				{
 					this.Text = "Save Document";
-					this.Buttons [0].StockType = ButtonStockType.Save;
+					this.Buttons [0].StockType = StockType.Save;
 					break;
 				}
 			}
diff --git a/CSharp/Libraries/UniversalEditor.UserInterface/Dialogs/NewDialog.Designer.cs b/CSharp/Libraries/UniversalEditor.UserInterface/Dialogs/NewDialog.Designer.cs
index 1fb2e261..38f78cb5 100644
--- a/CSharp/Libraries/UniversalEditor.UserInterface/Dialogs/NewDialog.Designer.cs
+++ b/CSharp/Libraries/UniversalEditor.UserInterface/Dialogs/NewDialog.Designer.cs
@@ -110,10 +110,10 @@ namespace UniversalEditor.UserInterface.Dialogs
 			this.Controls.Add(tableParams, new BoxLayout.Constraints(false, false, 16, BoxLayout.PackType.End));
 
 
-			this.Buttons.Add(new Button(ButtonStockType.New, DialogResult.None));
-			this.Buttons.Add(new Button(ButtonStockType.Cancel, DialogResult.Cancel));
+			this.Buttons.Add(new Button(StockType.New, DialogResult.None));
+			this.Buttons.Add(new Button(StockType.Cancel, DialogResult.Cancel));
 
-			this.Buttons[0].StockType = ButtonStockType.New;
+			this.Buttons[0].StockType = StockType.New;
 			this.Buttons[0].ResponseValue = (int)DialogResult.OK;
 			this.Buttons[0].Click += cmdOK_Click;
 
diff --git a/CSharp/Libraries/UniversalEditor.UserInterface/Editors/Binary/FieldDefinitionPropertiesDialog.cs b/CSharp/Libraries/UniversalEditor.UserInterface/Editors/Binary/FieldDefinitionPropertiesDialog.cs
index 43efabb9..d88f3b45 100644
--- a/CSharp/Libraries/UniversalEditor.UserInterface/Editors/Binary/FieldDefinitionPropertiesDialog.cs
+++ b/CSharp/Libraries/UniversalEditor.UserInterface/Editors/Binary/FieldDefinitionPropertiesDialog.cs
@@ -160,11 +160,11 @@ namespace UniversalEditor.Editors.Binary
 			this.cmdColor.Click += cmdColor_Click;
 			this.Controls.Add(this.cmdColor, new GridLayout.Constraints(4, 1));
 
-			this.Buttons.Add(new Button(ButtonStockType.OK));
+			this.Buttons.Add(new Button(StockType.OK));
 			this.Buttons[this.Buttons.Count - 1].Click += cmdOK_Click;
 			this.Buttons[this.Buttons.Count - 1].ResponseValue = (int)DialogResult.OK;
 
-			this.Buttons.Add(new Button(ButtonStockType.Cancel));
+			this.Buttons.Add(new Button(StockType.Cancel));
 			this.Buttons[this.Buttons.Count - 1].ResponseValue = (int)DialogResult.Cancel;
 		}
 
diff --git a/CSharp/Libraries/UniversalEditor.UserInterface/Editors/FileSystem/Dialogs/FilePropertiesDialog.cs b/CSharp/Libraries/UniversalEditor.UserInterface/Editors/FileSystem/Dialogs/FilePropertiesDialog.cs
index ab7bbcca..9f52208e 100644
--- a/CSharp/Libraries/UniversalEditor.UserInterface/Editors/FileSystem/Dialogs/FilePropertiesDialog.cs
+++ b/CSharp/Libraries/UniversalEditor.UserInterface/Editors/FileSystem/Dialogs/FilePropertiesDialog.cs
@@ -97,8 +97,8 @@ namespace UniversalEditor.Editors.FileSystem.Dialogs
 
 			Controls.Add(tbs, new BoxLayout.Constraints(true, true));
 
-			Buttons.Add(new Button(ButtonStockType.OK, DialogResult.OK));
-			Buttons.Add(new Button(ButtonStockType.Cancel, DialogResult.Cancel));
+			Buttons.Add(new Button(StockType.OK, DialogResult.OK));
+			Buttons.Add(new Button(StockType.Cancel, DialogResult.Cancel));
 		}
 	}
 }
diff --git a/CSharp/Plugins.UserInterface/UniversalEditor.Plugins.AddressBook.UserInterface/Editors/Contact/ContactEditor.cs b/CSharp/Plugins.UserInterface/UniversalEditor.Plugins.AddressBook.UserInterface/Editors/Contact/ContactEditor.cs
index 13777d73..73921ff3 100644
--- a/CSharp/Plugins.UserInterface/UniversalEditor.Plugins.AddressBook.UserInterface/Editors/Contact/ContactEditor.cs
+++ b/CSharp/Plugins.UserInterface/UniversalEditor.Plugins.AddressBook.UserInterface/Editors/Contact/ContactEditor.cs
@@ -214,7 +214,7 @@ namespace UniversalEditor.Editors.Contact
 			cboDetail.Text = detailType;
 
 			TextBox txtDetail = new TextBox ();
-			Button btnDelete = new Button (ButtonStockType.Delete);
+			Button btnDelete = new Button (StockType.Delete);
 			ct.Controls.Add (cboDetail, new GridLayout.Constraints (iRow + 1, 0, 1, 1, ExpandMode.None));
 			ct.Controls.Add (txtDetail, new GridLayout.Constraints (iRow + 1, 1, 1, 1, ExpandMode.Horizontal));
 			ct.Controls.Add (btnDelete, new GridLayout.Constraints (iRow + 1, 2, 1, 1, ExpandMode.None));
diff --git a/CSharp/Plugins.UserInterface/UniversalEditor.Plugins.Multimedia.UserInterface/Editors/Multimedia/Audio/Synthesized/PianoRoll/Dialogs/NotePropertiesDialog.cs b/CSharp/Plugins.UserInterface/UniversalEditor.Plugins.Multimedia.UserInterface/Editors/Multimedia/Audio/Synthesized/PianoRoll/Dialogs/NotePropertiesDialog.cs
index b2bdf758..9031e6bb 100644
--- a/CSharp/Plugins.UserInterface/UniversalEditor.Plugins.Multimedia.UserInterface/Editors/Multimedia/Audio/Synthesized/PianoRoll/Dialogs/NotePropertiesDialog.cs
+++ b/CSharp/Plugins.UserInterface/UniversalEditor.Plugins.Multimedia.UserInterface/Editors/Multimedia/Audio/Synthesized/PianoRoll/Dialogs/NotePropertiesDialog.cs
@@ -45,8 +45,8 @@ namespace UniversalEditor.Editors.Multimedia.Audio.Synthesized.PianoRoll.Dialogs
 
 			this.Controls.Add(p, new BoxLayout.Constraints(true, true));
 
-			this.Buttons.Add(new Button(ButtonStockType.OK, DialogResult.OK));
-			this.Buttons.Add(new Button(ButtonStockType.Cancel, DialogResult.Cancel));
+			this.Buttons.Add(new Button(StockType.OK, DialogResult.OK));
+			this.Buttons.Add(new Button(StockType.Cancel, DialogResult.Cancel));
 		}
 	}
 }