diff --git a/TODOnewNR.txt b/TODOnewNR.txt
index a08fef9131..b5861e3168 100644
--- a/TODOnewNR.txt
+++ b/TODOnewNR.txt
@@ -90,6 +90,14 @@ Functionality changes:
 		As part of this cleanup, I'm also replacing static services with service interfaces (see above).
 
 
+	AddInTree paths reorganized
+		Plenty of AddIn tree paths have been changed to better match the new namespace structure.
+		
+		I used a global replace operation for renaming paths; so AddIns that are in the SharpDevelop
+		repository but not in the SharpDevelop solution (because they haven't been ported yet)
+		have been adjusted as well.
+
+
 	SD.MainThread:
 		The new best way to invoke a call on the main thread is:
 			SD.MainThread.InvokeAsync(delegate { ... }).FireAndForget();
diff --git a/src/AddIns/BackendBindings/Boo/BooBinding/Project/BooBinding.addin b/src/AddIns/BackendBindings/Boo/BooBinding/Project/BooBinding.addin
index 7491e3e19d..d03302a0f5 100644
--- a/src/AddIns/BackendBindings/Boo/BooBinding/Project/BooBinding.addin
+++ b/src/AddIns/BackendBindings/Boo/BooBinding/Project/BooBinding.addin
@@ -87,7 +87,7 @@
 		       class = "Grunwald.BooBinding.BooAmbience"/>
 	</Path>
 	
-	<Path name = "/Workspace/Parser">
+	<Path name = "/SharpDevelop/Parser">
 		<Parser id    = "Boo"
 		        supportedextensions  = ".boo"
 		        projectfileextension = ".booproj"
diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.addin b/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.addin
index fe62b35fc8..55896e63b4 100644
--- a/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.addin
+++ b/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.addin
@@ -52,7 +52,7 @@
 		            extensions = "*.csproj"/>
 	</Path>
 	
-	<Path name = "/Workspace/Parser">
+	<Path name = "/SharpDevelop/Parser">
 		<Parser id    = "C#"
 		        supportedextensions  = ".cs"
 		        projectfileextension = ".csproj"
diff --git a/src/AddIns/BackendBindings/CppBinding/CppBinding/CppBinding.addin b/src/AddIns/BackendBindings/CppBinding/CppBinding/CppBinding.addin
index d2c6f6670b..37064e0fa6 100644
--- a/src/AddIns/BackendBindings/CppBinding/CppBinding/CppBinding.addin
+++ b/src/AddIns/BackendBindings/CppBinding/CppBinding/CppBinding.addin
@@ -77,7 +77,7 @@
 	</Path>
 
 	<!--
-	<Path name="/Workspace/Parser">
+	<Path name="/SharpDevelop/Parser">
 		<Parser id="C++"
 				supportedextensions=".cpp;.c;.hpp;.h"
 				projectfileextension="vcxproj"
diff --git a/src/AddIns/BackendBindings/JavaScriptBinding/Project/JavaScriptBinding.addin b/src/AddIns/BackendBindings/JavaScriptBinding/Project/JavaScriptBinding.addin
index cd4a17abe7..beec54ac3b 100644
--- a/src/AddIns/BackendBindings/JavaScriptBinding/Project/JavaScriptBinding.addin
+++ b/src/AddIns/BackendBindings/JavaScriptBinding/Project/JavaScriptBinding.addin
@@ -15,7 +15,7 @@
 	</Runtime>
 	
 	<!-- JavaScript parser -->
-	<Path name="/Workspace/Parser">
+	<Path name="/SharpDevelop/Parser">
 		<Parser
 			id="JavaScript"
 			supportedextensions=".js"
diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Project/PythonBinding.addin b/src/AddIns/BackendBindings/Python/PythonBinding/Project/PythonBinding.addin
index 3acc40ee69..529aea81d8 100644
--- a/src/AddIns/BackendBindings/Python/PythonBinding/Project/PythonBinding.addin
+++ b/src/AddIns/BackendBindings/Python/PythonBinding/Project/PythonBinding.addin
@@ -94,7 +94,7 @@
 	</Path>
 	
 	<!-- Python parser -->
-	<Path name="/Workspace/Parser">
+	<Path name="/SharpDevelop/Parser">
 		<Parser id="Python"
 		        supportedextensions=".py"
 		        projectfileextension=".pyproj"
diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/RubyBinding.addin b/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/RubyBinding.addin
index 0b26164e54..cedbb294d9 100644
--- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/RubyBinding.addin
+++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/RubyBinding.addin
@@ -88,7 +88,7 @@
 	</Path>
 	
 	<!-- Ruby parser -->
-	<Path name="/Workspace/Parser">
+	<Path name="/SharpDevelop/Parser">
 		<Parser id="Ruby"
 		        supportedextensions=".rb"
 		        projectfileextension=".rbproj"
diff --git a/src/AddIns/BackendBindings/VBNetBinding/Project/VBNetBinding.addin b/src/AddIns/BackendBindings/VBNetBinding/Project/VBNetBinding.addin
index 47ea5be309..71a913d744 100644
--- a/src/AddIns/BackendBindings/VBNetBinding/Project/VBNetBinding.addin
+++ b/src/AddIns/BackendBindings/VBNetBinding/Project/VBNetBinding.addin
@@ -47,7 +47,7 @@
 			class = "ICSharpCode.VBNetBinding.VbcEncodingFixingLogger"/>
 	</Path>
 	
-	<Path name = "/Workspace/Parser">
+	<Path name = "/SharpDevelop/Parser">
 		<Parser id    = "VBNet" 
 			supportedextensions  = ".vb"
 			projectfileextension = ".vbproj"
diff --git a/src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlBinding.addin b/src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlBinding.addin
index 068502375b..7f2a58f9be 100644
--- a/src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlBinding.addin
+++ b/src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlBinding.addin
@@ -33,7 +33,7 @@
 		            mimeType = "text/xml"/>
 	</Path>
 	
-	<Path name = "/Workspace/Parser">
+	<Path name = "/SharpDevelop/Parser">
 		<Parser id    = "XAML"
 		        supportedextensions  = ".xaml"
 		        class = "ICSharpCode.XamlBinding.XamlParser"/>
diff --git a/src/AddIns/Misc/AddInManager/Project/AddInManager.addin b/src/AddIns/Misc/AddInManager/Project/AddInManager.addin
index 52c8666b10..21d364a380 100644
--- a/src/AddIns/Misc/AddInManager/Project/AddInManager.addin
+++ b/src/AddIns/Misc/AddInManager/Project/AddInManager.addin
@@ -14,7 +14,7 @@
 		</Import>
 	</Runtime>
 	
-	<Path name = "/Workspace/Tools">
+	<Path name = "/SharpDevelop/Workbench/Tools">
 		<MenuItem id = "ShowAddInManager"
 		          label = "${res:AddInManager.Title}"
 		          class = "ICSharpCode.AddInManager.ShowCommand"/>
diff --git a/src/AddIns/Misc/AddinScout/Project/AddInScout.addin b/src/AddIns/Misc/AddinScout/Project/AddInScout.addin
index cb3377a803..92e381427a 100644
--- a/src/AddIns/Misc/AddinScout/Project/AddInScout.addin
+++ b/src/AddIns/Misc/AddinScout/Project/AddInScout.addin
@@ -13,7 +13,7 @@
 		<Import assembly="AddInScout.dll"/>
 	</Runtime>
 	
-	<Path name = "/Workspace/Tools">
+	<Path name = "/SharpDevelop/Workbench/Tools">
 		<MenuItem id = "ShowAddInScout"
 		          label = "AddIn Scout"
 		          class = "AddInScout.AddInScoutCommand"/>
diff --git a/src/AddIns/Misc/FiletypeRegisterer/Project/FiletypeRegisterer.addin b/src/AddIns/Misc/FiletypeRegisterer/Project/FiletypeRegisterer.addin
index 4ccd5967d8..7fd3ccf603 100644
--- a/src/AddIns/Misc/FiletypeRegisterer/Project/FiletypeRegisterer.addin
+++ b/src/AddIns/Misc/FiletypeRegisterer/Project/FiletypeRegisterer.addin
@@ -64,7 +64,7 @@
 	</Path>
 	
 	<!-- Disabled as we now do initial registration in the setup
-	<Path name = "/Workspace/Autostart">
+	<Path name = "/SharpDevelop/Autostart">
 		<Condition name = "Compare" string = "${property:SharpDevelop.FiletypesRegisterStartup??False}" equals = "True">
 			<Class id    = "RegisterFiletypes"
 			       class = "ICSharpCode.FiletypeRegisterer.RegisterFiletypesCommand"/>
diff --git a/src/AddIns/Misc/HelpViewer/HelpViewer.addin b/src/AddIns/Misc/HelpViewer/HelpViewer.addin
index 695899bac5..bab09bb5d6 100644
--- a/src/AddIns/Misc/HelpViewer/HelpViewer.addin
+++ b/src/AddIns/Misc/HelpViewer/HelpViewer.addin
@@ -4,6 +4,10 @@
        description        = "Help Integration for SharpDevelop"
        addInManagerHidden = "preinstalled">
 	
+	<Manifest>
+		<Identity name = "ICSharpCode.HelpViewer"/>
+	</Manifest>
+	
 	<Runtime>
 		<Import assembly = "HelpViewer.dll"/>
 	</Runtime>
diff --git a/src/AddIns/Misc/RegExpTk/Project/RegExpTk.addin b/src/AddIns/Misc/RegExpTk/Project/RegExpTk.addin
index 5f74344bf9..8efc6985bf 100644
--- a/src/AddIns/Misc/RegExpTk/Project/RegExpTk.addin
+++ b/src/AddIns/Misc/RegExpTk/Project/RegExpTk.addin
@@ -12,7 +12,7 @@
 		<Import assembly="RegExpTk.dll" />
 	</Runtime>
 	
-	<Path name = "/Workspace/Tools">
+	<Path name = "/SharpDevelop/Workbench/Tools">
 		<MenuItem id = "RegExpTk"
 		          label       = "${res:XML.MainMenu.ToolsMenu.RegularExpressionToolkit}"
 		          class       = "Plugins.RegExpTk.RegExpTkCommand"
diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/ICSharpCode.ReportDesigner.addin b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/ICSharpCode.ReportDesigner.addin
index af3fac8bda..9c0ed41d86 100644
--- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/ICSharpCode.ReportDesigner.addin
+++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/ICSharpCode.ReportDesigner.addin
@@ -184,7 +184,7 @@
 	</Path>
 	<!-- Start SharpDevelop Reports from MainMenu -->
 	
-	<Path name = "/Workspace/Tools">
+	<Path name = "/SharpDevelop/Workbench/Tools">
 		<MenuItem id       = "ReportGeneratorPad"
 		          label = "${res:SharpReport.ReportGenerator}"
 		          
diff --git a/src/AddIns/Misc/ResourceToolkit/Project/Hornung.ResourceToolkit.addin b/src/AddIns/Misc/ResourceToolkit/Project/Hornung.ResourceToolkit.addin
index 402405a88a..f312ec68e5 100644
--- a/src/AddIns/Misc/ResourceToolkit/Project/Hornung.ResourceToolkit.addin
+++ b/src/AddIns/Misc/ResourceToolkit/Project/Hornung.ResourceToolkit.addin
@@ -44,7 +44,7 @@
 	
 	<!-- Tools menu -->
 	
-	<Path name="/Workspace/Tools">
+	<Path name="/SharpDevelop/Workbench/Tools">
 		<MenuItem id="ResourceToolkit" label="${res:Hornung.ResourceToolkit.ToolsMenuLabel}" type="Menu">
 			
 			<MenuItem id="FindMissingResourceKeys" label="${res:Hornung.ResourceToolkit.FindMissingResourceKeys}" type="Menu">
diff --git a/src/AddIns/Misc/StartPage/Project/StartPage.addin b/src/AddIns/Misc/StartPage/Project/StartPage.addin
index e377109c1f..a0be42a314 100644
--- a/src/AddIns/Misc/StartPage/Project/StartPage.addin
+++ b/src/AddIns/Misc/StartPage/Project/StartPage.addin
@@ -24,7 +24,7 @@
 				  type = "Separator"/>
 	</Path>
 	
-	<Path name = "/Workspace/AutostartNothingLoaded">
+	<Path name = "/SharpDevelop/Workbench/AutostartNothingLoaded">
 		<Class id = "ShowStartPageCommand"
 		       class = "ICSharpCode.StartPage.ShowStartPageCommand"/>
 	</Path>
diff --git a/src/AddIns/Misc/UsageDataCollector/UsageDataCollector.AddIn/UsageDataCollector.addin b/src/AddIns/Misc/UsageDataCollector/UsageDataCollector.AddIn/UsageDataCollector.addin
index 607a7bea4b..6920e16230 100644
--- a/src/AddIns/Misc/UsageDataCollector/UsageDataCollector.AddIn/UsageDataCollector.addin
+++ b/src/AddIns/Misc/UsageDataCollector/UsageDataCollector.AddIn/UsageDataCollector.addin
@@ -19,7 +19,7 @@
 		</Condition>
 	</Path>
 	
-	<Path name = "/Workspace/Autostart">
+	<Path name = "/SharpDevelop/Autostart">
 		<Condition name = "Compare" string = "${property:ICSharpCode.UsageDataCollector.Enabled}" equals = "True">
 			<Class id    = "UsageDataCollector"
 			       class = "ICSharpCode.UsageDataCollector.AutoStartCommand"/>
diff --git a/src/AddIns/VersionControl/GitAddIn/GitAddIn.addin b/src/AddIns/VersionControl/GitAddIn/GitAddIn.addin
index a8f7c47bda..efa587b95a 100644
--- a/src/AddIns/VersionControl/GitAddIn/GitAddIn.addin
+++ b/src/AddIns/VersionControl/GitAddIn/GitAddIn.addin
@@ -13,7 +13,7 @@
 		</Import>
 	</Runtime>
 	
-	<Path name = "/Workspace/Autostart">
+	<Path name = "/SharpDevelop/Autostart">
 		<Class id = "ICSharpCode.GitAddIn.RegisterEventsCommand"
 		       class = "ICSharpCode.GitAddIn.RegisterEventsCommand"/>
 	</Path>
diff --git a/src/AddIns/VersionControl/SubversionAddIn/ICSharpCode.Svn.addin b/src/AddIns/VersionControl/SubversionAddIn/ICSharpCode.Svn.addin
index 752fe6c4eb..0053a6e942 100644
--- a/src/AddIns/VersionControl/SubversionAddIn/ICSharpCode.Svn.addin
+++ b/src/AddIns/VersionControl/SubversionAddIn/ICSharpCode.Svn.addin
@@ -18,7 +18,7 @@
 		</Import>
 	</Runtime>
 	
-	<Path name = "/Workspace/Autostart">
+	<Path name = "/SharpDevelop/Autostart">
 		<Class id = "ICSharpCode.Svn.Commands.RegisterEventsCommand"
 		       class = "ICSharpCode.Svn.Commands.RegisterEventsCommand"/>
 	</Path>
diff --git a/src/Main/Base/Project/Editor/DocumentUtilitites.cs b/src/Main/Base/Project/Editor/DocumentUtilitites.cs
index 6f8783ad5e..c41c817f6e 100644
--- a/src/Main/Base/Project/Editor/DocumentUtilitites.cs
+++ b/src/Main/Base/Project/Editor/DocumentUtilitites.cs
@@ -38,6 +38,11 @@ namespace ICSharpCode.SharpDevelop.Editor
 			return new ReadOnlyDocument(buffer);
 		}
 		
