NEW - bug 337513: rename "Tasks" UI entries to "Mylyn"
https://bugs.eclipse.org/bugs/show_bug.cgi?id=337513
diff --git a/org.eclipse.mylyn.monitor.usage/plugin.xml b/org.eclipse.mylyn.monitor.usage/plugin.xml
index 7f6fc45..ce4d9f3 100644
--- a/org.eclipse.mylyn.monitor.usage/plugin.xml
+++ b/org.eclipse.mylyn.monitor.usage/plugin.xml
@@ -26,7 +26,7 @@
          name="Usage Data"
          class="org.eclipse.mylyn.internal.monitor.usage.preferences.UsageDataPreferencePage"
          id="org.eclipse.mylyn.monitor.ui.ui.preferences"
-		 category="org.eclipse.mylyn.tasks.ui.preferences">
+		 category="org.eclipse.mylyn.preferencePages.Mylyn">
          <keywordReference id="org.eclipse.mylyn.monitor.ui.keywords"/>
       </page> 
    </extension>
diff --git a/org.eclipse.mylyn.sandbox.dev/plugin.xml b/org.eclipse.mylyn.sandbox.dev/plugin.xml
index d9f9ae7..0c317c5 100644
--- a/org.eclipse.mylyn.sandbox.dev/plugin.xml
+++ b/org.eclipse.mylyn.sandbox.dev/plugin.xml
@@ -69,16 +69,18 @@
   <extension
          point="org.eclipse.ui.views">
       <view
-            name="Repository Spy"
+            name="Repository Spy (Experimental)"
             icon="icons/repositories.gif"
-            category="org.eclipse.mylyn.sandbox"
+            category="org.eclipse.mylyn.ui"
             class="org.eclipse.mylyn.internal.sandbox.dev.views.RepositorySpyView"
             id="org.eclipse.mylyn.tasks.spy.views.RepositorySpyView">
       </view>
+      <!--
       <category
             id="org.eclipse.mylyn.sandbox"
             name="Experimental">
       </category>
+      -->
    </extension>
    <extension
          point="org.eclipse.core.runtime.adapters">
diff --git a/org.eclipse.mylyn.sandbox.ui/plugin.xml b/org.eclipse.mylyn.sandbox.ui/plugin.xml
index 73b802f..a4a9d34 100644
--- a/org.eclipse.mylyn.sandbox.ui/plugin.xml
+++ b/org.eclipse.mylyn.sandbox.ui/plugin.xml
@@ -12,17 +12,13 @@
 
 <plugin>
     <extension-point id="resourceHyperlinkExtensions" name="Resource Hyperlink Extension" schema="schema/resourceHyperlinkExtensions.exsd"/>
-    
-	<extension point="org.eclipse.ui.views">
-     	<category name="Experimental" id="org.eclipse.mylyn.sandbox"/>
-    </extension>
-
+	
     <extension point="org.eclipse.ui.preferencePages">
       <page 
          name="Experimental"
          class="org.eclipse.mylyn.internal.sandbox.ui.SandboxUiPreferencePage"
          id="org.eclipse.mylyn.sandbox.ui.preferences"
-         category="org.eclipse.mylyn.tasks.ui.preferences">
+         category="org.eclipse.mylyn.preferencePages.Mylyn">
          <keywordReference id="org.eclipse.mylyn.java.keywords"/>
       </page> 
     </extension>
@@ -225,30 +221,32 @@
             id="org.eclipse.mylyn.java.keywords"/>
    </extension>
 
-   <extension point="org.eclipse.ui.views"> 
+   <extension point="org.eclipse.ui.views">
+      <category name="Experimental" id="org.eclipse.mylyn.sandbox"/>
+    
    	  <view
           allowMultiple="false"
-          category="org.eclipse.mylyn.sandbox"
+          category="org.eclipse.mylyn.ui"
           class="org.eclipse.mylyn.internal.sandbox.ui.views.ActiveSearchView"
           icon="icons/eview16/active-search.gif"
           id="org.eclipse.mylyn.ui.views.active.search"
-          name="Context Search"/>
+          name="Context Search (Experimental)"/>
           
 	  <view
             allowMultiple="false"
-            category="org.eclipse.mylyn.sandbox"
+            category="org.eclipse.mylyn.ui"
             class="org.eclipse.mylyn.internal.sandbox.ui.views.ContextHierarchyView"
             icon="icons/eview16/active-hierarchy.gif"
             id="org.eclipse.mylyn.ui.views.active.hierarchy"
-            name="Context Hierarchy"/>
+            name="Context Hierarchy (Experimental)"/>
             
-            <view
+      <view
             allowMultiple="false"
-            category="org.eclipse.mylyn.sandbox"
+            category="org.eclipse.mylyn.ui"
             class="org.eclipse.mylyn.internal.sandbox.ui.views.TaskActivityView"
             icon="icons/eview16/task-activity.gif"
             id="org.eclipse.mylyn.tasklist.activity"
-            name="Task Activity"/>
+            name="Task Activity (Experimental)"/>
    </extension>
    
     <extension point="org.eclipse.ui.actionSets">