diff --git a/src/AddIns/BackendBindings/CppBinding/CppBinding/CppBinding.addin b/src/AddIns/BackendBindings/CppBinding/CppBinding/CppBinding.addin
index a66480f598..bbfde3910a 100644
--- a/src/AddIns/BackendBindings/CppBinding/CppBinding/CppBinding.addin
+++ b/src/AddIns/BackendBindings/CppBinding/CppBinding/CppBinding.addin
@@ -14,14 +14,10 @@
 	</Manifest>
 	
 	<Path path = "/SharpDevelop/BackendBindings/ProjectOptions/C++">
-	<!--
-		<OptionPanel id = "Application"
-		             label = "${res:Dialog.ProjectOptions.ApplicationSettings}"
-		             class = "ICSharpCode.CppBinding.Project.ApplicationOptions" />
-	-->
+	
 		<OptionPanel id = "Application1"
 		             label = "${res:Dialog.ProjectOptions.ApplicationSettings}"
-		             class = "ICSharpCode.CppBinding.Project.ApplicationOptionsXaml" />
+		             class = "ICSharpCode.CppBinding.Project.ApplicationOptions" />
 		
 		<OptionPanel id = "Preprocessor"
 				label = "${res:ICSharpCode.CppBinding.ProjectOptions.Preprocessor}"
@@ -29,19 +25,7 @@
 		<OptionPanel id = "Linker"
 				label = "${res:ICSharpCode.CppBinding.ProjectOptions.Linker}"
 				class = "ICSharpCode.CppBinding.Project.LinkerOptions" />
-		<!--<OptionPanel id    = "BuildEvents"
-		             label = "${res:Dialog.ProjectOptions.BuildEvents}"
-		             class = "ICSharpCode.CppBinding.Project.BuildEventOptions"/>-->
-		
-		<!--<OptionPanel id    = "ReferencePaths"
-		             label = "${res:Dialog.ProjectOptions.ReferencePaths}"
-		             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.ReferencePaths"/>
-		<OptionPanel id    = "Signing"
-		             label = "${res:Dialog.ProjectOptions.Signing}"
-		             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.Signing"/>
-		<OptionPanel id    = "DebugOptions"
-		             label = "${res:Dialog.ProjectOptions.DebugOptions}"
-		             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.DebugOptions"/>/-->
+	
 		<Include id = "AllManaged" path="/SharpDevelop/BackendBindings/ProjectOptions/AllManaged"/>
 	</Path>	
 	
diff --git a/src/AddIns/BackendBindings/CppBinding/CppBinding/CppBinding.csproj b/src/AddIns/BackendBindings/CppBinding/CppBinding/CppBinding.csproj
index 345ba2a0db..c75d526363 100644
--- a/src/AddIns/BackendBindings/CppBinding/CppBinding/CppBinding.csproj
+++ b/src/AddIns/BackendBindings/CppBinding/CppBinding/CppBinding.csproj
@@ -78,8 +78,8 @@
     <Compile Include="CppFormattingStrategy.cs" />
     <Compile Include="CppLanguageBinding.cs" />
     <Compile Include="CppLanguageProperties.cs" />
-    <Compile Include="Project\ApplicationOptionsXaml.cs">
-      <DependentUpon>ApplicationOptionsXaml.xaml</DependentUpon>
+    <Compile Include="Project\ApplicationOptions.cs">
+      <DependentUpon>ApplicationOptions.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Project\DependencyRelation.cs" />
@@ -170,6 +170,6 @@
     <Folder Include="Resources" />
   </ItemGroup>
   <ItemGroup>
-    <Page Include="Project\ApplicationOptionsXaml.xaml" />
+    <Page Include="Project\ApplicationOptions.xaml" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/AddIns/BackendBindings/CppBinding/CppBinding/Project/ApplicationOptionsXaml.cs b/src/AddIns/BackendBindings/CppBinding/CppBinding/Project/ApplicationOptions.cs
similarity index 99%
rename from src/AddIns/BackendBindings/CppBinding/CppBinding/Project/ApplicationOptionsXaml.cs
rename to src/AddIns/BackendBindings/CppBinding/CppBinding/Project/ApplicationOptions.cs
index d3e17b7023..4d2e496cda 100644
--- a/src/AddIns/BackendBindings/CppBinding/CppBinding/Project/ApplicationOptionsXaml.cs
+++ b/src/AddIns/BackendBindings/CppBinding/CppBinding/Project/ApplicationOptions.cs
@@ -27,14 +27,14 @@ namespace ICSharpCode.CppBinding.Project
 	/// <summary>
 	/// Interaction logic for ApplicationSettingsXaml.xaml
 	/// </summary>
-	public partial class ApplicationOptionsXaml : ProjectOptionPanel
+	public partial class ApplicationOptions : ProjectOptionPanel
 	{
 		private const string iconsfilter = "${res:SharpDevelop.FileFilter.Icons}|*.ico|${res:SharpDevelop.FileFilter.AllFiles}|*.*";
 		private const string manifestFilter = "${res:Dialog.ProjectOptions.ApplicationSettings.Manifest.ManifestFiles}|*.manifest|${res:SharpDevelop.FileFilter.AllFiles}|*.*";
 		private const string win32filter = "Win32 Resource files|*.res|${res:SharpDevelop.FileFilter.AllFiles}|*.*";
 		MSBuildBasedProject project;
 		
-		public ApplicationOptionsXaml()
+		public ApplicationOptions()
 		{
 			InitializeComponent();
 		}
diff --git a/src/AddIns/BackendBindings/CppBinding/CppBinding/Project/ApplicationOptionsXaml.xaml b/src/AddIns/BackendBindings/CppBinding/CppBinding/Project/ApplicationOptions.xaml
similarity index 98%
rename from src/AddIns/BackendBindings/CppBinding/CppBinding/Project/ApplicationOptionsXaml.xaml
rename to src/AddIns/BackendBindings/CppBinding/CppBinding/Project/ApplicationOptions.xaml
index df69353dd1..bf0bdf0c0f 100644
--- a/src/AddIns/BackendBindings/CppBinding/CppBinding/Project/ApplicationOptionsXaml.xaml
+++ b/src/AddIns/BackendBindings/CppBinding/CppBinding/Project/ApplicationOptions.xaml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <optionpanels:ProjectOptionPanel
-	x:Class="ICSharpCode.CppBinding.Project.ApplicationOptionsXaml"
+	x:Class="ICSharpCode.CppBinding.Project.ApplicationOptions"
 	xmlns:sys="clr-namespace:System;assembly=mscorlib"
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/src/AddIns/BackendBindings/CppBinding/CppBinding/Project/old_ApplicationOptions.cs b/src/AddIns/BackendBindings/CppBinding/CppBinding/Project/old_ApplicationOptions.cs
index be98f3ac74..ee78c491be 100644
--- a/src/AddIns/BackendBindings/CppBinding/CppBinding/Project/old_ApplicationOptions.cs
+++ b/src/AddIns/BackendBindings/CppBinding/CppBinding/Project/old_ApplicationOptions.cs
@@ -23,7 +23,7 @@ namespace ICSharpCode.CppBinding.Project
 	/// <summary>
 	/// Application settings panel for c++ project.
 	/// </summary>
-	public class ApplicationOptions : ICSharpCode.SharpDevelop.Gui.OptionPanels.old_ApplicationSettings
+	public class old_ApplicationOptions : ICSharpCode.SharpDevelop.Gui.OptionPanels.old_ApplicationSettings
 	{
 		public override void LoadPanelContents()
 		{