diff --git a/src/AddIns/Misc/HtmlHelp2/Project/src/Service/HtmlHelp2Options.cs b/src/AddIns/Misc/HtmlHelp2/Project/src/Service/HtmlHelp2Options.cs
index 1a9678fc2a..43afacb208 100644
--- a/src/AddIns/Misc/HtmlHelp2/Project/src/Service/HtmlHelp2Options.cs
+++ b/src/AddIns/Misc/HtmlHelp2/Project/src/Service/HtmlHelp2Options.cs
@@ -24,7 +24,7 @@ namespace HtmlHelp2Service
 		static string help2EnvironmentFile = "help2environment.xml";
 		bool Help2EnvIsReady               = false;
 		ComboBox help2Collections          = null;
-		string selectedHelp2Collection     = "Corsavy";
+		string selectedHelp2Collection     = HtmlHelp2Environment.DefaultNamespaceName;
 
 		public override void LoadPanelContents()
 		{
diff --git a/src/AddIns/Misc/HtmlHelp2/Project/src/Service/HtmlHelp2Service.cs b/src/AddIns/Misc/HtmlHelp2/Project/src/Service/HtmlHelp2Service.cs
index fe5c86eb0d..2c3a58a495 100644
--- a/src/AddIns/Misc/HtmlHelp2/Project/src/Service/HtmlHelp2Service.cs
+++ b/src/AddIns/Misc/HtmlHelp2/Project/src/Service/HtmlHelp2Service.cs
@@ -26,7 +26,7 @@ namespace HtmlHelp2Service
 		static IHxRegFilterList namespaceFilters         = null;
 		static IHxQuery fulltextSearch                   = null;
 		static IHxQuery dynamicHelp                      = null;
-		static string corsavyNamespaceName               = "Corsavy";
+		public static string DefaultNamespaceName        = "MS.NETFramework.v20.en";
 		static string currentSelectedFilterQuery         = "";
 		static string currentSelectedFilterName          = "";
 		static string defaultPage                        = "about:blank";
@@ -36,8 +36,8 @@ namespace HtmlHelp2Service
 		static HtmlHelp2Environment()
 		{
 			LoadHelp2Config();
-			corsavyNamespaceName = Help2RegistryWalker.GetFirstNamespace(corsavyNamespaceName);
-			InitializeNamespace(corsavyNamespaceName);
+			DefaultNamespaceName = Help2RegistryWalker.GetFirstNamespace(DefaultNamespaceName);
+			InitializeNamespace(DefaultNamespaceName);
 		}
 
 		#region Properties
@@ -51,7 +51,7 @@ namespace HtmlHelp2Service
 		public static string CurrentSelectedNamespace
 		{
 			get {
-				return corsavyNamespaceName;
+				return DefaultNamespaceName;
 			}
 		}
 
@@ -106,7 +106,7 @@ namespace HtmlHelp2Service
 				xmldoc.Load(PropertyService.ConfigDirectory + help2EnvironmentFile);
 
 				XmlNode node = xmldoc.SelectSingleNode("/help2environment/collection");
-				if(node != null) corsavyNamespaceName = node.InnerText;
+				if(node != null) DefaultNamespaceName = node.InnerText;
 			}
 			catch {
 			}
@@ -115,8 +115,8 @@ namespace HtmlHelp2Service
 		public static void ReloadNamespace()
 		{
 			LoadHelp2Config();
-			corsavyNamespaceName = Help2RegistryWalker.GetFirstNamespace(corsavyNamespaceName);
-			InitializeNamespace(corsavyNamespaceName);
+			DefaultNamespaceName = Help2RegistryWalker.GetFirstNamespace(DefaultNamespaceName);
+			InitializeNamespace(DefaultNamespaceName);
 			OnNamespaceReloaded(EventArgs.Empty);
 		}
 
diff --git a/src/Tools/Help/plugins.xml b/src/Tools/Help/plugins.xml
index 1b2d24bc57..c92ccae63b 100644
--- a/src/Tools/Help/plugins.xml
+++ b/src/Tools/Help/plugins.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <register>
 	<plugin parent="Corsavy">
-		<child name="MS.NETFrameworkSDKv2*"/>
+		<child name="MS.NETFramework.v20*"/>
 	</plugin>
 </register>
\ No newline at end of file
diff --git a/src/Tools/Help/register.xml b/src/Tools/Help/register.xml
index 6da79ac7bd..c42ee7c22d 100644
--- a/src/Tools/Help/register.xml
+++ b/src/Tools/Help/register.xml
@@ -5,7 +5,7 @@
     <file Id="SharpZipLib" HxS="..\..\..\doc\help\3rdparty\ICSharpCode.SharpZipLib.HxS" HxI="..\..\..\doc\help\3rdparty\ICSharpCode.SharpZipLib.HxI" LangId="1033"/>
     <filter name="(no filter)"/>
     <plugin>
-    	<child name="MS.NETFrameworkSDKv2*"/>
+    	<child name="MS.NETFramework.v20*"/>
     </plugin>
   </namespace>
 </register>
\ No newline at end of file