+		public static void ClearSelection(this ITextEditor editor)
+		{
+			editor.Select(editor.Document.GetOffset(editor.Caret.Location), 0);
+		}
+		
 		/// <summary>
 		/// Gets the word in front of the caret.
 		/// </summary>
diff --git a/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin b/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin
index def15b7359..e65ce932ca 100755
--- a/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin
+++ b/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin
@@ -1822,7 +1822,7 @@
 		<MenuItem id = "Tools" label = "${res:XML.MainMenu.ToolMenu}" type="Menu">
 			<MenuItem id = "ToolBuilder" type="Builder" class = "ICSharpCode.SharpDevelop.Commands.ToolMenuBuilder" />
 			<MenuItem id = "Separator1" type = "Separator" />
-			<Include id = "ToolList" path = "/Workspace/Tools" />
+			<Include id = "ToolList" path = "/SharpDevelop/Workbench/Tools" />
 			<MenuItem id = "Separator2" type = "Separator" />
 			
 			<Condition name = "WindowActive" activewindow="ICSharpCode.SharpDevelop.Editor.ITextEditorProvider">
@@ -1927,8 +1927,8 @@
 		</MenuItem> <!-- end HELP menu -->
 	</Path> <!-- end Main Menu -->
 	
-	<!-- create empty /Workspace/Tools path - it's included by the main menu -->
-	<Path name = "/Workspace/Tools"/>
+	<!-- create empty /SharpDevelop/Workbench/Tools path - it's included by the main menu -->
+	<Path name = "/SharpDevelop/Workbench/Tools"/>
 	
 	<!-- TEXT EDITOR -->
 	
