diff --git a/src/Main/Base/Project/Editor/CodeCompletion/CodeCompletionOptionPanel.xaml b/src/Main/Base/Project/Editor/CodeCompletion/CodeCompletionOptionPanel.xaml
index d450b86852..f39d4b88cd 100644
--- a/src/Main/Base/Project/Editor/CodeCompletion/CodeCompletionOptionPanel.xaml
+++ b/src/Main/Base/Project/Editor/CodeCompletion/CodeCompletionOptionPanel.xaml
@@ -1,4 +1,4 @@
-<gui:OptionPanel x:Class="ICSharpCode.SharpDevelop.Editor.CodeCompletion.CodeCompletionPanel"
+<gui:OptionPanel x:Class="ICSharpCode.SharpDevelop.Editor.CodeCompletion.CodeCompletionOptionPanel"
                  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/Editor/CodeCompletion/CodeCompletionOptionPanel.xaml.cs b/src/Main/Base/Project/Editor/CodeCompletion/CodeCompletionOptionPanel.xaml.cs
index 906da07b7d..e70363988c 100644
--- a/src/Main/Base/Project/Editor/CodeCompletion/CodeCompletionOptionPanel.xaml.cs
+++ b/src/Main/Base/Project/Editor/CodeCompletion/CodeCompletionOptionPanel.xaml.cs
@@ -18,17 +18,16 @@
 
 using System;
 using System.Windows;
-using ICSharpCode.Core;
 using ICSharpCode.SharpDevelop.Gui;
 
 namespace ICSharpCode.SharpDevelop.Editor.CodeCompletion
 {
 	/// <summary>
-	/// Interaction logic for CodeCompletionPanelXaml.xaml
+	/// Interaction logic for CodeCompletionOptionPanel.xaml
 	/// </summary>
-	public partial class CodeCompletionPanel : OptionPanel
+	public partial class CodeCompletionOptionPanel : OptionPanel
 	{
-		public CodeCompletionPanel()
+		public CodeCompletionOptionPanel()
 		{
 			InitializeComponent();
 			this.DataContext = this;
diff --git a/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin b/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin
index c590200465..f56c9d0d50 100755
--- a/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin
+++ b/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin
@@ -2178,7 +2178,7 @@
 		<OptionPanel id = "CodeCompletion"
 		             insertafter="Behavior"
 		             label = "${res:Dialog.Options.IDEOptions.TextEditor.CodeCompletion.PanelName}"
-		             class = "ICSharpCode.SharpDevelop.Editor.CodeCompletion.CodeCompletionPanel"/>
+		             class = "ICSharpCode.SharpDevelop.Editor.CodeCompletion.CodeCompletionOptionPanel"/>
 	</Path>
 	
 	<Path name = "/SharpDevelop/Pads/BookmarkPad/Toolbar">