diff --git a/src/AddIns/DisplayBindings/ServerTools/ICSharpCode.ServerTools.addin b/src/AddIns/DisplayBindings/ServerTools/ICSharpCode.ServerTools.addin
index e5c0f7f322..4555e5dadf 100644
--- a/src/AddIns/DisplayBindings/ServerTools/ICSharpCode.ServerTools.addin
+++ b/src/AddIns/DisplayBindings/ServerTools/ICSharpCode.ServerTools.addin
@@ -19,6 +19,6 @@
 		     title    = "Server Explorer"
 		     icon     = "ServerTool.Server"
 		     shortcut = "Control|Alt|D"
-		     class    = "ICSharpCode.ServerTools.ServerControl"/>
+		     class    = "ICSharpCode.ServerTools.ServerBrowserHost"/>
 	</Path>
 </AddIn>
diff --git a/src/AddIns/DisplayBindings/ServerTools/ServerBrowserHost.cs b/src/AddIns/DisplayBindings/ServerTools/ServerBrowserHost.cs
index 5f37add597..e176c16aa2 100644
--- a/src/AddIns/DisplayBindings/ServerTools/ServerBrowserHost.cs
+++ b/src/AddIns/DisplayBindings/ServerTools/ServerBrowserHost.cs
@@ -10,9 +10,9 @@ using System.Windows.Forms;
 using System.Windows.Forms.Integration;
 using ICSharpCode.Core;
 using ICSharpCode.SharpDevelop.Gui;
-using ICSharpCode.ServerTools.Servers;
+using ICSharpCode.ServerTools;
 
-namespace ICSharpCode.ServerTools.Forms
+namespace ICSharpCode.ServerTools
 {
 	/// <summary>
 	/// Enables a user to browse metadata associated with a db server and to open resources