diff --git a/src/Main/Base/Project/Src/Internal/Doozers/PadDoozer.cs b/src/Main/Base/Project/Src/Internal/Doozers/PadDoozer.cs
index 287dfca754..ba6f2cfd3c 100755
--- a/src/Main/Base/Project/Src/Internal/Doozers/PadDoozer.cs
+++ b/src/Main/Base/Project/Src/Internal/Doozers/PadDoozer.cs
@@ -35,7 +35,7 @@ namespace ICSharpCode.SharpDevelop
 	/// <attribute name="defaultPosition" use="optional">
 	/// Default position of the pad, as a ICSharpCode.SharpDevelop.DefaultPadPositions enum value (e.g. "Bottom, Hidden").
 	/// </attribute>
-	/// <usage>Only in /Workspace/Parser</usage>
+	/// <usage>Only in /SharpDevelop/Parser</usage>
 	/// <returns>
 	/// An PadDescriptor object that wraps the IPadContent object.
 	/// </returns>
diff --git a/src/Main/Base/Project/Src/Util/ExtensionMethods.cs b/src/Main/Base/Project/Src/Util/ExtensionMethods.cs
index 1510e1fa31..b9813bb34b 100644
--- a/src/Main/Base/Project/Src/Util/ExtensionMethods.cs
+++ b/src/Main/Base/Project/Src/Util/ExtensionMethods.cs
@@ -682,11 +682,6 @@ namespace ICSharpCode.SharpDevelop
 			return document.GetText(startOffset, document.GetOffset(endPos) - startOffset);
 		}
 		
