diff --git a/src/AddIns/Analysis/SourceAnalysis/SourceAnalysis.addin b/src/AddIns/Analysis/SourceAnalysis/SourceAnalysis.addin
index d49a4e047b..11e252e71e 100644
--- a/src/AddIns/Analysis/SourceAnalysis/SourceAnalysis.addin
+++ b/src/AddIns/Analysis/SourceAnalysis/SourceAnalysis.addin
@@ -47,7 +47,7 @@
 	<Path name = "/SharpDevelop/Dialogs/OptionsDialog/ToolsOptions">
 		<OptionPanel id    = "SourceAnalysisOptionPanel"
 		             label = "${res:AddIns.SourceAnalysis.Title}"
-		             class = "MattEverson.SourceAnalysis.AnalysisIdeOptionsPanelXaml"/>
+		             class = "MattEverson.SourceAnalysis.AnalysisIdeOptionsPanel"/>
 	
 	</Path>
 </AddIn>
diff --git a/src/AddIns/Analysis/SourceAnalysis/SourceAnalysis.csproj b/src/AddIns/Analysis/SourceAnalysis/SourceAnalysis.csproj
index a59891dd1d..cbc300b1c0 100644
--- a/src/AddIns/Analysis/SourceAnalysis/SourceAnalysis.csproj
+++ b/src/AddIns/Analysis/SourceAnalysis/SourceAnalysis.csproj
@@ -66,8 +66,8 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
     <Compile Include="Configuration\AssemblyInfo.cs" />
-    <Compile Include="Src\AnalysisIdeOptionsPanelXaml.xaml.cs">
-      <DependentUpon>AnalysisIdeOptionsPanelXaml.xaml</DependentUpon>
+    <Compile Include="Src\AnalysisIdeOptionsPanel.xaml.cs">
+      <DependentUpon>AnalysisIdeOptionsPanel.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Src\AnalysisOptionsPanel.xaml.cs">
@@ -115,7 +115,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Page Include="Src\AnalysisIdeOptionsPanelXaml.xaml" />
+    <Page Include="Src\AnalysisIdeOptionsPanel.xaml" />
     <Page Include="Src\AnalysisOptionsPanel.xaml" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
diff --git a/src/AddIns/Analysis/SourceAnalysis/Src/AnalysisIdeOptionsPanelXaml.xaml b/src/AddIns/Analysis/SourceAnalysis/Src/AnalysisIdeOptionsPanel.xaml
similarity index 96%
rename from src/AddIns/Analysis/SourceAnalysis/Src/AnalysisIdeOptionsPanelXaml.xaml
rename to src/AddIns/Analysis/SourceAnalysis/Src/AnalysisIdeOptionsPanel.xaml
index d15ab19c51..a6396ea478 100644
--- a/src/AddIns/Analysis/SourceAnalysis/Src/AnalysisIdeOptionsPanelXaml.xaml
+++ b/src/AddIns/Analysis/SourceAnalysis/Src/AnalysisIdeOptionsPanel.xaml
@@ -1,4 +1,4 @@
-<gui:OptionPanel x:Class="MattEverson.SourceAnalysis.AnalysisIdeOptionsPanelXaml"
+<gui:OptionPanel x:Class="MattEverson.SourceAnalysis.AnalysisIdeOptionsPanel"
                  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                  xmlns:core="http://icsharpcode.net/sharpdevelop/core"
                  xmlns:gui="clr-namespace:ICSharpCode.SharpDevelop.Gui;assembly=ICSharpCode.SharpDevelop"
diff --git a/src/AddIns/Analysis/SourceAnalysis/Src/AnalysisIdeOptionsPanelXaml.xaml.cs b/src/AddIns/Analysis/SourceAnalysis/Src/AnalysisIdeOptionsPanel.xaml.cs
similarity index 96%
rename from src/AddIns/Analysis/SourceAnalysis/Src/AnalysisIdeOptionsPanelXaml.xaml.cs
rename to src/AddIns/Analysis/SourceAnalysis/Src/AnalysisIdeOptionsPanel.xaml.cs
index 48aea628c5..8419af2541 100644
--- a/src/AddIns/Analysis/SourceAnalysis/Src/AnalysisIdeOptionsPanelXaml.xaml.cs
+++ b/src/AddIns/Analysis/SourceAnalysis/Src/AnalysisIdeOptionsPanel.xaml.cs
@@ -26,11 +26,11 @@ namespace MattEverson.SourceAnalysis
 	/// <summary>
 	/// Interaction logic for AnalysisIdeOptionsPanelXaml.xaml
 	/// </summary>
-	public partial class AnalysisIdeOptionsPanelXaml : OptionPanel
+	public partial class AnalysisIdeOptionsPanel : OptionPanel
 	{
 		private bool enableModifyStyleCopSettings;
 		
-		public AnalysisIdeOptionsPanelXaml()
+		public AnalysisIdeOptionsPanel()
 		{
 			InitializeComponent();
 			DataContext = this;
diff --git a/src/AddIns/Analysis/SourceAnalysis/Src/StyleCopWrapper.cs b/src/AddIns/Analysis/SourceAnalysis/Src/StyleCopWrapper.cs
index a2c6463907..d6b74509e2 100644
--- a/src/AddIns/Analysis/SourceAnalysis/Src/StyleCopWrapper.cs
+++ b/src/AddIns/Analysis/SourceAnalysis/Src/StyleCopWrapper.cs
@@ -24,7 +24,7 @@ namespace MattEverson.SourceAnalysis
 		
 		public static string FindStyleCopPath()
 		{
-			string styleCopPath = AnalysisIdeOptionsPanelXaml.StyleCopPath;				
+			string styleCopPath = AnalysisIdeOptionsPanel.StyleCopPath;				
 			if (IsStyleCopPath(styleCopPath)) {
 				return styleCopPath;
 			}