completed name refactoring for tasklist and bugs

72 files changed, 442 insertions, 435 deletions

diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/BugzillaUITools.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/BugzillaUITools.java
index c53775d77..6186b7e02 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/BugzillaUITools.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/BugzillaUITools.java
@@ -231,7 +231,7 @@ public class BugzillaUITools {
 						| WorkbenchBrowserSupport.NAVIGATION_BAR;
 			}
 			b = WorkbenchBrowserSupport.getInstance().createBrowser(
-					flags, "org.eclipse.mylar.tasks", "Task",
+					flags, "org.eclipse.mylar.tasklist", "Task",
 					"tasktooltip");
 			b.openURL(new URL(url));
 		} catch (PartInitException e) {
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/actions/CreateBugzillaTaskAction.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/actions/CreateBugzillaTaskAction.java
index cd7d4b7e3..0d8cba1a1 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/actions/CreateBugzillaTaskAction.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/actions/CreateBugzillaTaskAction.java
@@ -106,7 +106,7 @@ public class CreateBugzillaTaskAction extends Action implements IViewActionDeleg
 //	    if (selectedObject instanceof TaskCategory){
 //	        ((TaskCategory)selectedObject).addTask((ITask)bugTask);
 //	    } else { 
-//	        MylarTasksPlugin.getTaskListManager().getTaskList().addRootTask((ITask)bugTask);
+//	        MylarTasklistPlugin.getTaskListManager().getTaskList().addRootTask((ITask)bugTask);
 //	    }
 	    if(TaskListView.getDefault() != null)
 			TaskListView.getDefault().getViewer().refresh();
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/actions/RefreshBugzillaReportsAction.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/actions/RefreshBugzillaReportsAction.java
index 886901bfa..b586aefdb 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/actions/RefreshBugzillaReportsAction.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/actions/RefreshBugzillaReportsAction.java
@@ -95,11 +95,11 @@ public class RefreshBugzillaReportsAction extends Action implements IViewActionD
 // XXX refactored active search
 				// clear the caches
 //				Set<String> cachedHandles = new HashSet<String>();
-//				cachedHandles.addAll(MylarTasksPlugin.getDefault().getStructureBridge().getCachedHandles());
-//				cachedHandles.addAll(MylarTasksPlugin.getReferenceProvider().getCachedHandles());
-//				MylarTasksPlugin.getDefault().getStructureBridge().clearCache();
-//				MylarTasksPlugin.getReferenceProvider().clearCachedReports();
-//				BugzillaStructureBridge bridge = MylarTasksPlugin.getDefault().getStructureBridge();
+//				cachedHandles.addAll(MylarTasklistPlugin.getDefault().getStructureBridge().getCachedHandles());
+//				cachedHandles.addAll(MylarTasklistPlugin.getReferenceProvider().getCachedHandles());
+//				MylarTasklistPlugin.getDefault().getStructureBridge().clearCache();
+//				MylarTasklistPlugin.getReferenceProvider().clearCachedReports();
+//				BugzillaStructureBridge bridge = MylarTasklistPlugin.getDefault().getStructureBridge();
 				
 //				monitor.beginTask("Downloading Bugs", cachedHandles.size());
 //				for (String key : cachedHandles) {
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/tasklist/BugzillaTaskEditor.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/tasklist/BugzillaTaskEditor.java
index e86416da1..8760290c6 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/tasklist/BugzillaTaskEditor.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/tasklist/BugzillaTaskEditor.java
@@ -66,7 +66,7 @@ public class BugzillaTaskEditor extends TaskEditor {
 		super();
 
 		// get the workbench page and add a listener so we can detect when it closes
-//		IWorkbench wb = MylarTasksPlugin.getDefault().getWorkbench();
+//		IWorkbench wb = MylarTasklistPlugin.getDefault().getWorkbench();
 //		IWorkbenchWindow aw = wb.getActiveWorkbenchWindow();
 //		IWorkbenchPage ap = aw.getActivePage();
 //		BugzillaTaskEditorListener listener = new BugzillaTaskEditorListener();
diff --git a/org.eclipse.mylyn.tasks.core/META-INF/MANIFEST.MF b/org.eclipse.mylyn.tasks.core/META-INF/MANIFEST.MF
index 6de03dcbf..95ce39445 100644
--- a/org.eclipse.mylyn.tasks.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.tasks.core/META-INF/MANIFEST.MF
@@ -1,9 +1,9 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Mylar Bugzilla Plug-in
-Bundle-SymbolicName: org.eclipse.mylar.bugzilla;singleton:=true
+Bundle-Name: Mylar Bugs Plug-in
+Bundle-SymbolicName: org.eclipse.mylar.bugs; singleton:=true
 Bundle-Version: 0.3.2.2
-Bundle-Activator: org.eclipse.mylar.bugzilla.MylarBugzillaPlugin
+Bundle-Activator: org.eclipse.mylar.bugs.MylarBugzillaPlugin
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
@@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.jdt.core,
  org.eclipse.ui.ide,
  org.eclipse.core.resources,
- org.eclipse.mylar.tasks
+ org.eclipse.mylar.tasklist
 Eclipse-AutoStart: true
-Export-Package: org.eclipse.mylar.bugzilla,
- org.eclipse.mylar.tasks.search
+Export-Package: org.eclipse.mylar.bugs,
+ org.eclipse.mylar.bugs.search
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugzilla/BugzillaEditingMonitor.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugs/BugzillaEditingMonitor.java
index 3bee8b160..8f4990b4c 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugzilla/BugzillaEditingMonitor.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugs/BugzillaEditingMonitor.java
@@ -11,13 +11,13 @@
 /*
  * Created on Apr 27, 2005
   */
-package org.eclipse.mylar.bugzilla;
+package org.eclipse.mylar.bugs;
 
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.mylar.bugzilla.ui.editor.AbstractBugEditor;
 import org.eclipse.mylar.bugzilla.ui.outline.BugzillaReportSelection;
-import org.eclipse.mylar.bugzilla.ui.tasks.BugzillaTaskEditor;
+import org.eclipse.mylar.bugzilla.ui.tasklist.BugzillaTaskEditor;
 import org.eclipse.mylar.core.AbstractSelectionMonitor;
 import org.eclipse.ui.IWorkbenchPart;
 
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugzilla/BugzillaMylarBridge.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugs/BugzillaMylarBridge.java
index b76efc5b0..6e09c0df4 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugzilla/BugzillaMylarBridge.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugs/BugzillaMylarBridge.java
@@ -11,7 +11,7 @@
 /*
  * Created on Oct 1, 2004
  */
-package org.eclipse.mylar.bugzilla;
+package org.eclipse.mylar.bugs;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -22,7 +22,7 @@ import java.util.Map;
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.jdt.core.IJavaElement;
 import org.eclipse.jdt.core.IMember;
-import org.eclipse.mylar.bugzilla.ui.tasks.BugzillaReportNode;
+import org.eclipse.mylar.bugzilla.ui.tasklist.BugzillaReportNode;
 
 
 /**
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugzilla/BugzillaNodeLabelProvider.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugs/BugzillaNodeLabelProvider.java
index 5ff40382c..415749274 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugzilla/BugzillaNodeLabelProvider.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugs/BugzillaNodeLabelProvider.java
@@ -11,12 +11,12 @@
 /*
  * Created on Apr 18, 2005
   */
-package org.eclipse.mylar.bugzilla;
+package org.eclipse.mylar.bugs;
 
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.ILabelProviderListener;
 import org.eclipse.mylar.bugzilla.core.BugReport;
-import org.eclipse.mylar.bugzilla.ui.tasks.BugzillaReportNode;
+import org.eclipse.mylar.bugzilla.ui.tasklist.BugzillaReportNode;
 import org.eclipse.mylar.core.IMylarContextNode;
 import org.eclipse.mylar.ui.MylarImages;
 import org.eclipse.swt.graphics.Image;
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugzilla/BugzillaStructureBridge.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugs/BugzillaStructureBridge.java
index b7c2fa028..843f9c3fa 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugzilla/BugzillaStructureBridge.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugs/BugzillaStructureBridge.java
@@ -11,7 +11,7 @@
 /*
  * Created on May 2, 2005
   */
-package org.eclipse.mylar.bugzilla;
+package org.eclipse.mylar.bugs;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
@@ -33,8 +33,8 @@ import org.eclipse.mylar.bugzilla.core.search.BugzillaSearchHit;
 import org.eclipse.mylar.bugzilla.ui.editor.AbstractBugEditor;
 import org.eclipse.mylar.bugzilla.ui.outline.BugzillaOutlineNode;
 import org.eclipse.mylar.bugzilla.ui.outline.BugzillaReportSelection;
-import org.eclipse.mylar.bugzilla.ui.tasks.BugzillaCacheFile;
-import org.eclipse.mylar.bugzilla.ui.tasks.BugzillaReportNode;
+import org.eclipse.mylar.bugzilla.ui.tasklist.BugzillaCacheFile;
+import org.eclipse.mylar.bugzilla.ui.tasklist.BugzillaReportNode;
 import org.eclipse.mylar.core.AbstractRelationshipProvider;
 import org.eclipse.mylar.core.IDegreeOfSeparation;
 import org.eclipse.mylar.core.IMylarStructureBridge;
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugzilla/BugzillaUiBridge.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugs/BugzillaUiBridge.java
index 71399a20e..ee76ab477 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugzilla/BugzillaUiBridge.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugs/BugzillaUiBridge.java
@@ -11,7 +11,7 @@
 /*
  * Created on Apr 6, 2005
   */
-package org.eclipse.mylar.bugzilla;
+package org.eclipse.mylar.bugs;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -20,16 +20,16 @@ import java.util.List;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.mylar.bugs.search.BugzillaReferencesProvider;
 import org.eclipse.mylar.bugzilla.ui.BugzillaOpenStructure;
 import org.eclipse.mylar.bugzilla.ui.ViewBugzillaAction;
 import org.eclipse.mylar.bugzilla.ui.editor.AbstractBugEditor;
 import org.eclipse.mylar.bugzilla.ui.outline.BugzillaOutlinePage;
-import org.eclipse.mylar.bugzilla.ui.tasks.BugzillaTask;
-import org.eclipse.mylar.bugzilla.ui.tasks.BugzillaTaskEditor;
+import org.eclipse.mylar.bugzilla.ui.tasklist.BugzillaTask;
+import org.eclipse.mylar.bugzilla.ui.tasklist.BugzillaTaskEditor;
 import org.eclipse.mylar.core.IMylarContextNode;
-import org.eclipse.mylar.tasks.ITask;
-import org.eclipse.mylar.tasks.MylarTasksPlugin;
-import org.eclipse.mylar.tasks.search.BugzillaReferencesProvider;
+import org.eclipse.mylar.tasklist.ITask;
+import org.eclipse.mylar.tasklist.MylarTasklistPlugin;
 import org.eclipse.mylar.ui.IMylarUiBridge;
 import org.eclipse.mylar.ui.MylarImages;
 import org.eclipse.ui.IEditorPart;
@@ -64,7 +64,7 @@ public class BugzillaUiBridge implements IMylarUiBridge {
         List<BugzillaOpenStructure> l = new ArrayList<BugzillaOpenStructure>(1);
         l.add(new BugzillaOpenStructure(server, bugId, commentNumer));
         
-        ITask task= MylarTasksPlugin.getTaskListManager().getTaskForHandle(bugHandle);
+        ITask task= MylarTasklistPlugin.getTaskListManager().getTaskForHandle(bugHandle);
         if (task != null && task instanceof BugzillaTask) {
             BugzillaTask bugzillaTask = (BugzillaTask)task;
             bugzillaTask.openTask(commentNumer);
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugzilla/MylarBugzillaPlugin.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugs/MylarBugzillaPlugin.java
index 6433a9573..dd8ea18dd 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugzilla/MylarBugzillaPlugin.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugs/MylarBugzillaPlugin.java
@@ -1,11 +1,11 @@
-package org.eclipse.mylar.bugzilla;
+package org.eclipse.mylar.bugs;
 
 import java.util.List;
 
 import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.mylar.bugs.search.BugzillaReferencesProvider;
 import org.eclipse.mylar.core.AbstractRelationshipProvider;
 import org.eclipse.mylar.core.MylarPlugin;
-import org.eclipse.mylar.tasks.search.BugzillaReferencesProvider;
 import org.eclipse.mylar.ui.MylarUiPlugin;
 import org.eclipse.ui.IStartup;
 import org.eclipse.ui.IWorkbench;
@@ -84,7 +84,7 @@ public class MylarBugzillaPlugin extends AbstractUIPlugin implements IStartup {
 	 * @return the image descriptor
 	 */
 	public static ImageDescriptor getImageDescriptor(String path) {
-		return AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.mylar.bugzilla.bridge", path);
+		return AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.mylar.bugs.bridge", path);
 	}
 	
     public static BugzillaMylarBridge getBridge() {
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/search/BugzillaMylarSearch.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugs/search/BugzillaMylarSearch.java
index aba86a323..f167a9b1b 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/search/BugzillaMylarSearch.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugs/search/BugzillaMylarSearch.java
@@ -11,7 +11,7 @@
 /*
  * Created on Oct 13, 2004
  */
-package org.eclipse.mylar.tasks.search;
+package org.eclipse.mylar.bugs.search;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -23,8 +23,8 @@ import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.jdt.core.IJavaElement;
 import org.eclipse.jdt.core.IMember;
-import org.eclipse.mylar.bugzilla.BugzillaMylarBridge;
-import org.eclipse.mylar.bugzilla.ui.tasks.BugzillaReportNode;
+import org.eclipse.mylar.bugs.BugzillaMylarBridge;
+import org.eclipse.mylar.bugzilla.ui.tasklist.BugzillaReportNode;
 import org.eclipse.mylar.core.InterestComparator;
 import org.eclipse.mylar.core.search.IActiveSearchListener;
 import org.eclipse.mylar.core.search.IMylarSearchOperation;
@@ -75,7 +75,7 @@ public class BugzillaMylarSearch implements IMylarSearchOperation {
 
             	// FIXME: decide whether to do leave the caching of searches in for now or not
                 // check if we have the info cached
-//                List<BugzillaReportNode> landmarkDoi = MylarTasksPlugin.getBridge()
+//                List<BugzillaReportNode> landmarkDoi = MylarTasklistPlugin.getBridge()
 //                        .getFromLandmarksHash(m, scope);
 
 //                if (landmarkDoi != null) {
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/search/BugzillaMylarSearchJob.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugs/search/BugzillaMylarSearchJob.java
index b596f5536..5c80db9bf 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/search/BugzillaMylarSearchJob.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugs/search/BugzillaMylarSearchJob.java
@@ -11,7 +11,7 @@
 /*
  * Created on Oct 6, 2004
  */
-package org.eclipse.mylar.tasks.search;
+package org.eclipse.mylar.bugs.search;
 
 import javax.security.auth.login.LoginException;
 
@@ -21,7 +21,7 @@ import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.jface.dialogs.ErrorDialog;
 import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.mylar.bugzilla.BugzillaMylarBridge;
+import org.eclipse.mylar.bugs.BugzillaMylarBridge;
 import org.eclipse.mylar.bugzilla.core.BugzillaPlugin;
 import org.eclipse.mylar.bugzilla.core.IBugzillaConstants;
 import org.eclipse.ui.PlatformUI;
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/search/BugzillaMylarSearchOperation.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugs/search/BugzillaMylarSearchOperation.java
index a2da3e9b3..6045e3d94 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/search/BugzillaMylarSearchOperation.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugs/search/BugzillaMylarSearchOperation.java
@@ -11,7 +11,7 @@
 /*
  * Created on Oct 14, 2004
  */
-package org.eclipse.mylar.tasks.search;
+package org.eclipse.mylar.bugs.search;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -27,7 +27,7 @@ import org.eclipse.jdt.core.IJavaElement;
 import org.eclipse.jdt.core.IMember;
 import org.eclipse.jdt.core.IType;
 import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.mylar.bugzilla.MylarBugzillaPlugin;
+import org.eclipse.mylar.bugs.MylarBugzillaPlugin;
 import org.eclipse.mylar.bugzilla.core.BugReport;
 import org.eclipse.mylar.bugzilla.core.Comment;
 import org.eclipse.mylar.bugzilla.core.search.BugzillaSearchEngine;
@@ -35,13 +35,13 @@ import org.eclipse.mylar.bugzilla.core.search.BugzillaSearchHit;
 import org.eclipse.mylar.bugzilla.core.search.BugzillaSearchQuery;
 import org.eclipse.mylar.bugzilla.core.search.IBugzillaSearchOperation;
 import org.eclipse.mylar.bugzilla.ui.search.BugzillaResultCollector;
-import org.eclipse.mylar.bugzilla.ui.tasks.BugzillaReportNode;
-import org.eclipse.mylar.bugzilla.ui.tasks.BugzillaTask;
-import org.eclipse.mylar.bugzilla.ui.tasks.StackTrace;
+import org.eclipse.mylar.bugzilla.ui.tasklist.BugzillaReportNode;
+import org.eclipse.mylar.bugzilla.ui.tasklist.BugzillaTask;
+import org.eclipse.mylar.bugzilla.ui.tasklist.StackTrace;
 import org.eclipse.mylar.core.MylarPlugin;
-import org.eclipse.mylar.tasks.ITask;
-import org.eclipse.mylar.tasks.MylarTasksPlugin;
-import org.eclipse.mylar.tasks.internal.TaskCategory;
+import org.eclipse.mylar.tasklist.ITask;
+import org.eclipse.mylar.tasklist.MylarTasklistPlugin;
+import org.eclipse.mylar.tasklist.internal.TaskCategory;
 import org.eclipse.ui.actions.WorkspaceModifyOperation;
 
 
@@ -157,9 +157,9 @@ public class BugzillaMylarSearchOperation extends WorkspaceModifyOperation
         collector.setProgressMonitor(monitor);
         
         // get all of the root tasks and start the search
-        List<ITask> tasks = MylarTasksPlugin.getTaskListManager().getTaskList().getRootTasks();
+        List<ITask> tasks = MylarTasklistPlugin.getTaskListManager().getTaskList().getRootTasks();
         searchLocal(tasks, collector, elementName, monitor);
-		for (TaskCategory cat : MylarTasksPlugin.getTaskListManager().getTaskList().getTaskCategories()) {
+		for (TaskCategory cat : MylarTasklistPlugin.getTaskListManager().getTaskList().getTaskCategories()) {
 			searchLocal(cat.getChildren(), collector, elementName,  monitor);
 		}
 		
@@ -183,9 +183,9 @@ public class BugzillaMylarSearchOperation extends WorkspaceModifyOperation
 		collector.setProgressMonitor(monitor);
 		
 		// get all of the root tasks and start the search
-		List<ITask> tasks = MylarTasksPlugin.getTaskListManager().getTaskList().getRootTasks();
+		List<ITask> tasks = MylarTasklistPlugin.getTaskListManager().getTaskList().getRootTasks();
 		searchLocal(tasks, collector, elementName,  monitor);
-		for (TaskCategory cat : MylarTasksPlugin.getTaskListManager().getTaskList().getTaskCategories()) {
+		for (TaskCategory cat : MylarTasklistPlugin.getTaskListManager().getTaskList().getTaskCategories()) {
 			searchLocal(cat.getChildren(), collector, elementName,  monitor);
 		}
 		// return the collector
@@ -457,7 +457,7 @@ public class BugzillaMylarSearchOperation extends WorkspaceModifyOperation
     }
 
     /**
-     * @see org.eclipse.mylar.bugzilla.core.search.IBugzillaSearchOperation#getStatus()
+     * @see org.eclipse.mylar.bugs.core.search.IBugzillaSearchOperation#getStatus()
      */
     public IStatus getStatus() throws LoginException {
         // if a LoginException was thrown while trying to search, throw this
@@ -468,7 +468,7 @@ public class BugzillaMylarSearchOperation extends WorkspaceModifyOperation
     }
 
     /**
-     * @see org.eclipse.mylar.bugzilla.core.search.IBugzillaSearchOperation#getImageDescriptor()
+     * @see org.eclipse.mylar.bugs.core.search.IBugzillaSearchOperation#getImageDescriptor()
      */
     public ImageDescriptor getImageDescriptor() {
         return null;
@@ -493,14 +493,14 @@ public class BugzillaMylarSearchOperation extends WorkspaceModifyOperation
     }
 
     /**
-     * @see org.eclipse.mylar.bugzilla.core.search.IBugzillaSearchOperation#getQuery()
+     * @see org.eclipse.mylar.bugs.core.search.IBugzillaSearchOperation#getQuery()
      */
     public BugzillaSearchQuery getQuery() {
         return query;
     }
 
     /**
-     * @see org.eclipse.mylar.bugzilla.core.search.IBugzillaSearchOperation#setQuery(org.eclipse.mylar.bugzilla.core.search.BugzillaSearchQuery)
+     * @see org.eclipse.mylar.bugs.core.search.IBugzillaSearchOperation#setQuery(org.eclipse.mylar.bugs.core.search.BugzillaSearchQuery)
      */
     public void setQuery(BugzillaSearchQuery newQuery) {
         this.query = newQuery;
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/search/BugzillaReferencesProvider.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugs/search/BugzillaReferencesProvider.java
index a083647ba..a70693b87 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/search/BugzillaReferencesProvider.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugs/search/BugzillaReferencesProvider.java
@@ -11,7 +11,7 @@
 /*
  * Created on Feb 2, 2005
  */
-package org.eclipse.mylar.tasks.search;
+package org.eclipse.mylar.bugs.search;
 
 import java.util.Collection;
 import java.util.HashMap;
@@ -24,10 +24,10 @@ import org.eclipse.jdt.core.IJavaElement;
 import org.eclipse.jdt.core.IMember;
 import org.eclipse.jdt.core.IType;
 import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.mylar.bugzilla.BugzillaMylarBridge;
-import org.eclipse.mylar.bugzilla.BugzillaStructureBridge;
-import org.eclipse.mylar.bugzilla.MylarBugzillaPlugin;
-import org.eclipse.mylar.bugzilla.ui.tasks.BugzillaReportNode;
+import org.eclipse.mylar.bugs.BugzillaMylarBridge;
+import org.eclipse.mylar.bugs.BugzillaStructureBridge;
+import org.eclipse.mylar.bugs.MylarBugzillaPlugin;
+import org.eclipse.mylar.bugzilla.ui.tasklist.BugzillaReportNode;
 import org.eclipse.mylar.core.AbstractRelationshipProvider;
 import org.eclipse.mylar.core.IMylarContextNode;
 import org.eclipse.mylar.core.search.IActiveSearchListener;
@@ -40,7 +40,7 @@ import org.eclipse.ui.PlatformUI;
  */
 public class BugzillaReferencesProvider extends AbstractRelationshipProvider {
 
-    public static final String ID = "org.eclipse.mylar.bugzilla.search.references";
+    public static final String ID = "org.eclipse.mylar.bugs.search.references";
     public static final String NAME = "Bugilla report references";
     
     public BugzillaReferencesProvider() {
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/search/Util.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugs/search/Util.java
index d883e90ea..47d5821f8 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/search/Util.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugs/search/Util.java
@@ -11,7 +11,7 @@
 /*
  * Created on Nov 19, 2004
  */
-package org.eclipse.mylar.tasks.search;
+package org.eclipse.mylar.bugs.search;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
diff --git a/org.eclipse.mylyn.tasks.tests/META-INF/MANIFEST.MF b/org.eclipse.mylyn.tasks.tests/META-INF/MANIFEST.MF
index b71f68108..54c336629 100644
--- a/org.eclipse.mylyn.tasks.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.tasks.tests/META-INF/MANIFEST.MF
@@ -1,23 +1,23 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Mylar Tasklist Tests Plug-in
-Bundle-SymbolicName: org.eclipse.mylar.tasks.tests
+Bundle-SymbolicName: org.eclipse.mylar.tasklist.tests
 Bundle-Version: 0.0.0
-Bundle-Activator: org.eclipse.mylar.tasks.tests.MylarTasksTestsPlugin
+Bundle-Activator: org.eclipse.mylar.tasklist.tests.MylarTasksTestsPlugin
 Bundle-Vendor: University of British Columbia
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
  org.junit,
  org.eclipse.mylar.core,
  org.eclipse.mylar.core.tests,
- org.eclipse.mylar.tasks,
  org.eclipse.jdt.core,
  org.eclipse.core.resources,
  org.eclipse.ui,
  org.eclipse.mylar.bugzilla.core,
  org.eclipse.mylar.bugzilla.ui,
- org.eclipse.mylar.bugzilla
+ org.eclipse.mylar.bugs,
+ org.eclipse.mylar.tasklist
 Eclipse-AutoStart: true
 Bundle-ClassPath: mylar-tasklist-tests.jar
-Export-Package: org.eclipse.mylar.tasks.bugzilla.tests,
- org.eclipse.mylar.tasks.tests
+Export-Package: org.eclipse.mylar.tasklist.bugzilla.tests,
+ org.eclipse.mylar.tasklist.tests
diff --git a/org.eclipse.mylyn.tasks.tests/build.properties b/org.eclipse.mylyn.tasks.tests/build.properties
index 7ca24197e..74cab5999 100644
--- a/org.eclipse.mylyn.tasks.tests/build.properties
+++ b/org.eclipse.mylyn.tasks.tests/build.properties
@@ -9,7 +9,10 @@
 #     University Of British Columbia - initial API and implementation
 ###############################################################################
 bin.includes = META-INF/,\
-               mylar-tasklist-tests.jar
+               mylar-tasklist-tests.jar,\
+               about.html
 jars.compile.order = mylar-tasklist-tests.jar
 source.mylar-tasklist-tests.jar = src/
 output.mylar-tasklist-tests.jar = bin/
+src.includes = about.html,\
+               src/
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/bugzilla/tests/BugzillaSearchPluginTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasklist/bugzilla/tests/BugzillaSearchPluginTest.java
index 44bee8f24..77c74b26f 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/bugzilla/tests/BugzillaSearchPluginTest.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasklist/bugzilla/tests/BugzillaSearchPluginTest.java
@@ -11,7 +11,7 @@
 /*
  * Created on Nov 19, 2004
  */
-package org.eclipse.mylar.tasks.bugzilla.tests;
+package org.eclipse.mylar.tasklist.bugzilla.tests;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -20,17 +20,17 @@ import junit.framework.TestCase;
 
 import org.eclipse.jdt.core.IJavaProject;
 import org.eclipse.jdt.core.IType;
-import org.eclipse.mylar.bugzilla.MylarBugzillaPlugin;
-import org.eclipse.mylar.bugzilla.ui.tasks.BugzillaReportNode;
-import org.eclipse.mylar.bugzilla.ui.tasks.BugzillaTask;
-import org.eclipse.mylar.bugzilla.ui.tasks.BugzillaTask.BugTaskState;
+import org.eclipse.mylar.bugs.MylarBugzillaPlugin;
+import org.eclipse.mylar.bugs.search.BugzillaMylarSearch;
+import org.eclipse.mylar.bugzilla.ui.tasklist.BugzillaReportNode;
+import org.eclipse.mylar.bugzilla.ui.tasklist.BugzillaTask;
+import org.eclipse.mylar.bugzilla.ui.tasklist.BugzillaTask.BugTaskState;
 import org.eclipse.mylar.core.search.IActiveSearchListener;
 import org.eclipse.mylar.core.tests.support.WorkspaceSetupHelper;
 import org.eclipse.mylar.core.tests.support.search.SearchPluginTestHelper;
-import org.eclipse.mylar.tasks.MylarTasksPlugin;
-import org.eclipse.mylar.tasks.TaskListManager;
-import org.eclipse.mylar.tasks.internal.TaskCategory;
-import org.eclipse.mylar.tasks.search.BugzillaMylarSearch;
+import org.eclipse.mylar.tasklist.MylarTasklistPlugin;
+import org.eclipse.mylar.tasklist.TaskListManager;
+import org.eclipse.mylar.tasklist.internal.TaskCategory;
 
 /*TEST CASES TO HANDLE
  * 1. what is here
@@ -213,9 +213,9 @@ public class BugzillaSearchPluginTest extends TestCase{
 
 		String bugPrefix = "Bugzilla-";
 		
-//		TaskList t = MylarTasksPlugin.getTaskListManager().getTaskList();
-//		MylarTasksPlugin.getTaskListManager().setTaskList(t);
-		TaskListManager manager = MylarTasksPlugin.getTaskListManager();
+//		TaskList t = MylarTasklistPlugin.getTaskListManager().getTaskList();
+//		MylarTasklistPlugin.getTaskListManager().setTaskList(t);
+		TaskListManager manager = MylarTasklistPlugin.getTaskListManager();
 		TaskCategory cat = new TaskCategory("Testing Category");
 		manager.addCategory(cat);
 		BugzillaTask bugTask1 = new BugzillaTask(bugPrefix +94185, "<bugzilla info>");
@@ -266,7 +266,7 @@ public class BugzillaSearchPluginTest extends TestCase{
 		assertEquals("Results not the right size", 3, c.size());
 		
 		MylarBugzillaPlugin.getBridge().removeFromLandmarksHash(astNodeType);
-        MylarTasksPlugin.getTaskListManager().deleteCategory(cat);
+        MylarTasklistPlugin.getTaskListManager().deleteCategory(cat);
 	}
 	
 	//TODO need to test a bug that wraps...should fail since we can only search on a single line
@@ -276,9 +276,9 @@ public class BugzillaSearchPluginTest extends TestCase{
 		String bugPrefix = "Bugzilla-";
 		
 		
-//		TaskList t = MylarTasksPlugin.getTaskListManager().getTaskList();
-//		MylarTasksPlugin.getTaskListManager().setTaskList(t);
-		TaskListManager manager = MylarTasksPlugin.getTaskListManager();
+//		TaskList t = MylarTasklistPlugin.getTaskListManager().getTaskList();
+//		MylarTasklistPlugin.getTaskListManager().setTaskList(t);
+		TaskListManager manager = MylarTasklistPlugin.getTaskListManager();
 		TaskCategory cat = new TaskCategory("Testing Category");
 		manager.addCategory(cat);
 		BugzillaTask bugTask1 = new BugzillaTask(bugPrefix + 94185, "<bugzilla info>");
@@ -325,7 +325,7 @@ public class BugzillaSearchPluginTest extends TestCase{
 		assertEquals("Results not the right size", 1, c.size());
 		
 		MylarBugzillaPlugin.getBridge().removeFromLandmarksHash(astNodeType);
-        MylarTasksPlugin.getTaskListManager().deleteCategory(cat);
+        MylarTasklistPlugin.getTaskListManager().deleteCategory(cat);
 	}
 	
 }
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/bugzilla/tests/BugzillaStackTraceTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasklist/bugzilla/tests/BugzillaStackTraceTest.java
index d8d5f1f81..c7edde6ad 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/bugzilla/tests/BugzillaStackTraceTest.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasklist/bugzilla/tests/BugzillaStackTraceTest.java
@@ -9,7 +9,7 @@
  *     University Of British Columbia - initial API and implementation
  *******************************************************************************/
 ////Created on Oct 12, 2004
-package org.eclipse.mylar.tasks.bugzilla.tests;
+package org.eclipse.mylar.tasklist.bugzilla.tests;
 
 import java.io.File;
 import java.io.FileReader;
@@ -20,13 +20,13 @@ import java.util.List;
 import junit.framework.TestCase;
 
 import org.eclipse.core.runtime.Path;
+import org.eclipse.mylar.bugs.search.BugzillaMylarSearchOperation;
 import org.eclipse.mylar.bugzilla.core.internal.BugParser;
 import org.eclipse.mylar.bugzilla.core.search.BugzillaSearchHit;
-import org.eclipse.mylar.bugzilla.ui.tasks.BugzillaReportNode;
-import org.eclipse.mylar.bugzilla.ui.tasks.StackTrace;
+import org.eclipse.mylar.bugzilla.ui.tasklist.BugzillaReportNode;
+import org.eclipse.mylar.bugzilla.ui.tasklist.StackTrace;
 import org.eclipse.mylar.core.tests.MylarCoreTestsPlugin;
 import org.eclipse.mylar.core.tests.support.FileTool;
-import org.eclipse.mylar.tasks.search.BugzillaMylarSearchOperation;
 
 
 /**
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/bugzilla/tests/MylarBugzillaTestsPlugin.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasklist/bugzilla/tests/MylarBugzillaTestsPlugin.java
index 87a99779a..ad5b78c1d 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/bugzilla/tests/MylarBugzillaTestsPlugin.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasklist/bugzilla/tests/MylarBugzillaTestsPlugin.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     University Of British Columbia - initial API and implementation
  *******************************************************************************/
-package org.eclipse.mylar.tasks.bugzilla.tests;
+package org.eclipse.mylar.tasklist.bugzilla.tests;
 
 import org.eclipse.core.runtime.Plugin;
 import org.osgi.framework.BundleContext;
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/Job.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasklist/tests/Job.java
index 62d95fcce..1ba2a09c6 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/Job.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasklist/tests/Job.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     University Of British Columbia - initial API and implementation
  *******************************************************************************/
-package org.eclipse.mylar.tasks.tests;
+package org.eclipse.mylar.tasklist.tests;
 
 public class Job {
 	private String company;
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/MylarTasksTestsPlugin.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasklist/tests/MylarTasksTestsPlugin.java
index 7d420e1fd..1f544f371 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/MylarTasksTestsPlugin.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasklist/tests/MylarTasksTestsPlugin.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     University Of British Columbia - initial API and implementation
  *******************************************************************************/
-package org.eclipse.mylar.tasks.tests;
+package org.eclipse.mylar.tasklist.tests;
 
 import org.eclipse.core.runtime.Plugin;
 import org.osgi.framework.BundleContext;
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/People.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasklist/tests/People.java
index 2e88dcca4..e4f43ae51 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/People.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasklist/tests/People.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     University Of British Columbia - initial API and implementation
  *******************************************************************************/
-package org.eclipse.mylar.tasks.tests;
+package org.eclipse.mylar.tasklist.tests;
 
 import java.util.ArrayList;
 import java.util.Iterator;
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/Person.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasklist/tests/Person.java
index b4064f1b1..0bbe010c5 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/Person.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasklist/tests/Person.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     University Of British Columbia - initial API and implementation
  *******************************************************************************/
-package org.eclipse.mylar.tasks.tests;
+package org.eclipse.mylar.tasklist.tests;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListManagerTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasklist/tests/TaskListManagerTest.java
index f301b3465..c0de614a8 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListManagerTest.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasklist/tests/TaskListManagerTest.java
@@ -11,20 +11,20 @@
 /*
  * Created on Dec 21, 2004
   */
-package org.eclipse.mylar.tasks.tests;
+package org.eclipse.mylar.tasklist.tests;
 
-import java.util.List;
 import java.io.File;
+import java.util.List;
 
 import junit.framework.TestCase;
 
-import org.eclipse.mylar.bugzilla.ui.tasks.BugzillaTask;
-import org.eclipse.mylar.tasks.ITask;
-import org.eclipse.mylar.tasks.MylarTasksPlugin;
-import org.eclipse.mylar.tasks.Task;
-import org.eclipse.mylar.tasks.TaskListManager;
-import org.eclipse.mylar.tasks.internal.TaskCategory;
-import org.eclipse.mylar.tasks.internal.TaskList;
+import org.eclipse.mylar.bugzilla.ui.tasklist.BugzillaTask;
+import org.eclipse.mylar.tasklist.ITask;
+import org.eclipse.mylar.tasklist.MylarTasklistPlugin;
+import org.eclipse.mylar.tasklist.Task;
+import org.eclipse.mylar.tasklist.TaskListManager;
+import org.eclipse.mylar.tasklist.internal.TaskCategory;
+import org.eclipse.mylar.tasklist.internal.TaskList;
 
 /**
  * @author Mik Kersten
@@ -32,34 +32,34 @@ import org.eclipse.mylar.tasks.internal.TaskList;
 public class TaskListManagerTest extends TestCase {
 
     public void testCreationAndExternalization() {
-        File file = new File("foo" + MylarTasksPlugin.FILE_EXTENSION);
+        File file = new File("foo" + MylarTasklistPlugin.FILE_EXTENSION);
         file.deleteOnExit();
         TaskListManager manager = new TaskListManager(file);
         
 //        TaskList tlist = manager.getTaskList();
-        Task task1 = new Task(MylarTasksPlugin.getTaskListManager().genUniqueTaskId(), "task 1");
+        Task task1 = new Task(MylarTasklistPlugin.getTaskListManager().genUniqueTaskId(), "task 1");
         manager.addRootTask(task1);
-        Task sub1 = new Task(MylarTasksPlugin.getTaskListManager().genUniqueTaskId(), "sub 1");
+        Task sub1 = new Task(MylarTasklistPlugin.getTaskListManager().genUniqueTaskId(), "sub 1");
         task1.addSubTask(sub1);    
         sub1.setParent(task1);
-        Task task2 = new Task(MylarTasksPlugin.getTaskListManager().genUniqueTaskId(), "task 2");
+        Task task2 = new Task(MylarTasklistPlugin.getTaskListManager().genUniqueTaskId(), "task 2");
         manager.addRootTask(task2);
 
         TaskCategory cat1 = new TaskCategory("Category 1");
         manager.addCategory(cat1);
-        Task task3 = new Task(MylarTasksPlugin.getTaskListManager().genUniqueTaskId(), "task 3");
+        Task task3 = new Task(MylarTasklistPlugin.getTaskListManager().genUniqueTaskId(), "task 3");
         cat1.addTask(task3);
-        Task sub2 = new Task(MylarTasksPlugin.getTaskListManager().genUniqueTaskId(), "sub 2");
+        Task sub2 = new Task(MylarTasklistPlugin.getTaskListManager().genUniqueTaskId(), "sub 2");
         task3.addSubTask(sub2);
         sub2.setParent(task3);
-        Task task4 = new Task(MylarTasksPlugin.getTaskListManager().genUniqueTaskId(), "task 4");
+        Task task4 = new Task(MylarTasklistPlugin.getTaskListManager().genUniqueTaskId(), "task 4");
         cat1.addTask(task4);
         
         TaskCategory cat2 = new TaskCategory("Category 2");
         manager.addCategory(cat2);
-        Task task5 = new Task(MylarTasksPlugin.getTaskListManager().genUniqueTaskId(), "task 5");
+        Task task5 = new Task(MylarTasklistPlugin.getTaskListManager().genUniqueTaskId(), "task 5");
         cat2.addTask(task5);
-        Task task6 = new Task(MylarTasksPlugin.getTaskListManager().genUniqueTaskId(), "task 6");
+        Task task6 = new Task(MylarTasklistPlugin.getTaskListManager().genUniqueTaskId(), "task 6");
         cat2.addTask(task6);    
         
         BugzillaTask report = new BugzillaTask("123", "label 123", true);
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListUiTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasklist/tests/TaskListUiTest.java
index d53c5f161..a54e48c9f 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListUiTest.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasklist/tests/TaskListUiTest.java
@@ -9,18 +9,18 @@
  *     University Of British Columbia - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.mylar.tasks.tests;
+package org.eclipse.mylar.tasklist.tests;
 
 import junit.framework.TestCase;
 
 import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.mylar.tasks.ITask;
-import org.eclipse.mylar.tasks.MylarTasksPlugin;
-import org.eclipse.mylar.tasks.Task;
-import org.eclipse.mylar.tasks.TaskListManager;
-import org.eclipse.mylar.tasks.internal.TaskCategory;
-import org.eclipse.mylar.tasks.internal.TaskPriorityFilter;
-import org.eclipse.mylar.tasks.ui.views.TaskListView;
+import org.eclipse.mylar.tasklist.ITask;
+import org.eclipse.mylar.tasklist.MylarTasklistPlugin;
+import org.eclipse.mylar.tasklist.Task;
+import org.eclipse.mylar.tasklist.TaskListManager;
+import org.eclipse.mylar.tasklist.internal.TaskCategory;
+import org.eclipse.mylar.tasklist.internal.TaskPriorityFilter;
+import org.eclipse.mylar.tasklist.ui.views.TaskListView;
 import org.eclipse.swt.widgets.TreeItem;
 import org.eclipse.ui.PartInitException;
 
@@ -54,41 +54,41 @@ public class TaskListUiTest extends TestCase {
 	
 	public void setUp() throws PartInitException{
 		try {
-		MylarTasksPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage().showView("org.eclipse.mylar.tasks.ui.views.TaskListView");
-//		File file = new File("foo" + MylarTasksPlugin.FILE_EXTENSION);
-        TaskListManager manager = MylarTasksPlugin.getTaskListManager();        
+		MylarTasklistPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage().showView("org.eclipse.mylar.tasks.ui.views.TaskListView");
+//		File file = new File("foo" + MylarTasklistPlugin.FILE_EXTENSION);
+        TaskListManager manager = MylarTasklistPlugin.getTaskListManager();        
 //        tlist = manager.getTaskList();        
         cat1 = new TaskCategory("First Category");
         
-        cat1task1 = new Task(MylarTasksPlugin.getTaskListManager().genUniqueTaskId(), "task 1");
+        cat1task1 = new Task(MylarTasklistPlugin.getTaskListManager().genUniqueTaskId(), "task 1");
         cat1task1.setPriority("P1");
         cat1task1.setCompleted(true);
         cat1task1.setCategory(cat1);
 		cat1.addTask(cat1task1);
 		
-		cat1task1sub1 = new Task(MylarTasksPlugin.getTaskListManager().genUniqueTaskId(), "sub task 1");
+		cat1task1sub1 = new Task(MylarTasklistPlugin.getTaskListManager().genUniqueTaskId(), "sub task 1");
 		cat1task1sub1.setPriority("P1");
 		cat1task1sub1.setCompleted(true);
 		cat1task1sub1.setParent(cat1task1);
         cat1task1.addSubTask(cat1task1sub1);
 		
-		cat1task2 = new Task(MylarTasksPlugin.getTaskListManager().genUniqueTaskId(), "task 2");
+		cat1task2 = new Task(MylarTasklistPlugin.getTaskListManager().genUniqueTaskId(), "task 2");
 		cat1task2.setPriority("P2");
 		cat1task2.setCategory(cat1);
 		cat1.addTask(cat1task2);		
 		
-		cat1task3 = new Task(MylarTasksPlugin.getTaskListManager().genUniqueTaskId(), "task 3");
+		cat1task3 = new Task(MylarTasklistPlugin.getTaskListManager().genUniqueTaskId(), "task 3");
 		cat1task3.setPriority("P3");
 		cat1task3.setCompleted(true);
 		cat1task3.setCategory(cat1);
 		cat1.addTask(cat1task3);
 		
-		cat1task4 = new Task(MylarTasksPlugin.getTaskListManager().genUniqueTaskId(), "task 4");
+		cat1task4 = new Task(MylarTasklistPlugin.getTaskListManager().genUniqueTaskId(), "task 4");
 		cat1task4.setPriority("P4");
 		cat1task4.setCategory(cat1);
 		cat1.addTask(cat1task4);
 		
-		cat1task5 = new Task(MylarTasksPlugin.getTaskListManager().genUniqueTaskId(), "task 5");
+		cat1task5 = new Task(MylarTasklistPlugin.getTaskListManager().genUniqueTaskId(), "task 5");
 		cat1task5.setPriority("P5");
 		cat1task5.setCompleted(true);
 		cat1task5.setCategory(cat1);
@@ -99,34 +99,34 @@ public class TaskListUiTest extends TestCase {
 		
 		cat2 = new TaskCategory("Second Category");
         
-        cat2task1 = new Task(MylarTasksPlugin.getTaskListManager().genUniqueTaskId(), "task 1");
+        cat2task1 = new Task(MylarTasklistPlugin.getTaskListManager().genUniqueTaskId(), "task 1");
         cat2task1.setPriority("P1");
         cat2task1.setCategory(cat2);
 		cat2.addTask(cat2task1);
 		
-		cat2task1sub1 = new Task(MylarTasksPlugin.getTaskListManager().genUniqueTaskId(), "sub task 1");
+		cat2task1sub1 = new Task(MylarTasklistPlugin.getTaskListManager().genUniqueTaskId(), "sub task 1");
 		cat2task1sub1.setPriority("P1");
 		cat2task1sub1.setParent(cat2task1);
 		cat2task1.addSubTask(cat2task1sub1);
 		
-		cat2task2 = new Task(MylarTasksPlugin.getTaskListManager().genUniqueTaskId(), "task 2");
+		cat2task2 = new Task(MylarTasklistPlugin.getTaskListManager().genUniqueTaskId(), "task 2");
 		cat2task2.setPriority("P2");
 		cat2task2.setCompleted(true);
 		cat2task2.setCategory(cat2);
 		cat2.addTask(cat2task2);
 		
-		cat2task3 = new Task(MylarTasksPlugin.getTaskListManager().genUniqueTaskId(), "task 3");
+		cat2task3 = new Task(MylarTasklistPlugin.getTaskListManager().genUniqueTaskId(), "task 3");
 		cat2task3.setPriority("P3");
 		cat2task3.setCategory(cat2);
 		cat2.addTask(cat2task3);
 		
-		cat2task4 = new Task(MylarTasksPlugin.getTaskListManager().genUniqueTaskId(), "task 4");
+		cat2task4 = new Task(MylarTasklistPlugin.getTaskListManager().genUniqueTaskId(), "task 4");
 		cat2task4.setPriority("P4");
 		cat2task4.setCompleted(true);
 		cat2task4.setCategory(cat2);
 		cat2.addTask(cat2task4);
 		
-		cat2task5 = new Task(MylarTasksPlugin.getTaskListManager().genUniqueTaskId(), "task 5");
+		cat2task5 = new Task(MylarTasklistPlugin.getTaskListManager().genUniqueTaskId(), "task 5");
 		cat2task5.setPriority("P5");
 		cat2task5.setCategory(cat2);
 		cat2.addTask(cat2task5);
@@ -156,12 +156,12 @@ public class TaskListUiTest extends TestCase {
 		TaskListView.getDefault().removeFilter(TaskListView.getDefault().getCompleteFilter());
 		
 		
-//		MylarTasksPlugin.getTaskListManager().getTaskList().addFilter(TaskListView.getDefault().getInCompleteFilter());
+//		MylarTasklistPlugin.getTaskListManager().getTaskList().addFilter(TaskListView.getDefault().getInCompleteFilter());
 //		viewer.refresh();
 //		viewer.expandAll();
 //		items = viewer.getTree().getItems();
 //		assertTrue(checkFilter(CHECK_INCOMPLETE_FILTER, items));
-//		MylarTasksPlugin.getTaskListManager().getTaskList().removeFilter(TaskListView.getDefault().getInCompleteFilter());
+//		MylarTasklistPlugin.getTaskListManager().getTaskList().removeFilter(TaskListView.getDefault().getInCompleteFilter());
 		// check incomplte tasks
 		
 		
@@ -240,7 +240,7 @@ public class TaskListUiTest extends TestCase {
 //        	// don't care if we are disposed
 //        }
 //        public Object[] getElements(Object parent) {
-//            return applyFilter(MylarTasksPlugin.getTaskListManager().getTaskList().getRoots()).toArray();
+//            return applyFilter(MylarTasklistPlugin.getTaskListManager().getTaskList().getRoots()).toArray();
 //        }
 //        public Object getParent(Object child) {
 //            if (child instanceof ITask) {
diff --git a/org.eclipse.mylyn.tasks.ui/META-INF/MANIFEST.MF b/org.eclipse.mylyn.tasks.ui/META-INF/MANIFEST.MF
index c957b75b5..a25ce95c4 100644
--- a/org.eclipse.mylyn.tasks.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.tasks.ui/META-INF/MANIFEST.MF
@@ -1,9 +1,9 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Mylar Task Plug-in
-Bundle-SymbolicName: org.eclipse.mylar.tasks; singleton:=true
+Bundle-Name: Mylar TaskList Plug-in
+Bundle-SymbolicName: org.eclipse.mylar.tasklist; singleton:=true
 Bundle-Version: 0.3.2.2
-Bundle-Activator: org.eclipse.mylar.tasks.MylarTasksPlugin
+Bundle-Activator: org.eclipse.mylar.tasklist.MylarTasklistPlugin
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
@@ -21,9 +21,9 @@ Require-Bundle: org.eclipse.ui,
 Eclipse-AutoStart: true
 Bundle-Vendor: University of British Columbia
 Bundle-ClassPath: mylar-tasklist.jar
-Export-Package: org.eclipse.mylar.tasks,
- org.eclipse.mylar.tasks.internal,
- org.eclipse.mylar.tasks.ui,
- org.eclipse.mylar.tasks.ui.actions,
- org.eclipse.mylar.tasks.ui.preferences,
- org.eclipse.mylar.tasks.ui.views
+Export-Package: org.eclipse.mylar.tasklist,
+ org.eclipse.mylar.tasklist.internal,
+ org.eclipse.mylar.tasklist.ui,
+ org.eclipse.mylar.tasklist.ui.actions,
+ org.eclipse.mylar.tasklist.ui.preferences,
+ org.eclipse.mylar.tasklist.ui.views
diff --git a/org.eclipse.mylyn.tasks.ui/build.properties b/org.eclipse.mylyn.tasks.ui/build.properties
index c9d4ccc4a..3da25df2b 100644
--- a/org.eclipse.mylyn.tasks.ui/build.properties
+++ b/org.eclipse.mylyn.tasks.ui/build.properties
@@ -12,13 +12,17 @@ bin.includes = plugin.xml,\
                icons/,\
                lib/,\
                mylar-tasklist.jar,\
-               META-INF/
+               META-INF/,\
+               about.html,\
+               schema/
 src.includes = icons/,\
                plugin.xml,\
                tasklist.jar,\
                src/,\
                lib/,\
-               META-INF/
+               META-INF/,\
+               schema/,\
+               about.html
 jars.compile.order = mylar-tasklist.jar
 source.mylar-tasklist.jar = src/
 output.mylar-tasklist.jar = bin/
diff --git a/org.eclipse.mylyn.tasks.ui/plugin.xml b/org.eclipse.mylyn.tasks.ui/plugin.xml
index a239d506f..f6e4b4693 100644
--- a/org.eclipse.mylyn.tasks.ui/plugin.xml
+++ b/org.eclipse.mylyn.tasks.ui/plugin.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
 <plugin>
-   <extension-point id="taskListContributor" name="test" schema="schema/taskListContributor.exsd"/>
+   <extension-point id="taskListContributor" name="TaskList Contributor" schema="schema/taskListContributor.exsd"/>
 
     <extension point="org.eclipse.ui.perspectiveExtensions">
           <perspectiveExtension targetID="org.eclipse.jdt.ui.JavaPerspective">
-               <viewShortcut id="org.eclipse.mylar.tasks.ui.views.TaskListView"/>
-               <view id="org.eclipse.mylar.tasks.ui.views.TaskListView"
+               <viewShortcut id="org.eclipse.mylar.tasklist.ui.views.TaskListView"/>
+               <view id="org.eclipse.mylar.tasklist.ui.views.TaskListView"
                     relative="org.eclipse.ui.views.ContentOutline"
                     relationship="top"/>
           </perspectiveExtension>
 		  <perspectiveExtension targetID="org.eclipse.jdt.ui.JavaBrowsingPerspective">
-               <viewShortcut id="org.eclipse.mylar.tasks.ui.views.TaskListView"/>
+               <viewShortcut id="org.eclipse.mylar.tasklist.ui.views.TaskListView"/>
           </perspectiveExtension>
 	</extension>
 
@@ -20,16 +20,16 @@
 	  <view name="Mylar Task List" 
 	  	icon="icons/eview16/task-list.gif" 
 	  	category="org.eclipse.mylar" 
-	  	class="org.eclipse.mylar.tasks.ui.views.TaskListView" 
-	  	id="org.eclipse.mylar.tasks.ui.views.TaskListView" /> 
+	  	class="org.eclipse.mylar.tasklist.ui.views.TaskListView" 
+	  	id="org.eclipse.mylar.tasklist.ui.views.TaskListView" /> 
   </extension>
   <extension
         point="org.eclipse.ui.editors">
      <editor
            icon="icons/eview16/task.gif"
-           class="org.eclipse.mylar.tasks.ui.TaskEditor"
+           class="org.eclipse.mylar.tasklist.ui.TaskEditor"
            name="Task Viewer"
-           id="org.eclipse.mylar.tasks.ui.taskEditor"/>
+           id="org.eclipse.mylar.tasklist.ui.taskEditor"/>
   </extension>
   
   <extension point="org.eclipse.ui.commands">
@@ -37,8 +37,8 @@
   <extension point="org.eclipse.ui.preferencePages">
       <page 
          name="Task List"
-         class="org.eclipse.mylar.tasks.ui.preferences.MylarTaskPreferencePage"
-         id="org.eclipse.mylar.tasks.ui.preferences"
+         class="org.eclipse.mylar.tasklist.ui.preferences.MylarTaskPreferencePage"
+         id="org.eclipse.mylar.tasklist.ui.preferences"
          category="org.eclipse.mylar.ui.preferences">
       </page>  
    </extension>
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/AbstractCategory.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/AbstractCategory.java
index 93010fe41..3da6035dc 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/AbstractCategory.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/AbstractCategory.java
@@ -9,7 +9,7 @@
  *     University Of British Columbia - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.mylar.tasks;
+package org.eclipse.mylar.tasklist;
 
 import java.util.List;
 
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ITask.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ITask.java
index 6e6561ba6..995041fac 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ITask.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ITask.java
@@ -11,12 +11,12 @@
 /*
  * Created on Jan 13, 2005
  */
-package org.eclipse.mylar.tasks;
+package org.eclipse.mylar.tasklist;
 
 import java.io.Serializable;
 import java.util.List;
 
-import org.eclipse.mylar.tasks.internal.TaskCategory;
+import org.eclipse.mylar.tasklist.internal.TaskCategory;
 
 /**
  * @author Mik Kersten
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ITaskActivityListener.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ITaskActivityListener.java
index 98abbe02a..6aa280fdd 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ITaskActivityListener.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ITaskActivityListener.java
@@ -11,7 +11,7 @@
 /*
  * Created on Jan 13, 2005
   */
-package org.eclipse.mylar.tasks;
+package org.eclipse.mylar.tasklist;
 
 import java.util.List;
 
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ITaskFilter.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ITaskFilter.java
index bc6f24373..92b47942c 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ITaskFilter.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ITaskFilter.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     University Of British Columbia - initial API and implementation
  *******************************************************************************/
-package org.eclipse.mylar.tasks;
+package org.eclipse.mylar.tasklist;
 
 /**
 * @author Ken Sueda
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ITaskHandler.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ITaskHandler.java
index 879f64c3a..e86516fb0 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ITaskHandler.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ITaskHandler.java
@@ -1,8 +1,8 @@
-package org.eclipse.mylar.tasks;
+package org.eclipse.mylar.tasklist;
 
 import org.eclipse.jface.action.Action;
-import org.eclipse.mylar.tasks.internal.TaskCategory;
-import org.eclipse.mylar.tasks.ui.views.TaskListView;
+import org.eclipse.mylar.tasklist.internal.TaskCategory;
+import org.eclipse.mylar.tasklist.ui.views.TaskListView;
 import org.eclipse.ui.IWorkbenchPage;
 
 public interface ITaskHandler {
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ITaskInfo.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ITaskInfo.java
index 652184ac7..3d388ece3 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ITaskInfo.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ITaskInfo.java
@@ -9,7 +9,7 @@
  *     University Of British Columbia - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.mylar.tasks;
+package org.eclipse.mylar.tasklist;
 
 /**
  * @author Mik Kersten
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ITaskListDynamicSubMenuContributor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ITaskListDynamicSubMenuContributor.java
index 6913de861..52030ef88 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ITaskListDynamicSubMenuContributor.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ITaskListDynamicSubMenuContributor.java
@@ -1,7 +1,7 @@
-package org.eclipse.mylar.tasks;
+package org.eclipse.mylar.tasklist;
 
 import org.eclipse.jface.action.MenuManager;
-import org.eclipse.mylar.tasks.ui.views.TaskListView;
+import org.eclipse.mylar.tasklist.ui.views.TaskListView;
 
 public interface ITaskListDynamicSubMenuContributor {
 
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ITaskListElement.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ITaskListElement.java
index e7abd5a14..6b2d82b51 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ITaskListElement.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ITaskListElement.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     University Of British Columbia - initial API and implementation
  *******************************************************************************/
-package org.eclipse.mylar.tasks;
+package org.eclipse.mylar.tasklist;
 
 import org.eclipse.jface.resource.JFaceResources;
 import org.eclipse.swt.graphics.Color;
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ITaskListExternalizer.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ITaskListExternalizer.java
index a83cbbd00..39c9b13db 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ITaskListExternalizer.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ITaskListExternalizer.java
@@ -9,10 +9,10 @@
  *     University Of British Columbia - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.mylar.tasks;
+package org.eclipse.mylar.tasklist;
 
-import org.eclipse.mylar.tasks.internal.MylarExternalizerException;
-import org.eclipse.mylar.tasks.internal.TaskList;
+import org.eclipse.mylar.tasklist.internal.MylarExternalizerException;
+import org.eclipse.mylar.tasklist.internal.TaskList;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ITaskListener.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ITaskListener.java
index 2a46cccaa..4bd698b0b 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ITaskListener.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ITaskListener.java
@@ -9,7 +9,7 @@
  *     University Of British Columbia - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.mylar.tasks;
+package org.eclipse.mylar.tasklist;
 
 
 /**
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/MylarTasksPlugin.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/MylarTasklistPlugin.java
index 62a4588f2..def8ded23 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/MylarTasksPlugin.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/MylarTasklistPlugin.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     University Of British Columbia - initial API and implementation
  *******************************************************************************/
-package org.eclipse.mylar.tasks;
+package org.eclipse.mylar.tasklist;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -25,7 +25,7 @@ import org.eclipse.core.runtime.Preferences.IPropertyChangeListener;
 import org.eclipse.core.runtime.Preferences.PropertyChangeEvent;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.mylar.core.MylarPlugin;
-import org.eclipse.mylar.tasks.internal.TaskListExternalizer;
+import org.eclipse.mylar.tasklist.internal.TaskListExternalizer;
 import org.eclipse.swt.events.ShellEvent;
 import org.eclipse.swt.events.ShellListener;
 import org.eclipse.ui.IWorkbench;
@@ -37,14 +37,14 @@ import org.osgi.framework.BundleContext;
 /**
  * @author Mik Kersten
  */
-public class MylarTasksPlugin extends AbstractUIPlugin {
+public class MylarTasklistPlugin extends AbstractUIPlugin {
     
-    private static MylarTasksPlugin plugin;
+    private static MylarTasklistPlugin plugin;
     private static TaskListManager taskListManager;
     private TaskListExternalizer externalizer;
     private List<ITaskHandler> taskHandlers = new ArrayList<ITaskHandler>(); // TODO: use extension points
     
-    public static final String TASK_CONTRIBUTER_EXTENSION_POINT_ID = "org.eclipse.mylar.tasks.taskListContributor";
+    public static final String TASK_CONTRIBUTER_EXTENSION_POINT_ID = "org.eclipse.mylar.tasklist.taskListContributor";
     	public static final String TASK_HANDLER_ELEMENT = "taskHandler";
     		public static final String EXTERNALIZER_CLASS_ID = "externalizerClass";
     		public static final String ACTION_CONTRIBUTER_CLASS_ID = "taskHandlerClass";
@@ -53,18 +53,18 @@ public class MylarTasksPlugin extends AbstractUIPlugin {
     	public static final String DYNAMIC_POPUP_ELEMENT = "dynamicPopupMenu";
     		public static final String DYNAMIC_POPUP_CLASS_ID = "class";
     		
-    public static final String REPORT_OPEN_EDITOR = "org.eclipse.mylar.tasks.report.open.editor";
-    public static final String REPORT_OPEN_INTERNAL = "org.eclipse.mylar.tasks.report.open.internal";
-    public static final String REPORT_OPEN_EXTERNAL = "org.eclipse.mylar.tasks.report.open.external";
-    public static final String MULTIPLE_ACTIVE_TASKS = "org.eclipse.mylar.tasks.active.multipe";
+    public static final String REPORT_OPEN_EDITOR = "org.eclipse.mylar.tasklist.report.open.editor";
+    public static final String REPORT_OPEN_INTERNAL = "org.eclipse.mylar.tasklist.report.open.internal";
+    public static final String REPORT_OPEN_EXTERNAL = "org.eclipse.mylar.tasklist.report.open.external";
+    public static final String MULTIPLE_ACTIVE_TASKS = "org.eclipse.mylar.tasklist.active.multipe";
     
     public static final String FILE_EXTENSION = ".xml";
-    public static final String TASK_ID = "org.eclipse.mylar.tasks.userid";
+    public static final String TASK_ID = "org.eclipse.mylar.tasklist.userid";
     public static final String DEFAULT_TASK_LIST_FILE = "tasklist" + FILE_EXTENSION;
-    public static final String TASK_EDITOR_ID = "org.eclipse.mylar.tasks.ui.taskEditor";
-    public static final String SELECTED_PRIORITY = "org.eclipse.mylar.tasks.filter.priority";
-    public static final String FILTER_COMPLETE_MODE = "org.eclipse.mylar.tasks.filter.complete";
-    public static final String FILTER_INCOMPLETE_MODE = "org.eclipse.mylar.tasks.filter.incomplete";
+    public static final String TASK_EDITOR_ID = "org.eclipse.mylar.tasklist.ui.taskEditor";
+    public static final String SELECTED_PRIORITY = "org.eclipse.mylar.tasklist.filter.priority";
+    public static final String FILTER_COMPLETE_MODE = "org.eclipse.mylar.tasklist.filter.complete";
+    public static final String FILTER_INCOMPLETE_MODE = "org.eclipse.mylar.tasklist.filter.incomplete";
     
 	private ResourceBundle resourceBundle;
 //	private ITaskListActionContributor primaryContributor;
@@ -166,7 +166,7 @@ public class MylarTasksPlugin extends AbstractUIPlugin {
 		}        
     };
     
-	public MylarTasksPlugin() {
+	public MylarTasklistPlugin() {
 		super();
 		plugin = this;
 	}
@@ -221,7 +221,7 @@ public class MylarTasksPlugin extends AbstractUIPlugin {
 	/**
 	 * Returns the shared instance.
 	 */
-	public static MylarTasksPlugin getDefault() {
+	public static MylarTasklistPlugin getDefault() {
 		return plugin;
 	}
 
@@ -230,7 +230,7 @@ public class MylarTasksPlugin extends AbstractUIPlugin {
 	 * or 'key' if not found.
 	 */
 	public static String getResourceString(String key) {
-		ResourceBundle bundle = MylarTasksPlugin.getDefault().getResourceBundle();
+		ResourceBundle bundle = MylarTasklistPlugin.getDefault().getResourceBundle();
 		try {
 			return (bundle != null) ? bundle.getString(key) : key;
 		} catch (MissingResourceException e) {
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/RelatedLinks.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/RelatedLinks.java
index f23aa092b..3fe7cfdfe 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/RelatedLinks.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/RelatedLinks.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     University Of British Columbia - initial API and implementation
  *******************************************************************************/
-package org.eclipse.mylar.tasks;
+package org.eclipse.mylar.tasklist;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/Task.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/Task.java
index c25ccee00..e7a18c5ee 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/Task.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/Task.java
@@ -11,16 +11,16 @@
 /*
  * Created on Dec 22, 2004
   */
-package org.eclipse.mylar.tasks;
+package org.eclipse.mylar.tasklist;
 
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
 import org.eclipse.mylar.core.MylarPlugin;
-import org.eclipse.mylar.tasks.internal.TaskCategory;
-import org.eclipse.mylar.tasks.ui.TaskEditorInput;
-import org.eclipse.mylar.tasks.ui.views.TaskListView;
+import org.eclipse.mylar.tasklist.internal.TaskCategory;
+import org.eclipse.mylar.tasklist.ui.TaskEditorInput;
+import org.eclipse.mylar.tasklist.ui.views.TaskListView;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.Font;
 import org.eclipse.swt.graphics.Image;
@@ -155,7 +155,7 @@ public class Task implements ITask {
 	protected void openTaskEditor() {
 		
 		// get the active page so that we can reuse it
-		IWorkbenchPage page = MylarTasksPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage();
+		IWorkbenchPage page = MylarTasklistPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage();
 
 		// if we couldn't get a page, get out
 		if (page == null) {
@@ -166,7 +166,7 @@ public class Task implements ITask {
 		try 
 		{
 			// try to open an editor on the input task
-			page.openEditor(input, MylarTasksPlugin.TASK_EDITOR_ID);
+			page.openEditor(input, MylarTasklistPlugin.TASK_EDITOR_ID);
 			
 		} 
 		catch (PartInitException ex) 
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/TaskListImages.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/TaskListImages.java
index e7ac344bf..9cde2d7f1 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/TaskListImages.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/TaskListImages.java
@@ -11,7 +11,7 @@
 /*
  * Created on Apr 20, 2004
  */
-package org.eclipse.mylar.tasks;
+package org.eclipse.mylar.tasklist;
 
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -30,7 +30,7 @@ public class TaskListImages {
      
 	private static final String T_ELCL = "elcl16";
 	private static final String T_TOOL = "etool16";
-	private static final URL baseURL = MylarTasksPlugin.getDefault().getBundle().getEntry("/icons/");
+	private static final URL baseURL = MylarTasklistPlugin.getDefault().getBundle().getEntry("/icons/");
 	
 	public static final ImageDescriptor REMOVE = create(T_ELCL, "remove.gif");
 	public static final ImageDescriptor ERASE_TASKSCAPE = create(T_ELCL, "context-clear.gif");
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/TaskListManager.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/TaskListManager.java
index 834e777a3..c0ded66a3 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/TaskListManager.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/TaskListManager.java
@@ -11,16 +11,16 @@
 /*
  * Created on Dec 26, 2004
  */
-package org.eclipse.mylar.tasks;
+package org.eclipse.mylar.tasklist;
 
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
 import org.eclipse.mylar.core.MylarPlugin;
-import org.eclipse.mylar.tasks.internal.RelativePathUtil;
-import org.eclipse.mylar.tasks.internal.TaskCategory;
-import org.eclipse.mylar.tasks.internal.TaskList;
+import org.eclipse.mylar.tasklist.internal.RelativePathUtil;
+import org.eclipse.mylar.tasklist.internal.TaskCategory;
+import org.eclipse.mylar.tasklist.internal.TaskList;
 
 
 /**
@@ -35,8 +35,8 @@ public class TaskListManager {
     
     public TaskListManager(File file) {
         this.taskListFile = file;
-        if (MylarPlugin.getDefault() != null && MylarPlugin.getDefault().getPreferenceStore().contains(MylarTasksPlugin.TASK_ID)) { // TODO: fix to MylarTasksPlugin
-        	nextTaskId = MylarPlugin.getDefault().getPreferenceStore().getInt(MylarTasksPlugin.TASK_ID);
+        if (MylarPlugin.getDefault() != null && MylarPlugin.getDefault().getPreferenceStore().contains(MylarTasklistPlugin.TASK_ID)) { // TODO: fix to MylarTasklistPlugin
+        	nextTaskId = MylarPlugin.getDefault().getPreferenceStore().getInt(MylarTasklistPlugin.TASK_ID);
         } else {
         	nextTaskId = 1;
         }
@@ -52,10 +52,10 @@ public class TaskListManager {
     }
     
     public boolean readTaskList() {
-    	MylarTasksPlugin.getDefault().getTaskListExternalizer().initExtensions();
+    	MylarTasklistPlugin.getDefault().getTaskListExternalizer().initExtensions();
         try { 
         	if (taskListFile.exists()) {
-        		MylarTasksPlugin.getDefault().getTaskListExternalizer().readTaskList(taskList, taskListFile);
+        		MylarTasklistPlugin.getDefault().getTaskListExternalizer().readTaskList(taskList, taskListFile);
         		int maxHandle = taskList.findLargestTaskHandle();
         		if (maxHandle >= nextTaskId) {
         			nextTaskId = maxHandle + 1;
@@ -71,8 +71,8 @@ public class TaskListManager {
 
     public void saveTaskList() {
         try {   
-        	MylarTasksPlugin.getDefault().getTaskListExternalizer().writeTaskList(taskList, taskListFile);
-            MylarPlugin.getDefault().getPreferenceStore().setValue(MylarTasksPlugin.TASK_ID, nextTaskId);
+        	MylarTasklistPlugin.getDefault().getTaskListExternalizer().writeTaskList(taskList, taskListFile);
+            MylarPlugin.getDefault().getPreferenceStore().setValue(MylarTasklistPlugin.TASK_ID, nextTaskId);
         } catch (Exception e) {
             MylarPlugin.fail(e, "Could not save task list", true);
         }
@@ -112,7 +112,7 @@ public class TaskListManager {
     }
 
     public void activateTask(ITask task) {
-    	if (!MylarTasksPlugin.getDefault().isMultipleMode()) {
+    	if (!MylarTasklistPlugin.getDefault().isMultipleMode()) {
     		for (ITask t : taskList.getActiveTasks()) {
     			for (ITaskActivityListener listener : listeners) listener.taskDeactivated(t);    			
     		}
@@ -150,13 +150,13 @@ public class TaskListManager {
 						path = path.substring(3, path.length());
 					}
 					
-					String absPath = d.getPath() + "/" + path + MylarTasksPlugin.FILE_EXTENSION;
+					String absPath = d.getPath() + "/" + path + MylarTasklistPlugin.FILE_EXTENSION;
 					absPath = absPath.replaceAll("\\\\", "/");
 					String rel = RelativePathUtil.findRelativePath(MylarPlugin.getDefault().getUserDataDirectory() + "/", absPath);										
 					task.setPath(rel);
 					taskPropertyChanged(task, "Path");
 				} else {
-					String absPath = prevDir + "/" + task.getPath() + MylarTasksPlugin.FILE_EXTENSION;
+					String absPath = prevDir + "/" + task.getPath() + MylarTasklistPlugin.FILE_EXTENSION;
 					absPath = absPath.replaceAll("\\\\", "/");
 					String rel = RelativePathUtil.findRelativePath(MylarPlugin.getDefault().getUserDataDirectory(), absPath);
 					task.setPath(rel);
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/internal/DefaultTaskListExternalizer.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/DefaultTaskListExternalizer.java
index 3d2bbd27f..d44a2ff89 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/internal/DefaultTaskListExternalizer.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/DefaultTaskListExternalizer.java
@@ -9,17 +9,17 @@
  *     University Of British Columbia - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.mylar.tasks.internal;
+package org.eclipse.mylar.tasklist.internal;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import org.eclipse.mylar.core.MylarPlugin;
-import org.eclipse.mylar.tasks.AbstractCategory;
-import org.eclipse.mylar.tasks.ITask;
-import org.eclipse.mylar.tasks.ITaskListExternalizer;
-import org.eclipse.mylar.tasks.Task;
-import org.eclipse.mylar.tasks.ui.actions.TaskActivateAction;
+import org.eclipse.mylar.tasklist.AbstractCategory;
+import org.eclipse.mylar.tasklist.ITask;
+import org.eclipse.mylar.tasklist.ITaskListExternalizer;
+import org.eclipse.mylar.tasklist.Task;
+import org.eclipse.mylar.tasklist.ui.actions.TaskActivateAction;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/internal/MylarExternalizerException.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/MylarExternalizerException.java
index 427a7ce70..f7aeb5f9c 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/internal/MylarExternalizerException.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/MylarExternalizerException.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     University Of British Columbia - initial API and implementation
  *******************************************************************************/
-package org.eclipse.mylar.tasks.internal;
+package org.eclipse.mylar.tasklist.internal;
 
 /**
  * @author Mik Kersten and Ken Sueda
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/internal/RelativePathUtil.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/RelativePathUtil.java
index 50e320a79..4aedb2def 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/internal/RelativePathUtil.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/RelativePathUtil.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     University Of British Columbia - initial API and implementation
  *******************************************************************************/
-package org.eclipse.mylar.tasks.internal;
+package org.eclipse.mylar.tasklist.internal;
 
 public class RelativePathUtil {
 	public static String findRelativePath(String baseDirectory, String filePath) {
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/internal/TaskCategory.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/TaskCategory.java
index 7d57702e6..97d655ba5 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/internal/TaskCategory.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/TaskCategory.java
@@ -11,15 +11,15 @@
 /*
  * Created on Dec 26, 2004
   */
-package org.eclipse.mylar.tasks.internal;
+package org.eclipse.mylar.tasklist.internal;
 
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.eclipse.mylar.tasks.AbstractCategory;
-import org.eclipse.mylar.tasks.ITask;
-import org.eclipse.mylar.tasks.TaskListImages;
+import org.eclipse.mylar.tasklist.AbstractCategory;
+import org.eclipse.mylar.tasklist.ITask;
+import org.eclipse.mylar.tasklist.TaskListImages;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.Font;
 import org.eclipse.swt.graphics.Image;
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/internal/TaskCompleteFilter.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/TaskCompleteFilter.java
index 22caaa48d..bd53e2646 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/internal/TaskCompleteFilter.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/TaskCompleteFilter.java
@@ -8,11 +8,11 @@
  * Contributors:
  *     University Of British Columbia - initial API and implementation
  *******************************************************************************/
-package org.eclipse.mylar.tasks.internal;
+package org.eclipse.mylar.tasklist.internal;
 
-import org.eclipse.mylar.tasks.ITask;
-import org.eclipse.mylar.tasks.ITaskFilter;
-import org.eclipse.mylar.tasks.ITaskListElement;
+import org.eclipse.mylar.tasklist.ITask;
+import org.eclipse.mylar.tasklist.ITaskFilter;
+import org.eclipse.mylar.tasklist.ITaskListElement;
 
 /**
  * @author Ken Sueda
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/internal/TaskList.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/TaskList.java
index a2331b493..40cba3d2b 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/internal/TaskList.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/TaskList.java
@@ -11,15 +11,15 @@
 /*
  * Created on Dec 22, 2004
   */
-package org.eclipse.mylar.tasks.internal;
+package org.eclipse.mylar.tasklist.internal;
 
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.eclipse.mylar.tasks.AbstractCategory;
-import org.eclipse.mylar.tasks.ITask;
-import org.eclipse.mylar.tasks.ITaskListElement;
+import org.eclipse.mylar.tasklist.AbstractCategory;
+import org.eclipse.mylar.tasklist.ITask;
+import org.eclipse.mylar.tasklist.ITaskListElement;
 
  
 /**
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/internal/TaskListExtensionReader.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/TaskListExtensionReader.java
index 6876660a4..4aa9b9689 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/internal/TaskListExtensionReader.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/TaskListExtensionReader.java
@@ -1,4 +1,4 @@
-package org.eclipse.mylar.tasks.internal;
+package org.eclipse.mylar.tasklist.internal;
 
 import java.util.List;
 
@@ -9,11 +9,11 @@ import org.eclipse.core.runtime.IExtensionPoint;
 import org.eclipse.core.runtime.IExtensionRegistry;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.mylar.core.MylarPlugin;
-import org.eclipse.mylar.tasks.ITaskHandler;
-import org.eclipse.mylar.tasks.ITaskListDynamicSubMenuContributor;
-import org.eclipse.mylar.tasks.ITaskListExternalizer;
-import org.eclipse.mylar.tasks.ITaskListener;
-import org.eclipse.mylar.tasks.MylarTasksPlugin;
+import org.eclipse.mylar.tasklist.ITaskHandler;
+import org.eclipse.mylar.tasklist.ITaskListDynamicSubMenuContributor;
+import org.eclipse.mylar.tasklist.ITaskListExternalizer;
+import org.eclipse.mylar.tasklist.ITaskListener;
+import org.eclipse.mylar.tasklist.MylarTasklistPlugin;
 
 public class TaskListExtensionReader {
 	private static boolean extensionsRead = false;
@@ -24,16 +24,16 @@ public class TaskListExtensionReader {
 		// code from "contributing to eclipse" with modifications for deprecated code
 		if(!extensionsRead){
 			IExtensionRegistry registry = Platform.getExtensionRegistry();
-			IExtensionPoint extensionPoint = registry.getExtensionPoint(MylarTasksPlugin.TASK_CONTRIBUTER_EXTENSION_POINT_ID);
+			IExtensionPoint extensionPoint = registry.getExtensionPoint(MylarTasklistPlugin.TASK_CONTRIBUTER_EXTENSION_POINT_ID);
 			IExtension[] extensions = extensionPoint.getExtensions();
 			for(int i = 0; i < extensions.length; i++){
 				IConfigurationElement[] elements = extensions[i].getConfigurationElements();
 				for(int j = 0; j < elements.length; j++){
-					if(elements[j].getName().compareTo(MylarTasksPlugin.TASK_HANDLER_ELEMENT) == 0){
+					if(elements[j].getName().compareTo(MylarTasklistPlugin.TASK_HANDLER_ELEMENT) == 0){
 						readTaskHandler(elements[j], externalizers);
-					} else if(elements[j].getName().compareTo(MylarTasksPlugin.TASK_LISTENER_ELEMENT) == 0){
+					} else if(elements[j].getName().compareTo(MylarTasklistPlugin.TASK_LISTENER_ELEMENT) == 0){
 						readTaskListener(elements[j]);
-					} else if(elements[j].getName().compareTo(MylarTasksPlugin.DYNAMIC_POPUP_ELEMENT) == 0){
+					} else if(elements[j].getName().compareTo(MylarTasklistPlugin.DYNAMIC_POPUP_ELEMENT) == 0){
 						readDynamicPopupContributor(elements[j]);
 					}
 				}
@@ -45,9 +45,9 @@ public class TaskListExtensionReader {
 
 	private static void readTaskListener(IConfigurationElement element) {
 		try{
-			Object taskListener = element.createExecutableExtension(MylarTasksPlugin.TASK_LISTENER_CLASS_ID);
+			Object taskListener = element.createExecutableExtension(MylarTasklistPlugin.TASK_LISTENER_CLASS_ID);
 			if (taskListener instanceof ITaskListener) {
-				MylarTasksPlugin.getDefault().addTaskListListener((ITaskListener) taskListener);
+				MylarTasklistPlugin.getDefault().addTaskListListener((ITaskListener) taskListener);
 			} else {
 				MylarPlugin.log("Could not load tasklist listener: " + taskListener.getClass().getCanonicalName() + " must implement " + ITaskListener.class.getCanonicalName(), thisReader);	
 			}
@@ -58,9 +58,9 @@ public class TaskListExtensionReader {
 
 	private static void readDynamicPopupContributor(IConfigurationElement element) {
 		try{
-			Object dynamicPopupContributor = element.createExecutableExtension(MylarTasksPlugin.DYNAMIC_POPUP_CLASS_ID);
+			Object dynamicPopupContributor = element.createExecutableExtension(MylarTasklistPlugin.DYNAMIC_POPUP_CLASS_ID);
 			if (dynamicPopupContributor instanceof ITaskListDynamicSubMenuContributor) {
-				MylarTasksPlugin.getDefault().addDynamicPopupContributor((ITaskListDynamicSubMenuContributor) dynamicPopupContributor);
+				MylarTasklistPlugin.getDefault().addDynamicPopupContributor((ITaskListDynamicSubMenuContributor) dynamicPopupContributor);
 			} else {
 				MylarPlugin.log("Could not load dyanmic popup menu: " + dynamicPopupContributor.getClass().getCanonicalName() + " must implement " + ITaskListDynamicSubMenuContributor.class.getCanonicalName(), thisReader);	
 			}
@@ -71,16 +71,16 @@ public class TaskListExtensionReader {
 
 	private static void readTaskHandler(IConfigurationElement element, List<ITaskListExternalizer> externalizers) {
 		try{
-			Object externalizer = element.createExecutableExtension(MylarTasksPlugin.EXTERNALIZER_CLASS_ID);
+			Object externalizer = element.createExecutableExtension(MylarTasklistPlugin.EXTERNALIZER_CLASS_ID);
 			if (externalizer instanceof ITaskListExternalizer) {
 				externalizers.add((ITaskListExternalizer) externalizer);
 			} else {
 				MylarPlugin.log("Could not load externalizer: " + externalizer.getClass().getCanonicalName() + " must implement " + ITaskListExternalizer.class.getCanonicalName(), thisReader);	
 			}
 			
-			Object taskHandler = element.createExecutableExtension(MylarTasksPlugin.ACTION_CONTRIBUTER_CLASS_ID);
+			Object taskHandler = element.createExecutableExtension(MylarTasklistPlugin.ACTION_CONTRIBUTER_CLASS_ID);
 			if (taskHandler instanceof ITaskHandler) {
-				MylarTasksPlugin.getDefault().addTaskHandler((ITaskHandler) taskHandler);
+				MylarTasklistPlugin.getDefault().addTaskHandler((ITaskHandler) taskHandler);
 				
 			}else {
 				MylarPlugin.log("Could not load contributor: " + taskHandler.getClass().getCanonicalName() + " must implement " + ITaskHandler.class.getCanonicalName(), thisReader);	
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/internal/TaskListExternalizer.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/TaskListExternalizer.java
index 84b39d302..0d3606aa1 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/internal/TaskListExternalizer.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/TaskListExternalizer.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     University Of British Columbia - initial API and implementation
  *******************************************************************************/
-package org.eclipse.mylar.tasks.internal;
+package org.eclipse.mylar.tasklist.internal;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -33,11 +33,11 @@ import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 
 import org.eclipse.mylar.core.MylarPlugin;
-import org.eclipse.mylar.tasks.AbstractCategory;
-import org.eclipse.mylar.tasks.ITask;
-import org.eclipse.mylar.tasks.ITaskHandler;
-import org.eclipse.mylar.tasks.ITaskListExternalizer;
-import org.eclipse.mylar.tasks.MylarTasksPlugin;
+import org.eclipse.mylar.tasklist.AbstractCategory;
+import org.eclipse.mylar.tasklist.ITask;
+import org.eclipse.mylar.tasklist.ITaskHandler;
+import org.eclipse.mylar.tasklist.ITaskListExternalizer;
+import org.eclipse.mylar.tasklist.MylarTasklistPlugin;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
@@ -62,10 +62,10 @@ public class TaskListExternalizer {
 //	public void addExternalizer(ITaskListExternalizer externalizer) {
 //		externalizers.add(externalizer);
 //		defaultExternalizer.setExternalizers(externalizers);
-//		MylarTasksPlugin.getTaskListManager().getTaskList().clear();
-//		readTaskList(MylarTasksPlugin.getTaskListManager().getTaskList(), MylarTasksPlugin.getTaskListManager().getTaskListFile());
-//		if(MylarTasksPlugin.getDefault().getContributor() != null){
-//			MylarTasksPlugin.getDefault().getContributor().restoreState(TaskListView.getDefault());
+//		MylarTasklistPlugin.getTaskListManager().getTaskList().clear();
+//		readTaskList(MylarTasklistPlugin.getTaskListManager().getTaskList(), MylarTasklistPlugin.getTaskListManager().getTaskListFile());
+//		if(MylarTasklistPlugin.getDefault().getContributor() != null){
+//			MylarTasklistPlugin.getDefault().getContributor().restoreState(TaskListView.getDefault());
 //			if (TaskListView.getDefault() != null) {
 //				TaskListView.getDefault().getViewer().refresh();
 //			}
@@ -241,7 +241,7 @@ public class TaskListExternalizer {
 								if (externalizer.canReadTask(child)) {
 									// TODO add the tasks properly
 									ITask newTask = externalizer.readTask(child, tlist, null, null);
-									ITaskHandler taskHandler = MylarTasksPlugin.getDefault().getTaskHandlerForElement(newTask);
+									ITaskHandler taskHandler = MylarTasklistPlugin.getDefault().getTaskHandlerForElement(newTask);
 								    if(taskHandler != null){
 							    		newTask = taskHandler.taskAdded(newTask);
 							    	}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/internal/TaskPriorityFilter.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/TaskPriorityFilter.java
index dac1b9aba..f964e26c2 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/internal/TaskPriorityFilter.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/TaskPriorityFilter.java
@@ -8,12 +8,12 @@
  * Contributors:
  *     University Of British Columbia - initial API and implementation
  *******************************************************************************/
-package org.eclipse.mylar.tasks.internal;
+package org.eclipse.mylar.tasklist.internal;
 
-import org.eclipse.mylar.tasks.ITask;
-import org.eclipse.mylar.tasks.ITaskFilter;
-import org.eclipse.mylar.tasks.ITaskListElement;
-import org.eclipse.mylar.tasks.MylarTasksPlugin;
+import org.eclipse.mylar.tasklist.ITask;
+import org.eclipse.mylar.tasklist.ITaskFilter;
+import org.eclipse.mylar.tasklist.ITaskListElement;
+import org.eclipse.mylar.tasklist.MylarTasklistPlugin;
 
 /**
  * @author Ken Sueda
@@ -23,7 +23,7 @@ public class TaskPriorityFilter implements ITaskFilter {
 	private String priorityLevel = "P5";
 
 	public TaskPriorityFilter() {
-		displayPrioritiesAbove(MylarTasksPlugin.getPriorityLevel());
+		displayPrioritiesAbove(MylarTasklistPlugin.getPriorityLevel());
 	}
 	
 	public void displayPrioritiesAbove(String p) {
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TaskEditor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/TaskEditor.java
index 94324a656..d8fbd2e90 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TaskEditor.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/TaskEditor.java
@@ -11,11 +11,11 @@
 /*
  * Created on 19-Jan-2005
  */
-package org.eclipse.mylar.tasks.ui;
+package org.eclipse.mylar.tasklist.ui;
 
 import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.mylar.tasks.ITask;
-import org.eclipse.mylar.tasks.MylarTasksPlugin;
+import org.eclipse.mylar.tasklist.ITask;
+import org.eclipse.mylar.tasklist.MylarTasklistPlugin;
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.IEditorSite;
@@ -41,7 +41,7 @@ public class TaskEditor extends MultiPageEditorPart {
 		super();
 
 		// get the workbench page and add a listener so we can detect when it closes
-		IWorkbench wb = MylarTasksPlugin.getDefault().getWorkbench();
+		IWorkbench wb = MylarTasklistPlugin.getDefault().getWorkbench();
 		IWorkbenchWindow aw = wb.getActiveWorkbenchWindow();
 		IWorkbenchPage ap = aw.getActivePage();
 		TaskEditorListener listener = new TaskEditorListener();
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TaskEditorCopyAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/TaskEditorCopyAction.java
index 90af072f7..557b86529 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TaskEditorCopyAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/TaskEditorCopyAction.java
@@ -11,7 +11,7 @@
 /*
  * Created on 20-Jan-2005
  */
-package org.eclipse.mylar.tasks.ui;
+package org.eclipse.mylar.tasklist.ui;
 
 import org.eclipse.jface.action.Action;
 
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TaskEditorInput.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/TaskEditorInput.java
index 8c6e04b33..244cbdbc5 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TaskEditorInput.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/TaskEditorInput.java
@@ -11,10 +11,10 @@
 /*
  * Created on 19-Jan-2005
  */
-package org.eclipse.mylar.tasks.ui;
+package org.eclipse.mylar.tasklist.ui;
 
 import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.mylar.tasks.ITask;
+import org.eclipse.mylar.tasklist.ITask;
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IPersistableElement;
 
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TaskSummaryEditor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/TaskSummaryEditor.java
index cd307b92a..79344d44c 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TaskSummaryEditor.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/TaskSummaryEditor.java
@@ -14,7 +14,7 @@
  * TODO To change the template for this generated file go to
  * Window - Preferences - Java - Code Style - Code Templates
  */
-package org.eclipse.mylar.tasks.ui;
+package org.eclipse.mylar.tasklist.ui;
 
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -41,13 +41,13 @@ import org.eclipse.jface.viewers.TextCellEditor;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerSorter;
 import org.eclipse.mylar.core.MylarPlugin;
-import org.eclipse.mylar.tasks.ITask;
-import org.eclipse.mylar.tasks.ITaskActivityListener;
-import org.eclipse.mylar.tasks.MylarTasksPlugin;
-import org.eclipse.mylar.tasks.RelatedLinks;
-import org.eclipse.mylar.tasks.TaskListImages;
-import org.eclipse.mylar.tasks.internal.RelativePathUtil;
-import org.eclipse.mylar.tasks.ui.views.TaskListView;
+import org.eclipse.mylar.tasklist.ITask;
+import org.eclipse.mylar.tasklist.ITaskActivityListener;
+import org.eclipse.mylar.tasklist.MylarTasklistPlugin;
+import org.eclipse.mylar.tasklist.RelatedLinks;
+import org.eclipse.mylar.tasklist.TaskListImages;
+import org.eclipse.mylar.tasklist.internal.RelativePathUtil;
+import org.eclipse.mylar.tasklist.ui.views.TaskListView;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.SWTException;
 import org.eclipse.swt.events.ModifyEvent;
@@ -202,7 +202,7 @@ public class TaskSummaryEditor extends EditorPart {
 		copyAction.setAccelerator(SWT.CTRL | 'c');
 
 		copyAction.setEnabled(false);
-		MylarTasksPlugin.getTaskListManager().addListener(TASK_LIST_LISTENER);
+		MylarTasklistPlugin.getTaskListManager().addListener(TASK_LIST_LISTENER);
 	}
 	@Override
 	public void doSave(IProgressMonitor monitor) {
@@ -656,7 +656,7 @@ public class TaskSummaryEditor extends EditorPart {
 								| WorkbenchBrowserSupport.NAVIGATION_BAR;
 					}
 					b = WorkbenchBrowserSupport.getInstance().createBrowser(
-							flags, "org.eclipse.mylar.tasks", "Task", "tasktooltip");
+							flags, "org.eclipse.mylar.tasklist", "Task", "tasktooltip");
 					b.openURL(new URL((String) element));					
 				} catch (PartInitException e) {
 					MessageDialog.openError( Display.getDefault().getActiveShell(), 
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/actions/CreateCategoryAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/actions/CreateCategoryAction.java
index 323ac0468..df4049b0a 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/actions/CreateCategoryAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/actions/CreateCategoryAction.java
@@ -9,20 +9,20 @@
  *     University Of British Columbia - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.mylar.tasks.ui.actions;
+package org.eclipse.mylar.tasklist.ui.actions;
 
 import org.eclipse.jface.action.Action;
-import org.eclipse.mylar.tasks.TaskListImages;
-import org.eclipse.mylar.tasks.MylarTasksPlugin;
-import org.eclipse.mylar.tasks.internal.TaskCategory;
-import org.eclipse.mylar.tasks.ui.views.TaskListView;
+import org.eclipse.mylar.tasklist.MylarTasklistPlugin;
+import org.eclipse.mylar.tasklist.TaskListImages;
+import org.eclipse.mylar.tasklist.internal.TaskCategory;
+import org.eclipse.mylar.tasklist.ui.views.TaskListView;
 
 /**
  * @author Mik Kersten and Ken Sueda
  */
 public class CreateCategoryAction extends Action {        
 
-	public static final String ID = "org.eclipse.mylar.tasks.actions.create.category";
+	public static final String ID = "org.eclipse.mylar.tasklist.actions.create.category";
 		
 	private final TaskListView view;
 
@@ -42,7 +42,7 @@ public class CreateCategoryAction extends Action {
         String label = input[0];
         if(label == null) return;
         TaskCategory cat = new TaskCategory(label);
-        MylarTasksPlugin.getTaskListManager().addCategory(cat);
+        MylarTasklistPlugin.getTaskListManager().addCategory(cat);
         this.view.getViewer().refresh();
     }
 }
\ No newline at end of file
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/actions/CreateTaskAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/actions/CreateTaskAction.java
index 813dfaf5f..33694ecbc 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/actions/CreateTaskAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/actions/CreateTaskAction.java
@@ -9,22 +9,22 @@
  *     University Of British Columbia - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.mylar.tasks.ui.actions;
+package org.eclipse.mylar.tasklist.ui.actions;
 
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.mylar.tasks.TaskListImages;
-import org.eclipse.mylar.tasks.MylarTasksPlugin;
-import org.eclipse.mylar.tasks.Task;
-import org.eclipse.mylar.tasks.internal.TaskCategory;
-import org.eclipse.mylar.tasks.ui.views.TaskListView;
+import org.eclipse.mylar.tasklist.MylarTasklistPlugin;
+import org.eclipse.mylar.tasklist.Task;
+import org.eclipse.mylar.tasklist.TaskListImages;
+import org.eclipse.mylar.tasklist.internal.TaskCategory;
+import org.eclipse.mylar.tasklist.ui.views.TaskListView;
 
 /**
  * @author Mik Kersten and Ken Sueda
  */
 public class CreateTaskAction extends Action {
 
-	public static final String ID = "org.eclipse.mylar.tasks.actions.create.task";
+	public static final String ID = "org.eclipse.mylar.tasklist.actions.create.task";
 		
 	private final TaskListView view;
 
@@ -44,7 +44,7 @@ public class CreateTaskAction extends Action {
         String label = input[0];
         String priority = input[1];
         if(label == null) return;
-        Task newTask = new Task(MylarTasksPlugin.getTaskListManager().genUniqueTaskId(), label);
+        Task newTask = new Task(MylarTasklistPlugin.getTaskListManager().genUniqueTaskId(), label);
         if (priority != null) {
         	newTask.setPriority(priority);
         }        
@@ -59,7 +59,7 @@ public class CreateTaskAction extends Action {
 //            	t.addSubTask(newTask);
 //            }
         else {            	
-            MylarTasksPlugin.getTaskListManager().addRootTask(newTask);                
+            MylarTasklistPlugin.getTaskListManager().addRootTask(newTask);                
         }  
 //        MylarUiPlugin.getDefault().setHighlighterMapping(
 //                newTask.getHandle(), 
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/actions/DeleteAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/actions/DeleteAction.java
index 46fed4d76..e7ab19d8c 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/actions/DeleteAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/actions/DeleteAction.java
@@ -9,18 +9,18 @@
  *     University Of British Columbia - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.mylar.tasks.ui.actions;
+package org.eclipse.mylar.tasklist.ui.actions;
 
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.mylar.core.MylarPlugin;
-import org.eclipse.mylar.tasks.ITask;
-import org.eclipse.mylar.tasks.ITaskListElement;
-import org.eclipse.mylar.tasks.TaskListImages;
-import org.eclipse.mylar.tasks.MylarTasksPlugin;
-import org.eclipse.mylar.tasks.internal.TaskCategory;
-import org.eclipse.mylar.tasks.ui.views.TaskListView;
+import org.eclipse.mylar.tasklist.ITask;
+import org.eclipse.mylar.tasklist.ITaskListElement;
+import org.eclipse.mylar.tasklist.MylarTasklistPlugin;
+import org.eclipse.mylar.tasklist.TaskListImages;
+import org.eclipse.mylar.tasklist.internal.TaskCategory;
+import org.eclipse.mylar.tasklist.ui.views.TaskListView;
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.internal.Workbench;
 
@@ -29,7 +29,7 @@ import org.eclipse.ui.internal.Workbench;
  */
 public class DeleteAction extends Action {
 	
-	public static final String ID = "org.eclipse.mylar.tasks.actions.delete";
+	public static final String ID = "org.eclipse.mylar.tasklist.actions.delete";
 		
 	private final TaskListView view;
 
@@ -47,8 +47,8 @@ public class DeleteAction extends Action {
 		Object selectedObject = ((IStructuredSelection) this.view.getViewer()
 				.getSelection()).getFirstElement();
 		if(selectedObject instanceof ITaskListElement &&
-				MylarTasksPlugin.getDefault().getTaskHandlerForElement((ITaskListElement)selectedObject) != null){
-			MylarTasksPlugin.getDefault().getTaskHandlerForElement((ITaskListElement) selectedObject).itemDeleted((ITaskListElement)selectedObject);
+				MylarTasklistPlugin.getDefault().getTaskHandlerForElement((ITaskListElement)selectedObject) != null){
+			MylarTasklistPlugin.getDefault().getTaskHandlerForElement((ITaskListElement) selectedObject).itemDeleted((ITaskListElement)selectedObject);
 		}else if (selectedObject instanceof ITask) {
 			ITask task = (ITask) selectedObject;
 			if (task.isActive()) {
@@ -65,9 +65,9 @@ public class DeleteAction extends Action {
 			if (!deleteConfirmed) 
 				return;
 									
-			MylarTasksPlugin.getTaskListManager().deleteTask(task);
+			MylarTasklistPlugin.getTaskListManager().deleteTask(task);
 			MylarPlugin.getContextManager().taskDeleted(task.getHandle(), task.getPath());
-			IWorkbenchPage page = MylarTasksPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage();
+			IWorkbenchPage page = MylarTasklistPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage();
 
 			// if we couldn't get the page, get out of here
 			if (page == null)
@@ -88,7 +88,7 @@ public class DeleteAction extends Action {
 			TaskCategory cat = (TaskCategory) selectedObject;
 			for (ITask task : cat.getChildren()) {
 				MylarPlugin.getContextManager().taskDeleted(task.getHandle(), task.getPath());
-				IWorkbenchPage page = MylarTasksPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage();
+				IWorkbenchPage page = MylarTasklistPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage();
 				if (page != null) {
 					try {
 						this.view.closeTaskEditors(task, page);
@@ -97,7 +97,7 @@ public class DeleteAction extends Action {
 					}
 				}
 			}
-			MylarTasksPlugin.getTaskListManager().deleteCategory(cat);
+			MylarTasklistPlugin.getTaskListManager().deleteCategory(cat);
 		} else {
 			MessageDialog.openError(Workbench.getInstance()
 					.getActiveWorkbenchWindow().getShell(), "Delete failed",
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/actions/FilterCompletedTasksAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/actions/FilterCompletedTasksAction.java
index e8fceca82..7db7ee88b 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/actions/FilterCompletedTasksAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/actions/FilterCompletedTasksAction.java
@@ -9,19 +9,19 @@
  *     University Of British Columbia - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.mylar.tasks.ui.actions;
+package org.eclipse.mylar.tasklist.ui.actions;
 
 import org.eclipse.jface.action.Action;
-import org.eclipse.mylar.tasks.TaskListImages;
-import org.eclipse.mylar.tasks.MylarTasksPlugin;
-import org.eclipse.mylar.tasks.ui.views.TaskListView;
+import org.eclipse.mylar.tasklist.MylarTasklistPlugin;
+import org.eclipse.mylar.tasklist.TaskListImages;
+import org.eclipse.mylar.tasklist.ui.views.TaskListView;
 
 /**
  * @author Mik Kersten and Ken Sueda
  */
 public class FilterCompletedTasksAction extends Action {
 
-	public static final String ID = "org.eclipse.mylar.tasks.actions.filter.completed";
+	public static final String ID = "org.eclipse.mylar.tasklist.actions.filter.completed";
 		
 	private final TaskListView view;
 	
@@ -31,12 +31,12 @@ public class FilterCompletedTasksAction extends Action {
         setToolTipText("Filter Completed Tasks");
         setId(ID);
         setImageDescriptor(TaskListImages.FILTER_COMPLETE);
-        setChecked(MylarTasksPlugin.getDefault().isFilterCompleteMode());
+        setChecked(MylarTasklistPlugin.getDefault().isFilterCompleteMode());
 	}
 	@Override
 	public void run() {
 //        MylarPlugin.getDefault().actionObserved(this);
-		MylarTasksPlugin.getDefault().setFilterCompleteMode(isChecked());
+		MylarTasklistPlugin.getDefault().setFilterCompleteMode(isChecked());
 		if (isChecked()) {
 			view.addFilter(this.view.getCompleteFilter());
 //				filterInCompleteTask.setChecked(false);
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/actions/MarkTaskCompleteAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/actions/MarkTaskCompleteAction.java
index a05fd9574..d501cb458 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/actions/MarkTaskCompleteAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/actions/MarkTaskCompleteAction.java
@@ -9,22 +9,22 @@
  *     University Of British Columbia - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.mylar.tasks.ui.actions;
+package org.eclipse.mylar.tasklist.ui.actions;
 
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.mylar.tasks.ITask;
-import org.eclipse.mylar.tasks.MylarTasksPlugin;
-import org.eclipse.mylar.tasks.Task;
-import org.eclipse.mylar.tasks.TaskListImages;
-import org.eclipse.mylar.tasks.ui.views.TaskListView;
+import org.eclipse.mylar.tasklist.ITask;
+import org.eclipse.mylar.tasklist.MylarTasklistPlugin;
+import org.eclipse.mylar.tasklist.Task;
+import org.eclipse.mylar.tasklist.TaskListImages;
+import org.eclipse.mylar.tasklist.ui.views.TaskListView;
 
 /**
  * @author Mik Kersten and Ken Sueda
  */
 public class MarkTaskCompleteAction extends Action {
 
-	public static final String ID = "org.eclipse.mylar.tasks.actions.mark.completed";
+	public static final String ID = "org.eclipse.mylar.tasklist.actions.mark.completed";
 		
 	private final TaskListView view;
 	
@@ -40,8 +40,8 @@ public class MarkTaskCompleteAction extends Action {
 //        MylarPlugin.getDefault().actionObserved(this);
 	    Object selectedObject = ((IStructuredSelection)this.view.getViewer().getSelection()).getFirstElement();
 	    if(selectedObject instanceof ITask &&
-	    		MylarTasksPlugin.getDefault().getTaskHandlerForElement((ITask)selectedObject) != null) {
-	    	 MylarTasksPlugin.getDefault().getTaskHandlerForElement((ITask)selectedObject).taskCompleted((ITask)selectedObject);
+	    		MylarTasklistPlugin.getDefault().getTaskHandlerForElement((ITask)selectedObject) != null) {
+	    	 MylarTasklistPlugin.getDefault().getTaskHandlerForElement((ITask)selectedObject).taskCompleted((ITask)selectedObject);
 	 	}else if (selectedObject instanceof Task){ 
 	    	((Task)selectedObject).setCompleted(true);
 	    	
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/actions/MarkTaskIncompleteAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/actions/MarkTaskIncompleteAction.java
index 759e27cd6..a8c6ad835 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/actions/MarkTaskIncompleteAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/actions/MarkTaskIncompleteAction.java
@@ -9,20 +9,20 @@
  *     University Of British Columbia - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.mylar.tasks.ui.actions;
+package org.eclipse.mylar.tasklist.ui.actions;
 
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.mylar.tasks.TaskListImages;
-import org.eclipse.mylar.tasks.Task;
-import org.eclipse.mylar.tasks.ui.views.TaskListView;
+import org.eclipse.mylar.tasklist.Task;
+import org.eclipse.mylar.tasklist.TaskListImages;
+import org.eclipse.mylar.tasklist.ui.views.TaskListView;
 
 /**
  * @author Mik Kersten and Ken Sueda
  */
 public class MarkTaskIncompleteAction extends Action {
 
-	public static final String ID = "org.eclipse.mylar.tasks.actions.mark.incomplete";
+	public static final String ID = "org.eclipse.mylar.tasklist.actions.mark.incomplete";
 		
 	private final TaskListView view;
 	
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/actions/MoveTaskToRootAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/actions/MoveTaskToRootAction.java
index 23fbc5f2b..d8bc0252c 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/actions/MoveTaskToRootAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/actions/MoveTaskToRootAction.java
@@ -9,17 +9,17 @@
  *     University Of British Columbia - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.mylar.tasks.ui.actions;
+package org.eclipse.mylar.tasklist.ui.actions;
 
 import org.eclipse.jface.action.Action;
-import org.eclipse.mylar.tasks.ui.views.TaskListView;
+import org.eclipse.mylar.tasklist.ui.views.TaskListView;
 
 /**
  * @author Mik Kersten and Ken Sueda
  */
 public class MoveTaskToRootAction extends Action {
 
-	public static final String ID = "org.eclipse.mylar.tasks.actions.move.toroot";
+	public static final String ID = "org.eclipse.mylar.tasklist.actions.move.toroot";
 		
 //	private final TaskListView view;
 	public MoveTaskToRootAction(TaskListView view) {
@@ -40,12 +40,12 @@ public class MoveTaskToRootAction extends Action {
 //	    		cat.removeTask(t);
 //	    		t.setCategory(null);
 //	    		t.setParent(null);
-//	    		MylarTasksPlugin.getTaskListManager().getTaskList().addRootTask(t);
+//	    		MylarTasklistPlugin.getTaskListManager().getTaskList().addRootTask(t);
 //	    		this.view.getViewer().refresh();
 //	    	} else if (t.getParent() != null) {
 //	    		t.getParent().removeSubTask(t);
 //	    		t.setParent(null);
-//	    		MylarTasksPlugin.getTaskListManager().getTaskList().addRootTask(t);
+//	    		MylarTasklistPlugin.getTaskListManager().getTaskList().addRootTask(t);
 //	    		this.view.getViewer().refresh();
 //	    	}
 //	    }		    
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/actions/OpenTaskEditorAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/actions/OpenTaskEditorAction.java
index b4bae089c..8f34d58b3 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/actions/OpenTaskEditorAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/actions/OpenTaskEditorAction.java
@@ -9,23 +9,23 @@
  *     University Of British Columbia - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.mylar.tasks.ui.actions;
+package org.eclipse.mylar.tasklist.ui.actions;
 
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.mylar.tasks.ITaskHandler;
-import org.eclipse.mylar.tasks.ITaskListElement;
-import org.eclipse.mylar.tasks.MylarTasksPlugin;
-import org.eclipse.mylar.tasks.Task;
-import org.eclipse.mylar.tasks.ui.views.TaskListView;
+import org.eclipse.mylar.tasklist.ITaskHandler;
+import org.eclipse.mylar.tasklist.ITaskListElement;
+import org.eclipse.mylar.tasklist.MylarTasklistPlugin;
+import org.eclipse.mylar.tasklist.Task;
+import org.eclipse.mylar.tasklist.ui.views.TaskListView;
 
 /**
  * @author Mik Kersten and Ken Sueda
  */
 public class OpenTaskEditorAction extends Action {
 
-	public static final String ID = "org.eclipse.mylar.tasks.actions.open";
+	public static final String ID = "org.eclipse.mylar.tasklist.actions.open";
 	
 	private final TaskListView view;
 
@@ -43,7 +43,7 @@ public class OpenTaskEditorAction extends Action {
 	    Object obj = ((IStructuredSelection)selection).getFirstElement();
 	    if (obj instanceof ITaskListElement) {
 	    	ITaskListElement element = (ITaskListElement)obj;
-	    	ITaskHandler taskHandler = MylarTasksPlugin.getDefault().getTaskHandlerForElement(element);
+	    	ITaskHandler taskHandler = MylarTasklistPlugin.getDefault().getTaskHandlerForElement(element);
 		    if(taskHandler != null){
 	    		taskHandler.itemOpened(element);
 	    	} else{
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/actions/TaskActivateAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/actions/TaskActivateAction.java
index b6a7e82bf..e7833a4a5 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/actions/TaskActivateAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/actions/TaskActivateAction.java
@@ -9,18 +9,18 @@
  *     University Of British Columbia - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.mylar.tasks.ui.actions;
+package org.eclipse.mylar.tasklist.ui.actions;
 
 import org.eclipse.jface.action.Action;
-import org.eclipse.mylar.tasks.ITask;
-import org.eclipse.mylar.tasks.MylarTasksPlugin;
+import org.eclipse.mylar.tasklist.ITask;
+import org.eclipse.mylar.tasklist.MylarTasklistPlugin;
 
 /**
  * @author Mik Kersten and Ken Sueda
  */
 public class TaskActivateAction extends Action {
 	
-	public static final String ID = "org.eclipse.mylar.tasks.actions.context.activate";
+	public static final String ID = "org.eclipse.mylar.tasklist.actions.context.activate";
 		
 	private ITask task;
 	
@@ -30,6 +30,6 @@ public class TaskActivateAction extends Action {
 	}
 	
 	public void run() {		
-		MylarTasksPlugin.getTaskListManager().activateTask(task);
+		MylarTasklistPlugin.getTaskListManager().activateTask(task);
 	}
 }
\ No newline at end of file
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/actions/TaskDeactivateAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/actions/TaskDeactivateAction.java
index 5ec2fa4f5..bea2b6bf9 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/actions/TaskDeactivateAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/actions/TaskDeactivateAction.java
@@ -9,13 +9,13 @@
  *     University Of British Columbia - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.mylar.tasks.ui.actions;
+package org.eclipse.mylar.tasklist.ui.actions;
 
 import org.eclipse.jface.action.Action;
 import org.eclipse.mylar.core.MylarPlugin;
-import org.eclipse.mylar.tasks.ITask;
-import org.eclipse.mylar.tasks.MylarTasksPlugin;
-import org.eclipse.mylar.tasks.ui.views.TaskListView;
+import org.eclipse.mylar.tasklist.ITask;
+import org.eclipse.mylar.tasklist.MylarTasklistPlugin;
+import org.eclipse.mylar.tasklist.ui.views.TaskListView;
 import org.eclipse.ui.IWorkbenchPage;
 
 /**
@@ -23,7 +23,7 @@ import org.eclipse.ui.IWorkbenchPage;
  */
 public class TaskDeactivateAction extends Action {
 	
-	public static final String ID = "org.eclipse.mylar.tasks.actions.context.deactivate";
+	public static final String ID = "org.eclipse.mylar.tasklist.actions.context.deactivate";
 	
 	private ITask task;
 	private final TaskListView view;
@@ -36,8 +36,8 @@ public class TaskDeactivateAction extends Action {
 	
 	public void run() {
 //        MylarPlugin.getDefault().actionObserved(this);
-        MylarTasksPlugin.getTaskListManager().deactivateTask(task);
-        IWorkbenchPage page = MylarTasksPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage();
+        MylarTasklistPlugin.getTaskListManager().deactivateTask(task);
+        IWorkbenchPage page = MylarTasklistPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage();
 
 		// if we couldn't get the page, get out of here
 		if (page == null)
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/preferences/MylarTaskPreferencePage.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/preferences/MylarTaskPreferencePage.java
index 3a0566b2b..c07f1cdbc 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/preferences/MylarTaskPreferencePage.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/preferences/MylarTaskPreferencePage.java
@@ -8,11 +8,11 @@
  * Contributors:
  *     University Of British Columbia - initial API and implementation
  *******************************************************************************/
-package org.eclipse.mylar.tasks.ui.preferences;
+package org.eclipse.mylar.tasklist.ui.preferences;
 
 import org.eclipse.jface.preference.PreferencePage;
 import org.eclipse.mylar.core.MylarPlugin;
-import org.eclipse.mylar.tasks.MylarTasksPlugin;
+import org.eclipse.mylar.tasklist.MylarTasklistPlugin;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
@@ -38,7 +38,7 @@ public class MylarTaskPreferencePage extends PreferencePage implements
 	
 	public MylarTaskPreferencePage() {
 		super();
-		setPreferenceStore(MylarTasksPlugin.getPrefs());	
+		setPreferenceStore(MylarTasklistPlugin.getPrefs());	
 	}
 	@Override
 	protected Control createContents(Composite parent) {
@@ -67,7 +67,7 @@ public class MylarTaskPreferencePage extends PreferencePage implements
 		
 		multipleActive = new Button(container, SWT.CHECK);
 		multipleActive.setText("Enable multiple task contexts to be active");
-		multipleActive.setSelection(getPreferenceStore().getBoolean(MylarTasksPlugin.MULTIPLE_ACTIVE_TASKS));
+		multipleActive.setSelection(getPreferenceStore().getBoolean(MylarTasklistPlugin.MULTIPLE_ACTIVE_TASKS));
 	}
 	
 	private void createBugzillaReportOption(Composite parent) {
@@ -76,41 +76,41 @@ public class MylarTaskPreferencePage extends PreferencePage implements
 		container.setText("Open Bugzilla reports with");
 		reportEditor = new Button(container, SWT.RADIO);
 		reportEditor.setText("Bug editor");
-		reportEditor.setSelection(getPreferenceStore().getBoolean(MylarTasksPlugin.REPORT_OPEN_EDITOR));
+		reportEditor.setSelection(getPreferenceStore().getBoolean(MylarTasklistPlugin.REPORT_OPEN_EDITOR));
 		reportInternal = new Button(container, SWT.RADIO);
 		reportInternal.setText("Internal browser");
-		reportInternal.setSelection(getPreferenceStore().getBoolean(MylarTasksPlugin.REPORT_OPEN_INTERNAL));
+		reportInternal.setSelection(getPreferenceStore().getBoolean(MylarTasklistPlugin.REPORT_OPEN_INTERNAL));
 		reportExternal = new Button(container, SWT.RADIO);
 		reportExternal.setText("External browser");
-		reportExternal.setSelection(getPreferenceStore().getBoolean(MylarTasksPlugin.REPORT_OPEN_EXTERNAL));
+		reportExternal.setSelection(getPreferenceStore().getBoolean(MylarTasklistPlugin.REPORT_OPEN_EXTERNAL));
 		reportExternal.setEnabled(false);
 	}
 	
 	@Override
 	public boolean performOk() {
 		getPreferenceStore().setValue(MylarPlugin.CLOSE_EDITORS, closeEditors.getSelection());		
-		getPreferenceStore().setValue(MylarTasksPlugin.REPORT_OPEN_EDITOR, reportEditor.getSelection());
-		getPreferenceStore().setValue(MylarTasksPlugin.REPORT_OPEN_INTERNAL, reportInternal.getSelection());
-		getPreferenceStore().setValue(MylarTasksPlugin.REPORT_OPEN_EXTERNAL, reportExternal.getSelection());
-		getPreferenceStore().setValue(MylarTasksPlugin.MULTIPLE_ACTIVE_TASKS, multipleActive.getSelection());
+		getPreferenceStore().setValue(MylarTasklistPlugin.REPORT_OPEN_EDITOR, reportEditor.getSelection());
+		getPreferenceStore().setValue(MylarTasklistPlugin.REPORT_OPEN_INTERNAL, reportInternal.getSelection());
+		getPreferenceStore().setValue(MylarTasklistPlugin.REPORT_OPEN_EXTERNAL, reportExternal.getSelection());
+		getPreferenceStore().setValue(MylarTasklistPlugin.MULTIPLE_ACTIVE_TASKS, multipleActive.getSelection());
 		return true;
 	}
 	@Override
 	public boolean performCancel() {
 		closeEditors.setSelection(getPreferenceStore().getBoolean(MylarPlugin.CLOSE_EDITORS));		
-		reportEditor.setSelection(getPreferenceStore().getBoolean(MylarTasksPlugin.REPORT_OPEN_EDITOR));
-		reportInternal.setSelection(getPreferenceStore().getBoolean(MylarTasksPlugin.REPORT_OPEN_INTERNAL));
-		reportExternal.setSelection(getPreferenceStore().getBoolean(MylarTasksPlugin.REPORT_OPEN_EXTERNAL));
-		multipleActive.setSelection(getPreferenceStore().getBoolean(MylarTasksPlugin.MULTIPLE_ACTIVE_TASKS));
+		reportEditor.setSelection(getPreferenceStore().getBoolean(MylarTasklistPlugin.REPORT_OPEN_EDITOR));
+		reportInternal.setSelection(getPreferenceStore().getBoolean(MylarTasklistPlugin.REPORT_OPEN_INTERNAL));
+		reportExternal.setSelection(getPreferenceStore().getBoolean(MylarTasklistPlugin.REPORT_OPEN_EXTERNAL));
+		multipleActive.setSelection(getPreferenceStore().getBoolean(MylarTasklistPlugin.MULTIPLE_ACTIVE_TASKS));
 		return true;
 	}
 	
 	public void performDefaults() {
 		super.performDefaults();
 		closeEditors.setSelection(getPreferenceStore().getDefaultBoolean(MylarPlugin.CLOSE_EDITORS));		
-		reportEditor.setSelection(getPreferenceStore().getDefaultBoolean(MylarTasksPlugin.REPORT_OPEN_EDITOR));
-		reportInternal.setSelection(getPreferenceStore().getDefaultBoolean(MylarTasksPlugin.REPORT_OPEN_INTERNAL));
-		reportExternal.setSelection(getPreferenceStore().getDefaultBoolean(MylarTasksPlugin.REPORT_OPEN_EXTERNAL));
-		multipleActive.setSelection(getPreferenceStore().getDefaultBoolean(MylarTasksPlugin.MULTIPLE_ACTIVE_TASKS));
+		reportEditor.setSelection(getPreferenceStore().getDefaultBoolean(MylarTasklistPlugin.REPORT_OPEN_EDITOR));
+		reportInternal.setSelection(getPreferenceStore().getDefaultBoolean(MylarTasklistPlugin.REPORT_OPEN_INTERNAL));
+		reportExternal.setSelection(getPreferenceStore().getDefaultBoolean(MylarTasklistPlugin.REPORT_OPEN_EXTERNAL));
+		multipleActive.setSelection(getPreferenceStore().getDefaultBoolean(MylarTasklistPlugin.MULTIPLE_ACTIVE_TASKS));
 	}
 }
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/views/TaskListLabelProvider.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/views/TaskListLabelProvider.java
index 56d3d94eb..25d0df6c8 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/views/TaskListLabelProvider.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/views/TaskListLabelProvider.java
@@ -11,15 +11,15 @@
 /*
  * Created on Feb 18, 2005
   */
-package org.eclipse.mylar.tasks.ui.views;
+package org.eclipse.mylar.tasklist.ui.views;
 
 import org.eclipse.jface.viewers.IColorProvider;
 import org.eclipse.jface.viewers.IFontProvider;
 import org.eclipse.jface.viewers.ITableLabelProvider;
 import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.mylar.tasks.AbstractCategory;
-import org.eclipse.mylar.tasks.ITask;
-import org.eclipse.mylar.tasks.ITaskListElement;
+import org.eclipse.mylar.tasklist.AbstractCategory;
+import org.eclipse.mylar.tasklist.ITask;
+import org.eclipse.mylar.tasklist.ITaskListElement;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.Font;
 import org.eclipse.swt.graphics.Image;
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/views/TaskListView.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/views/TaskListView.java
index dd790e9df..e824aa09f 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/views/TaskListView.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/views/TaskListView.java
@@ -9,7 +9,7 @@
  *     University Of British Columbia - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.mylar.tasks.ui.views;
+package org.eclipse.mylar.tasklist.ui.views;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -48,28 +48,28 @@ import org.eclipse.jface.viewers.ViewerSorter;
 import org.eclipse.jface.window.Window;
 import org.eclipse.mylar.core.MylarPlugin;
 import org.eclipse.mylar.dt.MylarWebRef;
-import org.eclipse.mylar.tasks.AbstractCategory;
-import org.eclipse.mylar.tasks.ITask;
-import org.eclipse.mylar.tasks.ITaskFilter;
-import org.eclipse.mylar.tasks.ITaskHandler;
-import org.eclipse.mylar.tasks.ITaskListDynamicSubMenuContributor;
-import org.eclipse.mylar.tasks.ITaskListElement;
-import org.eclipse.mylar.tasks.MylarTasksPlugin;
-import org.eclipse.mylar.tasks.Task;
-import org.eclipse.mylar.tasks.TaskListImages;
-import org.eclipse.mylar.tasks.internal.TaskCategory;
-import org.eclipse.mylar.tasks.internal.TaskCompleteFilter;
-import org.eclipse.mylar.tasks.internal.TaskPriorityFilter;
-import org.eclipse.mylar.tasks.ui.TaskEditorInput;
-import org.eclipse.mylar.tasks.ui.actions.CreateCategoryAction;
-import org.eclipse.mylar.tasks.ui.actions.CreateTaskAction;
-import org.eclipse.mylar.tasks.ui.actions.DeleteAction;
-import org.eclipse.mylar.tasks.ui.actions.FilterCompletedTasksAction;
-import org.eclipse.mylar.tasks.ui.actions.MarkTaskCompleteAction;
-import org.eclipse.mylar.tasks.ui.actions.MarkTaskIncompleteAction;
-import org.eclipse.mylar.tasks.ui.actions.OpenTaskEditorAction;
-import org.eclipse.mylar.tasks.ui.actions.TaskActivateAction;
-import org.eclipse.mylar.tasks.ui.actions.TaskDeactivateAction;
+import org.eclipse.mylar.tasklist.AbstractCategory;
+import org.eclipse.mylar.tasklist.ITask;
+import org.eclipse.mylar.tasklist.ITaskFilter;
+import org.eclipse.mylar.tasklist.ITaskHandler;
+import org.eclipse.mylar.tasklist.ITaskListDynamicSubMenuContributor;
+import org.eclipse.mylar.tasklist.ITaskListElement;
+import org.eclipse.mylar.tasklist.MylarTasklistPlugin;
+import org.eclipse.mylar.tasklist.Task;
+import org.eclipse.mylar.tasklist.TaskListImages;
+import org.eclipse.mylar.tasklist.internal.TaskCategory;
+import org.eclipse.mylar.tasklist.internal.TaskCompleteFilter;
+import org.eclipse.mylar.tasklist.internal.TaskPriorityFilter;
+import org.eclipse.mylar.tasklist.ui.TaskEditorInput;
+import org.eclipse.mylar.tasklist.ui.actions.CreateCategoryAction;
+import org.eclipse.mylar.tasklist.ui.actions.CreateTaskAction;
+import org.eclipse.mylar.tasklist.ui.actions.DeleteAction;
+import org.eclipse.mylar.tasklist.ui.actions.FilterCompletedTasksAction;
+import org.eclipse.mylar.tasklist.ui.actions.MarkTaskCompleteAction;
+import org.eclipse.mylar.tasklist.ui.actions.MarkTaskIncompleteAction;
+import org.eclipse.mylar.tasklist.ui.actions.OpenTaskEditorAction;
+import org.eclipse.mylar.tasklist.ui.actions.TaskActivateAction;
+import org.eclipse.mylar.tasklist.ui.actions.TaskDeactivateAction;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.dnd.DND;
 import org.eclipse.swt.dnd.DragSourceEvent;
@@ -139,8 +139,8 @@ public class TaskListView extends ViewPart {
     protected int[] columnWidths = new int[] { 70, 20, 20, 120 };
     private TreeColumn[] columns;
     private IMemento taskListMemento;
-    public static final String columnWidthIdentifier = "org.eclipse.mylar.tasks.ui.views.tasklist.columnwidth";
-    public static final String tableSortIdentifier = "org.eclipse.mylar.tasks.ui.views.tasklist.sortIndex";
+    public static final String columnWidthIdentifier = "org.eclipse.mylar.tasklist.ui.views.tasklist.columnwidth";
+    public static final String tableSortIdentifier = "org.eclipse.mylar.tasklist.ui.views.tasklist.sortIndex";
     private int sortIndex = 2;
     
     private static String[] PRIORITY_LEVELS = { "P1", "P2", "P3", "P4", "P5" };    
@@ -185,7 +185,7 @@ public class TaskListView extends ViewPart {
 			Action P1 = new Action(PRIORITY_LEVELS[0], AS_CHECK_BOX) {	    		
 	    		@Override
 				public void run() {
-	    			MylarTasksPlugin.setPriorityLevel(MylarTasksPlugin.PriorityLevel.P1);
+	    			MylarTasklistPlugin.setPriorityLevel(MylarTasklistPlugin.PriorityLevel.P1);
 	    			PRIORITY_FILTER.displayPrioritiesAbove(PRIORITY_LEVELS[0]);	    			
 	    			viewer.refresh();
 				}
@@ -198,7 +198,7 @@ public class TaskListView extends ViewPart {
 			Action P2 = new Action(PRIORITY_LEVELS[1], AS_CHECK_BOX) {	    		
 	    		@Override
 				public void run() {
-	    			MylarTasksPlugin.setPriorityLevel(MylarTasksPlugin.PriorityLevel.P2);
+	    			MylarTasklistPlugin.setPriorityLevel(MylarTasklistPlugin.PriorityLevel.P2);
 	    			PRIORITY_FILTER.displayPrioritiesAbove(PRIORITY_LEVELS[1]);	    			
 	    			viewer.refresh();
 				}
@@ -211,7 +211,7 @@ public class TaskListView extends ViewPart {
 			Action P3 = new Action(PRIORITY_LEVELS[2], AS_CHECK_BOX) {	    		
 	    		@Override
 				public void run() { 
-	    			MylarTasksPlugin.setPriorityLevel(MylarTasksPlugin.PriorityLevel.P3);
+	    			MylarTasklistPlugin.setPriorityLevel(MylarTasklistPlugin.PriorityLevel.P3);
 	    			PRIORITY_FILTER.displayPrioritiesAbove(PRIORITY_LEVELS[2]);	    			
 	    			viewer.refresh();
 				}
@@ -224,7 +224,7 @@ public class TaskListView extends ViewPart {
 			Action P4 = new Action(PRIORITY_LEVELS[3], AS_CHECK_BOX) {	    		
 	    		@Override
 				public void run() {
-	    			MylarTasksPlugin.setPriorityLevel(MylarTasksPlugin.PriorityLevel.P4);
+	    			MylarTasklistPlugin.setPriorityLevel(MylarTasklistPlugin.PriorityLevel.P4);
 	    			PRIORITY_FILTER.displayPrioritiesAbove(PRIORITY_LEVELS[3]);	    			
 	    			viewer.refresh();
 				}
@@ -237,7 +237,7 @@ public class TaskListView extends ViewPart {
 			Action P5 = new Action(PRIORITY_LEVELS[4], AS_CHECK_BOX) {	    		
 	    		@Override
 				public void run() { 
-	    			MylarTasksPlugin.setPriorityLevel(MylarTasksPlugin.PriorityLevel.P5);
+	    			MylarTasklistPlugin.setPriorityLevel(MylarTasklistPlugin.PriorityLevel.P5);
 	    			PRIORITY_FILTER.displayPrioritiesAbove(PRIORITY_LEVELS[4]);	    			
 	    			viewer.refresh();
 	    		}
@@ -247,7 +247,7 @@ public class TaskListView extends ViewPart {
 			item= new ActionContributionItem(P5);
 			item.fill(dropDownMenu, -1);
 			
-			String priority = MylarTasksPlugin.getPriorityLevel();
+			String priority = MylarTasklistPlugin.getPriorityLevel();
 			if (priority.equals(PRIORITY_LEVELS[0])) {
 				P1.setChecked(true);
 			} else if (priority.equals(PRIORITY_LEVELS[1])) {
@@ -312,7 +312,7 @@ public class TaskListView extends ViewPart {
 //    	private List<String> priorities = new ArrayList<String>();
 //    	
 //    	public PriorityFilter() {    		
-//    		displayPrioritiesAbove(MylarTasksPlugin.getPriorityLevel());
+//    		displayPrioritiesAbove(MylarTasklistPlugin.getPriorityLevel());
 //    	}
 //    	
 //    	public void displayPrioritiesAbove(String p) {
@@ -376,8 +376,8 @@ public class TaskListView extends ViewPart {
         }
         public Object[] getElements(Object parent) {
             if (parent.equals(getViewSite())) {
-            	return applyFilter(MylarTasksPlugin.getTaskListManager().getTaskList().getRoots()).toArray();
-//            	return MylarTasksPlugin.getTaskListManager().getTaskList().getRoots().toArray();            	          
+            	return applyFilter(MylarTasklistPlugin.getTaskListManager().getTaskList().getRoots()).toArray();
+//            	return MylarTasklistPlugin.getTaskListManager().getTaskList().getRoots().toArray();            	          
             }
             return getChildren(parent);
         }
@@ -595,7 +595,7 @@ public class TaskListView extends ViewPart {
 					case 3: 
 						if (task.isDirectlyModifiable()) {
 							task.setLabel(((String) value).trim());
-							MylarTasksPlugin.getTaskListManager()
+							MylarTasklistPlugin.getTaskListManager()
 									.taskPropertyChanged(task, columnNames[3]);
 							viewer.setSelection(null);
 						}
@@ -715,9 +715,9 @@ public class TaskListView extends ViewPart {
 			viewer.setSorter(new TaskListTableSorter(columnNames[sortIndex]));
 		}
         addFilter(PRIORITY_FILTER);
-//        if (MylarTasksPlugin.getDefault().isFilterInCompleteMode()) 
-//        	MylarTasksPlugin.getTaskListManager().getTaskList().addFilter(inCompleteFilter);
-        if (MylarTasksPlugin.getDefault().isFilterCompleteMode()) 
+//        if (MylarTasklistPlugin.getDefault().isFilterInCompleteMode()) 
+//        	MylarTasklistPlugin.getTaskListManager().getTaskList().addFilter(inCompleteFilter);
+        if (MylarTasklistPlugin.getDefault().isFilterCompleteMode()) 
         	addFilter(COMPLETE_FILTER);
         
         viewer.refresh();
@@ -839,7 +839,7 @@ public class TaskListView extends ViewPart {
                 	} else if (source.getParent() != null) {
                 		source.getParent().removeSubTask(source);
                 	} else {
-                		MylarTasksPlugin.getTaskListManager().getTaskList().getRootTasks().remove(source);
+                		MylarTasklistPlugin.getTaskListManager().getTaskList().getRootTasks().remove(source);
                 	}
                     
                     if (getCurrentTarget() instanceof TaskCategory) {
@@ -855,10 +855,10 @@ public class TaskListView extends ViewPart {
                     viewer.refresh();
                     return true;
                 } else if(selectedObject instanceof ITaskListElement &&
-                		MylarTasksPlugin.getDefault().getTaskHandlerForElement((ITaskListElement)selectedObject) != null &&
+                		MylarTasklistPlugin.getDefault().getTaskHandlerForElement((ITaskListElement)selectedObject) != null &&
                 		getCurrentTarget() instanceof TaskCategory){
                 	
-                	MylarTasksPlugin.getDefault().getTaskHandlerForElement((ITaskListElement)selectedObject).dropItem((ITaskListElement)selectedObject, (TaskCategory)getCurrentTarget());
+                	MylarTasklistPlugin.getDefault().getTaskHandlerForElement((ITaskListElement)selectedObject).dropItem((ITaskListElement)selectedObject, (TaskCategory)getCurrentTarget());
                 		viewer.setSelection(null);
                 		viewer.refresh();
                         return true;
@@ -886,7 +886,7 @@ public class TaskListView extends ViewPart {
     }
     
     private void expandToActiveTasks() {
-    	List<ITask> activeTasks = MylarTasksPlugin.getTaskListManager().getTaskList().getActiveTasks();
+    	List<ITask> activeTasks = MylarTasklistPlugin.getTaskListManager().getTaskList().getActiveTasks();
     	for (ITask t : activeTasks) {
     		viewer.expandToLevel(t, 0);
     	}
@@ -930,7 +930,7 @@ public class TaskListView extends ViewPart {
         addAction(createTask, manager, element);
         manager.add(new Separator("mylar"));   
         	
-    	for (ITaskListDynamicSubMenuContributor contributor : MylarTasksPlugin.getDefault().getDynamicMenuContributers()) {
+    	for (ITaskListDynamicSubMenuContributor contributor : MylarTasklistPlugin.getDefault().getDynamicMenuContributers()) {
 	        manager.add(new Separator());
 	        MenuManager subMenuManager = contributor.getSubMenuManager(this, (ITaskListElement)selectedObject);
 	        if (subMenuManager != null) addMenuManager(subMenuManager, manager, element);
@@ -949,7 +949,7 @@ public class TaskListView extends ViewPart {
     private void addAction(Action action, IMenuManager manager, ITaskListElement element) {
     	manager.add(action);
     	if(element != null){
-    		ITaskHandler handler = MylarTasksPlugin.getDefault().getTaskHandlerForElement(element);
+    		ITaskHandler handler = MylarTasklistPlugin.getDefault().getTaskHandlerForElement(element);
     		if(handler != null){
     			action.setEnabled(handler.enableAction(action, element));
     		} else {
@@ -1024,13 +1024,13 @@ public class TaskListView extends ViewPart {
 	 *         children
 	 */
     protected boolean lookForId(String taskId) {
-    	return (MylarTasksPlugin.getTaskListManager().getTaskForHandle(taskId) == null);
-//    	for (ITask task : MylarTasksPlugin.getTaskListManager().getTaskList().getRootTasks()) {
+    	return (MylarTasklistPlugin.getTaskListManager().getTaskForHandle(taskId) == null);
+//    	for (ITask task : MylarTasklistPlugin.getTaskListManager().getTaskList().getRootTasks()) {
 //    		if (task.getHandle().equals(taskId)) {
 //    			return true;
 //    		}
 //    	}
-//    	for (TaskCategory cat : MylarTasksPlugin.getTaskListManager().getTaskList().getTaskCategories()) {
+//    	for (TaskCategory cat : MylarTasklistPlugin.getTaskListManager().getTaskList().getTaskCategories()) {
 //    		for (ITask task : cat.getChildren()) {
 //        		if (task.getHandle().equals(taskId)) {
 //        			return true;
@@ -1041,7 +1041,7 @@ public class TaskListView extends ViewPart {
 	}
 	
 	public void closeTaskEditors(ITask task, IWorkbenchPage page) throws LoginException, IOException{
-		ITaskHandler taskHandler = MylarTasksPlugin.getDefault().getTaskHandlerForElement(task);
+		ITaskHandler taskHandler = MylarTasklistPlugin.getDefault().getTaskHandlerForElement(task);
 	    if(taskHandler != null){
         	taskHandler.taskClosed(task, page);
         } else if (task instanceof Task) {
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/views/ToolTipHandler.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/views/ToolTipHandler.java
index 5efee7529..26f5c802f 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/views/ToolTipHandler.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/views/ToolTipHandler.java
@@ -12,10 +12,10 @@
  * Copied from newsgroup, forwarded from Make Technologies
  */
 
-package org.eclipse.mylar.tasks.ui.views;
+package org.eclipse.mylar.tasklist.ui.views;
 
 import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.mylar.tasks.ITask;
+import org.eclipse.mylar.tasklist.ITask;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.*;
 import org.eclipse.swt.graphics.*;