-		public static void ClearSelection(this ITextEditor editor)
-		{
-			editor.Select(editor.Document.GetOffset(editor.Caret.Location), 0);
-		}
-		
 		/// <summary>
 		/// Obsolete. Use GetOffset() instead.
 		/// </summary>
diff --git a/src/Main/Core/Project/Src/AddInTree/CoreStartup.cs b/src/Main/Core/Project/Src/AddInTree/CoreStartup.cs
index f72a481fba..72eb68fd97 100644
--- a/src/Main/Core/Project/Src/AddInTree/CoreStartup.cs
+++ b/src/Main/Core/Project/Src/AddInTree/CoreStartup.cs
@@ -171,7 +171,7 @@ namespace ICSharpCode.Core
 		/// Initializes the AddIn system.
 		/// This loads the AddIns that were added to the list,
 		/// then it executes the <see cref="ICommand">commands</see>
-		/// in <c>/Workspace/Autostart</c>.
+		/// in <c>/SharpDevelop/Autostart</c>.
 		/// </summary>
 		public void RunInitialization()
 		{
@@ -184,7 +184,7 @@ namespace ICSharpCode.Core
 			
 			// run workspace autostart commands
 			LoggingService.Info("Running autostart commands...");
-			foreach (ICommand command in addInTree.BuildItems<ICommand>("/Workspace/Autostart", null, false)) {
+			foreach (ICommand command in addInTree.BuildItems<ICommand>("/SharpDevelop/Autostart", null, false)) {
 				try {
 					command.Execute(null);
 				} catch (Exception ex) {
diff --git a/src/Main/SharpDevelop/Parser/ParserDoozer.cs b/src/Main/SharpDevelop/Parser/ParserDoozer.cs
index 2da0ee5e61..ff34480373 100644
--- a/src/Main/SharpDevelop/Parser/ParserDoozer.cs
+++ b/src/Main/SharpDevelop/Parser/ParserDoozer.cs
@@ -16,7 +16,7 @@ namespace ICSharpCode.SharpDevelop.Parser
 	/// <attribute name="class">
 	/// Name of the IParser class.
 	/// </attribute>
-	/// <usage>Only in /Workspace/Parser</usage>
+	/// <usage>Only in /SharpDevelop/Parser</usage>
 	/// <returns>
 	/// An ParserDescriptor object that wraps the IParser object.
 	/// </returns>
diff --git a/src/Main/SharpDevelop/Parser/ParserService.cs b/src/Main/SharpDevelop/Parser/ParserService.cs
index ca6013aa7a..2fb202e221 100644
--- a/src/Main/SharpDevelop/Parser/ParserService.cs
+++ b/src/Main/SharpDevelop/Parser/ParserService.cs
@@ -27,7 +27,7 @@ namespace ICSharpCode.SharpDevelop.Parser
 		
 		public ParserService()
 		{
-			parserDescriptors = AddInTree.BuildItems<ParserDescriptor>("/Workspace/Parser", null, false);
+			parserDescriptors = AddInTree.BuildItems<ParserDescriptor>("/SharpDevelop/Parser", null, false);
 			this.LoadSolutionProjectsThread = new LoadSolutionProjects();
 		}
 		
diff --git a/src/Main/SharpDevelop/Sda/CallHelper.cs b/src/Main/SharpDevelop/Sda/CallHelper.cs
index 2da2c38985..68a804424e 100644
--- a/src/Main/SharpDevelop/Sda/CallHelper.cs
+++ b/src/Main/SharpDevelop/Sda/CallHelper.cs
@@ -175,7 +175,7 @@ namespace ICSharpCode.SharpDevelop.Sda
 		
 		void RunWorkbenchInitializedCommands()
 		{
-			foreach (ICommand command in AddInTree.BuildItems<ICommand>("/Workspace/AutostartAfterWorkbenchInitialized", null, false)) {
+			foreach (ICommand command in AddInTree.BuildItems<ICommand>("/SharpDevelop/Workbench/AutostartAfterWorkbenchInitialized", null, false)) {
 				try {
 					command.Execute(null);
 				} catch (Exception ex) {
diff --git a/src/Main/SharpDevelop/Workbench/WorkbenchStartup.cs b/src/Main/SharpDevelop/Workbench/WorkbenchStartup.cs
index 0c2dad7637..c8b1b6e190 100644
--- a/src/Main/SharpDevelop/Workbench/WorkbenchStartup.cs
+++ b/src/Main/SharpDevelop/Workbench/WorkbenchStartup.cs
@@ -74,7 +74,7 @@ namespace ICSharpCode.SharpDevelop.Workbench
 			}
 			
 			if (!didLoadSolutionOrFile) {
-				foreach (ICommand command in AddInTree.BuildItems<ICommand>("/Workspace/AutostartNothingLoaded", null, false)) {
+				foreach (ICommand command in AddInTree.BuildItems<ICommand>("/SharpDevelop/Workbench/AutostartNothingLoaded", null, false)) {
 					try {
 						command.Execute(null);
 					} catch (Exception ex) {
diff --git a/src/Tools/StressTest/StressTest/StressTest.addin b/src/Tools/StressTest/StressTest/StressTest.addin
index 6b7bb21b50..d8e611cf91 100644
--- a/src/Tools/StressTest/StressTest/StressTest.addin
+++ b/src/Tools/StressTest/StressTest/StressTest.addin
@@ -7,13 +7,13 @@
 		<Import assembly = "StressTest.dll"/>
 	</Runtime>
 	
-	<Path name="/Workspace/Tools">
+	<Path name="/SharpDevelop/Workbench/Tools">
 		<MenuItem id="StressTest"
 		          label="Stress Test"
 		          class="StressTest.StressTestMenuCommand"/>
 	</Path>
 	
-	<Path name="/Workspace/AutostartNothingLoaded">
+	<Path name="/SharpDevelop/Workbench/AutostartNothingLoaded">
 		<Class id="StressTest"
 		       class="StressTest.StressTestMenuCommand"/>
 	</Path>
diff --git a/src/Tools/StringResourceToolAddIn/StringResourceToolAddIn.addin b/src/Tools/StringResourceToolAddIn/StringResourceToolAddIn.addin
index 9e461023d1..f729ba7e93 100644
--- a/src/Tools/StringResourceToolAddIn/StringResourceToolAddIn.addin
+++ b/src/Tools/StringResourceToolAddIn/StringResourceToolAddIn.addin
@@ -10,7 +10,7 @@
 		<Import assembly = "StringResourceToolAddIn.dll"/>
 	</Runtime>
 	
-	<Path name = "/Workspace/Tools">
+	<Path name = "/SharpDevelop/Workbench/Tools">
 		<MenuItem id = "StringResourceToolAddInCommand1"
 		          label = "StringResourceToolAddIn"
 		          shortcut = "Control|Shift|R"