diff --git a/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin b/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin
index 0c3b059cfe..27795c23a2 100755
--- a/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin
+++ b/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin
@@ -1255,13 +1255,10 @@
 			             label = "${res:Dialog.Options.IDEOptions.TaskListOptions.PanelName}"
 			             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.TaskListXaml"/>
 			
-			<OptionPanel id    = "OutputWindowOptions"
-			             label = "${res:Dialog.Options.IDEOptions.OutputPanel.Title}"
-			             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.old_OutputWindowOptionsPanel"/>
 			
-			<OptionPanel id    = "OutputWindowOptions1"
+			<OptionPanel id    = "OutputWindowOptions"
 			             label = "${res:Dialog.Options.IDEOptions.OutputPanel.Title}"
-			             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.OutputWindowOptionsPanelXaml"/>
+			             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.OutputWindowOptionsPanel"/>
 			
 			<OptionPanel id    = "ProjectAndSolutionOptions"
 			             label = "${res:Dialog.Options.IDEOptions.ProjectAndSolutionOptions.PanelName}"
diff --git a/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj b/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
index 467d66f1f5..a982b81d6b 100644
--- a/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
+++ b/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
@@ -225,8 +225,8 @@
       <DependentUpon>AbstractAttachToProcessForm.cs</DependentUpon>
     </Compile>
     <Compile Include="Src\Gui\Dialogs\ExtractInterfaceDialog.cs" />
-    <Compile Include="Src\Gui\Dialogs\OptionPanels\OutputWindowOptionsPanelXaml.xaml.cs">
-      <DependentUpon>OutputWindowOptionsPanelXaml.xaml</DependentUpon>
+    <Compile Include="Src\Gui\Dialogs\OptionPanels\OutputWindowOptionsPanel.xaml.cs">
+      <DependentUpon>OutputWindowOptionsPanel.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Src\Services\FileChangeWatcher.cs" />
@@ -839,7 +839,7 @@
     <Page Include="Src\Gui\Dialogs\OptionPanels\IDEOptions\EditStandardHeaderPanel.xaml" />
     <Page Include="Src\Gui\Dialogs\OptionPanels\IDEOptions\SelectStylePanel.xaml" />
     <Page Include="Src\Gui\Dialogs\OptionPanels\IDEOptions\TaskListOptionsl.xaml" />
-    <Page Include="Src\Gui\Dialogs\OptionPanels\OutputWindowOptionsPanelXaml.xaml" />
+    <Page Include="Src\Gui\Dialogs\OptionPanels\OutputWindowOptionsPanel.xaml" />
     <Page Include="Src\Gui\Dialogs\OptionPanels\ProjectOptions\ApplicationSettings.xaml" />
     <Page Include="Src\Gui\Dialogs\OptionPanels\ProjectOptions\BuildAdvanced.xaml" />
     <Page Include="Src\Gui\Dialogs\OptionPanels\ProjectOptions\BuildEvents.xaml" />
diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/OutputWindowOptionsPanelXaml.xaml b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/OutputWindowOptionsPanel.xaml
similarity index 94%
rename from src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/OutputWindowOptionsPanelXaml.xaml
rename to src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/OutputWindowOptionsPanel.xaml
index 04a4ec4b44..7376ed7e0c 100644
--- a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/OutputWindowOptionsPanelXaml.xaml
+++ b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/OutputWindowOptionsPanel.xaml
@@ -1,4 +1,4 @@
-<gui:OptionPanel x:Class="ICSharpCode.SharpDevelop.Gui.OptionPanels.OutputWindowOptionsPanelXaml"
+<gui:OptionPanel x:Class="ICSharpCode.SharpDevelop.Gui.OptionPanels.OutputWindowOptionsPanel"
                  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                  xmlns:core="http://icsharpcode.net/sharpdevelop/core"
diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/OutputWindowOptionsPanelXaml.xaml.cs b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/OutputWindowOptionsPanel.xaml.cs
similarity index 90%
rename from src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/OutputWindowOptionsPanelXaml.xaml.cs
rename to src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/OutputWindowOptionsPanel.xaml.cs
index 54a39c48f6..dc9e34f6a9 100644
--- a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/OutputWindowOptionsPanelXaml.xaml.cs
+++ b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/OutputWindowOptionsPanel.xaml.cs
@@ -15,7 +15,7 @@ namespace ICSharpCode.SharpDevelop.Gui.OptionPanels
 	/// <summary>
 	/// Interaction logic for OutputWindowOptionsPanelXaml.xaml
 	/// </summary>
-	public partial class OutputWindowOptionsPanelXaml :  OptionPanel
+	public partial class OutputWindowOptionsPanel :  OptionPanel
 	{
 		public static readonly string OutputWindowsProperty = "SharpDevelop.UI.OutputWindowOptions";
 	
@@ -24,7 +24,7 @@ namespace ICSharpCode.SharpDevelop.Gui.OptionPanels
 		public static readonly string WordWrapName = "WordWrap";
 		
 		
-		public OutputWindowOptionsPanelXaml()
+		public OutputWindowOptionsPanel()
 		{
 			InitializeComponent();
 			this.DataContext = this;
@@ -37,7 +37,7 @@ namespace ICSharpCode.SharpDevelop.Gui.OptionPanels
 			var properties = PropertyService.NestedProperties(OutputWindowsProperty);
 			WordWrap = properties.Get(WordWrapName, true);
 			
-			var fontDescription =  OutputWindowOptionsPanelXaml.DefaultFontDescription();
+			var fontDescription =  OutputWindowOptionsPanel.DefaultFontDescription();
 			fontSelectionPanel.SelectedFontFamily = new FontFamily(fontDescription.Item1);
 			fontSelectionPanel.SelectedFontSize = fontDescription.Item2;
 		}
diff --git a/src/Main/Base/Project/Src/Gui/Pads/CompilerMessageView/CompilerMessageView.cs b/src/Main/Base/Project/Src/Gui/Pads/CompilerMessageView/CompilerMessageView.cs
index 21907bcfa7..4c97c4852f 100644
--- a/src/Main/Base/Project/Src/Gui/Pads/CompilerMessageView/CompilerMessageView.cs
+++ b/src/Main/Base/Project/Src/Gui/Pads/CompilerMessageView/CompilerMessageView.cs
@@ -206,7 +206,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 			
 			textEditor.ContextMenu = MenuService.CreateContextMenu(this, "/SharpDevelop/Pads/CompilerMessageView/ContextMenu");
 			
-			properties = PropertyService.NestedProperties(OutputWindowOptionsPanelXaml.OutputWindowsProperty);
+			properties = PropertyService.NestedProperties(OutputWindowOptionsPanel.OutputWindowsProperty);
 			
 			SetTextEditorFont();
 			
@@ -238,7 +238,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 		
 		private bool IsFontChanged (string propName)
 		{
-			if ((propName == OutputWindowOptionsPanelXaml.FontSizeName) || (propName == OutputWindowOptionsPanelXaml.FontFamilyName)) {
+			if ((propName == OutputWindowOptionsPanel.FontSizeName) || (propName == OutputWindowOptionsPanel.FontFamilyName)) {
 				return true;
 			}
 			return false;
@@ -253,7 +253,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 		
 		private void SetTextEditorFont()
 		{
-			var fontDescription =  OutputWindowOptionsPanelXaml.DefaultFontDescription();
+			var fontDescription =  OutputWindowOptionsPanel.DefaultFontDescription();
 			textEditor.FontFamily = new FontFamily(fontDescription.Item1);
 			textEditor.FontSize = fontDescription.Item2;
 		}
@@ -413,7 +413,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 		/// </summary>
 		void PropertyChanged(object sender, PropertyChangedEventArgs e)
 		{
-			if (e.PropertyName == OutputWindowOptionsPanelXaml.WordWrapName) {
+			if (e.PropertyName == OutputWindowOptionsPanel.WordWrapName) {
 				SetWordWrap();
 				ToolBarService.UpdateStatus(toolStrip.Items);
 			}