NEW - bug 124321: [api] merge local tasks with repository tasks

https://bugs.eclipse.org/bugs/show_bug.cgi?id=124321

102 files changed, 916 insertions, 917 deletions

diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/AbstractTaskListFilter.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/AbstractTaskListFilter.java
index f547ccdf6..0fd4d7434 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/AbstractTaskListFilter.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/AbstractTaskListFilter.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 package org.eclipse.mylyn.internal.tasks.ui;
 
-import org.eclipse.mylyn.tasks.core.ITask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
 
 /**
  * Custom filters are used so that the "Find:" filter can 'see through'
@@ -22,7 +22,7 @@ public abstract class AbstractTaskListFilter {
 
 	public abstract boolean select(Object parent, Object element);
 
-	public boolean shouldAlwaysShow(Object parent, ITask task, boolean exposeSubTasks) {
+	public boolean shouldAlwaysShow(Object parent, AbstractTask task, boolean exposeSubTasks) {
 		return task.isActive();
 	}
 }
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/AddExistingTaskJob.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/AddExistingTaskJob.java
index a35029268..c3d417e68 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/AddExistingTaskJob.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/AddExistingTaskJob.java
@@ -13,8 +13,8 @@ import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.mylyn.core.MylarStatusHandler;
 import org.eclipse.mylyn.internal.tasks.ui.views.TaskListView;
 import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector;
-import org.eclipse.mylyn.tasks.core.AbstractTaskContainer;
-import org.eclipse.mylyn.tasks.core.ITask;
+import org.eclipse.mylyn.tasks.core.AbstractTaskListElement;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
 import org.eclipse.mylyn.tasks.core.TaskCategory;
 import org.eclipse.mylyn.tasks.core.TaskRepository;
 import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
@@ -44,13 +44,13 @@ public class AddExistingTaskJob extends Job {
 	 * null, it will be added to the current selected task's category in task
 	 * list
 	 */
-	private AbstractTaskContainer taskContainer;
+	private AbstractTaskListElement taskContainer;
 
 	public AddExistingTaskJob(TaskRepository repository, String taskId) {
 		this(repository, taskId, null);
 	}
 
-	public AddExistingTaskJob(TaskRepository repository, String taskId, AbstractTaskContainer taskContainer) {
+	public AddExistingTaskJob(TaskRepository repository, String taskId, AbstractTaskListElement taskContainer) {
 		super(MessageFormat.format("Adding task: \"{0}\"...", taskId));
 		this.repository = repository;
 		this.taskId = taskId;
@@ -62,11 +62,11 @@ public class AddExistingTaskJob extends Job {
 		final AbstractRepositoryConnector connector = TasksUiPlugin.getRepositoryManager().getRepositoryConnector(
 				repository.getKind());
 		try {
-			final ITask newTask = connector.createTaskFromExistingId(repository, taskId, monitor);
+			final AbstractTask newTask = connector.createTaskFromExistingId(repository, taskId, monitor);
 
-//			if (newTask instanceof AbstractRepositoryTask) {
+//			if (newTask instanceof AbstractTask) {
 //				// TODO: encapsulate in abstract connector
-//				AbstractRepositoryTask repositoryTask = (AbstractRepositoryTask) newTask;
+//				AbstractTask repositoryTask = (AbstractTask) newTask;
 //				TasksUiPlugin.getDefault().getTaskDataManager().push(newTask.getHandleIdentifier(),
 //						repositoryTask.getTaskData());
 //			}
@@ -76,7 +76,7 @@ public class AddExistingTaskJob extends Job {
 				PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
 
 					public void run() {
-						AbstractTaskContainer category = taskContainer;
+						AbstractTaskListElement category = taskContainer;
 						TaskListView taskListView = TaskListView.getFromActivePerspective();
 						if (category == null) {
 							Object selectedObject = ((IStructuredSelection) taskListView.getViewer().getSelection())
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/IDynamicSubMenuContributor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/IDynamicSubMenuContributor.java
index 923e1e288..3b1641118 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/IDynamicSubMenuContributor.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/IDynamicSubMenuContributor.java
@@ -13,13 +13,13 @@ package org.eclipse.mylyn.internal.tasks.ui;
 import java.util.List;
 
 import org.eclipse.jface.action.MenuManager;
-import org.eclipse.mylyn.tasks.core.ITaskListElement;
+import org.eclipse.mylyn.tasks.core.AbstractTaskListElement;
 
 /**
  * @author Mik Kersten
  */
 public interface IDynamicSubMenuContributor {
 
-	public abstract MenuManager getSubMenuManager(List<ITaskListElement> selectedElements);
+	public abstract MenuManager getSubMenuManager(List<AbstractTaskListElement> selectedElements);
 
 }
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/ITaskHighlighter.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/ITaskHighlighter.java
index 59edc1121..e407b98f3 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/ITaskHighlighter.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/ITaskHighlighter.java
@@ -11,7 +11,7 @@
 
 package org.eclipse.mylyn.internal.tasks.ui;
 
-import org.eclipse.mylyn.tasks.core.ITask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
 import org.eclipse.swt.graphics.Color;
 
 /**
@@ -19,5 +19,5 @@ import org.eclipse.swt.graphics.Color;
  */
 public interface ITaskHighlighter {
 
-	public Color getHighlightColor(ITask task);
+	public Color getHighlightColor(AbstractTask task);
 }
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/MoveToCategoryMenuContributor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/MoveToCategoryMenuContributor.java
index 468004fef..dc92f8567 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/MoveToCategoryMenuContributor.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/MoveToCategoryMenuContributor.java
@@ -16,9 +16,9 @@ import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.MenuManager;
 import org.eclipse.jface.action.Separator;
 import org.eclipse.mylyn.internal.tasks.ui.actions.NewCategoryAction;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
 import org.eclipse.mylyn.tasks.core.AbstractTaskContainer;
-import org.eclipse.mylyn.tasks.core.ITask;
-import org.eclipse.mylyn.tasks.core.ITaskListElement;
+import org.eclipse.mylyn.tasks.core.AbstractTaskListElement;
 import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
 
 /**
@@ -29,18 +29,18 @@ public class MoveToCategoryMenuContributor implements IDynamicSubMenuContributor
 
 	private static final String LABEL = "Move to";
 
-	public MenuManager getSubMenuManager(final List<ITaskListElement> selectedElements) {
+	public MenuManager getSubMenuManager(final List<AbstractTaskListElement> selectedElements) {
 		final MenuManager subMenuManager = new MenuManager(LABEL);
 
 		//subMenuManager.setVisible(selectedElements.size() > 0 && !(selectedElements.get(0) instanceof AbstractTaskContainer || selectedElements.get(0) instanceof AbstractRepositoryQuery));
 		
 		subMenuManager
 		.setVisible(selectedElements.size() > 0
-				&& selectedElements.get(0) instanceof ITask);
+				&& selectedElements.get(0) instanceof AbstractTask);
 		
 		List<AbstractTaskContainer> categories = new ArrayList<AbstractTaskContainer>(TasksUiPlugin.getTaskListManager().getTaskList().getCategories());
 		Collections.sort(categories);
-		for (final AbstractTaskContainer category : categories) {
+		for (final AbstractTaskListElement category : categories) {
 			if (!category.equals(TasksUiPlugin.getTaskListManager().getTaskList().getArchiveContainer())) {
 				Action action = new Action() {
 					@Override
@@ -98,11 +98,11 @@ public class MoveToCategoryMenuContributor implements IDynamicSubMenuContributor
 	 * @param selectedElements
 	 * @param category 
 	 */
-	private void moveToCategory(final List<ITaskListElement> selectedElements, AbstractTaskContainer category) {
-		for (ITaskListElement element : selectedElements) {
-			if (element instanceof ITask) {
+	private void moveToCategory(final List<AbstractTaskListElement> selectedElements, AbstractTaskListElement category) {
+		for (AbstractTaskListElement element : selectedElements) {
+			if (element instanceof AbstractTask) {
 				TasksUiPlugin.getTaskListManager().getTaskList().moveToContainer(category,
-						(ITask) element);
+						(AbstractTask) element);
 			}
 		}
 	}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/PersonProposalProvider.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/PersonProposalProvider.java
index e50ecb141..af9c8d92b 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/PersonProposalProvider.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/PersonProposalProvider.java
@@ -20,8 +20,8 @@ import java.util.TreeSet;
 
 import org.eclipse.jface.fieldassist.IContentProposal;
 import org.eclipse.jface.fieldassist.IContentProposalProvider;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask;
-import org.eclipse.mylyn.tasks.core.ITask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
 import org.eclipse.mylyn.tasks.core.RepositoryAttachment;
 import org.eclipse.mylyn.tasks.core.RepositoryTaskData;
 import org.eclipse.mylyn.tasks.core.TaskComment;
@@ -33,7 +33,7 @@ import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
  */
 public class PersonProposalProvider implements IContentProposalProvider {
 
-	private AbstractRepositoryTask currentTask;
+	private AbstractTask currentTask;
 
 	private RepositoryTaskData currentTaskData;
 
@@ -41,7 +41,7 @@ public class PersonProposalProvider implements IContentProposalProvider {
 	
 	private Set<String> addressSet = null;
 
-	public PersonProposalProvider(AbstractRepositoryTask repositoryTask, RepositoryTaskData taskData) {
+	public PersonProposalProvider(AbstractTask repositoryTask, RepositoryTaskData taskData) {
 		this.currentTask = repositoryTask;
 		this.currentTaskData = taskData;
 	}
@@ -102,7 +102,7 @@ public class PersonProposalProvider implements IContentProposalProvider {
 		}
 
 		if (repositoryUrl != null && repositoryKind != null) {
-			Set<AbstractRepositoryTask> tasks = new HashSet<AbstractRepositoryTask>();
+			Set<AbstractTask> tasks = new HashSet<AbstractTask>();
 			if (currentTask != null) {
 				tasks.add(currentTask);
 			}
@@ -116,17 +116,17 @@ public class PersonProposalProvider implements IContentProposalProvider {
 					addressSet.add(currentUser);
 			}
 
-			Collection<ITask> allTasks = TasksUiPlugin.getTaskListManager().getTaskList().getAllTasks();
-			for (ITask task : allTasks) {
-				if (task instanceof AbstractRepositoryTask) {
-					AbstractRepositoryTask repositoryTask = (AbstractRepositoryTask) task;
+			Collection<AbstractTask> allTasks = TasksUiPlugin.getTaskListManager().getTaskList().getAllTasks();
+			for (AbstractTask task : allTasks) {
+				if (task instanceof AbstractTask) {
+					AbstractTask repositoryTask = (AbstractTask) task;
 					if (repositoryTask.getRepositoryUrl().equals(repositoryUrl)) {
 						tasks.add(repositoryTask);
 					}
 				}
 			}
 
-			for (AbstractRepositoryTask task : tasks) {
+			for (AbstractTask task : tasks) {
 				addAddresses(task, addressSet);
 			}
 		}
@@ -134,9 +134,9 @@ public class PersonProposalProvider implements IContentProposalProvider {
 		return addressSet;
 	}
 
-	private void addAddresses(AbstractRepositoryTask task, Set<String> addressSet) {
+	private void addAddresses(AbstractTask task, Set<String> addressSet) {
 		// TODO: Owner, Creator, and CC should be stored on
-		// AbstractRepositoryTask
+		// AbstractTask
 		// RepositoryTaskData data =
 		// TasksUiPlugin.getDefault().getTaskData(task);
 
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/ScheduleTaskMenuContributor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/ScheduleTaskMenuContributor.java
index 6f14a7055..5cda16fde 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/ScheduleTaskMenuContributor.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/ScheduleTaskMenuContributor.java
@@ -21,8 +21,8 @@ import org.eclipse.jface.action.MenuManager;
 import org.eclipse.jface.action.Separator;
 import org.eclipse.jface.window.Window;
 import org.eclipse.mylyn.internal.tasks.ui.planner.DateSelectionDialog;
-import org.eclipse.mylyn.tasks.core.ITask;
-import org.eclipse.mylyn.tasks.core.ITaskListElement;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
+import org.eclipse.mylyn.tasks.core.AbstractTaskListElement;
 import org.eclipse.mylyn.tasks.ui.DatePicker;
 import org.eclipse.mylyn.tasks.ui.TaskListManager;
 import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
@@ -49,7 +49,7 @@ public class ScheduleTaskMenuContributor implements IDynamicSubMenuContributor {
 	private static final String LABEL_CLEAR = "Clear";
 
 	@SuppressWarnings("deprecation")
-	public MenuManager getSubMenuManager(final List<ITaskListElement> selectedElements) {
+	public MenuManager getSubMenuManager(final List<AbstractTaskListElement> selectedElements) {
 
 		final TaskListManager tasklistManager = TasksUiPlugin.getTaskListManager();
 
@@ -57,19 +57,19 @@ public class ScheduleTaskMenuContributor implements IDynamicSubMenuContributor {
 
 		subMenuManager
 				.setVisible(selectedElements.size() > 0
-						&& selectedElements.get(0) instanceof ITask);// !(selectedElements.get(0) instanceof AbstractTaskContainer || selectedElements.get(0) instanceof AbstractRepositoryQuery));
+						&& selectedElements.get(0) instanceof AbstractTask);// !(selectedElements.get(0) instanceof AbstractTaskContainer || selectedElements.get(0) instanceof AbstractRepositoryQuery));
 
-		ITaskListElement singleSelection = null;
+		AbstractTaskListElement singleSelection = null;
 		if (selectedElements.size() == 1) {
-			ITaskListElement selectedElement = selectedElements.get(0);
-			if (selectedElement instanceof ITask) {
+			AbstractTaskListElement selectedElement = selectedElements.get(0);
+			if (selectedElement instanceof AbstractTask) {
 				singleSelection = selectedElement;
 			}
 		}
-		final ITask singleTaskSelection = tasklistManager.getTaskForElement(singleSelection, false);
-		final List<ITaskListElement> taskListElementsToSchedule = new ArrayList<ITaskListElement>();
-		for (ITaskListElement selectedElement : selectedElements) {
-			if (selectedElement instanceof ITask) {
+		final AbstractTask singleTaskSelection = tasklistManager.getTaskForElement(singleSelection, false);
+		final List<AbstractTaskListElement> taskListElementsToSchedule = new ArrayList<AbstractTaskListElement>();
+		for (AbstractTaskListElement selectedElement : selectedElements) {
+			if (selectedElement instanceof AbstractTask) {
 				taskListElementsToSchedule.add(selectedElement);
 			}
 			// if (selectedElement instanceof ITask) {
@@ -88,8 +88,8 @@ public class ScheduleTaskMenuContributor implements IDynamicSubMenuContributor {
 			public void run() {
 				Calendar reminderCalendar = GregorianCalendar.getInstance();
 				TasksUiPlugin.getTaskListManager().setScheduledEndOfDay(reminderCalendar);
-				for (ITaskListElement element : taskListElementsToSchedule) {
-					ITask task = tasklistManager.getTaskForElement(element, true);
+				for (AbstractTaskListElement element : taskListElementsToSchedule) {
+					AbstractTask task = tasklistManager.getTaskForElement(element, true);
 					TasksUiPlugin.getTaskListManager().setScheduledFor(task, reminderCalendar.getTime());
 				}
 			}
@@ -114,8 +114,8 @@ public class ScheduleTaskMenuContributor implements IDynamicSubMenuContributor {
 					Calendar reminderCalendar = GregorianCalendar.getInstance();
 					int dueIn = day - today;
 					TasksUiPlugin.getTaskListManager().setSecheduledIn(reminderCalendar, dueIn);
-					for (ITaskListElement element : taskListElementsToSchedule) {
-						ITask task = tasklistManager.getTaskForElement(element, true);
+					for (AbstractTaskListElement element : taskListElementsToSchedule) {
+						AbstractTask task = tasklistManager.getTaskForElement(element, true);
 						TasksUiPlugin.getTaskListManager().setScheduledFor(task, reminderCalendar.getTime());
 					}
 				}
@@ -141,8 +141,8 @@ public class ScheduleTaskMenuContributor implements IDynamicSubMenuContributor {
 		action = new Action() {
 			@Override
 			public void run() {
-				for (ITaskListElement element : taskListElementsToSchedule) {
-					ITask task = tasklistManager.getTaskForElement(element, true);
+				for (AbstractTaskListElement element : taskListElementsToSchedule) {
+					AbstractTask task = tasklistManager.getTaskForElement(element, true);
 					Calendar startNextWeek = Calendar.getInstance();
 					TasksUiPlugin.getTaskListManager().setScheduledNextWeek(startNextWeek);
 					TasksUiPlugin.getTaskListManager().setScheduledFor(task, startNextWeek.getTime());
@@ -163,8 +163,8 @@ public class ScheduleTaskMenuContributor implements IDynamicSubMenuContributor {
 		action = new Action() {
 			@Override
 			public void run() {
-				for (ITaskListElement element : taskListElementsToSchedule) {
-					ITask task = tasklistManager.getTaskForElement(element, true);
+				for (AbstractTaskListElement element : taskListElementsToSchedule) {
+					AbstractTask task = tasklistManager.getTaskForElement(element, true);
 					TasksUiPlugin.getTaskListManager().setScheduledFor(task,
 							TasksUiPlugin.getTaskListManager().getActivityFuture().getStart().getTime());
 				}
@@ -192,10 +192,10 @@ public class ScheduleTaskMenuContributor implements IDynamicSubMenuContributor {
 						.getActiveWorkbenchWindow().getShell(), theCalendar, DatePicker.TITLE_DIALOG);
 				int result = reminderDialog.open();
 				if (result == Window.OK) {
-					for (ITaskListElement element : taskListElementsToSchedule) {
-						ITask task = null;
-						if (element instanceof ITask) {
-							task = (ITask) element;
+					for (AbstractTaskListElement element : taskListElementsToSchedule) {
+						AbstractTask task = null;
+						if (element instanceof AbstractTask) {
+							task = (AbstractTask) element;
 						}
 						TasksUiPlugin.getTaskListManager().setScheduledFor(task, reminderDialog.getDate());
 					}
@@ -209,8 +209,8 @@ public class ScheduleTaskMenuContributor implements IDynamicSubMenuContributor {
 		action = new Action() {
 			@Override
 			public void run() {
-				for (ITaskListElement element : taskListElementsToSchedule) {
-					ITask task = tasklistManager.getTaskForElement(element, true);
+				for (AbstractTaskListElement element : taskListElementsToSchedule) {
+					AbstractTask task = tasklistManager.getTaskForElement(element, true);
 					TasksUiPlugin.getTaskListManager().setScheduledFor(task, null);
 				}
 			}
@@ -249,9 +249,9 @@ public class ScheduleTaskMenuContributor implements IDynamicSubMenuContributor {
 		}
 	}
 
-	private boolean canSchedule(ITaskListElement singleSelection, List<ITaskListElement> elements) {
-		if (singleSelection instanceof ITask) {
-			return ((!((ITask) singleSelection).isCompleted()) || elements.size() > 0);
+	private boolean canSchedule(AbstractTaskListElement singleSelection, List<AbstractTaskListElement> elements) {
+		if (singleSelection instanceof AbstractTask) {
+			return ((!((AbstractTask) singleSelection).isCompleted()) || elements.size() > 0);
 		} else {
 			return elements.size() > 0;
 		}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/ScheduledTaskListSynchJob.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/ScheduledTaskListSynchJob.java
index 1cae5a004..0df89da25 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/ScheduledTaskListSynchJob.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/ScheduledTaskListSynchJob.java
@@ -26,7 +26,7 @@ import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.core.runtime.jobs.JobChangeAdapter;
 import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector;
 import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery;
-import org.eclipse.mylyn.tasks.core.TaskList;
+import org.eclipse.mylyn.tasks.core.getAllCategories;
 import org.eclipse.mylyn.tasks.core.TaskRepository;
 import org.eclipse.mylyn.tasks.ui.TaskListManager;
 import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
@@ -44,7 +44,7 @@ public class ScheduledTaskListSynchJob extends Job {
 
 	private long scheduleDelay = 1000 * 60 * 20;// 20 minutes default
 
-	private TaskList taskList = null;
+	private getAllCategories taskList = null;
 
 	private static long count = 0;
 
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskCompletionFilter.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskCompletionFilter.java
index 262c30782..b9d4ff082 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskCompletionFilter.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskCompletionFilter.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 package org.eclipse.mylyn.internal.tasks.ui;
 
-import org.eclipse.mylyn.tasks.core.ITask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
 import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
 
 /**
@@ -22,8 +22,8 @@ public class TaskCompletionFilter extends AbstractTaskListFilter {
 	public boolean select(Object parent, Object element) {
 		boolean exposeSubTasks = !TasksUiPlugin.getDefault().getPreferenceStore().getBoolean(
 				TasksUiPreferenceConstants.FILTER_SUBTASKS);
-		if (element instanceof ITask) {
-			ITask task = (ITask) element;
+		if (element instanceof AbstractTask) {
+			AbstractTask task = (AbstractTask) element;
 			if (shouldAlwaysShow(parent, task, exposeSubTasks)) {
 				return true;
 			}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskLabelDecorator.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskLabelDecorator.java
index 4b73c44e9..737cc95ae 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskLabelDecorator.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskLabelDecorator.java
@@ -20,8 +20,8 @@ import org.eclipse.jface.viewers.ILabelProviderListener;
 import org.eclipse.jface.viewers.ILightweightLabelDecorator;
 import org.eclipse.mylyn.internal.tasks.ui.views.TaskElementLabelProvider;
 import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask;
-import org.eclipse.mylyn.tasks.core.ITask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
 import org.eclipse.mylyn.tasks.core.TaskRepository;
 import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
 
@@ -53,15 +53,15 @@ public class TaskLabelDecorator implements ILightweightLabelDecorator {
 					decoration.addSuffix("   [" + taskRepository.getRepositoryLabel() + "]");
 				}
 			}
-		} else if (element instanceof AbstractRepositoryTask) {
-			AbstractRepositoryTask task = (AbstractRepositoryTask) element;
+		} else if (element instanceof AbstractTask) {
+			AbstractTask task = (AbstractTask) element;
 			if (!task.isCompleted() && TasksUiPlugin.getTaskListManager().isOverdue(task)) {
 				decoration.addOverlay(TasksUiImages.OVERLAY_OVER_DUE, IDecoration.TOP_RIGHT);
 			} else if (!task.isCompleted() && task.getDueDate() != null) {
 				decoration.addOverlay(TasksUiImages.OVERLAY_HAS_DUE, IDecoration.TOP_RIGHT);
 			}
-		} else if (element instanceof ITask) {
-			ITask task = (ITask) element;
+		} else if (element instanceof AbstractTask) {
+			AbstractTask task = (AbstractTask) element;
 			if (!task.isCompleted() && TasksUiPlugin.getTaskListManager().isOverdue(task)) {
 				decoration.addOverlay(TasksUiImages.OVERLAY_OVER_DUE, IDecoration.TOP_RIGHT);
 			}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationIncoming.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationIncoming.java
index fd0bebf9c..9c0af01d5 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationIncoming.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationIncoming.java
@@ -15,8 +15,8 @@ import java.util.Date;
 
 import org.eclipse.jface.viewers.DecoratingLabelProvider;
 import org.eclipse.mylyn.internal.tasks.ui.views.TaskElementLabelProvider;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask;
-import org.eclipse.mylyn.tasks.core.ITask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
 import org.eclipse.mylyn.tasks.ui.TasksUiUtil;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.ui.PlatformUI;
@@ -26,7 +26,7 @@ import org.eclipse.ui.PlatformUI;
  */
 public class TaskListNotificationIncoming implements ITaskListNotification {
 
-	private final AbstractRepositoryTask task;
+	private final AbstractTask task;
 	
 	private String description = null;
 
@@ -35,7 +35,7 @@ public class TaskListNotificationIncoming implements ITaskListNotification {
 
 	private Date date;
 
-	public TaskListNotificationIncoming(AbstractRepositoryTask task) {
+	public TaskListNotificationIncoming(AbstractTask task) {
 		this.task = task;
 	}
 
@@ -82,7 +82,7 @@ public class TaskListNotificationIncoming implements ITaskListNotification {
 		return notification.getTask().equals(task);
 	}
 
-	private ITask getTask() {
+	private AbstractTask getTask() {
 		return task;
 	}
 
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationQueryIncoming.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationQueryIncoming.java
index 1a8c9f6a8..ca57d05b4 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationQueryIncoming.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationQueryIncoming.java
@@ -15,7 +15,7 @@ import java.util.Date;
 
 import org.eclipse.jface.viewers.DecoratingLabelProvider;
 import org.eclipse.mylyn.internal.tasks.ui.views.TaskElementLabelProvider;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
 import org.eclipse.mylyn.tasks.ui.TasksUiUtil;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.ui.PlatformUI;
@@ -25,14 +25,14 @@ import org.eclipse.ui.PlatformUI;
  */
 public class TaskListNotificationQueryIncoming implements ITaskListNotification {
 
-	private final AbstractRepositoryTask hit;
+	private final AbstractTask hit;
 
 	private DecoratingLabelProvider labelProvider = new DecoratingLabelProvider(new TaskElementLabelProvider(),
 			PlatformUI.getWorkbench().getDecoratorManager().getLabelDecorator());
 
 	private Date date;
 
-	public TaskListNotificationQueryIncoming(AbstractRepositoryTask hit) {
+	public TaskListNotificationQueryIncoming(AbstractTask hit) {
 		this.hit = hit;
 	}
 
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationReminder.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationReminder.java
index 3b9e4d860..74327b77c 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationReminder.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationReminder.java
@@ -15,7 +15,7 @@ import java.util.Date;
 
 import org.eclipse.jface.viewers.DecoratingLabelProvider;
 import org.eclipse.mylyn.internal.tasks.ui.views.TaskElementLabelProvider;
-import org.eclipse.mylyn.tasks.core.ITask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
 import org.eclipse.mylyn.tasks.ui.TasksUiUtil;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.ui.PlatformUI;
@@ -25,14 +25,14 @@ import org.eclipse.ui.PlatformUI;
  */
 public class TaskListNotificationReminder implements ITaskListNotification {
 
-	private final ITask task;
+	private final AbstractTask task;
 
 	private DecoratingLabelProvider labelProvider = new DecoratingLabelProvider(new TaskElementLabelProvider(),
 			PlatformUI.getWorkbench().getDecoratorManager().getLabelDecorator());
 
 	private Date date;
 
-	public TaskListNotificationReminder(ITask task) {
+	public TaskListNotificationReminder(AbstractTask task) {
 		this.task = task;
 	}
 
@@ -75,7 +75,7 @@ public class TaskListNotificationReminder implements ITaskListNotification {
 		return notification.getTask().equals(task);
 	}
 
-	private ITask getTask() {
+	private AbstractTask getTask() {
 		return task;
 	}
 
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskPriorityFilter.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskPriorityFilter.java
index 864919f39..92146aa1d 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskPriorityFilter.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskPriorityFilter.java
@@ -11,9 +11,9 @@
 package org.eclipse.mylyn.internal.tasks.ui;
 
 import org.eclipse.mylyn.internal.tasks.ui.views.TaskListView;
-import org.eclipse.mylyn.tasks.core.ITask;
-import org.eclipse.mylyn.tasks.core.ITaskListElement;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask.PriorityLevel;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
+import org.eclipse.mylyn.tasks.core.AbstractTaskListElement;
+import org.eclipse.mylyn.tasks.core.AbstractTask.PriorityLevel;
 import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
 
 /**
@@ -38,18 +38,18 @@ public class TaskPriorityFilter extends AbstractTaskListFilter {
 	public boolean select(Object parent, Object element) {
 		boolean exposeSubTasks = !TasksUiPlugin.getDefault().getPreferenceStore().getBoolean(
 				TasksUiPreferenceConstants.FILTER_SUBTASKS);
-		if (element instanceof ITaskListElement) {
-			if (element instanceof ITask) {
-				ITask task = (ITask) element;
+		if (element instanceof AbstractTaskListElement) {
+			if (element instanceof AbstractTask) {
+				AbstractTask task = (AbstractTask) element;
 				if (shouldAlwaysShow(parent, task, exposeSubTasks)) {
 					return true;
 				}
 			}
-			String priority = ((ITaskListElement) element).getPriority();
+			String priority = ((AbstractTaskListElement) element).getPriority();
 			if (priority == null || !(priority.startsWith(PRIORITY_PREFIX))) {
 				return true;
 			}
-			if (priorityLevel.compareTo(((ITaskListElement) element).getPriority()) >= 0) {
+			if (priorityLevel.compareTo(((AbstractTaskListElement) element).getPriority()) >= 0) {
 				return true;
 			}
 			return false;
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskStatusMenuContributor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskStatusMenuContributor.java
index cb3542ca5..b9fff414c 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskStatusMenuContributor.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskStatusMenuContributor.java
@@ -18,8 +18,8 @@ import org.eclipse.mylyn.internal.tasks.ui.actions.MarkTaskCompleteAction;
 import org.eclipse.mylyn.internal.tasks.ui.actions.MarkTaskIncompleteAction;
 import org.eclipse.mylyn.internal.tasks.ui.actions.MarkTaskReadAction;
 import org.eclipse.mylyn.internal.tasks.ui.actions.MarkTaskUnreadAction;
-import org.eclipse.mylyn.tasks.core.ITask;
-import org.eclipse.mylyn.tasks.core.ITaskListElement;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
+import org.eclipse.mylyn.tasks.core.AbstractTaskListElement;
 
 /**
  * @author Rob Elves
@@ -28,12 +28,12 @@ public class TaskStatusMenuContributor implements IDynamicSubMenuContributor {
 
 	private static final String LABEL = "Mark";
 
-	public MenuManager getSubMenuManager(final List<ITaskListElement> selectedElements) {
+	public MenuManager getSubMenuManager(final List<AbstractTaskListElement> selectedElements) {
 		final MenuManager subMenuManager = new MenuManager(LABEL);
-		ITask singleTask = null;
+		AbstractTask singleTask = null;
 		if (selectedElements.size() == 1) {
-			if (selectedElements.get(0) instanceof ITask) {
-				singleTask = (ITask)selectedElements.get(0);
+			if (selectedElements.get(0) instanceof AbstractTask) {
+				singleTask = (AbstractTask)selectedElements.get(0);
 			}
 		}
 		
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskTrimWidget.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskTrimWidget.java
index e8cbe324a..69ed801c6 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskTrimWidget.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskTrimWidget.java
@@ -15,7 +15,7 @@ import org.eclipse.mylyn.internal.tasks.ui.actions.PreviousTaskDropDownAction;
 import org.eclipse.mylyn.internal.tasks.ui.views.TaskListFilteredTree;
 import org.eclipse.mylyn.internal.tasks.ui.views.TaskListView;
 import org.eclipse.mylyn.tasks.core.DateRangeContainer;
-import org.eclipse.mylyn.tasks.core.ITask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
 import org.eclipse.mylyn.tasks.core.ITaskActivityListener;
 import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
 import org.eclipse.mylyn.tasks.ui.TasksUiUtil;
@@ -45,11 +45,11 @@ public class TaskTrimWidget extends WorkbenchWindowControlContribution {
 
 	private final ITaskActivityListener TASK_CHANGE_LISTENER = new ITaskActivityListener() {
 
-		public void taskActivated(ITask task) {
+		public void taskActivated(AbstractTask task) {
 			indicateActiveTask(task);
 		}
 
-		public void taskDeactivated(ITask task) {
+		public void taskDeactivated(AbstractTask task) {
 			indicateNoActiveTask();
 		}
 
@@ -62,7 +62,7 @@ public class TaskTrimWidget extends WorkbenchWindowControlContribution {
 		public void taskListRead() {
 		}
 
-		public void tasksActivated(List<ITask> tasks) {
+		public void tasksActivated(List<AbstractTask> tasks) {
 		}
 		
 	};
@@ -116,7 +116,7 @@ public class TaskTrimWidget extends WorkbenchWindowControlContribution {
 		activeTaskLabel.setLayoutData(new GridData(p.x, SWT.DEFAULT));
 		activeTaskLabel.setText(TaskListFilteredTree.LABEL_NO_ACTIVE);
 
-		ITask activeTask = TasksUiPlugin.getTaskListManager().getTaskList().getActiveTask();
+		AbstractTask activeTask = TasksUiPlugin.getTaskListManager().getTaskList().getActiveTask();
 		if (activeTask != null) {
 			indicateActiveTask(activeTask);
 		}
@@ -140,7 +140,7 @@ public class TaskTrimWidget extends WorkbenchWindowControlContribution {
 		return activeTaskLabel;
 	}
 
-	public void indicateActiveTask(ITask task) {
+	public void indicateActiveTask(AbstractTask task) {
 		if (activeTaskLabel.isDisposed()) {
 			return;
 		}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskWorkingSetFilter.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskWorkingSetFilter.java
index d63b80af3..8a8b9a484 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskWorkingSetFilter.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskWorkingSetFilter.java
@@ -12,10 +12,10 @@ package org.eclipse.mylyn.internal.tasks.ui;
 
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery;
-import org.eclipse.mylyn.tasks.core.AbstractTaskContainer;
+import org.eclipse.mylyn.tasks.core.AbstractTaskListElement;
 import org.eclipse.mylyn.tasks.core.DateRangeContainer;
-import org.eclipse.mylyn.tasks.core.ITask;
-import org.eclipse.mylyn.tasks.core.TaskList;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
+import org.eclipse.mylyn.tasks.core.getAllCategories;
 import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
 import org.eclipse.ui.IWorkingSet;
 
@@ -26,17 +26,17 @@ import org.eclipse.ui.IWorkingSet;
  */
 public class TaskWorkingSetFilter extends AbstractTaskListFilter {
 	
-	private final TaskList taskList = TasksUiPlugin.getTaskListManager().getTaskList();
+	private final getAllCategories taskList = TasksUiPlugin.getTaskListManager().getTaskList();
 
 	private IWorkingSet currentWorkingSet;
 
 
 	public boolean select(Object parent, Object element) {
-		if (parent instanceof AbstractTaskContainer && !(parent instanceof DateRangeContainer)) {
-			return selectWorkingSet((AbstractTaskContainer) parent);
+		if (parent instanceof AbstractTaskListElement && !(parent instanceof DateRangeContainer)) {
+			return selectWorkingSet((AbstractTaskListElement) parent);
 		}
-		if (element instanceof ITask) {
-			AbstractRepositoryQuery query = taskList.getQueryForHandle(((ITask) element).getHandleIdentifier());
+		if (element instanceof AbstractTask) {
+			AbstractRepositoryQuery query = taskList.getQueryForHandle(((AbstractTask) element).getHandleIdentifier());
 			if (query != null) {
 				return selectWorkingSet(query);
 			}
@@ -44,16 +44,16 @@ public class TaskWorkingSetFilter extends AbstractTaskListFilter {
 		return true;
 	}
 
-	private boolean selectWorkingSet(AbstractTaskContainer container) {
+	private boolean selectWorkingSet(AbstractTaskListElement container) {
 		if (currentWorkingSet == null) {
 			return true;
 		}
 		boolean seenTaskWorkingSets = false;
 		String handleIdentifier = container.getHandleIdentifier();
 		for (IAdaptable adaptable : currentWorkingSet.getElements()) {
-			if (adaptable instanceof AbstractTaskContainer) {
+			if (adaptable instanceof AbstractTaskListElement) {
 				seenTaskWorkingSets = true;
-				if (handleIdentifier.equals(((AbstractTaskContainer) adaptable).getHandleIdentifier())) {
+				if (handleIdentifier.equals(((AbstractTaskListElement) adaptable).getHandleIdentifier())) {
 					return true;
 				}
 			}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TasksReminderDialog.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TasksReminderDialog.java
index 0dd70e380..7edc613c4 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TasksReminderDialog.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TasksReminderDialog.java
@@ -22,7 +22,7 @@ import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.mylyn.tasks.core.ITask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
@@ -39,7 +39,7 @@ import org.eclipse.swt.widgets.TableColumn;
  * @author Ken Sueda
  */
 public class TasksReminderDialog extends Dialog {
-	private List<ITask> tasks = null;
+	private List<AbstractTask> tasks = null;
 
 	private Table table = null;
 
@@ -61,7 +61,7 @@ public class TasksReminderDialog extends Dialog {
 
 	private static long DAY = 24 * 3600 * 1000;
 
-	public TasksReminderDialog(Shell parentShell, List<ITask> remTasks) {
+	public TasksReminderDialog(Shell parentShell, List<AbstractTask> remTasks) {
 		super(parentShell);
 		tasks = remTasks;
 		setShellStyle(SWT.CLOSE | SWT.MIN | SWT.MODELESS | SWT.BORDER | SWT.TITLE);
@@ -153,14 +153,14 @@ public class TasksReminderDialog extends Dialog {
 	@Override
 	protected void buttonPressed(int buttonId) {
 		if (buttonId == DISMISS_ALL_ID) {
-			for (ITask t : tasks) {
+			for (AbstractTask t : tasks) {
 				t.setReminded(true);
 			}
 			okPressed();
 		} else if (buttonId == DISMISS_ID) {
 			Object sel = ((IStructuredSelection) tableViewer.getSelection()).getFirstElement();
-			if (sel != null && sel instanceof ITask) {
-				ITask t = (ITask) sel;
+			if (sel != null && sel instanceof AbstractTask) {
+				AbstractTask t = (AbstractTask) sel;
 				t.setReminded(true);
 				tasks.remove(t);
 				if (tasks.isEmpty()) {
@@ -171,8 +171,8 @@ public class TasksReminderDialog extends Dialog {
 			}
 		} else if (buttonId == SNOOZE_ID) {
 			Object sel = ((IStructuredSelection) tableViewer.getSelection()).getFirstElement();
-			if (sel != null && sel instanceof ITask) {
-				ITask t = (ITask) sel;
+			if (sel != null && sel instanceof AbstractTask) {
+				AbstractTask t = (AbstractTask) sel;
 				t.setReminded(false);
 				t.setScheduledForDate(new Date(new Date().getTime() + DAY));
 				tasks.remove(t);
@@ -205,8 +205,8 @@ public class TasksReminderDialog extends Dialog {
 		}
 
 		public String getColumnText(Object element, int columnIndex) {
-			if (element instanceof ITask) {
-				ITask task = (ITask) element;
+			if (element instanceof AbstractTask) {
+				AbstractTask task = (AbstractTask) element;
 				switch (columnIndex) {
 				case 0:
 					return task.getSummary();
@@ -238,8 +238,8 @@ public class TasksReminderDialog extends Dialog {
 
 		@Override
 		public int compare(Viewer viewer, Object obj1, Object obj2) {
-			ITask t1 = (ITask) obj1;
-			ITask t2 = (ITask) obj2;
+			AbstractTask t1 = (AbstractTask) obj1;
+			AbstractTask t2 = (AbstractTask) obj2;
 
 			switch (criteria) {
 			case DESCRIPTION:
@@ -253,15 +253,15 @@ public class TasksReminderDialog extends Dialog {
 			}
 		}
 
-		private int compareDescription(ITask task1, ITask task2) {
+		private int compareDescription(AbstractTask task1, AbstractTask task2) {
 			return task1.getSummary().compareToIgnoreCase(task2.getSummary());
 		}
 
-		private int comparePriority(ITask task1, ITask task2) {
+		private int comparePriority(AbstractTask task1, AbstractTask task2) {
 			return task1.getPriority().compareTo(task2.getPriority());
 		}
 
-		private int compareDate(ITask task1, ITask task2) {
+		private int compareDate(AbstractTask task1, AbstractTask task2) {
 			return task2.getScheduledForDate().compareTo(task1.getScheduledForDate());
 		}
 	}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TasksUiImages.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TasksUiImages.java
index d9575379d..4eb302657 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TasksUiImages.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TasksUiImages.java
@@ -18,7 +18,7 @@ import java.net.URL;
 
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask.PriorityLevel;
+import org.eclipse.mylyn.tasks.core.AbstractTask.PriorityLevel;
 import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
 import org.eclipse.swt.graphics.Image;
 
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/AbstractRepositoryTasksAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/AbstractTaskAction.java
index 5a48fa1fc..ae174a871 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/AbstractRepositoryTasksAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/AbstractTaskAction.java
@@ -12,35 +12,35 @@ import java.util.List;
 
 import org.eclipse.jface.action.Action;
 import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask;
-import org.eclipse.mylyn.tasks.core.AbstractTaskContainer;
-import org.eclipse.mylyn.tasks.core.ITask;
-import org.eclipse.mylyn.tasks.core.ITaskListElement;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
+import org.eclipse.mylyn.tasks.core.AbstractTaskListElement;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
+import org.eclipse.mylyn.tasks.core.AbstractTaskListElement;
 import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
 
 /**
  * @author Rob Elves
  */
-public abstract class AbstractRepositoryTasksAction extends Action {
+public abstract class AbstractTaskAction extends Action {
 
-	protected List<ITaskListElement> selectedElements;
+	protected List<AbstractTaskListElement> selectedElements;
 
 	@Override
 	public void run() {
-		for (ITaskListElement element : selectedElements) {
-			if (element instanceof AbstractRepositoryTask) {
-				AbstractRepositoryTask repositoryTask = (AbstractRepositoryTask) element;
+		for (AbstractTaskListElement element : selectedElements) {
+			if (element instanceof AbstractTask) {
+				AbstractTask repositoryTask = (AbstractTask) element;
 				performActionOnTask(repositoryTask);
 			} else if (element instanceof AbstractRepositoryQuery) {
 				AbstractRepositoryQuery repositoryQuery = (AbstractRepositoryQuery) element;
-				for (AbstractRepositoryTask queryHit : repositoryQuery.getHits()) {
+				for (AbstractTask queryHit : repositoryQuery.getHits()) {
 					performActionOnTask(queryHit);
 				}
-			} else if (element instanceof AbstractTaskContainer) {
-				AbstractTaskContainer container = (AbstractTaskContainer) element;
-				for (ITask iTask : container.getChildren()) {
-					if (iTask instanceof AbstractRepositoryTask) {
-						AbstractRepositoryTask repositoryTask = (AbstractRepositoryTask) iTask;
+			} else if (element instanceof AbstractTaskListElement) {
+				AbstractTaskListElement container = (AbstractTaskListElement) element;
+				for (AbstractTask iTask : container.getChildren()) {
+					if (iTask instanceof AbstractTask) {
+						AbstractTask repositoryTask = (AbstractTask) iTask;
 						performActionOnTask(repositoryTask);
 					}
 				}
@@ -48,9 +48,9 @@ public abstract class AbstractRepositoryTasksAction extends Action {
 		}
 	}
 
-	protected abstract void performActionOnTask(AbstractRepositoryTask repositoryTask);
+	protected abstract void performActionOnTask(AbstractTask repositoryTask);
 
-	protected boolean containsArchiveContainer(List<ITaskListElement> selectedElements) {
+	protected boolean containsArchiveContainer(List<AbstractTaskListElement> selectedElements) {
 		return selectedElements.contains(TasksUiPlugin.getTaskListManager().getTaskList().getArchiveContainer());
 	}
 
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/ActivateTaskDialogAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/ActivateTaskDialogAction.java
index b33a200c0..cd01cdb03 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/ActivateTaskDialogAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/ActivateTaskDialogAction.java
@@ -13,7 +13,7 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.IDialogSettings;
 import org.eclipse.jface.window.Window;
 import org.eclipse.mylyn.internal.tasks.ui.views.TaskListView;
-import org.eclipse.mylyn.tasks.core.ITask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
 import org.eclipse.mylyn.tasks.ui.TaskListManager;
 import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
 import org.eclipse.ui.IWorkbenchWindow;
@@ -52,8 +52,8 @@ public class ActivateTaskDialogAction extends ActionDelegate implements IWorkben
 
 		Object result = dlg.getFirstResult();
 		TaskListManager manager = TasksUiPlugin.getTaskListManager();
-		if (result instanceof ITask) {
-			ITask task = (ITask) result;
+		if (result instanceof AbstractTask) {
+			AbstractTask task = (AbstractTask) result;
 			manager.activateTask(task);
 			manager.getTaskActivationHistory().addTask(task);
 		}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/AttachFileAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/AttachFileAction.java
index 77b68cb18..67b8b8361 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/AttachFileAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/AttachFileAction.java
@@ -11,7 +11,7 @@ package org.eclipse.mylyn.internal.tasks.ui.actions;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.mylyn.internal.tasks.ui.wizards.NewAttachmentWizard;
 import org.eclipse.mylyn.internal.tasks.ui.wizards.NewAttachmentWizardDialog;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
 import org.eclipse.mylyn.tasks.core.TaskRepository;
 import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
 import org.eclipse.mylyn.tasks.ui.editors.TaskEditor;
@@ -36,8 +36,8 @@ public class AttachFileAction extends BaseSelectionListenerAction {
 			editor.showBusy(true);
 		}
 		Object selection = super.getStructuredSelection().getFirstElement();
-		if (selection instanceof AbstractRepositoryTask) {
-			AbstractRepositoryTask repositoryTask = (AbstractRepositoryTask) selection;
+		if (selection instanceof AbstractTask) {
+			AbstractTask repositoryTask = (AbstractTask) selection;
 			TaskRepository repository = TasksUiPlugin.getRepositoryManager().getRepository(
 					repositoryTask.getRepositoryKind(), repositoryTask.getRepositoryUrl());
 
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/ClearOutgoingAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/ClearOutgoingAction.java
index 496a6eef3..d397788c2 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/ClearOutgoingAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/ClearOutgoingAction.java
@@ -16,9 +16,9 @@ import java.util.List;
 
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask;
-import org.eclipse.mylyn.tasks.core.ITaskListElement;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask.RepositoryTaskSyncState;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
+import org.eclipse.mylyn.tasks.core.AbstractTaskListElement;
+import org.eclipse.mylyn.tasks.core.AbstractTask.RepositoryTaskSyncState;
 import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
 
 /**
@@ -32,15 +32,15 @@ public class ClearOutgoingAction extends Action {
 
 	public static final String ID = "org.eclipse.mylyn.tasklist.actions.mark.discard";
 
-	private List<ITaskListElement> selectedElements;
+	private List<AbstractTaskListElement> selectedElements;
 
-	public ClearOutgoingAction(List<ITaskListElement> selectedElements) {
+	public ClearOutgoingAction(List<AbstractTaskListElement> selectedElements) {
 		this.selectedElements = selectedElements;
 		setText(ACTION_NAME);
 		setToolTipText(ACTION_NAME);
 		setId(ID);
-		if (selectedElements.size() == 1 && (selectedElements.get(0) instanceof AbstractRepositoryTask)) {
-			AbstractRepositoryTask task = (AbstractRepositoryTask) selectedElements.get(0);
+		if (selectedElements.size() == 1 && (selectedElements.get(0) instanceof AbstractTask)) {
+			AbstractTask task = (AbstractTask) selectedElements.get(0);
 			setEnabled(task.getSyncState().equals(RepositoryTaskSyncState.OUTGOING));
 		} else {
 			setEnabled(false);
@@ -49,12 +49,12 @@ public class ClearOutgoingAction extends Action {
 
 	@Override
 	public void run() {
-		ArrayList<AbstractRepositoryTask> toClear = new ArrayList<AbstractRepositoryTask>();
+		ArrayList<AbstractTask> toClear = new ArrayList<AbstractTask>();
 		for (Object selectedObject : selectedElements) {
-			if (selectedObject instanceof AbstractRepositoryTask
-					&& ((AbstractRepositoryTask) selectedObject).getSyncState()
+			if (selectedObject instanceof AbstractTask
+					&& ((AbstractTask) selectedObject).getSyncState()
 							.equals(RepositoryTaskSyncState.OUTGOING)) {
-				toClear.add(((AbstractRepositoryTask) selectedObject));
+				toClear.add(((AbstractTask) selectedObject));
 			}
 		}
 		if (toClear.size() > 0) {
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/CopyTaskDetailsAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/CopyTaskDetailsAction.java
index b91325976..37137363d 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/CopyTaskDetailsAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/CopyTaskDetailsAction.java
@@ -15,9 +15,9 @@ import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.mylyn.internal.tasks.ui.TasksUiImages;
 import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector;
 import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask;
-import org.eclipse.mylyn.tasks.core.ITask;
-import org.eclipse.mylyn.tasks.core.ITaskListElement;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
+import org.eclipse.mylyn.tasks.core.AbstractTaskListElement;
 import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
 import org.eclipse.mylyn.tasks.ui.editors.RepositoryTaskSelection;
 import org.eclipse.swt.SWT;
@@ -64,14 +64,14 @@ public class CopyTaskDetailsAction extends BaseSelectionListenerAction {
 
 	public static String getTextForTask(Object object) {
 		String text = "";
-		if (object instanceof ITask) {
-			ITask task = null;
-			if (object instanceof ITask) {
-				task = (ITask) object;
+		if (object instanceof AbstractTask) {
+			AbstractTask task = null;
+			if (object instanceof AbstractTask) {
+				task = (AbstractTask) object;
 			}
 			if (task != null) {
-				if (task instanceof AbstractRepositoryTask) {
-					text += ((AbstractRepositoryTask) task).getTaskKey() + ": ";
+				if (task instanceof AbstractTask) {
+					text += ((AbstractTask) task).getTaskKey() + ": ";
 				}
 
 				text += task.getSummary();
@@ -83,8 +83,8 @@ public class CopyTaskDetailsAction extends BaseSelectionListenerAction {
 			AbstractRepositoryQuery query = (AbstractRepositoryQuery) object;
 			text += query.getSummary();
 			text += "\n" + query.getUrl();
-		} else if (object instanceof ITaskListElement) {
-			ITaskListElement element = (ITaskListElement) object;
+		} else if (object instanceof AbstractTaskListElement) {
+			AbstractTaskListElement element = (AbstractTaskListElement) object;
 			text = element.getSummary();
 		} else if (object instanceof RepositoryTaskSelection) {
 
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/DeleteAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/DeleteAction.java
index d68136457..e6095037d 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/DeleteAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/DeleteAction.java
@@ -20,8 +20,8 @@ import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.mylyn.context.core.ContextCorePlugin;
 import org.eclipse.mylyn.internal.tasks.ui.views.TaskListView;
 import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery;
-import org.eclipse.mylyn.tasks.core.ITask;
-import org.eclipse.mylyn.tasks.core.ITaskListElement;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
+import org.eclipse.mylyn.tasks.core.AbstractTaskListElement;
 import org.eclipse.mylyn.tasks.core.TaskCategory;
 import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
 import org.eclipse.mylyn.tasks.ui.TasksUiUtil;
@@ -56,8 +56,8 @@ public class DeleteAction extends Action {
 		for (Object object : toDelete) {
 			i++;
 			if (i < 20) {
-				if (object instanceof ITaskListElement) {
-					message += "    " + ((ITaskListElement) object).getSummary() + "\n";
+				if (object instanceof AbstractTaskListElement) {
+					message += "    " + ((AbstractTaskListElement) object).getSummary() + "\n";
 				}
 			} else {
 				message += "...";
@@ -71,9 +71,9 @@ public class DeleteAction extends Action {
 		}
 
 		for (Object selectedObject : toDelete) {
-			if (selectedObject instanceof ITask) {
-				ITask task = null;
-				task = (ITask) selectedObject;
+			if (selectedObject instanceof AbstractTask) {
+				AbstractTask task = null;
+				task = (AbstractTask) selectedObject;
 				TasksUiPlugin.getTaskListManager().deactivateTask(task);
 				TasksUiPlugin.getTaskListManager().getTaskList().deleteTask(task);
 				ContextCorePlugin.getContextManager().deleteContext(task.getHandleIdentifier());
@@ -95,7 +95,7 @@ public class DeleteAction extends Action {
 				// if (!deleteConfirmed)
 				// return;
 				TaskCategory cat = (TaskCategory) selectedObject;
-				for (ITask task : cat.getChildren()) {
+				for (AbstractTask task : cat.getChildren()) {
 					ContextCorePlugin.getContextManager().deleteContext(task.getHandleIdentifier());
 					TasksUiUtil.closeEditorInActivePage(task);
 				}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/MarkTaskCompleteAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/MarkTaskCompleteAction.java
index f04827ab6..3f2fb3521 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/MarkTaskCompleteAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/MarkTaskCompleteAction.java
@@ -16,9 +16,9 @@ import java.util.List;
 import org.eclipse.jface.action.Action;
 import org.eclipse.mylyn.internal.tasks.core.WebTask;
 import org.eclipse.mylyn.internal.tasks.ui.TasksUiImages;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask;
-import org.eclipse.mylyn.tasks.core.ITask;
-import org.eclipse.mylyn.tasks.core.ITaskListElement;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
+import org.eclipse.mylyn.tasks.core.AbstractTaskListElement;
 import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
 
 /**
@@ -30,16 +30,16 @@ public class MarkTaskCompleteAction extends Action {
 
 	private static final String ACTION_NAME = "Complete";
 
-	private List<ITaskListElement> selectedElements;
+	private List<AbstractTaskListElement> selectedElements;
 
-	public MarkTaskCompleteAction(List<ITaskListElement> selectedElements) {
+	public MarkTaskCompleteAction(List<AbstractTaskListElement> selectedElements) {
 		this.selectedElements = selectedElements;
 		setText(ACTION_NAME);
 		setToolTipText("Mark " + ACTION_NAME);
 		setId(ID);
 		setImageDescriptor(TasksUiImages.TASK_COMPLETE);
-		if (selectedElements.size() == 1 && (selectedElements.get(0) instanceof AbstractRepositoryTask)) {
-			AbstractRepositoryTask task = (AbstractRepositoryTask) selectedElements.get(0);
+		if (selectedElements.size() == 1 && (selectedElements.get(0) instanceof AbstractTask)) {
+			AbstractTask task = (AbstractTask) selectedElements.get(0);
 			if (task instanceof WebTask) {
 				setEnabled(true);
 			} else {
@@ -55,8 +55,8 @@ public class MarkTaskCompleteAction extends Action {
 	@Override
 	public void run() {
 		for (Object selectedObject : selectedElements) {
-			if (selectedObject instanceof ITask) {
-				TasksUiPlugin.getTaskListManager().getTaskList().markComplete(((ITask) selectedObject), true);
+			if (selectedObject instanceof AbstractTask) {
+				TasksUiPlugin.getTaskListManager().getTaskList().markComplete(((AbstractTask) selectedObject), true);
 			}
 		}
 	}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/MarkTaskIncompleteAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/MarkTaskIncompleteAction.java
index 51f8e7ddf..7b5150a74 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/MarkTaskIncompleteAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/MarkTaskIncompleteAction.java
@@ -15,9 +15,9 @@ import java.util.List;
 
 import org.eclipse.jface.action.Action;
 import org.eclipse.mylyn.internal.tasks.ui.TasksUiImages;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask;
-import org.eclipse.mylyn.tasks.core.ITask;
-import org.eclipse.mylyn.tasks.core.ITaskListElement;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
+import org.eclipse.mylyn.tasks.core.AbstractTaskListElement;
 import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
 
 /**
@@ -29,16 +29,16 @@ public class MarkTaskIncompleteAction extends Action {
 
 	public static final String ID = "org.eclipse.mylyn.tasklist.actions.mark.incomplete";
 
-	private List<ITaskListElement> selectedElements;
+	private List<AbstractTaskListElement> selectedElements;
 
-	public MarkTaskIncompleteAction(List<ITaskListElement> selectedElements) {
+	public MarkTaskIncompleteAction(List<AbstractTaskListElement> selectedElements) {
 		this.selectedElements = selectedElements;
 		setText(ACTION_NAME);
 		setToolTipText("Mark " + ACTION_NAME);
 		setId(ID);
 		setImageDescriptor(TasksUiImages.TASK_INCOMPLETE);
-		if (selectedElements.size() == 1 && (selectedElements.get(0) instanceof AbstractRepositoryTask)) {
-			AbstractRepositoryTask task = (AbstractRepositoryTask) selectedElements.get(0);
+		if (selectedElements.size() == 1 && (selectedElements.get(0) instanceof AbstractTask)) {
+			AbstractTask task = (AbstractTask) selectedElements.get(0);
 			setEnabled(task.isLocal());
 //		} else if (selectedElements.size() == 1 && (selectedElements.get(0) instanceof WebQueryHit)) {
 //			setEnabled(true);
@@ -50,8 +50,8 @@ public class MarkTaskIncompleteAction extends Action {
 	@Override
 	public void run() {
 		for (Object selectedObject : selectedElements) {
-			if (selectedObject instanceof ITask) {
-				TasksUiPlugin.getTaskListManager().getTaskList().markComplete(((ITask) selectedObject), false);
+			if (selectedObject instanceof AbstractTask) {
+				TasksUiPlugin.getTaskListManager().getTaskList().markComplete(((AbstractTask) selectedObject), false);
 			}
 		}
 	}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/MarkTaskReadAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/MarkTaskReadAction.java
index 7f310498e..b391b246f 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/MarkTaskReadAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/MarkTaskReadAction.java
@@ -13,20 +13,20 @@ package org.eclipse.mylyn.internal.tasks.ui.actions;
 
 import java.util.List;
 
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask;
-import org.eclipse.mylyn.tasks.core.ITaskListElement;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
+import org.eclipse.mylyn.tasks.core.AbstractTaskListElement;
 import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
 
 /**
  * @author Rob Elves
  */
-public class MarkTaskReadAction extends AbstractRepositoryTasksAction {
+public class MarkTaskReadAction extends AbstractTaskAction {
 
 	private static final String ACTION_NAME = "Read";
 
 	public static final String ID = "org.eclipse.mylyn.tasklist.actions.mark.read";
 
-	public MarkTaskReadAction(List<ITaskListElement> selectedElements) {
+	public MarkTaskReadAction(List<AbstractTaskListElement> selectedElements) {
 		super.selectedElements = selectedElements;
 		setText(ACTION_NAME);
 		setToolTipText("Mark " + ACTION_NAME);
@@ -35,8 +35,8 @@ public class MarkTaskReadAction extends AbstractRepositoryTasksAction {
 			setEnabled(false);
 		} else {
 			setEnabled(selectedElements.size() > 0);
-			if (selectedElements.size() == 1 && (selectedElements.get(0) instanceof AbstractRepositoryTask)) {
-				AbstractRepositoryTask task = (AbstractRepositoryTask) selectedElements.get(0);
+			if (selectedElements.size() == 1 && (selectedElements.get(0) instanceof AbstractTask)) {
+				AbstractTask task = (AbstractTask) selectedElements.get(0);
 				setEnabled(!task.isLocal());
 			} else {
 				setEnabled(true);
@@ -45,7 +45,7 @@ public class MarkTaskReadAction extends AbstractRepositoryTasksAction {
 	}
 
 	@Override
-	protected void performActionOnTask(AbstractRepositoryTask repositoryTask) {
+	protected void performActionOnTask(AbstractTask repositoryTask) {
 		TasksUiPlugin.getSynchronizationManager().setTaskRead(repositoryTask, true);
 	}
 
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/MarkTaskUnreadAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/MarkTaskUnreadAction.java
index 3f88bb7ff..89341297e 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/MarkTaskUnreadAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/MarkTaskUnreadAction.java
@@ -14,20 +14,20 @@ package org.eclipse.mylyn.internal.tasks.ui.actions;
 import java.util.List;
 
 import org.eclipse.mylyn.internal.tasks.ui.TasksUiImages;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask;
-import org.eclipse.mylyn.tasks.core.ITaskListElement;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
+import org.eclipse.mylyn.tasks.core.AbstractTaskListElement;
 import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
 
 /**
  * @author Rob Elves
  */
-public class MarkTaskUnreadAction extends AbstractRepositoryTasksAction {
+public class MarkTaskUnreadAction extends AbstractTaskAction {
 
 	private static final String ACTION_NAME = "Unread";
 
 	public static final String ID = "org.eclipse.mylyn.tasklist.actions.mark.unread";
 
-	public MarkTaskUnreadAction(List<ITaskListElement> selectedElements) {
+	public MarkTaskUnreadAction(List<AbstractTaskListElement> selectedElements) {
 		this.selectedElements = selectedElements;
 		setText(ACTION_NAME);
 		setToolTipText(ACTION_NAME);
@@ -37,8 +37,8 @@ public class MarkTaskUnreadAction extends AbstractRepositoryTasksAction {
 		if (containsArchiveContainer(selectedElements)) {
 			setEnabled(false);
 		} else {
-			if (selectedElements.size() == 1 && (selectedElements.get(0) instanceof AbstractRepositoryTask)) {
-				AbstractRepositoryTask task = (AbstractRepositoryTask) selectedElements.get(0);
+			if (selectedElements.size() == 1 && (selectedElements.get(0) instanceof AbstractTask)) {
+				AbstractTask task = (AbstractTask) selectedElements.get(0);
 				setEnabled(!task.isLocal());
 			} else {
 				setEnabled(true);
@@ -47,7 +47,7 @@ public class MarkTaskUnreadAction extends AbstractRepositoryTasksAction {
 	}
 
 	@Override
-	protected void performActionOnTask(AbstractRepositoryTask repositoryTask) {
+	protected void performActionOnTask(AbstractTask repositoryTask) {
 		TasksUiPlugin.getSynchronizationManager().setTaskRead(repositoryTask, false);
 	}
 
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/OpenTaskAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/OpenTaskAction.java
index 6f5eb19a9..58133686a 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/OpenTaskAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/OpenTaskAction.java
@@ -12,7 +12,7 @@ import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.IDialogSettings;
 import org.eclipse.jface.window.Window;
-import org.eclipse.mylyn.tasks.core.ITask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
 import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
 import org.eclipse.mylyn.tasks.ui.TasksUiUtil;
 import org.eclipse.ui.IWorkbenchWindow;
@@ -55,8 +55,8 @@ public class OpenTaskAction extends ActionDelegate implements IWorkbenchWindowAc
 		}
 
 		Object result = dlg.getFirstResult();
-		if (result instanceof ITask) {
-			ITask task = (ITask) result;
+		if (result instanceof AbstractTask) {
+			AbstractTask task = (AbstractTask) result;
 			if (dlg.getOpenInBrowser()) {
 				if (task.hasValidUrl()) {
 					TasksUiUtil.openUrl(task.getTaskUrl(), false);
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/OpenTaskListElementAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/OpenTaskListElementAction.java
index 08cf220a2..1e6782a92 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/OpenTaskListElementAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/OpenTaskListElementAction.java
@@ -18,8 +18,8 @@ import org.eclipse.jface.action.Action;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.mylyn.tasks.core.ITask;
-import org.eclipse.mylyn.tasks.core.ITaskListElement;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
+import org.eclipse.mylyn.tasks.core.AbstractTaskListElement;
 import org.eclipse.mylyn.tasks.ui.TasksUiUtil;
 
 /**
@@ -45,8 +45,8 @@ public class OpenTaskListElementAction extends Action {
 		for (Iterator<?> iterator = list.iterator(); iterator.hasNext();) {
 			Object element = (Object) iterator.next();
 //			if (element instanceof ITaskListElement && !(element instanceof AbstractTaskContainer)) {
-			if (element instanceof ITask) {
-				TasksUiUtil.refreshAndOpenTaskListElement((ITaskListElement) element);
+			if (element instanceof AbstractTask) {
+				TasksUiUtil.refreshAndOpenTaskListElement((AbstractTaskListElement) element);
 			}
 		}
 	}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/OpenWithBrowserAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/OpenWithBrowserAction.java
index 732d2a56d..df288ba8d 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/OpenWithBrowserAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/OpenWithBrowserAction.java
@@ -13,8 +13,8 @@ package org.eclipse.mylyn.internal.tasks.ui.actions;
 
 import java.util.Iterator;
 
-import org.eclipse.mylyn.tasks.core.AbstractTaskContainer;
-import org.eclipse.mylyn.tasks.core.ITask;
+import org.eclipse.mylyn.tasks.core.AbstractTaskListElement;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
 import org.eclipse.mylyn.tasks.ui.TasksUiUtil;
 import org.eclipse.ui.actions.BaseSelectionListenerAction;
 
@@ -46,13 +46,13 @@ public class OpenWithBrowserAction extends BaseSelectionListenerAction {
 
 	private void runWithSelection(Object selectedObject) {
 		String urlString = null;
-		if (selectedObject instanceof ITask) {
-			ITask task = (ITask)selectedObject;
+		if (selectedObject instanceof AbstractTask) {
+			AbstractTask task = (AbstractTask)selectedObject;
 			if (task != null && task.hasValidUrl()) {
 				urlString = task.getTaskUrl();
 			}
-		} else if (selectedObject instanceof AbstractTaskContainer) {
-			AbstractTaskContainer query = (AbstractTaskContainer) selectedObject;
+		} else if (selectedObject instanceof AbstractTaskListElement) {
+			AbstractTaskListElement query = (AbstractTaskListElement) selectedObject;
 			urlString = query.getUrl();
 		}
 		
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/PreviousTaskDropDownAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/PreviousTaskDropDownAction.java
index c31308749..a5c8c21cc 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/PreviousTaskDropDownAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/PreviousTaskDropDownAction.java
@@ -17,7 +17,7 @@ import org.eclipse.jface.action.ActionContributionItem;
 import org.eclipse.jface.action.Separator;
 import org.eclipse.mylyn.internal.tasks.ui.TasksUiImages;
 import org.eclipse.mylyn.internal.tasks.ui.views.TaskActivationHistory;
-import org.eclipse.mylyn.tasks.core.ITask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
 import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
 
 /**
@@ -40,14 +40,14 @@ public class PreviousTaskDropDownAction extends TaskNavigateDropDownAction {
 
 	@Override
 	protected void addActionsToMenu() {
-		List<ITask> tasks = taskHistory.getPreviousTasks();
+		List<AbstractTask> tasks = taskHistory.getPreviousTasks();
 
 		if (tasks.size() > MAX_ITEMS_TO_DISPLAY) {
 			tasks = tasks.subList(tasks.size() - MAX_ITEMS_TO_DISPLAY, tasks.size());
 		}
 
 		for (int i = tasks.size() - 1; i >= 0; i--) {
-			ITask currTask = tasks.get(i);
+			AbstractTask currTask = tasks.get(i);
 			Action taskNavAction = new TaskNavigateAction(currTask);
 			ActionContributionItem item = new ActionContributionItem(taskNavAction);
 			if (currTask.isActive()) {
@@ -56,7 +56,7 @@ public class PreviousTaskDropDownAction extends TaskNavigateDropDownAction {
 			item.fill(dropDownMenu, -1);
 		}
 
-		ITask active = TasksUiPlugin.getTaskListManager().getTaskList().getActiveTask();
+		AbstractTask active = TasksUiPlugin.getTaskListManager().getTaskList().getActiveTask();
 		if (active != null) {
 			Separator separator = new Separator();
 			separator.fill(dropDownMenu, -1);
@@ -71,7 +71,7 @@ public class PreviousTaskDropDownAction extends TaskNavigateDropDownAction {
 	@Override
 	public void run() {
 		if (taskHistory.hasPrevious()) {
-			ITask previousTask = taskHistory.getPreviousTask();
+			AbstractTask previousTask = taskHistory.getPreviousTask();
 			new TaskActivateAction().run(previousTask);
 			setButtonStatus();
 			// view.refreshAndFocus(false);
@@ -91,7 +91,7 @@ public class PreviousTaskDropDownAction extends TaskNavigateDropDownAction {
 		
 		@Override
 		public void run() {
-			ITask active = TasksUiPlugin.getTaskListManager().getTaskList().getActiveTask();
+			AbstractTask active = TasksUiPlugin.getTaskListManager().getTaskList().getActiveTask();
 			if (active != null) {
 				TasksUiPlugin.getTaskListManager().deactivateTask(active);
 			}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/RemoveFromCategoryAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/RemoveFromCategoryAction.java
index 54ad7050a..86341c604 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/RemoveFromCategoryAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/RemoveFromCategoryAction.java
@@ -19,7 +19,7 @@ import org.eclipse.mylyn.core.MylarStatusHandler;
 import org.eclipse.mylyn.internal.tasks.ui.ITasksUiConstants;
 import org.eclipse.mylyn.internal.tasks.ui.TasksUiImages;
 import org.eclipse.mylyn.internal.tasks.ui.views.TaskListView;
-import org.eclipse.mylyn.tasks.core.ITask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
 import org.eclipse.mylyn.tasks.core.TaskCategory;
 import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
 import org.eclipse.swt.widgets.TreeItem;
@@ -45,8 +45,8 @@ public class RemoveFromCategoryAction extends Action {
 		try {
 			ISelection selection = TaskListView.getFromActivePerspective().getViewer().getSelection();
 			for (Object selectedObject : ((IStructuredSelection) selection).toList()) {
-				if (selectedObject instanceof ITask) { // && !((ITask) selectedObject).isLocal()) {
-					ITask task = (ITask) selectedObject;
+				if (selectedObject instanceof AbstractTask) { // && !((ITask) selectedObject).isLocal()) {
+					AbstractTask task = (AbstractTask) selectedObject;
 					if (task.isActive()) {
 						MessageDialog.openInformation(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
 								ITasksUiConstants.TITLE_DIALOG,
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/RenameAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/RenameAction.java
index 58d682320..d1b48ab88 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/RenameAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/RenameAction.java
@@ -13,7 +13,7 @@ package org.eclipse.mylyn.internal.tasks.ui.actions;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.mylyn.internal.tasks.core.LocalTask;
 import org.eclipse.mylyn.internal.tasks.ui.views.TaskListView;
-import org.eclipse.mylyn.tasks.core.ITaskListElement;
+import org.eclipse.mylyn.tasks.core.AbstractTaskListElement;
 import org.eclipse.swt.SWT;
 import org.eclipse.ui.actions.BaseSelectionListenerAction;
 
@@ -38,8 +38,8 @@ public class RenameAction extends BaseSelectionListenerAction {
 	@Override
 	public void run() {
 		Object selectedObject = ((IStructuredSelection) this.view.getViewer().getSelection()).getFirstElement();
-		if (selectedObject instanceof ITaskListElement) {
-			ITaskListElement element = (ITaskListElement) selectedObject;
+		if (selectedObject instanceof AbstractTaskListElement) {
+			AbstractTaskListElement element = (AbstractTaskListElement) selectedObject;
 			view.setInRenameAction(true);
 			view.getViewer().editElement(element, 0);
 			view.setInRenameAction(false);
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/SynchronizeEditorAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/SynchronizeEditorAction.java
index 0097d0754..fb1972873 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/SynchronizeEditorAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/SynchronizeEditorAction.java
@@ -17,10 +17,10 @@ import org.eclipse.core.runtime.jobs.IJobChangeEvent;
 import org.eclipse.core.runtime.jobs.JobChangeAdapter;
 import org.eclipse.mylyn.internal.tasks.ui.TasksUiImages;
 import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask;
-import org.eclipse.mylyn.tasks.core.ITask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
 import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
-import org.eclipse.mylyn.tasks.ui.editors.AbstractRepositoryTaskEditor;
+import org.eclipse.mylyn.tasks.ui.editors.AbstractTaskEditor;
 import org.eclipse.mylyn.tasks.ui.editors.TaskEditor;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.actions.BaseSelectionListenerAction;
@@ -53,15 +53,15 @@ public class SynchronizeEditorAction extends BaseSelectionListenerAction {
 	}
 
 	private void runWithSelection(final Object selectedObject) {
-		AbstractRepositoryTask repositoryTask = null;
+		AbstractTask repositoryTask = null;
 		if (selectedObject instanceof TaskEditor) {
 			TaskEditor editor = (TaskEditor) selectedObject;
-			ITask task = editor.getTaskEditorInput().getTask();
-			if (task instanceof AbstractRepositoryTask) {
-				repositoryTask = (AbstractRepositoryTask) task;
+			AbstractTask task = editor.getTaskEditorInput().getTask();
+			if (task instanceof AbstractTask) {
+				repositoryTask = (AbstractTask) task;
 			}
-		} else if (selectedObject instanceof AbstractRepositoryTaskEditor) {
-			AbstractRepositoryTaskEditor editor = (AbstractRepositoryTaskEditor) selectedObject;
+		} else if (selectedObject instanceof AbstractTaskEditor) {
+			AbstractTaskEditor editor = (AbstractTaskEditor) selectedObject;
 			repositoryTask = editor.getRepositoryTask();
 		}
 
@@ -80,8 +80,8 @@ public class SynchronizeEditorAction extends BaseSelectionListenerAction {
 										if (selectedObject instanceof TaskEditor) {
 											TaskEditor editor = (TaskEditor) selectedObject;
 											editor.refreshEditorContents();
-										} else if (selectedObject instanceof AbstractRepositoryTaskEditor) {
-											((AbstractRepositoryTaskEditor) selectedObject).refreshEditor();
+										} else if (selectedObject instanceof AbstractTaskEditor) {
+											((AbstractTaskEditor) selectedObject).refreshEditor();
 										}
 									}
 								});
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/SynchronizeSelectedAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/SynchronizeSelectedAction.java
index e969caaff..768d85014 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/SynchronizeSelectedAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/SynchronizeSelectedAction.java
@@ -26,8 +26,8 @@ import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.mylyn.internal.tasks.ui.views.TaskListView;
 import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector;
 import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask;
-import org.eclipse.mylyn.tasks.core.ITask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
 import org.eclipse.mylyn.tasks.core.TaskCategory;
 import org.eclipse.mylyn.tasks.core.TaskRepository;
 import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
@@ -45,7 +45,7 @@ public class SynchronizeSelectedAction extends ActionDelegate implements IViewAc
 
 	private Map<AbstractRepositoryConnector, List<AbstractRepositoryQuery>> queriesToSyncMap = new LinkedHashMap<AbstractRepositoryConnector, List<AbstractRepositoryQuery>>();
 
-	private Map<AbstractRepositoryConnector, List<AbstractRepositoryTask>> tasksToSyncMap = new LinkedHashMap<AbstractRepositoryConnector, List<AbstractRepositoryTask>>();
+	private Map<AbstractRepositoryConnector, List<AbstractTask>> tasksToSyncMap = new LinkedHashMap<AbstractRepositoryConnector, List<AbstractTask>>();
 
 	@Override
 	public void run(IAction action) {
@@ -68,15 +68,15 @@ public class SynchronizeSelectedAction extends ActionDelegate implements IViewAc
 					}
 				} else if (obj instanceof TaskCategory) {
 					TaskCategory cat = (TaskCategory) obj;
-					for (ITask task : cat.getChildren()) {
-						if (task instanceof AbstractRepositoryTask) {
+					for (AbstractTask task : cat.getChildren()) {
+						if (task instanceof AbstractTask) {
 							AbstractRepositoryConnector client = TasksUiPlugin.getRepositoryManager()
-									.getRepositoryConnector(((AbstractRepositoryTask) task).getRepositoryKind());
-							addTaskToSync(client, (AbstractRepositoryTask) task);
+									.getRepositoryConnector(((AbstractTask) task).getRepositoryKind());
+							addTaskToSync(client, (AbstractTask) task);
 						}
 					}
-				} else if (obj instanceof AbstractRepositoryTask) {
-					AbstractRepositoryTask repositoryTask = (AbstractRepositoryTask) obj;
+				} else if (obj instanceof AbstractTask) {
+					AbstractTask repositoryTask = (AbstractTask) obj;
 					AbstractRepositoryConnector client = TasksUiPlugin.getRepositoryManager().getRepositoryConnector(
 							repositoryTask.getRepositoryKind());
 					addTaskToSync(client, repositoryTask);
@@ -115,9 +115,9 @@ public class SynchronizeSelectedAction extends ActionDelegate implements IViewAc
 			}
 			if (!tasksToSyncMap.isEmpty()) {
 				for (AbstractRepositoryConnector connector : tasksToSyncMap.keySet()) {
-					List<AbstractRepositoryTask> tasksToSync = tasksToSyncMap.get(connector);
+					List<AbstractTask> tasksToSync = tasksToSyncMap.get(connector);
 					if (tasksToSync != null && tasksToSync.size() > 0) {
-						TasksUiPlugin.getSynchronizationManager().synchronize(connector, new HashSet<AbstractRepositoryTask>(tasksToSync), true, null);
+						TasksUiPlugin.getSynchronizationManager().synchronize(connector, new HashSet<AbstractTask>(tasksToSync), true, null);
 					}
 				}
 			}
@@ -134,11 +134,11 @@ public class SynchronizeSelectedAction extends ActionDelegate implements IViewAc
 //		}		
 	}
 
-	private void addTaskToSync(AbstractRepositoryConnector client, AbstractRepositoryTask repositoryTask) {
+	private void addTaskToSync(AbstractRepositoryConnector client, AbstractTask repositoryTask) {
 		if (client != null) {
-			List<AbstractRepositoryTask> tasksToSync = tasksToSyncMap.get(client);
+			List<AbstractTask> tasksToSync = tasksToSyncMap.get(client);
 			if (tasksToSync == null) {
-				tasksToSync = new ArrayList<AbstractRepositoryTask>();
+				tasksToSync = new ArrayList<AbstractTask>();
 				tasksToSyncMap.put(client, tasksToSync);
 			}
 			tasksToSync.add(repositoryTask);
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskActivateAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskActivateAction.java
index cae5d9120..f599d5a6e 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskActivateAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskActivateAction.java
@@ -16,7 +16,7 @@ import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.mylyn.internal.tasks.ui.TasksUiImages;
 import org.eclipse.mylyn.internal.tasks.ui.views.TaskListView;
-import org.eclipse.mylyn.tasks.core.ITask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
 import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
 import org.eclipse.ui.IViewActionDelegate;
 import org.eclipse.ui.IViewPart;
@@ -43,7 +43,7 @@ public class TaskActivateAction extends Action implements IViewActionDelegate {
 		run(TaskListView.getFromActivePerspective().getSelectedTask());
 	}
 
-	public void run(ITask task) {
+	public void run(AbstractTask task) {
 		if (task != null && !task.isActive()) {
 			TasksUiPlugin.getTaskListManager().activateTask(task);
 			if (TaskListView.getFromActivePerspective() != null) {
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskDeactivateAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskDeactivateAction.java
index 36f16b772..ef77b6ed6 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskDeactivateAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskDeactivateAction.java
@@ -15,7 +15,7 @@ import org.eclipse.jface.action.Action;
 import org.eclipse.mylyn.core.MylarStatusHandler;
 import org.eclipse.mylyn.internal.tasks.ui.TasksUiImages;
 import org.eclipse.mylyn.internal.tasks.ui.views.TaskListView;
-import org.eclipse.mylyn.tasks.core.ITask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
 import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
 import org.eclipse.mylyn.tasks.ui.TasksUiUtil;
 
@@ -32,7 +32,7 @@ public class TaskDeactivateAction extends Action {
 		setImageDescriptor(TasksUiImages.TASK_INACTIVE);
 	}
 
-	public void run(ITask task) {
+	public void run(AbstractTask task) {
 		try {
 			if (task != null) {
 				TasksUiPlugin.getTaskListManager().deactivateTask(task);
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskListElementPropertiesAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskListElementPropertiesAction.java
index 96ad6a7e1..5ed788c2f 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskListElementPropertiesAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskListElementPropertiesAction.java
@@ -16,7 +16,7 @@ import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredViewer;
 import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery;
-import org.eclipse.mylyn.tasks.core.ITaskListElement;
+import org.eclipse.mylyn.tasks.core.AbstractTaskListElement;
 import org.eclipse.mylyn.tasks.core.TaskCategory;
 import org.eclipse.mylyn.tasks.ui.TasksUiUtil;
 
@@ -42,7 +42,7 @@ public class TaskListElementPropertiesAction extends Action {
 		ISelection selection = viewer.getSelection();
 		Object element = ((IStructuredSelection) selection).getFirstElement();
 		if (element instanceof TaskCategory || element instanceof AbstractRepositoryQuery) {
-			TasksUiUtil.refreshAndOpenTaskListElement((ITaskListElement)element);	
+			TasksUiUtil.refreshAndOpenTaskListElement((AbstractTaskListElement)element);	
 		}
 	}
 }
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskNavigateDropDownAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskNavigateDropDownAction.java
index d5ca5d501..b39f42cd2 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskNavigateDropDownAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskNavigateDropDownAction.java
@@ -15,7 +15,7 @@ import org.eclipse.jface.action.IMenuCreator;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.mylyn.internal.tasks.ui.views.TaskActivationHistory;
 import org.eclipse.mylyn.internal.tasks.ui.views.TaskElementLabelProvider;
-import org.eclipse.mylyn.tasks.core.ITask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Menu;
@@ -50,11 +50,11 @@ public abstract class TaskNavigateDropDownAction extends Action implements IMenu
 	 */
 	public class TaskNavigateAction extends Action {
 
-		private ITask targetTask;
+		private AbstractTask targetTask;
 
 		private static final int MAX_LABEL_LENGTH = 40;
 
-		public TaskNavigateAction(ITask task) {
+		public TaskNavigateAction(AbstractTask task) {
 			targetTask = task;
 			String taskDescription = task.getSummary();
 			if (taskDescription.length() > MAX_LABEL_LENGTH) {
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskSelectionDialog.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskSelectionDialog.java
index 5d7e31993..ff5b3a85f 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskSelectionDialog.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskSelectionDialog.java
@@ -29,10 +29,10 @@ import org.eclipse.jface.viewers.ViewerComparator;
 import org.eclipse.jface.viewers.ViewerFilter;
 import org.eclipse.mylyn.internal.tasks.ui.views.TaskElementLabelProvider;
 import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask;
-import org.eclipse.mylyn.tasks.core.ITask;
-import org.eclipse.mylyn.tasks.core.ITaskListElement;
-import org.eclipse.mylyn.tasks.core.TaskList;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
+import org.eclipse.mylyn.tasks.core.AbstractTaskListElement;
+import org.eclipse.mylyn.tasks.core.getAllCategories;
 import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.KeyAdapter;
@@ -83,13 +83,13 @@ public class TaskSelectionDialog extends SelectionStatusDialog {
 				return TasksUiPlugin.getTaskListManager().getTaskActivationHistory().getPreviousTasks().contains(
 						element);
 			}
-			if (element instanceof AbstractRepositoryTask) {
-				AbstractRepositoryTask repositoryTask = (AbstractRepositoryTask) element;
+			if (element instanceof AbstractTask) {
+				AbstractTask repositoryTask = (AbstractTask) element;
 				String taskString = repositoryTask.getTaskKey() + ": "
 						+ repositoryTask.getSummary();
 				return pattern.matcher(taskString).find();
-			} else if (element instanceof ITask) {
-				String taskString = ((ITask) element).getSummary();
+			} else if (element instanceof AbstractTask) {
+				String taskString = ((AbstractTask) element).getSummary();
 				return pattern.matcher(taskString).find();
 			} 
 			return false;
@@ -155,19 +155,19 @@ public class TaskSelectionDialog extends SelectionStatusDialog {
 
 		// Compute all existing tasks or query hits (if corresponding task does
 		// not exist yet...)
-		Set<ITaskListElement> allTasks = new HashSet<ITaskListElement>();
-		TaskList taskList = TasksUiPlugin.getTaskListManager().getTaskList();
+		Set<AbstractTaskListElement> allTasks = new HashSet<AbstractTaskListElement>();
+		getAllCategories taskList = TasksUiPlugin.getTaskListManager().getTaskList();
 		allTasks.addAll(taskList.getAllTasks());
 		for (AbstractRepositoryQuery query : taskList.getQueries()) {
 			allTasks.addAll(query.getChildren());
 			// TODO: should not need to do this
-			for (ITask hit : query.getHits()) {
+			for (AbstractTask hit : query.getHits()) {
 					allTasks.add(hit);
 			}
 		}
 
 		// Compute the task navigation history (in recent-to-older order)
-		final List<ITask> taskHistory = new ArrayList<ITask>(TasksUiPlugin.getTaskListManager()
+		final List<AbstractTask> taskHistory = new ArrayList<AbstractTask>(TasksUiPlugin.getTaskListManager()
 				.getTaskActivationHistory().getPreviousTasks());
 		Collections.reverse(taskHistory);
 
@@ -175,7 +175,7 @@ public class TaskSelectionDialog extends SelectionStatusDialog {
 		// make the task history appear first on the list is to add them before
 		// all other tasks; being a LinkedHashSet, it will not be duplicated
 		// (this is VERY IMPORTANT)
-		Set<ITaskListElement> taskSet = new LinkedHashSet<ITaskListElement>(taskHistory);
+		Set<AbstractTaskListElement> taskSet = new LinkedHashSet<AbstractTaskListElement>(taskHistory);
 		taskSet.addAll(allTasks);
 		viewer.setInput(taskSet);
 
@@ -183,17 +183,17 @@ public class TaskSelectionDialog extends SelectionStatusDialog {
 		viewer.addFilter(filter);
 		viewer.setComparator(new ViewerComparator() {
 
-			private ITask getCorrespondingTask(Object o) {
-				if (o instanceof ITask) {
-					return (ITask) o;
+			private AbstractTask getCorrespondingTask(Object o) {
+				if (o instanceof AbstractTask) {
+					return (AbstractTask) o;
 				}
 				return null;
 			}
 
 			@Override
 			public int compare(Viewer viewer, Object e1, Object e2) {
-				ITask t1 = getCorrespondingTask(e1);
-				ITask t2 = getCorrespondingTask(e2);
+				AbstractTask t1 = getCorrespondingTask(e1);
+				AbstractTask t2 = getCorrespondingTask(e2);
 				boolean isInHistory1 = taskHistory.contains(t1);
 				boolean isInHistory2 = taskHistory.contains(t2);
 
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/commands/RemoteTaskSelectionDialog.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/commands/RemoteTaskSelectionDialog.java
index d7a42d55e..5f20bbeed 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/commands/RemoteTaskSelectionDialog.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/commands/RemoteTaskSelectionDialog.java
@@ -39,10 +39,10 @@ import org.eclipse.mylyn.internal.tasks.ui.views.TaskElementLabelProvider;
 import org.eclipse.mylyn.internal.tasks.ui.views.TaskRepositoryLabelProvider;
 import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector;
 import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask;
-import org.eclipse.mylyn.tasks.core.AbstractTaskContainer;
-import org.eclipse.mylyn.tasks.core.ITask;
-import org.eclipse.mylyn.tasks.core.TaskList;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
+import org.eclipse.mylyn.tasks.core.AbstractTaskListElement;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
+import org.eclipse.mylyn.tasks.core.getAllCategories;
 import org.eclipse.mylyn.tasks.core.TaskRepository;
 import org.eclipse.mylyn.tasks.core.TaskRepositoryFilter;
 import org.eclipse.mylyn.tasks.core.TaskRepositoryManager;
@@ -130,10 +130,10 @@ public class RemoteTaskSelectionDialog extends SelectionStatusDialog {
 				}
 
 				// Only shows exact task matches
-				if (!(element instanceof AbstractRepositoryTask)) {
+				if (!(element instanceof AbstractTask)) {
 					return false;
 				}
-				AbstractRepositoryTask task = (AbstractRepositoryTask) element;
+				AbstractTask task = (AbstractTask) element;
 				String taskId = task.getTaskKey();
 				for (String id : selectedIds) {
 					if (id.equals(taskId)) {
@@ -222,8 +222,8 @@ public class RemoteTaskSelectionDialog extends SelectionStatusDialog {
 
 		categoryViewer = new ComboViewer(addToTaskListComposite, SWT.DROP_DOWN | SWT.READ_ONLY);
 		categoryViewer.setContentProvider(new ArrayContentProvider());
-		TaskList taskList = TasksUiPlugin.getTaskListManager().getTaskList();
-		LinkedList<AbstractTaskContainer> categories = new LinkedList<AbstractTaskContainer>(taskList
+		getAllCategories taskList = TasksUiPlugin.getTaskListManager().getTaskList();
+		LinkedList<AbstractTaskListElement> categories = new LinkedList<AbstractTaskListElement>(taskList
 				.getUserCategories());
 		categories.addFirst(taskList.getUncategorizedCategory());
 		categoryViewer.setInput(categories);
@@ -231,8 +231,8 @@ public class RemoteTaskSelectionDialog extends SelectionStatusDialog {
 
 			@Override
 			public String getText(Object element) {
-				if (element instanceof AbstractTaskContainer) {
-					return ((AbstractTaskContainer) element).getSummary();
+				if (element instanceof AbstractTaskListElement) {
+					return ((AbstractTaskListElement) element).getSummary();
 				}
 				return super.getText(element);
 			}
@@ -277,8 +277,8 @@ public class RemoteTaskSelectionDialog extends SelectionStatusDialog {
 			AbstractRepositoryQuery query = (AbstractRepositoryQuery) element;
 			return getRepository(query.getRepositoryUrl(), query.getRepositoryKind());
 
-		} else if (element instanceof AbstractRepositoryTask) {
-			AbstractRepositoryTask task = (AbstractRepositoryTask) element;
+		} else if (element instanceof AbstractTask) {
+			AbstractTask task = (AbstractTask) element;
 			return getRepository(task.getRepositoryUrl(), task.getRepositoryKind());
 		} else if (element instanceof IResource) {
 			IResource resource = (IResource) element;
@@ -289,9 +289,9 @@ public class RemoteTaskSelectionDialog extends SelectionStatusDialog {
 			if (resource != null) {
 				return TasksUiPlugin.getDefault().getRepositoryForResource(resource, true);
 			} else {
-				ITask task = (ITask) adaptable.getAdapter(ITask.class);
-				if (task instanceof AbstractRepositoryTask) {
-					AbstractRepositoryTask rtask = (AbstractRepositoryTask) task;
+				AbstractTask task = (AbstractTask) adaptable.getAdapter(AbstractTask.class);
+				if (task instanceof AbstractTask) {
+					AbstractTask rtask = (AbstractTask) task;
 					return getRepository(rtask.getRepositoryUrl(), rtask.getRepositoryKind());
 				}
 			}
@@ -333,11 +333,11 @@ public class RemoteTaskSelectionDialog extends SelectionStatusDialog {
 
 	private TaskRepository selectedRepository;
 
-	private AbstractRepositoryTask selectedTask;
+	private AbstractTask selectedTask;
 
 	private boolean shouldAddToTaskList;
 
-	private AbstractTaskContainer selectedCategory;
+	private AbstractTaskListElement selectedCategory;
 
 	public String[] getSelectedIds() {
 		return selectedIds;
@@ -347,7 +347,7 @@ public class RemoteTaskSelectionDialog extends SelectionStatusDialog {
 		return selectedRepository;
 	}
 
-	public AbstractRepositoryTask getSelectedTask() {
+	public AbstractTask getSelectedTask() {
 		return selectedTask;
 	}
 
@@ -355,7 +355,7 @@ public class RemoteTaskSelectionDialog extends SelectionStatusDialog {
 		return shouldAddToTaskList;
 	}
 
-	public AbstractTaskContainer getSelectedCategory() {
+	public AbstractTaskListElement getSelectedCategory() {
 		return selectedCategory;
 	}
 
@@ -365,14 +365,14 @@ public class RemoteTaskSelectionDialog extends SelectionStatusDialog {
 
 		ISelection taskSelection = tasksViewer.getSelection();
 		if (!taskSelection.isEmpty()) {
-			selectedTask = (AbstractRepositoryTask) ((IStructuredSelection) taskSelection).getFirstElement();
+			selectedTask = (AbstractTask) ((IStructuredSelection) taskSelection).getFirstElement();
 		} else {
 			selectedRepository = (TaskRepository) ((IStructuredSelection) repositoriesViewer.getSelection())
 					.getFirstElement();
 		}
 		shouldAddToTaskList = addToTaskListCheck.getSelection();
 		if (shouldAddToTaskList) {
-			selectedCategory = (AbstractTaskContainer) ((IStructuredSelection) categoryViewer.getSelection())
+			selectedCategory = (AbstractTaskListElement) ((IStructuredSelection) categoryViewer.getSelection())
 					.getFirstElement();
 		}
 	}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/CategoryEditorInput.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/CategoryEditorInput.java
index dbb5e187e..36e2789c1 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/CategoryEditorInput.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/CategoryEditorInput.java
@@ -12,7 +12,7 @@
 package org.eclipse.mylyn.internal.tasks.ui.editors;
 
 import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.mylyn.tasks.core.AbstractTaskContainer;
+import org.eclipse.mylyn.tasks.core.TaskCategory;
 import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IPersistableElement;
@@ -22,9 +22,9 @@ import org.eclipse.ui.IPersistableElement;
  */
 public class CategoryEditorInput implements IEditorInput {
 
-	private AbstractTaskContainer category;
+	private TaskCategory category;
 
-	public CategoryEditorInput(AbstractTaskContainer cat) {
+	public CategoryEditorInput(TaskCategory cat) {
 		this.category = cat;
 	}
 
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/RepositoryTaskOutlinePage.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/RepositoryTaskOutlinePage.java
index 5f75c63f6..7fd2e5882 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/RepositoryTaskOutlinePage.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/RepositoryTaskOutlinePage.java
@@ -19,7 +19,7 @@ import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.mylyn.core.MylarStatusHandler;
 import org.eclipse.mylyn.internal.tasks.ui.TasksUiImages;
 import org.eclipse.mylyn.tasks.core.TaskComment;
-import org.eclipse.mylyn.tasks.ui.editors.AbstractRepositoryTaskEditor;
+import org.eclipse.mylyn.tasks.ui.editors.AbstractTaskEditor;
 import org.eclipse.mylyn.tasks.ui.editors.RepositoryTaskOutlineNode;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Composite;
@@ -36,7 +36,7 @@ public class RepositoryTaskOutlinePage extends ContentOutlinePage {
 
 	protected final ISelectionListener selectionListener = new ISelectionListener() {
 		public void selectionChanged(IWorkbenchPart part, ISelection selection) {
-			if ((part instanceof AbstractRepositoryTaskEditor) && (selection instanceof IStructuredSelection)) {
+			if ((part instanceof AbstractTaskEditor) && (selection instanceof IStructuredSelection)) {
 				if (((IStructuredSelection) selection).getFirstElement() instanceof IRepositoryTaskSelection) {
 					if (((IStructuredSelection) getSelection()).getFirstElement() instanceof IRepositoryTaskSelection) {
 						IRepositoryTaskSelection brs1 = (IRepositoryTaskSelection) ((IStructuredSelection) getSelection())
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorActionContributor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorActionContributor.java
index 0c3081e8d..569aa75e8 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorActionContributor.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorActionContributor.java
@@ -39,12 +39,12 @@ import org.eclipse.mylyn.internal.tasks.ui.actions.SynchronizeEditorAction;
 import org.eclipse.mylyn.internal.tasks.ui.actions.TaskActivateAction;
 import org.eclipse.mylyn.internal.tasks.ui.actions.TaskDeactivateAction;
 import org.eclipse.mylyn.internal.tasks.ui.views.TaskListView;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask;
-import org.eclipse.mylyn.tasks.core.AbstractTaskContainer;
-import org.eclipse.mylyn.tasks.core.ITask;
-import org.eclipse.mylyn.tasks.core.ITaskListElement;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
+import org.eclipse.mylyn.tasks.core.AbstractTaskListElement;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
+import org.eclipse.mylyn.tasks.core.AbstractTaskListElement;
 import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
-import org.eclipse.mylyn.tasks.ui.editors.AbstractRepositoryTaskEditor;
+import org.eclipse.mylyn.tasks.ui.editors.AbstractTaskEditor;
 import org.eclipse.mylyn.tasks.ui.editors.NewTaskEditorInput;
 import org.eclipse.mylyn.tasks.ui.editors.RepositoryTaskEditorInput;
 import org.eclipse.mylyn.tasks.ui.editors.TaskEditor;
@@ -158,7 +158,7 @@ public class TaskEditorActionContributor extends MultiPageEditorActionBarContrib
 	public void contextMenuAboutToShow(IMenuManager mng) {
 		boolean addClipboard = this.getEditor().getActivePageInstance() != null
 				&& (this.getEditor().getActivePageInstance() instanceof TaskPlanningEditor || this.getEditor()
-						.getActivePageInstance() instanceof AbstractRepositoryTaskEditor);
+						.getActivePageInstance() instanceof AbstractTaskEditor);
 		contextMenuAboutToShow(mng, addClipboard);
 	}
 
@@ -171,12 +171,12 @@ public class TaskEditorActionContributor extends MultiPageEditorActionBarContrib
 
 		if (editor.getTaskEditorInput() == null && !(editor.getEditorInput() instanceof NewTaskEditorInput)) {
 			final MenuManager subMenuManager = new MenuManager("Add to " + TaskListView.LABEL_VIEW);
-			List<AbstractTaskContainer> categories = new ArrayList<AbstractTaskContainer>(TasksUiPlugin
+			List<AbstractTaskListElement> categories = new ArrayList<AbstractTaskListElement>(TasksUiPlugin
 					.getTaskListManager().getTaskList().getCategories());
 			
 			// This is added to solve Bug 180252
 			Collections.sort(categories);
-			for (final AbstractTaskContainer category : categories) {
+			for (final AbstractTaskListElement category : categories) {
 				if (!category.equals(TasksUiPlugin.getTaskListManager().getTaskList().getArchiveContainer())) {
 					Action action = new Action() {
 						@Override
@@ -199,7 +199,7 @@ public class TaskEditorActionContributor extends MultiPageEditorActionBarContrib
 			return;
 		}
 
-		final ITask task = editor.getTaskEditorInput().getTask();
+		final AbstractTask task = editor.getTaskEditorInput().getTask();
 		if (task == null) {
 			return;
 		} else {
@@ -212,7 +212,7 @@ public class TaskEditorActionContributor extends MultiPageEditorActionBarContrib
 			synchronizeEditorAction.selectionChanged(new StructuredSelection(this.getEditor()));
 
 			manager.add(openWithBrowserAction);
-			if (task instanceof AbstractRepositoryTask) {
+			if (task instanceof AbstractTask) {
 				manager.add(attachFileAction);
 				manager.add(synchronizeEditorAction);
 			}
@@ -239,7 +239,7 @@ public class TaskEditorActionContributor extends MultiPageEditorActionBarContrib
 			for (String menuPath : TasksUiPlugin.getDefault().getDynamicMenuMap().keySet()) {
 				for (IDynamicSubMenuContributor contributor : TasksUiPlugin.getDefault().getDynamicMenuMap().get(
 						menuPath)) {
-					List<ITaskListElement> selectedElements = new ArrayList<ITaskListElement>();
+					List<AbstractTaskListElement> selectedElements = new ArrayList<AbstractTaskListElement>();
 					selectedElements.add(task);
 					MenuManager subMenuManager = contributor.getSubMenuManager(selectedElements);
 					if (subMenuManager != null) {
@@ -275,7 +275,7 @@ public class TaskEditorActionContributor extends MultiPageEditorActionBarContrib
 		manager.add(new GroupMarker(IWorkbenchActionConstants.MB_ADDITIONS));
 	}
 
-	private void moveToCategory(AbstractTaskContainer category) {
+	private void moveToCategory(AbstractTaskListElement category) {
 		IEditorInput input = getEditor().getEditorInput();
 		if (input instanceof RepositoryTaskEditorInput) {
 			RepositoryTaskEditorInput repositoryTaskEditorInput = (RepositoryTaskEditorInput) input;
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorInputFactory.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorInputFactory.java
index 861622bb4..4b9d7f467 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorInputFactory.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorInputFactory.java
@@ -12,7 +12,7 @@
 package org.eclipse.mylyn.internal.tasks.ui.editors;
 
 import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.mylyn.tasks.core.ITask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
 import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
 import org.eclipse.mylyn.tasks.ui.editors.TaskEditorInput;
 import org.eclipse.ui.IElementFactory;
@@ -29,7 +29,7 @@ public class TaskEditorInputFactory implements IElementFactory {
 
 	public IAdaptable createElement(IMemento memento) {
 		String handle = memento.getString(TAG_TASK_HANDLE);
-		ITask task = TasksUiPlugin.getTaskListManager().getTaskList().getTask(handle);
+		AbstractTask task = TasksUiPlugin.getTaskListManager().getTaskList().getTask(handle);
 		if (task != null) {
 			return new TaskEditorInput(task, false);
 		}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskPlanningEditor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskPlanningEditor.java
index 8a243ff73..cdeea7141 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskPlanningEditor.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskPlanningEditor.java
@@ -27,12 +27,12 @@ import org.eclipse.mylyn.internal.tasks.ui.TasksUiImages;
 import org.eclipse.mylyn.internal.tasks.ui.views.TaskListView;
 import org.eclipse.mylyn.monitor.core.DateUtil;
 import org.eclipse.mylyn.monitor.ui.MonitorUiPlugin;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask;
-import org.eclipse.mylyn.tasks.core.AbstractTaskContainer;
-import org.eclipse.mylyn.tasks.core.ITask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
+import org.eclipse.mylyn.tasks.core.AbstractTaskListElement;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
 import org.eclipse.mylyn.tasks.core.ITaskListChangeListener;
 import org.eclipse.mylyn.tasks.core.TaskRepository;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask.PriorityLevel;
+import org.eclipse.mylyn.tasks.core.AbstractTask.PriorityLevel;
 import org.eclipse.mylyn.tasks.ui.AbstractRepositoryConnectorUi;
 import org.eclipse.mylyn.tasks.ui.DatePicker;
 import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
@@ -105,7 +105,7 @@ public class TaskPlanningEditor extends TaskFormPage {
 
 	private DatePicker datePicker;
 
-	private ITask task;
+	private AbstractTask task;
 
 	private Composite editorComposite;
 
@@ -135,7 +135,7 @@ public class TaskPlanningEditor extends TaskFormPage {
 
 	private ITaskListChangeListener TASK_LIST_LISTENER = new ITaskListChangeListener() {
 
-		public void localInfoChanged(final ITask updateTask) {
+		public void localInfoChanged(final AbstractTask updateTask) {
 			if (updateTask != null && task != null
 					&& updateTask.getHandleIdentifier().equals(task.getHandleIdentifier())) {
 				if (PlatformUI.getWorkbench() != null && !PlatformUI.getWorkbench().isClosing()) {
@@ -150,31 +150,31 @@ public class TaskPlanningEditor extends TaskFormPage {
 			}
 		}
 
-		public void repositoryInfoChanged(ITask task) {
+		public void repositoryInfoChanged(AbstractTask task) {
 			localInfoChanged(task);
 		}
 
-		public void taskMoved(ITask task, AbstractTaskContainer fromContainer, AbstractTaskContainer toContainer) {
+		public void taskMoved(AbstractTask task, AbstractTaskListElement fromContainer, AbstractTaskListElement toContainer) {
 			// ignore
 		}
 
-		public void taskDeleted(ITask task) {
+		public void taskDeleted(AbstractTask task) {
 			// ignore
 		}
 
-		public void containerAdded(AbstractTaskContainer container) {
+		public void containerAdded(AbstractTaskListElement container) {
 			// ignore
 		}
 
-		public void containerDeleted(AbstractTaskContainer container) {
+		public void containerDeleted(AbstractTaskListElement container) {
 			// ignore
 		}
 
-		public void taskAdded(ITask task) {
+		public void taskAdded(AbstractTask task) {
 			// ignore
 		}
 
-		public void containerInfoChanged(AbstractTaskContainer container) {
+		public void containerInfoChanged(AbstractTaskListElement container) {
 			// ignore
 		}
 
@@ -190,7 +190,7 @@ public class TaskPlanningEditor extends TaskFormPage {
 	}
 
 	/** public for testing */
-	public void updateTaskData(final ITask updateTask) {
+	public void updateTaskData(final AbstractTask updateTask) {
 		if (datePicker != null && !datePicker.isDisposed()) {
 			if (updateTask.getScheduledForDate() != null) {
 				Calendar cal = Calendar.getInstance();
@@ -239,7 +239,7 @@ public class TaskPlanningEditor extends TaskFormPage {
 		if (task instanceof LocalTask) {
 			String label = summary.getText();
 			// task.setDescription(label);
-			TasksUiPlugin.getTaskListManager().getTaskList().renameTask((AbstractRepositoryTask) task, label);
+			TasksUiPlugin.getTaskListManager().getTaskList().renameTask((AbstractTask) task, label);
 
 			// TODO: refactor mutation into TaskList?
 			task.setTaskUrl(issueReportURL.getText());
@@ -655,9 +655,9 @@ public class TaskPlanningEditor extends TaskFormPage {
 			}
 		});
 
-		if (task instanceof AbstractRepositoryTask && !(task instanceof LocalTask)) {
-			AbstractRepositoryConnectorUi connector = TasksUiPlugin.getRepositoryUi(((AbstractRepositoryTask) task).getRepositoryKind());
-			if (connector != null && connector.handlesDueDates((AbstractRepositoryTask) task)) {
+		if (task instanceof AbstractTask && !(task instanceof LocalTask)) {
+			AbstractRepositoryConnectorUi connector = TasksUiPlugin.getRepositoryUi(((AbstractTask) task).getRepositoryKind());
+			if (connector != null && connector.handlesDueDates((AbstractTask) task)) {
 				dueDatePicker.setEnabled(false);
 				clearDueDate.setEnabled(false);
 			}
@@ -766,8 +766,8 @@ public class TaskPlanningEditor extends TaskFormPage {
 		container.setLayoutData(new GridData(GridData.FILL_BOTH));
 
 		TaskRepository repository = null;
-		if (task instanceof AbstractRepositoryTask && !(task instanceof LocalTask)) {
-			AbstractRepositoryTask repositoryTask = (AbstractRepositoryTask) task;
+		if (task instanceof AbstractTask && !(task instanceof LocalTask)) {
+			AbstractTask repositoryTask = (AbstractTask) task;
 			repository = TasksUiPlugin.getRepositoryManager().getRepository(repositoryTask.getRepositoryKind(),
 					repositoryTask.getRepositoryUrl());
 		}
@@ -797,7 +797,7 @@ public class TaskPlanningEditor extends TaskFormPage {
 		toolkit.paintBordersFor(container);
 	}
 
-	private String getTaskDateString(ITask task) {
+	private String getTaskDateString(AbstractTask task) {
 
 		if (task == null)
 			return "";
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/CompletedTaskCollector.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/CompletedTaskCollector.java
index c71ce2782..18ce6dbca 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/CompletedTaskCollector.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/CompletedTaskCollector.java
@@ -17,14 +17,14 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-import org.eclipse.mylyn.tasks.core.ITask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
 
 /**
  * @author Ken Sueda
  */
 public class CompletedTaskCollector implements ITaskCollector {
 
-	private Map<String, ITask> completedTasks = new HashMap<String, ITask>();
+	private Map<String, AbstractTask> completedTasks = new HashMap<String, AbstractTask>();
 
 	private Date periodStartDate;
 
@@ -36,7 +36,7 @@ public class CompletedTaskCollector implements ITaskCollector {
 		return "Completed Tasks";
 	}
 
-	public void consumeTask(ITask task) {
+	public void consumeTask(AbstractTask task) {
 		if (task.isCompleted() && task.getCompletionDate() != null
 				&& task.getCompletionDate().compareTo(periodStartDate) > 0
 				&& !completedTasks.containsKey(task.getHandleIdentifier())) {
@@ -44,8 +44,8 @@ public class CompletedTaskCollector implements ITaskCollector {
 		}
 	}
 
-	public Set<ITask> getTasks() {
-		Set<ITask> tasks = new HashSet<ITask>();
+	public Set<AbstractTask> getTasks() {
+		Set<AbstractTask> tasks = new HashSet<AbstractTask>();
 		tasks.addAll(completedTasks.values());
 		return tasks;
 	}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/ITaskCollector.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/ITaskCollector.java
index 8a23c1415..ce3c9da77 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/ITaskCollector.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/ITaskCollector.java
@@ -13,14 +13,14 @@ package org.eclipse.mylyn.internal.tasks.ui.planner;
 
 import java.util.Set;
 
-import org.eclipse.mylyn.tasks.core.ITask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
 
 /**
  * @author Ken Sueda
  */
 public interface ITaskCollector {
 
-	public abstract void consumeTask(ITask task);
+	public abstract void consumeTask(AbstractTask task);
 
-	public abstract Set<ITask> getTasks();
+	public abstract Set<AbstractTask> getTasks();
 }
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/ITaskPlannerContentProvider.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/ITaskPlannerContentProvider.java
index 03d8fe17c..c2a308a24 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/ITaskPlannerContentProvider.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/ITaskPlannerContentProvider.java
@@ -11,10 +11,10 @@
 
 package org.eclipse.mylyn.internal.tasks.ui.planner;
 
-import org.eclipse.mylyn.tasks.core.ITask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
 
 public interface ITaskPlannerContentProvider {
 
-	public void removeTask(ITask task);
-	public void addTask(ITask task);
+	public void removeTask(AbstractTask task);
+	public void addTask(AbstractTask task);
 }
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/InProgressTaskCollector.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/InProgressTaskCollector.java
index 637c9e94f..c3c230abf 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/InProgressTaskCollector.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/InProgressTaskCollector.java
@@ -20,7 +20,7 @@ import java.util.Set;
 import org.eclipse.mylyn.context.core.IInteractionContext;
 import org.eclipse.mylyn.context.core.ContextCorePlugin;
 import org.eclipse.mylyn.monitor.core.InteractionEvent;
-import org.eclipse.mylyn.tasks.core.ITask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
 
 /**
  * Collects tasks that are not complete but have been worked on during the
@@ -31,11 +31,11 @@ import org.eclipse.mylyn.tasks.core.ITask;
  */
 public class InProgressTaskCollector implements ITaskCollector {
 
-	private Map<String, ITask> inProgressTasks = new HashMap<String, ITask>();
+	private Map<String, AbstractTask> inProgressTasks = new HashMap<String, AbstractTask>();
 
 	private Date periodStartDate;
 
-	protected static boolean hasActivitySince(ITask task, Date startDate) {
+	protected static boolean hasActivitySince(AbstractTask task, Date startDate) {
 		IInteractionContext mylarContext = ContextCorePlugin.getContextManager().loadContext(task.getHandleIdentifier());
 		if (mylarContext != null) {
 			List<InteractionEvent> events = mylarContext.getInteractionHistory();
@@ -57,15 +57,15 @@ public class InProgressTaskCollector implements ITaskCollector {
 		return "Tasks in Progress";
 	}
 
-	public void consumeTask(ITask task) {
+	public void consumeTask(AbstractTask task) {
 		if (!task.isCompleted() && hasActivitySince(task, periodStartDate)
 				&& !inProgressTasks.containsKey(task.getHandleIdentifier())) {
 			inProgressTasks.put(task.getHandleIdentifier(), task);
 		}
 	}
 
-	public Set<ITask> getTasks() {
-		Set<ITask> tasks = new HashSet<ITask>();
+	public Set<AbstractTask> getTasks() {
+		Set<AbstractTask> tasks = new HashSet<AbstractTask>();
 		tasks.addAll(inProgressTasks.values());
 		return tasks;
 	}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/OpenTaskEditorAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/OpenTaskEditorAction.java
index ea1c4ea9e..b60cb33c2 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/OpenTaskEditorAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/OpenTaskEditorAction.java
@@ -15,7 +15,7 @@ import org.eclipse.jface.action.Action;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.mylyn.tasks.core.ITask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
 import org.eclipse.mylyn.tasks.ui.TasksUiUtil;
 
 /**
@@ -43,8 +43,8 @@ public class OpenTaskEditorAction extends Action {
 	public void run() {
 		ISelection selection = viewer.getSelection();
 		Object object = ((IStructuredSelection) selection).getFirstElement();
-		if (object instanceof ITask) {
-			TasksUiUtil.openEditor((ITask)object, false);
+		if (object instanceof AbstractTask) {
+			TasksUiUtil.openEditor((AbstractTask)object, false);
 		}
 //		if (obj instanceof Task) {
 //			((Task) obj).openTaskInEditor(false);
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/PlannedTasksContentProvider.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/PlannedTasksContentProvider.java
index 2bf505909..5d822f6c4 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/PlannedTasksContentProvider.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/PlannedTasksContentProvider.java
@@ -13,7 +13,7 @@ package org.eclipse.mylyn.internal.tasks.ui.planner;
 
 import org.eclipse.jface.viewers.IStructuredContentProvider;
 import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.mylyn.tasks.core.ITask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
 
 /**
  * @author Rob Elves
@@ -37,11 +37,11 @@ public class PlannedTasksContentProvider implements IStructuredContentProvider,
 	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
 	}
 
-	public void addTask(ITask task) {
+	public void addTask(AbstractTask task) {
 		editorInput.addPlannedTask(task);
 	}
 
-	public void removeTask(ITask task) {
+	public void removeTask(AbstractTask task) {
 		editorInput.removePlannedTask(task);
 	}
 
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/RemoveTaskAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/RemoveTaskAction.java
index 3d5706c4b..9582b678a 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/RemoveTaskAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/RemoveTaskAction.java
@@ -15,7 +15,7 @@ import org.eclipse.jface.action.Action;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.mylyn.internal.tasks.ui.TasksUiImages;
-import org.eclipse.mylyn.tasks.core.ITask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
 
 /**
  * @author Rob Elves
@@ -35,8 +35,8 @@ public class RemoveTaskAction extends Action {
 	@Override
 	public void run() {
 		for (Object object : ((IStructuredSelection) viewer.getSelection()).toList()) {
-			if (object instanceof ITask) {
-				ITask task = (ITask) object;
+			if (object instanceof AbstractTask) {
+				AbstractTask task = (AbstractTask) object;
 				if (task != null) {									
 					((ITaskPlannerContentProvider) (viewer.getContentProvider())).removeTask(task);
 				}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskActivityContentProvider.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskActivityContentProvider.java
index 0823e2662..73f85a2fe 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskActivityContentProvider.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskActivityContentProvider.java
@@ -16,7 +16,7 @@ import java.util.List;
 
 import org.eclipse.jface.viewers.IStructuredContentProvider;
 import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.mylyn.tasks.core.ITask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
 
 /**
  * @author Rob Elves
@@ -30,7 +30,7 @@ public class TaskActivityContentProvider implements IStructuredContentProvider,
 	}
 
 	public Object[] getElements(Object inputElement) {
-		List<ITask> allTasks = new ArrayList<ITask>();
+		List<AbstractTask> allTasks = new ArrayList<AbstractTask>();
 		allTasks.addAll(editorInput.getCompletedTasks());
 		allTasks.addAll(editorInput.getInProgressTasks());
 		return allTasks.toArray();
@@ -45,12 +45,12 @@ public class TaskActivityContentProvider implements IStructuredContentProvider,
 		// ignore
 	}
 
-	public void removeTask(ITask task) {
+	public void removeTask(AbstractTask task) {
 		editorInput.removeCompletedTask(task);
 		editorInput.removeInProgressTask(task);
 	}
 
-	public void addTask(ITask task) {
+	public void addTask(AbstractTask task) {
 		// ignore
 	}
 
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskActivityEditorInput.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskActivityEditorInput.java
index 4b1d9adcb..4b1775d8a 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskActivityEditorInput.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskActivityEditorInput.java
@@ -18,9 +18,9 @@ import java.util.Set;
 
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.mylyn.core.MylarStatusHandler;
-import org.eclipse.mylyn.tasks.core.ITask;
-import org.eclipse.mylyn.tasks.core.ITaskListElement;
-import org.eclipse.mylyn.tasks.core.TaskList;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
+import org.eclipse.mylyn.tasks.core.AbstractTaskListElement;
+import org.eclipse.mylyn.tasks.core.getAllCategories;
 import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IPersistableElement;
@@ -35,11 +35,11 @@ public class TaskActivityEditorInput implements IEditorInput {
 
 	private static final String TASK_ACTIVITY_REPORT = "Task Activity Report";
 
-	private Set<ITask> completedTasks = new HashSet<ITask>();
+	private Set<AbstractTask> completedTasks = new HashSet<AbstractTask>();
 
-	private Set<ITask> inProgressTasks = new HashSet<ITask>();
+	private Set<AbstractTask> inProgressTasks = new HashSet<AbstractTask>();
 	
-	private Set<ITask> plannedTasks = new HashSet<ITask>();
+	private Set<AbstractTask> plannedTasks = new HashSet<AbstractTask>();
 
 	private TaskReportGenerator taskReportGenerator = null;
 
@@ -47,7 +47,7 @@ public class TaskActivityEditorInput implements IEditorInput {
 
 	private Date reportStartDate = null;
 
-	public TaskActivityEditorInput(Date reportStartDate, Set<ITaskListElement> chosenCategories, TaskList tlist) {
+	public TaskActivityEditorInput(Date reportStartDate, Set<AbstractTaskListElement> chosenCategories, getAllCategories tlist) {
 		this.reportStartDate = reportStartDate;
 		taskReportGenerator = new TaskReportGenerator(tlist, chosenCategories);
 
@@ -103,21 +103,21 @@ public class TaskActivityEditorInput implements IEditorInput {
 		return null;
 	}
 
-	public Set<ITask> getCompletedTasks() {
+	public Set<AbstractTask> getCompletedTasks() {
 		return completedTasks;
 	}
 
-	public Set<ITask> getInProgressTasks() {
+	public Set<AbstractTask> getInProgressTasks() {
 		return inProgressTasks;
 	}
 	
-	public Set<ITask> getPlannedTasks() {
+	public Set<AbstractTask> getPlannedTasks() {
 		return plannedTasks;
 	}
 
 	public long getTotalTimeSpentOnCompletedTasks() {
 		long duration = 0;
-		for (ITask t : completedTasks) {
+		for (AbstractTask t : completedTasks) {
 			duration += TasksUiPlugin.getTaskListManager().getElapsedTime(t);
 		}
 		return duration;
@@ -125,7 +125,7 @@ public class TaskActivityEditorInput implements IEditorInput {
 
 	public long getTotalTimeSpentOnInProgressTasks() {
 		long duration = 0;
-		for (ITask t : inProgressTasks) {
+		for (AbstractTask t : inProgressTasks) {
 			duration += TasksUiPlugin.getTaskListManager().getElapsedTime(t);
 		}
 		return duration;
@@ -135,7 +135,7 @@ public class TaskActivityEditorInput implements IEditorInput {
 		return taskReportGenerator;
 	}
 
-	public boolean createdDuringReportPeriod(ITask task) {
+	public boolean createdDuringReportPeriod(AbstractTask task) {
 		Date creationDate = task.getCreationDate();
 		if (creationDate != null) {
 			return creationDate.compareTo(reportStartDate) > 0;
@@ -150,31 +150,31 @@ public class TaskActivityEditorInput implements IEditorInput {
 
 	public int getTotalTimeEstimated() {
 		int duration = 0;
-		for (ITask task : inProgressTasks) {
+		for (AbstractTask task : inProgressTasks) {
 			duration += task.getEstimateTimeHours();
 		}
 		return duration;
 	}
 	
-	public void removeCompletedTask( ITask task) {
+	public void removeCompletedTask( AbstractTask task) {
 		completedTasks.remove(task);				
 	}
 	
-	public void removeInProgressTask(ITask task) {
+	public void removeInProgressTask(AbstractTask task) {
 		inProgressTasks.remove(task);
 	}
 	
-	public void addPlannedTask(ITask task) {		
+	public void addPlannedTask(AbstractTask task) {		
 		plannedTasks.add(task);		
 	}
 	
-	public void removePlannedTask(ITask task) {
+	public void removePlannedTask(AbstractTask task) {
 		plannedTasks.remove(task);
 	}
 	
 	public int getPlannedEstimate() {
 		int estimated = 0;
-		for (ITask task : plannedTasks) {
+		for (AbstractTask task : plannedTasks) {
 			estimated += task.getEstimateTimeHours();
 		}
 		return estimated;
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskActivityEditorPart.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskActivityEditorPart.java
index 3e052fd9c..59e25e4c5 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskActivityEditorPart.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskActivityEditorPart.java
@@ -34,7 +34,7 @@ import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.mylyn.core.MylarStatusHandler;
 import org.eclipse.mylyn.monitor.core.DateUtil;
-import org.eclipse.mylyn.tasks.core.ITask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
 import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.SashForm;
@@ -167,7 +167,7 @@ public class TaskActivityEditorPart extends EditorPart {
 		createSummarySection(editorComposite, toolkit, editorInput.getReportStartDate());
 		String label = LABEL_PAST_ACTIVITY;
 
-		List<ITask> allTasks = new ArrayList<ITask>();
+		List<AbstractTask> allTasks = new ArrayList<AbstractTask>();
 		allTasks.addAll(editorInput.getCompletedTasks());
 		allTasks.addAll(editorInput.getInProgressTasks());
 
@@ -723,8 +723,8 @@ public class TaskActivityEditorPart extends EditorPart {
 		writer.write("</tr>");
 
 		for (Object element : planContentProvider.getElements(null)) {
-			if (element instanceof ITask) {
-				ITask currentTask = (ITask) element;
+			if (element instanceof AbstractTask) {
+				AbstractTask currentTask = (AbstractTask) element;
 
 				String formatString = "dd-MM-yyyy";
 				SimpleDateFormat format = new SimpleDateFormat(formatString, Locale.ENGLISH);
@@ -773,8 +773,8 @@ public class TaskActivityEditorPart extends EditorPart {
 		writer.write("</tr>");
 
 		for (Object element : activityContentProvider.getElements(null)) {
-			if (element instanceof ITask) {
-				ITask currentTask = (ITask) element;
+			if (element instanceof AbstractTask) {
+				AbstractTask currentTask = (AbstractTask) element;
 
 				String formatString = "dd-MM-yyyy";
 				SimpleDateFormat format = new SimpleDateFormat(formatString, Locale.ENGLISH);
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskActivitySorter.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskActivitySorter.java
index 922064d4b..5682a8ee9 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskActivitySorter.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskActivitySorter.java
@@ -13,7 +13,7 @@ package org.eclipse.mylyn.internal.tasks.ui.planner;
 
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.mylyn.tasks.core.ITask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
 import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
 
 /**
@@ -45,8 +45,8 @@ public class TaskActivitySorter extends ViewerSorter {
 
 	@Override
 	public int compare(Viewer viewer, Object obj1, Object obj2) {
-		ITask t1 = (ITask) obj1;
-		ITask t2 = (ITask) obj2;
+		AbstractTask t1 = (AbstractTask) obj1;
+		AbstractTask t2 = (AbstractTask) obj2;
 
 		switch (criteria) {
 		case DESCRIPTION:
@@ -66,23 +66,23 @@ public class TaskActivitySorter extends ViewerSorter {
 		}
 	}
 
-	protected int compareDescription(ITask task1, ITask task2) {
+	protected int compareDescription(AbstractTask task1, AbstractTask task2) {
 		return task1.getSummary().compareToIgnoreCase(task2.getSummary());
 	}
 
-	protected int comparePriority(ITask task1, ITask task2) {
+	protected int comparePriority(AbstractTask task1, AbstractTask task2) {
 		return task1.getPriority().compareTo(task2.getPriority());
 	}
 
-	protected int compareCompletedDate(ITask task1, ITask task2) {
+	protected int compareCompletedDate(AbstractTask task1, AbstractTask task2) {
 		return task2.getCompletionDate().compareTo(task1.getCompletionDate());
 	}
 
-	protected int compareEstimated(ITask task1, ITask task2) {
+	protected int compareEstimated(AbstractTask task1, AbstractTask task2) {
 		return task2.getEstimateTimeHours() - task1.getEstimateTimeHours();
 	}
 
-	protected int compareCreationDate(ITask task1, ITask task2) {
+	protected int compareCreationDate(AbstractTask task1, AbstractTask task2) {
 		if (task1.getCreationDate() == null)
 			return 1;
 		else if (task2.getCreationDate() == null)
@@ -91,7 +91,7 @@ public class TaskActivitySorter extends ViewerSorter {
 			return task2.getCreationDate().compareTo(task1.getCreationDate());
 	}
 
-	protected int compareDuration(ITask task1, ITask task2) {
+	protected int compareDuration(AbstractTask task1, AbstractTask task2) {
 		return TasksUiPlugin.getTaskListManager().getElapsedTime(task1) < TasksUiPlugin.getTaskListManager().getElapsedTime(task2) ? 1 : -1;
 	}
 }
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskActivityWizardPage.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskActivityWizardPage.java
index 67885b00c..542056a5d 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskActivityWizardPage.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskActivityWizardPage.java
@@ -19,8 +19,8 @@ import java.util.Set;
 import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.mylyn.internal.tasks.ui.views.TaskElementLabelProvider;
 import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery;
-import org.eclipse.mylyn.tasks.core.AbstractTaskContainer;
-import org.eclipse.mylyn.tasks.core.ITaskListElement;
+import org.eclipse.mylyn.tasks.core.AbstractTaskListElement;
+import org.eclipse.mylyn.tasks.core.AbstractTaskListElement;
 import org.eclipse.mylyn.tasks.ui.DatePicker;
 import org.eclipse.mylyn.tasks.ui.TaskListManager;
 import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
@@ -188,7 +188,7 @@ public class TaskActivityWizardPage extends WizardPage {
 		}
 
 		// populate categories
-		for (AbstractTaskContainer category : manager.getTaskList().getTaskContainers()) {
+		for (AbstractTaskListElement category : manager.getTaskList().getTaskContainers()) {
 			TableItem item = new TableItem(filtersTable, SWT.NONE);
 			item.setImage(labelProvider.getImage(category));
 			item.setText(category.getSummary());
@@ -291,12 +291,12 @@ public class TaskActivityWizardPage extends WizardPage {
 
 	}
 
-	public Set<ITaskListElement> getSelectedFilters() {
-		Set<ITaskListElement> result = new HashSet<ITaskListElement>();
+	public Set<AbstractTaskListElement> getSelectedFilters() {
+		Set<AbstractTaskListElement> result = new HashSet<AbstractTaskListElement>();
 		TableItem[] items = filtersTable.getItems();
 		for (TableItem item : items) {
-			if (item.getChecked() && item.getData() instanceof ITaskListElement) {
-				result.add((ITaskListElement)item.getData());
+			if (item.getChecked() && item.getData() instanceof AbstractTaskListElement) {
+				result.add((AbstractTaskListElement)item.getData());
 			}
 		}
 		return result;
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskPlanContentProvider.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskPlanContentProvider.java
index fb83710af..fef97ce42 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskPlanContentProvider.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskPlanContentProvider.java
@@ -16,14 +16,14 @@ import java.util.List;
 
 import org.eclipse.jface.viewers.IStructuredContentProvider;
 import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.mylyn.tasks.core.ITask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
 
 /**
  * @author Ken Sueda
  */
 public class TaskPlanContentProvider implements IStructuredContentProvider {
 
-	private List<ITask> tasks = new ArrayList<ITask>();
+	private List<AbstractTask> tasks = new ArrayList<AbstractTask>();
 
 	public Object[] getElements(Object inputElement) {
 		return tasks.toArray();
@@ -35,17 +35,17 @@ public class TaskPlanContentProvider implements IStructuredContentProvider {
 	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
 	}
 
-	public void addTask(ITask t) {
+	public void addTask(AbstractTask t) {
 		if (!tasks.contains(t)) {
 			tasks.add(t);
 		}
 	}
 
-	public void removeTask(ITask t) {
+	public void removeTask(AbstractTask t) {
 		tasks.remove(t);
 	}
 
-	public List<ITask> getTasks() {
+	public List<AbstractTask> getTasks() {
 		return tasks;
 	}
 }
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskPlanLabelProvider.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskPlanLabelProvider.java
index b962b9b7e..cf2ded806 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskPlanLabelProvider.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskPlanLabelProvider.java
@@ -16,7 +16,7 @@ import java.text.DateFormat;
 import org.eclipse.jface.viewers.ITableLabelProvider;
 import org.eclipse.mylyn.internal.tasks.ui.views.TaskElementLabelProvider;
 import org.eclipse.mylyn.monitor.core.DateUtil;
-import org.eclipse.mylyn.tasks.core.ITask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
 import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
 import org.eclipse.swt.graphics.Image;
 
@@ -35,8 +35,8 @@ public class TaskPlanLabelProvider extends TaskElementLabelProvider implements I
 	}
 
 	public String getColumnText(Object element, int columnIndex) {
-		if (element instanceof ITask) {
-			ITask task = (ITask) element;
+		if (element instanceof AbstractTask) {
+			AbstractTask task = (AbstractTask) element;
 			switch (columnIndex) {
 			case 1:
 				return task.getPriority();
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskPlanSorter.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskPlanSorter.java
index e3aa9b203..99c47b868 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskPlanSorter.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskPlanSorter.java
@@ -12,7 +12,7 @@
 package org.eclipse.mylyn.internal.tasks.ui.planner;
 
 import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.mylyn.tasks.core.ITask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
 
 /**
  * @author Mik Kersten
@@ -41,8 +41,8 @@ public class TaskPlanSorter extends TaskActivitySorter {
 
 	@Override
 	public int compare(Viewer viewer, Object obj1, Object obj2) {
-		ITask t1 = (ITask) obj1;
-		ITask t2 = (ITask) obj2;
+		AbstractTask t1 = (AbstractTask) obj1;
+		AbstractTask t2 = (AbstractTask) obj2;
 
 		switch (criteria) {
 		case PRIORITY:
@@ -60,7 +60,7 @@ public class TaskPlanSorter extends TaskActivitySorter {
 		}
 	}
 
-	private int compareReminder(ITask task1, ITask task2) {
+	private int compareReminder(AbstractTask task1, AbstractTask task2) {
 		if (task2.getScheduledForDate() == null)
 			return -1;
 		if (task1.getScheduledForDate() == null)
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskPlannerLabelProvider.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskPlannerLabelProvider.java
index ca9ebf72f..e725ae240 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskPlannerLabelProvider.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskPlannerLabelProvider.java
@@ -18,7 +18,7 @@ import org.eclipse.jface.viewers.ITableLabelProvider;
 import org.eclipse.mylyn.core.MylarStatusHandler;
 import org.eclipse.mylyn.internal.tasks.ui.views.TaskElementLabelProvider;
 import org.eclipse.mylyn.monitor.core.DateUtil;
-import org.eclipse.mylyn.tasks.core.ITask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
 import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.Image;
@@ -40,8 +40,8 @@ public class TaskPlannerLabelProvider extends TaskElementLabelProvider implement
 
 	public String getColumnText(Object element, int columnIndex) {
 		try {
-			if (element instanceof ITask) {
-				ITask task = (ITask) element;
+			if (element instanceof AbstractTask) {
+				AbstractTask task = (AbstractTask) element;
 				switch (columnIndex) {
 				case 1:
 					return task.getPriority();
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskReportGenerator.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskReportGenerator.java
index 41b2b6c2f..aee457e1d 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskReportGenerator.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskReportGenerator.java
@@ -22,11 +22,11 @@ import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.jface.operation.IRunnableWithProgress;
 import org.eclipse.mylyn.core.MylarStatusHandler;
 import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask;
-import org.eclipse.mylyn.tasks.core.AbstractTaskContainer;
-import org.eclipse.mylyn.tasks.core.ITask;
-import org.eclipse.mylyn.tasks.core.ITaskListElement;
-import org.eclipse.mylyn.tasks.core.TaskList;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
+import org.eclipse.mylyn.tasks.core.AbstractTaskListElement;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
+import org.eclipse.mylyn.tasks.core.AbstractTaskListElement;
+import org.eclipse.mylyn.tasks.core.getAllCategories;
 
 /**
  * @author Ken Sueda
@@ -39,21 +39,21 @@ public class TaskReportGenerator implements IRunnableWithProgress {
 
 	private boolean finished;
 
-	private TaskList tasklist = null;
+	private getAllCategories tasklist = null;
 
 	private List<ITaskCollector> collectors = new ArrayList<ITaskCollector>();
 
-	private List<ITask> tasks = new ArrayList<ITask>();
+	private List<AbstractTask> tasks = new ArrayList<AbstractTask>();
 
-	private Set<ITaskListElement> filterCategories;
+	private Set<AbstractTaskListElement> filterCategories;
 
-	public TaskReportGenerator(TaskList tlist) {
+	public TaskReportGenerator(getAllCategories tlist) {
 		this(tlist, null);
 	}
 
-	public TaskReportGenerator(TaskList tlist, Set<ITaskListElement> filterCategories) {
+	public TaskReportGenerator(getAllCategories tlist, Set<AbstractTaskListElement> filterCategories) {
 		tasklist = tlist;
-		this.filterCategories = filterCategories != null ? filterCategories : new HashSet<ITaskListElement>();
+		this.filterCategories = filterCategories != null ? filterCategories : new HashSet<AbstractTaskListElement>();
 	}
 
 	public void addCollector(ITaskCollector collector) {
@@ -72,7 +72,7 @@ public class TaskReportGenerator implements IRunnableWithProgress {
 
 	public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
 
-		Set<ITaskListElement> rootElements;
+		Set<AbstractTaskListElement> rootElements;
 		if (filterCategories.size() == 0) {
 			rootElements = tasklist.getRootElements();
 		} else {
@@ -84,22 +84,22 @@ public class TaskReportGenerator implements IRunnableWithProgress {
 
 		for (Object element : rootElements) {
 			monitor.worked(1);
-			if (element instanceof AbstractRepositoryTask) {
-				AbstractRepositoryTask task = (AbstractRepositoryTask) element;
+			if (element instanceof AbstractTask) {
+				AbstractTask task = (AbstractTask) element;
 				for (ITaskCollector collector : collectors) {
 					collector.consumeTask(task);
 				}
 			} else if (element instanceof AbstractRepositoryQuery) {
 				// process queries
 				AbstractRepositoryQuery repositoryQuery = (AbstractRepositoryQuery) element;
-				for (ITask task : repositoryQuery.getChildren()) {
+				for (AbstractTask task : repositoryQuery.getChildren()) {
 					for (ITaskCollector collector : collectors) {
 						collector.consumeTask(task);
 					}
 				}
-			} else if (element instanceof AbstractTaskContainer) {
-				AbstractTaskContainer cat = (AbstractTaskContainer) element;
-				for (ITask task : cat.getChildren())
+			} else if (element instanceof AbstractTaskListElement) {
+				AbstractTaskListElement cat = (AbstractTaskListElement) element;
+				for (AbstractTask task : cat.getChildren())
 					for (ITaskCollector collector : collectors) {
 						collector.consumeTask(task);
 					}
@@ -114,7 +114,7 @@ public class TaskReportGenerator implements IRunnableWithProgress {
 		monitor.done();
 	}
 
-	public List<ITask> getAllCollectedTasks() {
+	public List<AbstractTask> getAllCollectedTasks() {
 		return tasks;
 	}
 
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/OpenSearchResultAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/OpenSearchResultAction.java
index b6f122dd1..76bdfd9ae 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/OpenSearchResultAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/OpenSearchResultAction.java
@@ -15,7 +15,7 @@ import java.util.Iterator;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
 import org.eclipse.mylyn.tasks.ui.TasksUiUtil;
 
 /**
@@ -53,8 +53,8 @@ public class OpenSearchResultAction extends Action {
 			IStructuredSelection selection = (IStructuredSelection) s;
 
 			// go through each of the selected items and show it in an editor
-			for (Iterator<AbstractRepositoryTask> it = selection.iterator(); it.hasNext();) {
-				AbstractRepositoryTask repositoryHit = it.next();
+			for (Iterator<AbstractTask> it = selection.iterator(); it.hasNext();) {
+				AbstractTask repositoryHit = it.next();
 				TasksUiUtil.openRepositoryTask(repositoryHit.getRepositoryUrl(), repositoryHit.getTaskId(), repositoryHit.getTaskUrl());
 				// try {
 				// int taskId = Integer.parseInt(repositoryHit.getId());
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/RepositorySearchResultView.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/RepositorySearchResultView.java
index ddf2a289a..21d1308bf 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/RepositorySearchResultView.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/RepositorySearchResultView.java
@@ -21,7 +21,7 @@ import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.mylyn.internal.tasks.ui.TaskListColorsAndFonts;
 import org.eclipse.mylyn.internal.tasks.ui.views.TaskElementLabelProvider;
 import org.eclipse.mylyn.internal.tasks.ui.views.TaskTableLabelProvider;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
 import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
 import org.eclipse.mylyn.tasks.ui.TasksUiUtil;
 import org.eclipse.search.internal.ui.SearchMessages;
@@ -210,7 +210,7 @@ public class RepositorySearchResultView extends AbstractTextSearchViewPage imple
 	@Override
 	protected void showMatch(Match match, int currentOffset, int currentLength, boolean activate)
 			throws PartInitException {
-		AbstractRepositoryTask repositoryHit = (AbstractRepositoryTask) match.getElement();
+		AbstractTask repositoryHit = (AbstractTask) match.getElement();
 
 		TasksUiUtil.openRepositoryTask(repositoryHit.getRepositoryUrl(), repositoryHit.getTaskId(), repositoryHit
 				.getTaskUrl());
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/SearchResultSorterDescription.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/SearchResultSorterDescription.java
index aca988845..9c442cf1c 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/SearchResultSorterDescription.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/SearchResultSorterDescription.java
@@ -14,7 +14,7 @@ package org.eclipse.mylyn.internal.tasks.ui.search;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerSorter;
 import org.eclipse.mylyn.internal.tasks.ui.views.TaskKeyComparator;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
 
 /**
  * Sorts search results by summary.
@@ -38,8 +38,8 @@ public class SearchResultSorterDescription extends ViewerSorter {
 	public int compare(Viewer viewer, Object e1, Object e2) {
 		try {
 
-			AbstractRepositoryTask entry1 = (AbstractRepositoryTask) e1;
-			AbstractRepositoryTask entry2 = (AbstractRepositoryTask) e2;
+			AbstractTask entry1 = (AbstractTask) e1;
+			AbstractTask entry2 = (AbstractTask) e2;
 			// NOTE we just comparing ids here, once summary and taskId separated
 			// they should have their own column/sorter.
 			return taskKeyComparator.compare(entry1.getTaskId(), entry2.getTaskId());
@@ -65,7 +65,7 @@ public class SearchResultSorterDescription extends ViewerSorter {
 	@Override
 	public int category(Object element) {
 		try {
-			AbstractRepositoryTask hit = (AbstractRepositoryTask) element;
+			AbstractTask hit = (AbstractTask) element;
 			return Integer.parseInt(hit.getTaskId());
 		} catch (Exception ignored) {
 			// ignore if
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/SearchResultSorterId.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/SearchResultSorterId.java
index 52256e68e..a71bbd66e 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/SearchResultSorterId.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/SearchResultSorterId.java
@@ -13,7 +13,7 @@ package org.eclipse.mylyn.internal.tasks.ui.search;
 
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
 
 /**
  * Sorts search results (AbstractQueryHit) by taskId.
@@ -33,11 +33,11 @@ public class SearchResultSorterId extends ViewerSorter {
 	public int compare(Viewer viewer, Object e1, Object e2) {
 		try {
 			// cast the object and get its bug taskId
-			AbstractRepositoryTask entry1 = (AbstractRepositoryTask) e1;
+			AbstractTask entry1 = (AbstractTask) e1;
 			Integer id1 = Integer.parseInt(entry1.getTaskId());
 
 			// cast the other object and get its bug taskId
-			AbstractRepositoryTask entry2 = (AbstractRepositoryTask) e2;
+			AbstractTask entry2 = (AbstractTask) e2;
 			Integer id2 = Integer.parseInt(entry2.getTaskId());
 
 			// if neither is null, compare the bug taskId's
@@ -64,7 +64,7 @@ public class SearchResultSorterId extends ViewerSorter {
 	@Override
 	public int category(Object element) {
 		try {
-			AbstractRepositoryTask hit = (AbstractRepositoryTask) element;
+			AbstractTask hit = (AbstractTask) element;
 			return Integer.parseInt(hit.getTaskId());
 		} catch (Exception ignored) {
 			// ignore
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/SearchResultSorterPriority.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/SearchResultSorterPriority.java
index 3692d58ff..3b38e4bc8 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/SearchResultSorterPriority.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/SearchResultSorterPriority.java
@@ -13,7 +13,7 @@ package org.eclipse.mylyn.internal.tasks.ui.search;
 
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
 
 /**
  * Sorts results of Bugzilla search by bug priority.
@@ -33,8 +33,8 @@ public class SearchResultSorterPriority extends ViewerSorter {
 	@Override
 	public int compare(Viewer viewer, Object e1, Object e2) {
 		try {
-			AbstractRepositoryTask hit1 = (AbstractRepositoryTask) e1;
-			AbstractRepositoryTask hit2 = (AbstractRepositoryTask) e2;
+			AbstractTask hit1 = (AbstractTask) e1;
+			AbstractTask hit2 = (AbstractTask) e2;
 			return hit1.getPriority().compareTo(hit2.getPriority());
 		} catch (Exception ignored) {
 			// do nothing
@@ -55,7 +55,7 @@ public class SearchResultSorterPriority extends ViewerSorter {
 	@Override
 	public int category(Object element) {
 		try {
-			AbstractRepositoryTask hit = (AbstractRepositoryTask) element;
+			AbstractTask hit = (AbstractTask) element;
 			return Integer.parseInt(hit.getTaskId());
 		} catch (Exception ignored) {
 			// ignore if there is a problem
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TaskDataExportJob.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TaskDataExportJob.java
index 9f46d7a8f..663acd93c 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TaskDataExportJob.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TaskDataExportJob.java
@@ -32,7 +32,7 @@ import org.eclipse.mylyn.internal.context.core.InteractionContextManager;
 import org.eclipse.mylyn.internal.monitor.core.util.ZipFileUtil;
 import org.eclipse.mylyn.internal.tasks.ui.ITasksUiConstants;
 import org.eclipse.mylyn.internal.tasks.ui.WorkspaceAwareContextStore;
-import org.eclipse.mylyn.tasks.core.ITask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
 import org.eclipse.mylyn.tasks.core.TaskRepositoryManager;
 import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
 
@@ -63,7 +63,7 @@ public class TaskDataExportJob implements IRunnableWithProgress {
 
 	private File destZipFile = null;
 
-	private Collection<ITask> tasks;
+	private Collection<AbstractTask> tasks;
 
 	/** export all data */
 	public TaskDataExportJob(String destinationDirectory, boolean zipIt, String zipFileName) {
@@ -73,7 +73,7 @@ public class TaskDataExportJob implements IRunnableWithProgress {
 
 	/** export specified data */
 	public TaskDataExportJob(String destinationDirectory, boolean exportTaskList, boolean exportActivationHistory,
-			boolean exportTaskContexts, boolean zipIt, String zipFileName, Collection<ITask> taskContextsToExport) {
+			boolean exportTaskContexts, boolean zipIt, String zipFileName, Collection<AbstractTask> taskContextsToExport) {
 		this.zipFileName = zipFileName;
 		this.zip = zipIt;
 		this.exportTaskList = exportTaskList;
@@ -193,7 +193,7 @@ public class TaskDataExportJob implements IRunnableWithProgress {
 		if (exportTaskContexts) {
 			// Prevent many repeated error messages
 			boolean errorDisplayed = false;
-			for (ITask task : tasks) {
+			for (AbstractTask task : tasks) {
 
 				if (!ContextCorePlugin.getContextManager().hasContext(task.getHandleIdentifier())) {
 					continue; // Tasks without a context have no file to
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TaskListSaveManager.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TaskListSaveManager.java
index 9100c9d38..08d0c475c 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TaskListSaveManager.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TaskListSaveManager.java
@@ -31,8 +31,8 @@ import org.eclipse.mylyn.context.core.ContextCorePlugin;
 import org.eclipse.mylyn.core.MylarStatusHandler;
 import org.eclipse.mylyn.internal.context.core.InteractionContextManager;
 import org.eclipse.mylyn.internal.tasks.ui.ITasksUiConstants;
-import org.eclipse.mylyn.tasks.core.AbstractTaskContainer;
-import org.eclipse.mylyn.tasks.core.ITask;
+import org.eclipse.mylyn.tasks.core.AbstractTaskListElement;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
 import org.eclipse.mylyn.tasks.core.ITaskListChangeListener;
 import org.eclipse.mylyn.tasks.ui.TaskListManager;
 import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
@@ -86,7 +86,7 @@ public class TaskListSaveManager implements ITaskListChangeListener, IBackground
 			TaskListManager taskListManager = TasksUiPlugin.getTaskListManager();
 			if (async) {
 				if (saveContext) {
-					for (ITask task : taskListManager.getTaskList().getActiveTasks()) {
+					for (AbstractTask task : taskListManager.getTaskList().getActiveTasks()) {
 						taskListSaverJob.addTaskContext(task);
 					}
 				}
@@ -95,7 +95,7 @@ public class TaskListSaveManager implements ITaskListChangeListener, IBackground
 				taskListSaverJob.waitSaveCompleted();
 				InteractionContextManager contextManager = ContextCorePlugin.getContextManager();
 				if (saveContext) {
-					for (ITask task : new ArrayList<ITask>(taskListManager.getTaskList().getActiveTasks())) {
+					for (AbstractTask task : new ArrayList<AbstractTask>(taskListManager.getTaskList().getActiveTasks())) {
 						contextManager.saveContext(task.getHandleIdentifier());
 					}
 				}
@@ -208,23 +208,23 @@ public class TaskListSaveManager implements ITaskListChangeListener, IBackground
 		}
 	}
 
-	public void taskActivated(ITask task) {
+	public void taskActivated(AbstractTask task) {
 		// ignore
 	}
 
-	public void tasksActivated(List<ITask> tasks) {
+	public void tasksActivated(List<AbstractTask> tasks) {
 		// ignore
 	}
 
-	public void taskDeactivated(ITask task) {
+	public void taskDeactivated(AbstractTask task) {
 		saveTaskList(true, true);
 	}
 
-	public void localInfoChanged(ITask task) {
+	public void localInfoChanged(AbstractTask task) {
 		saveTaskList(false, true);
 	}
 
-	public void repositoryInfoChanged(ITask task) {
+	public void repositoryInfoChanged(AbstractTask task) {
 		// ignore
 	}
 
@@ -240,23 +240,23 @@ public class TaskListSaveManager implements ITaskListChangeListener, IBackground
 // // saveTimer.setForceSyncExec(on);
 // }
 
-	public void taskMoved(ITask task, AbstractTaskContainer fromContainer, AbstractTaskContainer toContainer) {
+	public void taskMoved(AbstractTask task, AbstractTaskListElement fromContainer, AbstractTaskListElement toContainer) {
 		saveTaskList(false, true);
 	}
 
-	public void taskDeleted(ITask task) {
+	public void taskDeleted(AbstractTask task) {
 		saveTaskList(false, true);
 	}
 
-	public void containerAdded(AbstractTaskContainer container) {
+	public void containerAdded(AbstractTaskListElement container) {
 		saveTaskList(false, true);
 	}
 
-	public void containerDeleted(AbstractTaskContainer container) {
+	public void containerDeleted(AbstractTaskListElement container) {
 		saveTaskList(false, true);
 	}
 
-	public void taskAdded(ITask task) {
+	public void taskAdded(AbstractTask task) {
 		saveTaskList(false, true);
 	}
 
@@ -265,7 +265,7 @@ public class TaskListSaveManager implements ITaskListChangeListener, IBackground
 		return saveTimer;
 	}
 
-	public void containerInfoChanged(AbstractTaskContainer container) {
+	public void containerInfoChanged(AbstractTaskListElement container) {
 		saveTaskList(false, true);
 	}
 
@@ -275,7 +275,7 @@ public class TaskListSaveManager implements ITaskListChangeListener, IBackground
 
 	private class TaskListSaverJob extends Job {
 
-		private final Queue<ITask> taskQueue = new LinkedList<ITask>();
+		private final Queue<AbstractTask> taskQueue = new LinkedList<AbstractTask>();
 
 		private volatile boolean saveRequested = false;
 
@@ -294,7 +294,7 @@ public class TaskListSaveManager implements ITaskListChangeListener, IBackground
 					saveCompleted = false;
 					InteractionContextManager contextManager = ContextCorePlugin.getContextManager();
 					while (!taskQueue.isEmpty()) {
-						ITask task = taskQueue.poll();
+						AbstractTask task = taskQueue.poll();
 						if (task != null) {
 							contextManager.saveContext(task.getHandleIdentifier());
 						}
@@ -316,7 +316,7 @@ public class TaskListSaveManager implements ITaskListChangeListener, IBackground
 			}
 		}
 
-		void addTaskContext(ITask task) {
+		void addTaskContext(AbstractTask task) {
 			taskQueue.add(task);
 		}
 
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TaskListWriter.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TaskListWriter.java
index 320fb9ae4..d156ffbf7 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TaskListWriter.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TaskListWriter.java
@@ -44,12 +44,12 @@ import org.eclipse.mylyn.core.MylarStatusHandler;
 import org.eclipse.mylyn.internal.tasks.core.TaskDataManager;
 import org.eclipse.mylyn.internal.tasks.ui.ITasksUiConstants;
 import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery;
-import org.eclipse.mylyn.tasks.core.AbstractTaskContainer;
+import org.eclipse.mylyn.tasks.core.AbstractTaskListElement;
 import org.eclipse.mylyn.tasks.core.DelegatingTaskExternalizer;
-import org.eclipse.mylyn.tasks.core.ITask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
 import org.eclipse.mylyn.tasks.core.ITaskListExternalizer;
 import org.eclipse.mylyn.tasks.core.TaskExternalizationException;
-import org.eclipse.mylyn.tasks.core.TaskList;
+import org.eclipse.mylyn.tasks.core.getAllCategories;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
@@ -100,7 +100,7 @@ public class TaskListWriter {
 		this.delagatingExternalizer.setDelegateExternalizers(externalizers);
 	}
 
-	public void writeTaskList(TaskList taskList, File outFile) {
+	public void writeTaskList(getAllCategories taskList, File outFile) {
 		DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
 		DocumentBuilder db;
 		Document doc = null;
@@ -117,7 +117,7 @@ public class TaskListWriter {
 		root.setAttribute(ATTRIBUTE_VERSION, VALUE_VERSION);
 
 		// create the categories
-		for (AbstractTaskContainer category : taskList.getCategories()) {
+		for (AbstractTaskListElement category : taskList.getCategories()) {
 			// if (!category.getHandleIdentifier().equals(TaskArchive.HANDLE)) {
 			delagatingExternalizer.createCategoryElement(category, doc, root);
 			// }
@@ -143,7 +143,7 @@ public class TaskListWriter {
 		// Collection<ITask> allTasks =
 		// Collections.synchronizedCollection(taskList.getAllTasks());
 		// synchronized (allTasks) {
-		for (ITask task : taskList.getAllTasks()) {
+		for (AbstractTask task : taskList.getAllTasks()) {
 			createTaskElement(doc, root, task);
 		}
 
@@ -168,7 +168,7 @@ public class TaskListWriter {
 		return;
 	}
 
-	private void createTaskElement(Document doc, Element root, ITask task) {
+	private void createTaskElement(Document doc, Element root, AbstractTask task) {
 		try {
 			Element element = null;
 			for (ITaskListExternalizer externalizer : externalizers) {
@@ -247,9 +247,9 @@ public class TaskListWriter {
 	/**
 	 * TODO: fix this old mess
 	 */
-	public void readTaskList(TaskList taskList, File inFile, TaskDataManager taskDataManager) {
+	public void readTaskList(getAllCategories taskList, File inFile, TaskDataManager taskDataManager) {
 		hasCaughtException = false;
-		Map<ITask, NodeList> tasksWithSubtasks = new HashMap<ITask, NodeList>();
+		Map<AbstractTask, NodeList> tasksWithSubtasks = new HashMap<AbstractTask, NodeList>();
 		orphanedTaskNodes.clear();
 		orphanedQueryNodes.clear();
 		try {
@@ -287,7 +287,7 @@ public class TaskListWriter {
 						if (!child.getNodeName().endsWith(DelegatingTaskExternalizer.KEY_CATEGORY)
 								&& !child.getNodeName().endsWith(DelegatingTaskExternalizer.KEY_QUERY)) {
 
-							ITask task = delagatingExternalizer.readTask(child, taskList, null, null);
+							AbstractTask task = delagatingExternalizer.readTask(child, taskList, null, null);
 							if (task == null) {
 								orphanedTaskNodes.add(child);
 							} else {
@@ -308,7 +308,7 @@ public class TaskListWriter {
 					}
 				}
 
-				for (ITask task : tasksWithSubtasks.keySet()) {
+				for (AbstractTask task : tasksWithSubtasks.keySet()) {
 					NodeList nodes = tasksWithSubtasks.get(task);
 					delagatingExternalizer.readSubTasks(task, nodes, taskList);
 				}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/CustomTaskListDecorationDrawer.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/CustomTaskListDecorationDrawer.java
index fdfe5e463..de0393ca2 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/CustomTaskListDecorationDrawer.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/CustomTaskListDecorationDrawer.java
@@ -13,11 +13,11 @@ import java.util.Arrays;
 import org.eclipse.mylyn.context.core.ContextCorePlugin;
 import org.eclipse.mylyn.internal.tasks.ui.TasksUiPreferenceConstants;
 import org.eclipse.mylyn.internal.tasks.ui.TasksUiImages;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask;
-import org.eclipse.mylyn.tasks.core.AbstractTaskContainer;
-import org.eclipse.mylyn.tasks.core.ITask;
-import org.eclipse.mylyn.tasks.core.ITaskListElement;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask.RepositoryTaskSyncState;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
+import org.eclipse.mylyn.tasks.core.AbstractTaskListElement;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
+import org.eclipse.mylyn.tasks.core.AbstractTaskListElement;
+import org.eclipse.mylyn.tasks.core.AbstractTask.RepositoryTaskSyncState;
 import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Image;
@@ -63,10 +63,10 @@ class CustomTaskListDecorationDrawer implements Listener {
 	 */
 	public void handleEvent(Event event) {
 		Object data = event.item.getData();
-		ITask task = null;
+		AbstractTask task = null;
 		Image activationImage = null;
-		if (data instanceof ITask) {
-			task = (ITask) data;
+		if (data instanceof AbstractTask) {
+			task = (AbstractTask) data;
 		}
 		if (task != null) {
 			if (task.isActive()) {
@@ -77,15 +77,15 @@ class CustomTaskListDecorationDrawer implements Listener {
 				activationImage = taskInactive;
 			}
 		}
-		if (data instanceof ITaskListElement) {
+		if (data instanceof AbstractTaskListElement) {
 			switch (event.type) {
 			case SWT.EraseItem: {
 				if (activationImage != null) {
 					drawActivationImage(activationImageOffset, event, activationImage);
 				}
 				if (!this.taskListView.synchronizationOverlaid) {
-					if (data instanceof ITaskListElement) {
-						drawSyncronizationImage((ITaskListElement) data, event);
+					if (data instanceof AbstractTaskListElement) {
+						drawSyncronizationImage((AbstractTaskListElement) data, event);
 					}
 				}
 				break;
@@ -94,8 +94,8 @@ class CustomTaskListDecorationDrawer implements Listener {
 				if (activationImage != null) {
 					drawActivationImage(activationImageOffset, event, activationImage);
 				}
-				if (data instanceof ITaskListElement) {
-					drawSyncronizationImage((ITaskListElement) data, event);
+				if (data instanceof AbstractTaskListElement) {
+					drawSyncronizationImage((AbstractTaskListElement) data, event);
 				}
 				break;
 			}
@@ -103,7 +103,7 @@ class CustomTaskListDecorationDrawer implements Listener {
 		}
 	}
 
-	private void drawSyncronizationImage(ITaskListElement element, Event event) {
+	private void drawSyncronizationImage(AbstractTaskListElement element, Event event) {
 		Image image = null;
 		int offsetX = 6;
 		int offsetY = (event.height / 2) - 5;
@@ -111,9 +111,9 @@ class CustomTaskListDecorationDrawer implements Listener {
 			offsetX = event.x + 18 - platformSpecificSquish;
 			offsetY += 2;
 		}
-		if (element instanceof AbstractTaskContainer && !(element instanceof ITask)) {
+		if (element instanceof AbstractTaskListElement && !(element instanceof AbstractTask)) {
 			if (!Arrays.asList(this.taskListView.getViewer().getExpandedElements()).contains(element)
-					&& hasIncoming((AbstractTaskContainer) element)) {
+					&& hasIncoming((AbstractTaskListElement) element)) {
 				int additionalSquish = 0;
 				if (platformSpecificSquish > 0 && taskListView.synchronizationOverlaid) {
 					additionalSquish = platformSpecificSquish + 3;
@@ -137,10 +137,10 @@ class CustomTaskListDecorationDrawer implements Listener {
 		}
 	}
 
-	private boolean hasIncoming(AbstractTaskContainer container) {
-		for (ITask task : container.getChildren()) {
-			if (task instanceof AbstractRepositoryTask) {
-				AbstractRepositoryTask containedRepositoryTask = (AbstractRepositoryTask) task;
+	private boolean hasIncoming(AbstractTaskListElement container) {
+		for (AbstractTask task : container.getChildren()) {
+			if (task instanceof AbstractTask) {
+				AbstractTask containedRepositoryTask = (AbstractTask) task;
 				if (containedRepositoryTask.getSyncState() == RepositoryTaskSyncState.INCOMING) {
 					return true;
 				}
@@ -148,7 +148,7 @@ class CustomTaskListDecorationDrawer implements Listener {
 		}
 // if (container instanceof AbstractRepositoryQuery) {
 // AbstractRepositoryQuery query = (AbstractRepositoryQuery) container;
-// for (AbstractRepositoryTask hit : query.getHits()) {
+// for (AbstractTask hit : query.getHits()) {
 // if (hit.getSyncState() == RepositoryTaskSyncState.INCOMING) {
 // return true;
 // }
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/PriorityDropDownAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/PriorityDropDownAction.java
index 83f79fae9..de76e5bdf 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/PriorityDropDownAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/PriorityDropDownAction.java
@@ -13,7 +13,7 @@ import org.eclipse.jface.action.ActionContributionItem;
 import org.eclipse.jface.action.IMenuCreator;
 import org.eclipse.mylyn.internal.tasks.ui.TasksUiImages;
 import org.eclipse.mylyn.internal.tasks.ui.TasksUiPreferenceConstants;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask.PriorityLevel;
+import org.eclipse.mylyn.tasks.core.AbstractTask.PriorityLevel;
 import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Menu;
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TableDecoratingLabelProvider.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TableDecoratingLabelProvider.java
index 6a0efc5e2..5e48a9157 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TableDecoratingLabelProvider.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TableDecoratingLabelProvider.java
@@ -18,9 +18,9 @@ import org.eclipse.jface.viewers.ITableLabelProvider;
 import org.eclipse.mylyn.context.core.ContextCorePlugin;
 import org.eclipse.mylyn.internal.tasks.ui.TasksUiImages;
 import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery;
-import org.eclipse.mylyn.tasks.core.AbstractTaskContainer;
-import org.eclipse.mylyn.tasks.core.ITask;
-import org.eclipse.mylyn.tasks.core.ITaskListElement;
+import org.eclipse.mylyn.tasks.core.AbstractTaskListElement;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
+import org.eclipse.mylyn.tasks.core.AbstractTaskListElement;
 import org.eclipse.swt.graphics.Image;
 
 /**
@@ -33,14 +33,14 @@ public class TableDecoratingLabelProvider extends DecoratingLabelProvider implem
 	}
 
 	public Image getColumnImage(Object element, int columnIndex) {
-		if (!(element instanceof ITaskListElement)) {
+		if (!(element instanceof AbstractTaskListElement)) {
 			return null;
 		}
 		if (columnIndex == 0) {
-			if (element instanceof AbstractTaskContainer && !(element instanceof ITask)) {
+			if (element instanceof AbstractTaskListElement && !(element instanceof AbstractTask)) {
 				return super.getImage(element);
 			} else {
-				ITask task = TaskElementLabelProvider.getCorrespondingTask((ITaskListElement)element);
+				AbstractTask task = TaskElementLabelProvider.getCorrespondingTask((AbstractTaskListElement)element);
 				if (task != null) {
 					if (task.isActive()) {
 						return TasksUiImages.getImage(TasksUiImages.TASK_ACTIVE);
@@ -56,7 +56,7 @@ public class TableDecoratingLabelProvider extends DecoratingLabelProvider implem
 				}
 			}
 		} else if (columnIndex == 1) {
-			if (element instanceof AbstractTaskContainer || element instanceof AbstractRepositoryQuery) {
+			if (element instanceof AbstractTaskListElement || element instanceof AbstractRepositoryQuery) {
 				return null;
 			}
 			return super.getImage(element);
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskActivationHistory.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskActivationHistory.java
index e03bc51dd..ae3286c1d 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskActivationHistory.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskActivationHistory.java
@@ -16,7 +16,7 @@ import java.util.List;
 import org.eclipse.mylyn.context.core.ContextCorePlugin;
 import org.eclipse.mylyn.core.MylarStatusHandler;
 import org.eclipse.mylyn.monitor.core.InteractionEvent;
-import org.eclipse.mylyn.tasks.core.ITask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
 import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
 
 /**
@@ -27,7 +27,7 @@ import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
  */
 public class TaskActivationHistory {
 
-	private List<ITask> history = new ArrayList<ITask>();
+	private List<AbstractTask> history = new ArrayList<AbstractTask>();
 
 	private int currentIndex = -1;
 
@@ -52,7 +52,7 @@ public class TaskActivationHistory {
 		history.clear();
 		for (int i = ContextCorePlugin.getContextManager().getActivityMetaContext().getInteractionHistory()
 				.size() - 1; i >= 0; i--) {
-			ITask prevTask = getHistoryTaskAt(i);
+			AbstractTask prevTask = getHistoryTaskAt(i);
 
 			if (prevTask != null && !history.contains(prevTask)) {
 				// !isDuplicate(prevTask, i + 1)) {
@@ -71,13 +71,13 @@ public class TaskActivationHistory {
 	 * Returns the task corresponding to the interaction event history item at
 	 * the specified position
 	 */
-	protected ITask getHistoryTaskAt(int pos) {
+	protected AbstractTask getHistoryTaskAt(int pos) {
 		InteractionEvent event = ContextCorePlugin.getContextManager().getActivityMetaContext()
 				.getInteractionHistory().get(pos);
 		return TasksUiPlugin.getTaskListManager().getTaskList().getTask(event.getStructureHandle());
 	}
 
-	public void addTask(ITask task) {
+	public void addTask(AbstractTask task) {
 		try {
 			if (!persistentHistoryLoaded) {
 				loadPersistentHistory();
@@ -92,10 +92,10 @@ public class TaskActivationHistory {
 		}
 	}
 
-	public ITask getPreviousTask() {
+	public AbstractTask getPreviousTask() {
 		try {
 			boolean active = false;
-			for (ITask task: history) {
+			for (AbstractTask task: history) {
 				if(task.isActive()) {
 					active = true;
 					break;
@@ -117,7 +117,7 @@ public class TaskActivationHistory {
 		}
 	}
 
-	public List<ITask> getPreviousTasks() {
+	public List<AbstractTask> getPreviousTasks() {
 		return history;
 	}
 
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskActivityLabelProvider.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskActivityLabelProvider.java
index 3fc419761..5eeadd3af 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskActivityLabelProvider.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskActivityLabelProvider.java
@@ -23,12 +23,12 @@ import org.eclipse.mylyn.core.MylarStatusHandler;
 import org.eclipse.mylyn.internal.tasks.ui.TaskListColorsAndFonts;
 import org.eclipse.mylyn.internal.tasks.ui.TasksUiImages;
 import org.eclipse.mylyn.monitor.core.DateUtil;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask;
-import org.eclipse.mylyn.tasks.core.AbstractTaskContainer;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
+import org.eclipse.mylyn.tasks.core.AbstractTaskListElement;
 import org.eclipse.mylyn.tasks.core.DateRangeActivityDelegate;
 import org.eclipse.mylyn.tasks.core.DateRangeContainer;
-import org.eclipse.mylyn.tasks.core.ITask;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask.PriorityLevel;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
+import org.eclipse.mylyn.tasks.core.AbstractTask.PriorityLevel;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.Font;
 import org.eclipse.swt.graphics.Image;
@@ -71,11 +71,11 @@ public class TaskActivityLabelProvider extends DecoratingLabelProvider implement
 	public String getColumnText(Object element, int columnIndex) {
 		if (element instanceof DateRangeActivityDelegate) {
 			DateRangeActivityDelegate activityDelegate = (DateRangeActivityDelegate) element;
-			ITask task = activityDelegate.getCorrespondingTask();
+			AbstractTask task = activityDelegate.getCorrespondingTask();
 			switch (columnIndex) {			
 			case 2:
-				if(task instanceof AbstractRepositoryTask) {
-					return ((AbstractRepositoryTask)task).getTaskKey() +": " + task.getSummary();
+				if(task instanceof AbstractTask) {
+					return ((AbstractTask)task).getTaskKey() +": " + task.getSummary();
 				} else {
 					return task.getSummary();
 				}
@@ -120,7 +120,7 @@ public class TaskActivityLabelProvider extends DecoratingLabelProvider implement
 
 	@Override
 	public Color getBackground(Object element) {
-		if (element instanceof AbstractTaskContainer && !(element instanceof ITask)) {
+		if (element instanceof AbstractTaskListElement && !(element instanceof AbstractTask)) {
 			return categoryBackgroundColor;
 		} else {
 			return super.getBackground(element);
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskElementLabelProvider.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskElementLabelProvider.java
index 70c424230..1a9dc366a 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskElementLabelProvider.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskElementLabelProvider.java
@@ -21,16 +21,16 @@ import org.eclipse.mylyn.internal.tasks.ui.ITaskHighlighter;
 import org.eclipse.mylyn.internal.tasks.ui.TaskListColorsAndFonts;
 import org.eclipse.mylyn.internal.tasks.ui.TasksUiImages;
 import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask;
-import org.eclipse.mylyn.tasks.core.AbstractTaskContainer;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
+import org.eclipse.mylyn.tasks.core.AbstractTaskListElement;
 import org.eclipse.mylyn.tasks.core.DateRangeContainer;
-import org.eclipse.mylyn.tasks.core.ITask;
-import org.eclipse.mylyn.tasks.core.ITaskListElement;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
+import org.eclipse.mylyn.tasks.core.AbstractTaskListElement;
 import org.eclipse.mylyn.tasks.core.TaskArchive;
 import org.eclipse.mylyn.tasks.core.TaskCategory;
 import org.eclipse.mylyn.tasks.core.UncategorizedCategory;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask.RepositoryTaskSyncState;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask.PriorityLevel;
+import org.eclipse.mylyn.tasks.core.AbstractTask.RepositoryTaskSyncState;
+import org.eclipse.mylyn.tasks.core.AbstractTask.PriorityLevel;
 import org.eclipse.mylyn.tasks.ui.AbstractRepositoryConnectorUi;
 import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
 import org.eclipse.swt.graphics.Color;
@@ -65,12 +65,12 @@ public class TaskElementLabelProvider extends LabelProvider implements IColorPro
 	@Override
 	public Image getImage(Object element) {
 		CompositeImageDescriptor compositeDescriptor = getImageDescriptor(element);
-		if (element instanceof ITask) {
+		if (element instanceof AbstractTask) {
 			if (compositeDescriptor.overlayKind == null) {
 				compositeDescriptor.overlayKind = TasksUiImages.OVERLAY_BLANK;
 			}
 			return TasksUiImages.getCompositeTaskImage(compositeDescriptor.icon, compositeDescriptor.overlayKind);
-		} else if (element instanceof AbstractTaskContainer) {
+		} else if (element instanceof AbstractTaskListElement) {
 //			if (compositeDescriptor.overlaySynch == null) {
 //				compositeDescriptor.overlaySynch = TasksUiImages.OVERLAY_BLANK;
 //			}
@@ -89,13 +89,13 @@ public class TaskElementLabelProvider extends LabelProvider implements IColorPro
 			compositeDescriptor.icon = TasksUiImages.CATEGORY;
 		}
 
-		if (object instanceof ITaskListElement) {
-			ITaskListElement element = (ITaskListElement) object;
+		if (object instanceof AbstractTaskListElement) {
+			AbstractTaskListElement element = (AbstractTaskListElement) object;
 
 			AbstractRepositoryConnectorUi connectorUi = null;
-			if (element instanceof AbstractRepositoryTask) {
-				AbstractRepositoryTask repositoryTask = (AbstractRepositoryTask) element;
-				connectorUi = TasksUiPlugin.getRepositoryUi(((AbstractRepositoryTask) element).getRepositoryKind());
+			if (element instanceof AbstractTask) {
+				AbstractTask repositoryTask = (AbstractTask) element;
+				connectorUi = TasksUiPlugin.getRepositoryUi(((AbstractTask) element).getRepositoryKind());
 				if (connectorUi != null) {
 					compositeDescriptor.overlayKind = connectorUi.getTaskKindOverlay(repositoryTask);
 				}
@@ -109,7 +109,7 @@ public class TaskElementLabelProvider extends LabelProvider implements IColorPro
 			} else {
 				if (element instanceof AbstractRepositoryQuery) {
 					compositeDescriptor.icon = TasksUiImages.QUERY;
-				} else if (element instanceof ITask) {
+				} else if (element instanceof AbstractTask) {
 					compositeDescriptor.icon = TasksUiImages.TASK;
 				} else if (element instanceof DateRangeContainer) {
 					compositeDescriptor.icon = TasksUiImages.CALENDAR;
@@ -121,10 +121,10 @@ public class TaskElementLabelProvider extends LabelProvider implements IColorPro
 	}
 
 	public static ImageDescriptor getSynchronizationImageDescriptor(Object element, boolean synchViewStyle) {
-		AbstractRepositoryTask repositoryTask = null;
+		AbstractTask repositoryTask = null;
 		ImageDescriptor imageDescriptor = null;
-		if (element instanceof AbstractRepositoryTask) {
-			repositoryTask = (AbstractRepositoryTask) element;
+		if (element instanceof AbstractTask) {
+			repositoryTask = (AbstractTask) element;
 		}
 		if (repositoryTask != null) {
 			if (repositoryTask.getLastSyncDateStamp() == null) {
@@ -154,8 +154,8 @@ public class TaskElementLabelProvider extends LabelProvider implements IColorPro
 			} else if (imageDescriptor != null) {
 				return imageDescriptor;
 			}
-		} else if (element instanceof AbstractTaskContainer) {
-			AbstractTaskContainer container = (AbstractTaskContainer) element;
+		} else if (element instanceof AbstractTaskListElement) {
+			AbstractTaskListElement container = (AbstractTaskListElement) element;
 			if (container instanceof AbstractRepositoryQuery) {
 				AbstractRepositoryQuery query = (AbstractRepositoryQuery) container;
 				if (query.getStatus() != null) {
@@ -169,15 +169,15 @@ public class TaskElementLabelProvider extends LabelProvider implements IColorPro
 
 	public static ImageDescriptor getPriorityImageDescriptor(Object element) {
 		AbstractRepositoryConnectorUi connectorUi;
-		if (element instanceof AbstractRepositoryTask) {
-			AbstractRepositoryTask repositoryTask = (AbstractRepositoryTask) element;
-			connectorUi = TasksUiPlugin.getRepositoryUi(((AbstractRepositoryTask) element).getRepositoryKind());
+		if (element instanceof AbstractTask) {
+			AbstractTask repositoryTask = (AbstractTask) element;
+			connectorUi = TasksUiPlugin.getRepositoryUi(((AbstractTask) element).getRepositoryKind());
 			if (connectorUi != null) {
 				return connectorUi.getTaskPriorityOverlay(repositoryTask);
 			}
 		}
-		if (element instanceof ITask) {
-			ITask task = TaskElementLabelProvider.getCorrespondingTask((ITaskListElement) element);
+		if (element instanceof AbstractTask) {
+			AbstractTask task = TaskElementLabelProvider.getCorrespondingTask((AbstractTaskListElement) element);
 			if (task != null) {
 				return TasksUiImages.getImageDescriptorForPriority(PriorityLevel.fromString(task.getPriority()));
 			}
@@ -187,8 +187,8 @@ public class TaskElementLabelProvider extends LabelProvider implements IColorPro
 
 	@Override
 	public String getText(Object object) {
-		if (object instanceof AbstractRepositoryTask) {
-			AbstractRepositoryTask task = (AbstractRepositoryTask) object;
+		if (object instanceof AbstractTask) {
+			AbstractTask task = (AbstractTask) object;
 			if (task.getSummary() == null) {
 				if (task.getTaskKey() != null) {
 					return task.getTaskKey() + NO_SUMMARY_AVAILABLE;
@@ -204,8 +204,8 @@ public class TaskElementLabelProvider extends LabelProvider implements IColorPro
 			} else {
 				return task.getSummary();
 			}
-		} else if (object instanceof ITaskListElement) {
-			ITaskListElement element = (ITaskListElement) object;
+		} else if (object instanceof AbstractTaskListElement) {
+			AbstractTaskListElement element = (AbstractTaskListElement) object;
 			return element.getSummary();
 		} else {
 			return super.getText(object);
@@ -213,8 +213,8 @@ public class TaskElementLabelProvider extends LabelProvider implements IColorPro
 	}
 
 	public Color getForeground(Object object) {
-		if (object instanceof ITaskListElement && object instanceof ITask) {
-			ITask task = getCorrespondingTask((ITaskListElement) object);
+		if (object instanceof AbstractTaskListElement && object instanceof AbstractTask) {
+			AbstractTask task = getCorrespondingTask((AbstractTaskListElement) object);
 			if (task != null) {
 				if (TasksUiPlugin.getTaskListManager().isCompletedToday(task)) {
 					return themeManager.getCurrentTheme().getColorRegistry().get(
@@ -235,8 +235,8 @@ public class TaskElementLabelProvider extends LabelProvider implements IColorPro
 							TaskListColorsAndFonts.THEME_COLOR_TASK_THISWEEK_SCHEDULED);
 				}
 			}
-		} else if (object instanceof AbstractTaskContainer) {
-			for (ITask child : ((AbstractTaskContainer) object).getChildren()) {
+		} else if (object instanceof AbstractTaskListElement) {
+			for (AbstractTask child : ((AbstractTaskListElement) object).getChildren()) {
 				if (child.isActive()) {
 					return TaskListColorsAndFonts.COLOR_TASK_ACTIVE;
 				} else if (child.isPastReminder() && !child.isCompleted()) {
@@ -251,17 +251,17 @@ public class TaskElementLabelProvider extends LabelProvider implements IColorPro
 	/**
 	 * TODO: move
 	 */
-	public static ITask getCorrespondingTask(ITaskListElement element) {
-		if (element instanceof ITask) {
-			return (ITask) element;
+	public static AbstractTask getCorrespondingTask(AbstractTaskListElement element) {
+		if (element instanceof AbstractTask) {
+			return (AbstractTask) element;
 		} else {
 			return null;
 		}
 	}
 
 	public Color getBackground(Object element) {
-		if (element instanceof ITask) {
-			ITask task = (ITask) element;
+		if (element instanceof AbstractTask) {
+			AbstractTask task = (AbstractTask) element;
 			ITaskHighlighter highlighter = TasksUiPlugin.getDefault().getHighlighter();
 			if (highlighter != null) {
 				return highlighter.getHighlightColor(task);
@@ -271,23 +271,23 @@ public class TaskElementLabelProvider extends LabelProvider implements IColorPro
 	}
 
 	public Font getFont(Object element) {
-		if (!(element instanceof ITaskListElement)) {
+		if (!(element instanceof AbstractTaskListElement)) {
 			return null;
 		}
-		ITask task = getCorrespondingTask((ITaskListElement) element);
-		if (task instanceof AbstractRepositoryTask) {
-			AbstractRepositoryTask repositoryTask = (AbstractRepositoryTask) task;
+		AbstractTask task = getCorrespondingTask((AbstractTaskListElement) element);
+		if (task instanceof AbstractTask) {
+			AbstractTask repositoryTask = (AbstractTask) task;
 			if (repositoryTask.isSynchronizing()) {
 				return TaskListColorsAndFonts.ITALIC;
 			}
 		}
-		if (element instanceof AbstractTaskContainer) {
+		if (element instanceof AbstractTaskListElement) {
 			if (element instanceof AbstractRepositoryQuery) {
 				if (((AbstractRepositoryQuery) element).isSynchronizing()) {
 					return TaskListColorsAndFonts.ITALIC;
 				}
 			}
-			for (ITask child : ((AbstractTaskContainer) element).getChildren()) {
+			for (AbstractTask child : ((AbstractTaskListElement) element).getChildren()) {
 				if (child.isActive()) {
 					return TaskListColorsAndFonts.BOLD;
 				}
@@ -299,7 +299,7 @@ public class TaskElementLabelProvider extends LabelProvider implements IColorPro
 			} else if (task.isCompleted()) {
 				return TaskListColorsAndFonts.STRIKETHROUGH;
 			}
-			for (ITask child : task.getChildren()) {
+			for (AbstractTask child : task.getChildren()) {
 				if (child.isActive()) {
 					return TaskListColorsAndFonts.BOLD;
 				}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListCellModifier.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListCellModifier.java
index a326fef4f..010972cda 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListCellModifier.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListCellModifier.java
@@ -14,10 +14,9 @@ import org.eclipse.jface.viewers.ICellModifier;
 import org.eclipse.mylyn.core.MylarStatusHandler;
 import org.eclipse.mylyn.internal.tasks.ui.actions.TaskActivateAction;
 import org.eclipse.mylyn.internal.tasks.ui.actions.TaskDeactivateAction;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
 import org.eclipse.mylyn.tasks.core.AbstractTaskContainer;
-import org.eclipse.mylyn.tasks.core.ITask;
-import org.eclipse.mylyn.tasks.core.ITaskListElement;
+import org.eclipse.mylyn.tasks.core.AbstractTaskListElement;
 import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
 import org.eclipse.swt.widgets.TreeItem;
 
@@ -39,8 +38,8 @@ class TaskListCellModifier implements ICellModifier {
 	public Object getValue(Object element, String property) {
 		try {
 			int columnIndex = Arrays.asList(this.taskListView.columnNames).indexOf(property);
-			if (element instanceof ITaskListElement) {
-				final ITaskListElement taskListElement = (ITaskListElement) element;
+			if (element instanceof AbstractTaskListElement) {
+				final AbstractTaskListElement taskListElement = (AbstractTaskListElement) element;
 				switch (columnIndex) {
 				case 0:
 					return taskListElement.getSummary();
@@ -60,13 +59,13 @@ class TaskListCellModifier implements ICellModifier {
 		int columnIndex = -1;
 		try {
 			columnIndex = Arrays.asList(this.taskListView.columnNames).indexOf(property);
-			 if (((TreeItem) element).getData() instanceof ITask) {
-					final ITaskListElement taskListElement = (ITaskListElement) ((TreeItem) element).getData();
-					ITask task = (ITask) taskListElement;
+			 if (((TreeItem) element).getData() instanceof AbstractTask) {
+					final AbstractTaskListElement taskListElement = (AbstractTaskListElement) ((TreeItem) element).getData();
+					AbstractTask task = (AbstractTask) taskListElement;
 					switch (columnIndex) {
 					case 0:
-						if (!(task instanceof AbstractRepositoryTask)) {
-							TasksUiPlugin.getTaskListManager().getTaskList().renameTask((AbstractRepositoryTask) task,
+						if (!(task instanceof AbstractTask)) {
+							TasksUiPlugin.getTaskListManager().getTaskList().renameTask((AbstractTask) task,
 									((String) value).trim());
 						}
 						break;
@@ -95,10 +94,10 @@ class TaskListCellModifier implements ICellModifier {
 		this.taskListView.getViewer().refresh();
 	}
 
-	public void toggleTaskActivation(ITaskListElement taskListElement) {
-		ITask task = null;
-		if (taskListElement instanceof ITask) {
-			task = (ITask) taskListElement;
+	public void toggleTaskActivation(AbstractTaskListElement taskListElement) {
+		AbstractTask task = null;
+		if (taskListElement instanceof AbstractTask) {
+			task = (AbstractTask) taskListElement;
 		}
 
 		if (task != null) {
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListContentProvider.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListContentProvider.java
index 7125a84fb..c637d81db 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListContentProvider.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListContentProvider.java
@@ -22,10 +22,10 @@ import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.mylyn.internal.tasks.ui.AbstractTaskListFilter;
 import org.eclipse.mylyn.internal.tasks.ui.TasksUiPreferenceConstants;
 import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask;
-import org.eclipse.mylyn.tasks.core.AbstractTaskContainer;
-import org.eclipse.mylyn.tasks.core.ITask;
-import org.eclipse.mylyn.tasks.core.ITaskListElement;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
+import org.eclipse.mylyn.tasks.core.AbstractTaskListElement;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
+import org.eclipse.mylyn.tasks.core.AbstractTaskListElement;
 import org.eclipse.mylyn.tasks.core.TaskArchive;
 import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
 
@@ -60,11 +60,11 @@ public class TaskListContentProvider implements IStructuredContentProvider, ITre
 	}
 
 	public Object getParent(Object child) {
-		if (child instanceof ITask) {
+		if (child instanceof AbstractTask) {
 //			if (((ITask) child).getParent() != null) {
 //				return ((ITask) child).getParent();
 //			} else {
-			return ((ITask) child).getContainer();
+			return ((AbstractTask) child).getContainer();
 //			}
 		}
 		return null;
@@ -81,24 +81,24 @@ public class TaskListContentProvider implements IStructuredContentProvider, ITre
 		if (parent instanceof AbstractRepositoryQuery) {
 			AbstractRepositoryQuery t = (AbstractRepositoryQuery) parent;
 			return !t.isEmpty();
-		} else if (parent instanceof ITask) {
-			return taskHasUnfilteredChildren((ITask) parent);
-		} else if (parent instanceof AbstractTaskContainer) {
-			AbstractTaskContainer cat = (AbstractTaskContainer) parent;
+		} else if (parent instanceof AbstractTask) {
+			return taskHasUnfilteredChildren((AbstractTask) parent);
+		} else if (parent instanceof AbstractTaskListElement) {
+			AbstractTaskListElement cat = (AbstractTaskListElement) parent;
 			// TODO: should provide hasChildren method!
 			return cat.getChildren() != null && cat.getChildren().size() > 0;
 		}
 		return false;
 	}
 
-	private boolean taskHasUnfilteredChildren(ITask parent) {
+	private boolean taskHasUnfilteredChildren(AbstractTask parent) {
 		boolean filterSubtasks = TasksUiPlugin.getDefault().getPreferenceStore().getBoolean(
 				TasksUiPreferenceConstants.FILTER_SUBTASKS);
 		if (filterSubtasks)
 			return false;
-		Set<ITask> children = parent.getChildren();
+		Set<AbstractTask> children = parent.getChildren();
 		if (children != null) {
-			for (ITask task : children) {
+			for (AbstractTask task : children) {
 				if (!filter(parent, task)) {
 					return true;
 				}
@@ -107,12 +107,12 @@ public class TaskListContentProvider implements IStructuredContentProvider, ITre
 		return false;
 	}
 
-	protected List<ITaskListElement> applyFilter(Set<ITaskListElement> roots) {
+	protected List<AbstractTaskListElement> applyFilter(Set<AbstractTaskListElement> roots) {
 		String filterText = (this.view.getFilteredTree().getFilterControl()).getText();
 		if (containsNoFilterText(filterText)) {
-			List<ITaskListElement> filteredRoots = new ArrayList<ITaskListElement>();
-			for (ITaskListElement element : roots) {
-				if (element instanceof ITask) {
+			List<AbstractTaskListElement> filteredRoots = new ArrayList<AbstractTaskListElement>();
+			for (AbstractTaskListElement element : roots) {
+				if (element instanceof AbstractTask) {
 					if (!filter(null, element)) {
 						filteredRoots.add(element);
 					}
@@ -120,15 +120,15 @@ public class TaskListContentProvider implements IStructuredContentProvider, ITre
 					if (selectQuery((AbstractRepositoryQuery) element)) {
 						filteredRoots.add(element);
 					}
-				} else if (element instanceof AbstractTaskContainer) {
-					if (selectContainer((AbstractTaskContainer) element)) {
+				} else if (element instanceof AbstractTaskListElement) {
+					if (selectContainer((AbstractTaskListElement) element)) {
 						filteredRoots.add(element);
 					}
 				}
 			}
 			return filteredRoots;
 		} else {
-			return new ArrayList<ITaskListElement>(roots);
+			return new ArrayList<AbstractTaskListElement>(roots);
 		}
 	}
 
@@ -141,11 +141,11 @@ public class TaskListContentProvider implements IStructuredContentProvider, ITre
 
 	// TODO: should only know about containers, not queries
 	private boolean selectQuery(AbstractRepositoryQuery query) {
-		Set<AbstractRepositoryTask> hits = query.getHits();
+		Set<AbstractTask> hits = query.getHits();
 		if (hits.size() == 0) {
 			return true;
 		}
-		for (AbstractRepositoryTask element : hits) {
+		for (AbstractTask element : hits) {
 			if (!filter(query, element)) {
 				return true;
 			}
@@ -153,16 +153,16 @@ public class TaskListContentProvider implements IStructuredContentProvider, ITre
 		return false;
 	}
 
-	private boolean selectContainer(AbstractTaskContainer container) {
+	private boolean selectContainer(AbstractTaskListElement container) {
 		if (filter(null, container) && !shouldAlwaysShow(container)) {
 			return false;
 		}
 
-		Set<ITask> children = container.getChildren();
+		Set<AbstractTask> children = container.getChildren();
 		if (children.size() == 0) {
 			return true;
 		}
-		for (ITaskListElement child : children) {
+		for (AbstractTaskListElement child : children) {
 			if (!filter(container, child)) {
 				return true;
 			}
@@ -170,8 +170,8 @@ public class TaskListContentProvider implements IStructuredContentProvider, ITre
 		return false;
 	}
 
-	private boolean shouldAlwaysShow(AbstractTaskContainer container) {
-		for (ITask task : container.getChildren()) {
+	private boolean shouldAlwaysShow(AbstractTaskListElement container) {
+		for (AbstractTask task : container.getChildren()) {
 			if (shouldAlwaysShow(container, task)) {
 				if (container instanceof TaskArchive) {
 					if (TasksUiPlugin.getTaskListManager().getTaskList().getContainerForHandle(
@@ -188,7 +188,7 @@ public class TaskListContentProvider implements IStructuredContentProvider, ITre
 		return false;
 	}
 
-	private boolean shouldAlwaysShow(Object parent, ITask task) {
+	private boolean shouldAlwaysShow(Object parent, AbstractTask task) {
 		for (AbstractTaskListFilter filter : this.view.getFilters()) {
 			if (filter.shouldAlwaysShow(parent, task, !TasksUiPlugin.getDefault().getPreferenceStore().getBoolean(
 					TasksUiPreferenceConstants.FILTER_SUBTASKS))) {
@@ -199,13 +199,13 @@ public class TaskListContentProvider implements IStructuredContentProvider, ITre
 	}
 
 	// TODO: This can be simplified post bug#124321
-	private List<ITaskListElement> getFilteredChildrenFor(Object parent) {
+	private List<AbstractTaskListElement> getFilteredChildrenFor(Object parent) {
 		if (containsNoFilterText((this.view.getFilteredTree().getFilterControl()).getText())) {
-			List<ITaskListElement> children = new ArrayList<ITaskListElement>();
-			if (parent instanceof AbstractTaskContainer && ((AbstractTaskContainer) parent).isLocal()) {
+			List<AbstractTaskListElement> children = new ArrayList<AbstractTaskListElement>();
+			if (parent instanceof AbstractTaskListElement && ((AbstractTaskListElement) parent).isLocal()) {
 				if (filter(null, parent)) {
-					if (((AbstractTaskContainer) parent) instanceof TaskArchive) {
-						for (ITask task : ((AbstractTaskContainer) parent).getChildren()) {
+					if (((AbstractTaskListElement) parent) instanceof TaskArchive) {
+						for (AbstractTask task : ((AbstractTaskListElement) parent).getChildren()) {
 							if (shouldAlwaysShow(parent, task)) {
 								// TODO: archive logic?
 								if (TasksUiPlugin.getTaskListManager().getTaskList().getQueriesForHandle(
@@ -217,23 +217,23 @@ public class TaskListContentProvider implements IStructuredContentProvider, ITre
 						return children;
 					}
 				}
-				Set<ITask> parentsTasks = ((AbstractTaskContainer) parent).getChildren();
-				for (ITaskListElement element : parentsTasks) {
+				Set<AbstractTask> parentsTasks = ((AbstractTaskListElement) parent).getChildren();
+				for (AbstractTaskListElement element : parentsTasks) {
 					if (!filter(parent, element)) {
 						children.add(element);
 					}
 				}
 				return children;
 			} else if (parent instanceof AbstractRepositoryQuery) {
-				for (ITaskListElement element : ((AbstractRepositoryQuery) parent).getHits()) {
+				for (AbstractTaskListElement element : ((AbstractRepositoryQuery) parent).getHits()) {
 					if (!filter(parent, element)) {
 						children.add(element);
 					}
 				}
 				return children;
-			} else if (parent instanceof AbstractRepositoryTask) {
-				Set<ITask> subTasks = ((AbstractRepositoryTask) parent).getChildren();
-				for (ITask t : subTasks) {
+			} else if (parent instanceof AbstractTask) {
+				Set<AbstractTask> subTasks = ((AbstractTask) parent).getChildren();
+				for (AbstractTask t : subTasks) {
 					if (!filter(parent, t)) {
 						children.add(t);
 					}
@@ -241,9 +241,9 @@ public class TaskListContentProvider implements IStructuredContentProvider, ITre
 				return children;
 			}
 		} else {
-			List<ITaskListElement> children = new ArrayList<ITaskListElement>();
-			if (parent instanceof AbstractTaskContainer) {
-				children.addAll(((AbstractTaskContainer) parent).getChildren());
+			List<AbstractTaskListElement> children = new ArrayList<AbstractTaskListElement>();
+			if (parent instanceof AbstractTaskListElement) {
+				children.addAll(((AbstractTaskListElement) parent).getChildren());
 				return children;
 			}
 		}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListDragSourceListener.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListDragSourceListener.java
index eb64fc45f..9461c92dc 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListDragSourceListener.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListDragSourceListener.java
@@ -20,8 +20,8 @@ import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.mylyn.context.core.ContextCorePlugin;
 import org.eclipse.mylyn.internal.tasks.ui.actions.CopyTaskDetailsAction;
-import org.eclipse.mylyn.tasks.core.ITask;
-import org.eclipse.mylyn.tasks.core.ITaskListElement;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
+import org.eclipse.mylyn.tasks.core.AbstractTaskListElement;
 import org.eclipse.mylyn.tasks.ui.TaskTransfer;
 import org.eclipse.swt.dnd.DragSourceEvent;
 import org.eclipse.swt.dnd.DragSourceListener;
@@ -54,16 +54,16 @@ class TaskListDragSourceListener implements DragSourceListener {
 
 	public void dragSetData(DragSourceEvent event) {
 		StructuredSelection selection = (StructuredSelection) this.view.getViewer().getSelection();
-		ITaskListElement selectedElement = null;
-		if (((IStructuredSelection) selection).getFirstElement() instanceof ITaskListElement) {
-			selectedElement = (ITaskListElement)((IStructuredSelection) selection).getFirstElement();
+		AbstractTaskListElement selectedElement = null;
+		if (((IStructuredSelection) selection).getFirstElement() instanceof AbstractTaskListElement) {
+			selectedElement = (AbstractTaskListElement)((IStructuredSelection) selection).getFirstElement();
 		}
 		if (TaskTransfer.getInstance().isSupportedType(event.dataType)) {
-			List<ITask> tasks = new ArrayList<ITask>();
+			List<AbstractTask> tasks = new ArrayList<AbstractTask>();
 			for (Iterator<?> iter = selection.iterator(); iter.hasNext();) {
-				ITaskListElement element = (ITaskListElement) iter.next();
-				if (element instanceof ITask) {
-					tasks.add((ITask)element);
+				AbstractTaskListElement element = (AbstractTaskListElement) iter.next();
+				if (element instanceof AbstractTask) {
+					tasks.add((AbstractTask)element);
 				}
 			}
 			event.data = tasks.toArray();
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListDropAdapter.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListDropAdapter.java
index 7e9da852b..73398acae 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListDropAdapter.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListDropAdapter.java
@@ -32,10 +32,10 @@ import org.eclipse.mylyn.internal.tasks.ui.RetrieveTitleFromUrlJob;
 import org.eclipse.mylyn.internal.tasks.ui.actions.TaskActivateAction;
 import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector;
 import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
 import org.eclipse.mylyn.tasks.core.DateRangeContainer;
-import org.eclipse.mylyn.tasks.core.ITask;
-import org.eclipse.mylyn.tasks.core.ITaskListElement;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
+import org.eclipse.mylyn.tasks.core.AbstractTaskListElement;
 import org.eclipse.mylyn.tasks.core.TaskCategory;
 import org.eclipse.mylyn.tasks.core.TaskRepository;
 import org.eclipse.mylyn.tasks.ui.TaskTransfer;
@@ -53,7 +53,7 @@ import org.eclipse.swt.dnd.TransferData;
  */
 public class TaskListDropAdapter extends ViewerDropAdapter {
 
-	private AbstractRepositoryTask newTask = null;
+	private AbstractTask newTask = null;
 
 	private TransferData currentTransfer;
 
@@ -74,15 +74,15 @@ public class TaskListDropAdapter extends ViewerDropAdapter {
 	@Override
 	public boolean performDrop(Object data) {
 		Object currentTarget = getCurrentTarget();
-		List<ITask> tasksToMove = new ArrayList<ITask>();
+		List<AbstractTask> tasksToMove = new ArrayList<AbstractTask>();
 		ISelection selection = ((TreeViewer) getViewer()).getSelection();
 		if (isUrl(data) && createTaskFromUrl(data)) {
 			tasksToMove.add(newTask);
 		} else if (TaskTransfer.getInstance().isSupportedType(currentTransfer)) {
 			for (Object selectedObject : ((IStructuredSelection) selection).toList()) {
-				ITask toMove = null;
-				if (selectedObject instanceof ITask) {
-					toMove = (ITask) selectedObject;
+				AbstractTask toMove = null;
+				if (selectedObject instanceof AbstractTask) {
+					toMove = (AbstractTask) selectedObject;
 				} 
 				if (toMove != null) {
 					tasksToMove.add(toMove);
@@ -91,9 +91,9 @@ public class TaskListDropAdapter extends ViewerDropAdapter {
 		} else if (data instanceof String && createTaskFromString((String) data)) {
 			tasksToMove.add(newTask);
 		} else if (FileTransfer.getInstance().isSupportedType(currentTransfer)) {
-			ITask targetTask = null;
-			if (getCurrentTarget() instanceof ITask) {
-				targetTask = (ITask) getCurrentTarget();
+			AbstractTask targetTask = null;
+			if (getCurrentTarget() instanceof AbstractTask) {
+				targetTask = (AbstractTask) getCurrentTarget();
 			}
 			if (targetTask != null) {
 				final String[] names = (String[]) data;
@@ -111,11 +111,11 @@ public class TaskListDropAdapter extends ViewerDropAdapter {
 			}
 		}
 
-		for (ITask task : tasksToMove) {
+		for (AbstractTask task : tasksToMove) {
 			if (currentTarget instanceof TaskCategory) {
 				TasksUiPlugin.getTaskListManager().getTaskList().moveToContainer((TaskCategory) currentTarget, task);
-			} else if (currentTarget instanceof ITask) {
-				ITask targetTask = (ITask) currentTarget;
+			} else if (currentTarget instanceof AbstractTask) {
+				AbstractTask targetTask = (AbstractTask) currentTarget;
 				if (targetTask.getContainer() == null) {
 					TasksUiPlugin.getTaskListManager().getTaskList().moveToRoot(task);
 				} else {
@@ -191,9 +191,9 @@ public class TaskListDropAdapter extends ViewerDropAdapter {
 					try {
 						newTask = connector.createTaskFromExistingId(repository, id, new NullProgressMonitor());
 
-//						if (newTask instanceof AbstractRepositoryTask) {
+//						if (newTask instanceof AbstractTask) {
 //							// TODO: encapsulate in abstract connector
-//							AbstractRepositoryTask repositoryTask = (AbstractRepositoryTask) newTask;
+//							AbstractTask repositoryTask = (AbstractTask) newTask;
 //							TasksUiPlugin.getDefault().getTaskDataManager().push(
 //									RepositoryTaskHandleUtil.getHandle(repository.getUrl(), id),
 //									repositoryTask.getTaskData());
@@ -255,13 +255,13 @@ public class TaskListDropAdapter extends ViewerDropAdapter {
 
 		Object selectedObject = ((IStructuredSelection) ((TreeViewer) getViewer()).getSelection()).getFirstElement();
 		if (FileTransfer.getInstance().isSupportedType(currentTransfer)) {
-			if (getCurrentTarget() instanceof ITask) {
+			if (getCurrentTarget() instanceof AbstractTask) {
 				return true;
 			}
 		} else if (selectedObject != null && !(selectedObject instanceof AbstractRepositoryQuery)) {
 			if (getCurrentTarget() instanceof TaskCategory) {
 				return true;
-			} else if (getCurrentTarget() instanceof ITaskListElement
+			} else if (getCurrentTarget() instanceof AbstractTaskListElement
 					&& (getCurrentLocation() == ViewerDropAdapter.LOCATION_AFTER || getCurrentLocation() == ViewerDropAdapter.LOCATION_BEFORE)) {
 				return true;
 			} else {
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListFilteredTree.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListFilteredTree.java
index a8f9eba7a..4859d67ee 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListFilteredTree.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListFilteredTree.java
@@ -15,9 +15,9 @@ import java.util.Set;
 
 import org.eclipse.jface.layout.TreeColumnLayout;
 import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.mylyn.tasks.core.AbstractTaskContainer;
+import org.eclipse.mylyn.tasks.core.AbstractTaskListElement;
 import org.eclipse.mylyn.tasks.core.DateRangeContainer;
-import org.eclipse.mylyn.tasks.core.ITask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
 import org.eclipse.mylyn.tasks.core.ITaskActivityListener;
 import org.eclipse.mylyn.tasks.core.ITaskListChangeListener;
 import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
@@ -86,29 +86,29 @@ public class TaskListFilteredTree extends AbstractMylarFilteredTree {
 
 		TasksUiPlugin.getTaskListManager().getTaskList().addChangeListener(new ITaskListChangeListener() {
 
-			public void containerAdded(AbstractTaskContainer container) {
+			public void containerAdded(AbstractTaskListElement container) {
 			}
 
-			public void containerDeleted(AbstractTaskContainer container) {
+			public void containerDeleted(AbstractTaskListElement container) {
 			}
 
-			public void containerInfoChanged(AbstractTaskContainer container) {
+			public void containerInfoChanged(AbstractTaskListElement container) {
 			}
 
-			public void localInfoChanged(ITask task) {
+			public void localInfoChanged(AbstractTask task) {
 				updateTaskProgressBar();
 			}
 
-			public void repositoryInfoChanged(ITask task) {
+			public void repositoryInfoChanged(AbstractTask task) {
 			}
 
-			public void taskAdded(ITask task) {
+			public void taskAdded(AbstractTask task) {
 			}
 
-			public void taskDeleted(ITask task) {
+			public void taskDeleted(AbstractTask task) {
 			}
 
-			public void taskMoved(ITask task, AbstractTaskContainer fromContainer, AbstractTaskContainer toContainer) {
+			public void taskMoved(AbstractTask task, AbstractTaskListElement fromContainer, AbstractTaskListElement toContainer) {
 			}
 		});
 
@@ -121,16 +121,16 @@ public class TaskListFilteredTree extends AbstractMylarFilteredTree {
 			public void calendarChanged() {
 			}
 
-			public void taskActivated(ITask task) {
+			public void taskActivated(AbstractTask task) {
 			}
 
-			public void taskDeactivated(ITask task) {
+			public void taskDeactivated(AbstractTask task) {
 			}
 
 			public void taskListRead() {
 			}
 
-			public void tasksActivated(List<ITask> tasks) {
+			public void tasksActivated(List<AbstractTask> tasks) {
 			}
 
 		});
@@ -142,12 +142,12 @@ public class TaskListFilteredTree extends AbstractMylarFilteredTree {
 			return;
 		}
 
-		Set<ITask> tasksThisWeek = TasksUiPlugin.getTaskListManager().getScheduledForThisWeek();
+		Set<AbstractTask> tasksThisWeek = TasksUiPlugin.getTaskListManager().getScheduledForThisWeek();
 		totalTasks = tasksThisWeek.size();
 		completeTime = 0;
 		completeTasks = 0;
 		incompleteTime = 0;
-		for (ITask task : tasksThisWeek) {
+		for (AbstractTask task : tasksThisWeek) {
 			if (task.isCompleted()) {
 				completeTasks++;
 				if (task.getEstimateTimeHours() > 0) {
@@ -181,7 +181,7 @@ public class TaskListFilteredTree extends AbstractMylarFilteredTree {
 
 		activeTaskLabel = new Hyperlink(container, SWT.LEFT);
 		activeTaskLabel.setText(LABEL_NO_ACTIVE);
-		ITask activeTask = TasksUiPlugin.getTaskListManager().getTaskList().getActiveTask();
+		AbstractTask activeTask = TasksUiPlugin.getTaskListManager().getTaskList().getActiveTask();
 		if (activeTask != null) {
 			indicateActiveTask(activeTask);
 		}
@@ -205,7 +205,7 @@ public class TaskListFilteredTree extends AbstractMylarFilteredTree {
 		return activeTaskLabel;
 	}
 
-	public void indicateActiveTask(ITask task) {
+	public void indicateActiveTask(AbstractTask task) {
 		if (filterComposite.isDisposed()) {
 			return;
 		}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListTableSorter.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListTableSorter.java
index b4e3932e3..acb440cf8 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListTableSorter.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListTableSorter.java
@@ -16,11 +16,11 @@ import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerSorter;
 import org.eclipse.mylyn.internal.tasks.ui.ITasksUiConstants;
 import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask;
-import org.eclipse.mylyn.tasks.core.AbstractTaskContainer;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
+import org.eclipse.mylyn.tasks.core.AbstractTaskListElement;
 import org.eclipse.mylyn.tasks.core.DateRangeContainer;
-import org.eclipse.mylyn.tasks.core.ITask;
-import org.eclipse.mylyn.tasks.core.ITaskListElement;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
+import org.eclipse.mylyn.tasks.core.AbstractTaskListElement;
 import org.eclipse.mylyn.tasks.core.TaskArchive;
 import org.eclipse.mylyn.tasks.core.UncategorizedCategory;
 import org.eclipse.ui.PlatformUI;
@@ -66,50 +66,50 @@ public class TaskListTableSorter extends ViewerSorter {
 				DateRangeContainer dateRangeTaskContainer1 = (DateRangeContainer) o1;
 				DateRangeContainer dateRangeTaskContainer2 = (DateRangeContainer) o2;
 				return -1 * dateRangeTaskContainer2.getStart().compareTo(dateRangeTaskContainer1.getStart());
-			} else if (o2 instanceof ITask) {
+			} else if (o2 instanceof AbstractTask) {
 				return 1;
 			} else {
 				return -1;
 			}
 		}
 
-		if (o1 instanceof UncategorizedCategory && o2 instanceof AbstractTaskContainer) {
+		if (o1 instanceof UncategorizedCategory && o2 instanceof AbstractTaskListElement) {
 			return -1;
-		} else if (o1 instanceof AbstractTaskContainer && o2 instanceof UncategorizedCategory) {
+		} else if (o1 instanceof AbstractTaskListElement && o2 instanceof UncategorizedCategory) {
 			return 1;
 		}
 
-		if (o1 instanceof AbstractTaskContainer && o2 instanceof TaskArchive) {
+		if (o1 instanceof AbstractTaskListElement && o2 instanceof TaskArchive) {
 			return -1;
-		} else if (o2 instanceof AbstractTaskContainer && o1 instanceof TaskArchive) {
+		} else if (o2 instanceof AbstractTaskListElement && o1 instanceof TaskArchive) {
 			return 1;
 		}
 
-		if (!(o1 instanceof ITask) && o2 instanceof ITask) {
+		if (!(o1 instanceof AbstractTask) && o2 instanceof AbstractTask) {
 			return 1;
 		}
 
-		if (o1 instanceof ITask && !(o2 instanceof AbstractTaskContainer)) {
+		if (o1 instanceof AbstractTask && !(o2 instanceof AbstractTaskListElement)) {
 			return -1;
 		}
 
 		// if (o1 instanceof AbstractTaskContainer || o1 instanceof
 		// AbstractRepositoryQuery) {
-		if (!(o1 instanceof ITask)) {
-			if (o2 instanceof AbstractTaskContainer || o2 instanceof AbstractRepositoryQuery) {
+		if (!(o1 instanceof AbstractTask)) {
+			if (o2 instanceof AbstractTaskListElement || o2 instanceof AbstractRepositoryQuery) {
 
 				return this.view.sortDirection
-						* ((ITaskListElement) o1).getSummary()
-								.compareToIgnoreCase(((ITaskListElement) o2).getSummary());
+						* ((AbstractTaskListElement) o1).getSummary()
+								.compareToIgnoreCase(((AbstractTaskListElement) o2).getSummary());
 			} else {
 				return -1;
 			}
-		} else if (o1 instanceof ITaskListElement) {
-			if (!(o2 instanceof ITask)) {
+		} else if (o1 instanceof AbstractTaskListElement) {
+			if (!(o2 instanceof AbstractTask)) {
 				return -1;
-			} else if (o2 instanceof ITaskListElement) {
-				ITaskListElement element1 = (ITaskListElement) o1;
-				ITaskListElement element2 = (ITaskListElement) o2;
+			} else if (o2 instanceof AbstractTaskListElement) {
+				AbstractTaskListElement element1 = (AbstractTaskListElement) o1;
+				AbstractTaskListElement element2 = (AbstractTaskListElement) o2;
 
 				return compareElements(element1, element2);
 			}
@@ -119,20 +119,20 @@ public class TaskListTableSorter extends ViewerSorter {
 		return 0;
 	}
 
-	private int compareElements(ITaskListElement element1, ITaskListElement element2) {
+	private int compareElements(AbstractTaskListElement element1, AbstractTaskListElement element2) {
 		if (SortByIndex.PRIORITY.equals(sortByIndex)) {
 			int result = this.view.sortDirection * element1.getPriority().compareTo(element2.getPriority());
 			if (result != 0) {
 				return result;
 			}
 		} else if (SortByIndex.DATE_CREATED.equals(sortByIndex)) {
-			ITask t1 = null;
-			ITask t2 = null;
-			if (element1 instanceof ITask) {
-				t1 = (ITask) element1;
+			AbstractTask t1 = null;
+			AbstractTask t2 = null;
+			if (element1 instanceof AbstractTask) {
+				t1 = (AbstractTask) element1;
 			}
-			if (element2 instanceof ITask) {
-				t2 = (ITask) element2;
+			if (element2 instanceof AbstractTask) {
+				t2 = (AbstractTask) element2;
 			}
 			if (t1 != null && t2 != null) {
 				if (t1.getCreationDate() != null) {
@@ -148,11 +148,11 @@ public class TaskListTableSorter extends ViewerSorter {
 		return 0;
 	}
 
-	public static String getSortableSummaryFromElement(ITaskListElement element) {
+	public static String getSortableSummaryFromElement(AbstractTaskListElement element) {
 		String summary = element.getSummary();
 
-		if (element instanceof AbstractRepositoryTask) {
-			AbstractRepositoryTask task1 = (AbstractRepositoryTask) element;
+		if (element instanceof AbstractTask) {
+			AbstractTask task1 = (AbstractTask) element;
 			if (task1.getTaskKey() != null) {
 				summary = task1.getTaskKey() + ": " + summary;
 			}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListToolTipHandler.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListToolTipHandler.java
index edcc27abf..3879c5ea1 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListToolTipHandler.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListToolTipHandler.java
@@ -25,14 +25,14 @@ import org.eclipse.mylyn.internal.tasks.ui.TasksUiImages;
 import org.eclipse.mylyn.monitor.core.DateUtil;
 import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector;
 import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask;
-import org.eclipse.mylyn.tasks.core.AbstractTaskContainer;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
+import org.eclipse.mylyn.tasks.core.AbstractTaskListElement;
 import org.eclipse.mylyn.tasks.core.DateRangeContainer;
-import org.eclipse.mylyn.tasks.core.ITask;
-import org.eclipse.mylyn.tasks.core.ITaskListElement;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
+import org.eclipse.mylyn.tasks.core.AbstractTaskListElement;
 import org.eclipse.mylyn.tasks.core.RepositoryStatus;
 import org.eclipse.mylyn.tasks.core.TaskRepository;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask.RepositoryTaskSyncState;
+import org.eclipse.mylyn.tasks.core.AbstractTask.RepositoryTaskSyncState;
 import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.MouseAdapter;
@@ -153,8 +153,8 @@ public class TaskListToolTipHandler {
 			incommingTipLabelText.setLayoutData(textGridData);
 		}
 
-		ITaskListElement element = getTaskListElement(widget);
-		if (element instanceof AbstractTaskContainer) {
+		AbstractTaskListElement element = getTaskListElement(widget);
+		if (element instanceof AbstractTaskListElement) {
 			Composite progressComposite = new Composite(tipShell, SWT.NONE);
 			GridLayout progressLayout = new GridLayout(1, false);
 			progressLayout.marginWidth = 2;
@@ -173,13 +173,13 @@ public class TaskListToolTipHandler {
 	}
 
 	private String updateContainerProgressBar(WorkweekProgressBar taskProgressBar, Object object) {
-		if (taskProgressBar != null && !taskProgressBar.isDisposed() && object instanceof AbstractTaskContainer) {
+		if (taskProgressBar != null && !taskProgressBar.isDisposed() && object instanceof AbstractTaskListElement) {
 			String text = "";
-			AbstractTaskContainer container = (AbstractTaskContainer) object;
+			AbstractTaskListElement container = (AbstractTaskListElement) object;
 						
 			int total = container.getChildren().size();
 			int completed = 0;
-			for (ITask task : container.getChildren()) {
+			for (AbstractTask task : container.getChildren()) {
 				if (task.isCompleted()) {
 					completed++;
 				}
@@ -190,7 +190,7 @@ public class TaskListToolTipHandler {
 				total = 0;
 				completed = 0;
 				total += query.getHits().size();
-				for (AbstractRepositoryTask hit : query.getHits()) {
+				for (AbstractTask hit : query.getHits()) {
 					if (hit.isCompleted()) {
 						completed++;
 					}
@@ -205,14 +205,14 @@ public class TaskListToolTipHandler {
 		}
 	}
 
-	private ITaskListElement getTaskListElement(Object hoverObject) {
+	private AbstractTaskListElement getTaskListElement(Object hoverObject) {
 		if (hoverObject instanceof Widget) {
 			Object data = ((Widget) hoverObject).getData();
 			if (data != null) {
-				if (data instanceof ITaskListElement) {
-					return (ITaskListElement) data;
+				if (data instanceof AbstractTaskListElement) {
+					return (AbstractTaskListElement) data;
 				} else if (data instanceof IAdaptable) {
-					return (ITaskListElement) ((IAdaptable) data).getAdapter(ITaskListElement.class);
+					return (AbstractTaskListElement) ((IAdaptable) data).getAdapter(AbstractTaskListElement.class);
 				}
 			}
 		}
@@ -220,7 +220,7 @@ public class TaskListToolTipHandler {
 	}
 
 	protected String getBasicToolTextTip(Object object) {
-		ITaskListElement element = getTaskListElement(object);
+		AbstractTaskListElement element = getTaskListElement(object);
 		String tooltip = "";
 		String priority = "";
 
@@ -263,9 +263,9 @@ public class TaskListToolTipHandler {
 			return tooltip;
 		}
 
-		if (element instanceof AbstractRepositoryTask) {
+		if (element instanceof AbstractTask) {
 
-			AbstractRepositoryTask repositoryTask = (AbstractRepositoryTask) element;
+			AbstractTask repositoryTask = (AbstractTask) element;
 
 			tooltip += (element).getSummary();
 			if (repositoryTask != null) {
@@ -295,18 +295,18 @@ public class TaskListToolTipHandler {
 		return null;
 	}
 
-	private String getActivityText(ITaskListElement element) {
+	private String getActivityText(AbstractTaskListElement element) {
 
-		if (element != null && element instanceof ITask) {
+		if (element != null && element instanceof AbstractTask) {
 			try {
 				String result = "";
-				Date date = ((ITask) element).getScheduledForDate();
+				Date date = ((AbstractTask) element).getScheduledForDate();
 				if (date != null) {
 					result += "Scheduled for: " + DateFormat.getDateInstance(DateFormat.LONG).format(date) + " ("
 							+ DateFormat.getTimeInstance(DateFormat.SHORT).format(date) + ")\n";
 				}
 
-				long elapsed = TasksUiPlugin.getTaskListManager().getElapsedTime((ITask) element);
+				long elapsed = TasksUiPlugin.getTaskListManager().getElapsedTime((AbstractTask) element);
 				String elapsedTimeString = DateUtil.getFormattedDurationShort(elapsed);
 				if (!elapsedTimeString.equals("")) {
 					result += "Elapsed: " + elapsedTimeString + "\n";
@@ -319,10 +319,10 @@ public class TaskListToolTipHandler {
 		return null;
 	}
 
-	private String getIncommingText(ITaskListElement element) {
-		if (element instanceof AbstractRepositoryTask) {
+	private String getIncommingText(AbstractTaskListElement element) {
+		if (element instanceof AbstractTask) {
 
-			AbstractRepositoryTask repositoryTask = (AbstractRepositoryTask) element;
+			AbstractTask repositoryTask = (AbstractTask) element;
 
 			if (repositoryTask != null && repositoryTask.getSyncState() == RepositoryTaskSyncState.INCOMING) {
 				AbstractRepositoryConnector connector = TasksUiPlugin.getRepositoryManager().getRepositoryConnector(
@@ -347,7 +347,7 @@ public class TaskListToolTipHandler {
 	}
 
 	protected Image getImage(Object object) {
-		ITaskListElement element = getTaskListElement(object);
+		AbstractTaskListElement element = getTaskListElement(object);
 		if (object instanceof Control) {
 			return (Image) ((Control) object).getData("TIP_IMAGE");
 		} else if (element instanceof AbstractRepositoryQuery) {
@@ -357,8 +357,8 @@ public class TaskListToolTipHandler {
 			if (connector != null) {
 				return TasksUiPlugin.getDefault().getBrandingIcon(connector.getRepositoryType());
 			}
-		} else if (element instanceof AbstractRepositoryTask) {
-			AbstractRepositoryTask repositoryTask = (AbstractRepositoryTask) element;
+		} else if (element instanceof AbstractTask) {
+			AbstractTask repositoryTask = (AbstractTask) element;
 
 			if (repositoryTask != null) {
 				AbstractRepositoryConnector connector = TasksUiPlugin.getRepositoryManager().getRepositoryConnector(
@@ -482,7 +482,7 @@ public class TaskListToolTipHandler {
 							scheduledText != null, incommingText != null);
 				}
 				
-				ITaskListElement element = getTaskListElement(widget);
+				AbstractTaskListElement element = getTaskListElement(widget);
 				String progressText = updateContainerProgressBar(taskProgressBar, element);
 
 				String dateText = "";
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListView.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListView.java
index 65328edcf..2c4d0abcf 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListView.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListView.java
@@ -86,17 +86,17 @@ import org.eclipse.mylyn.internal.tasks.ui.actions.TaskListElementPropertiesActi
 import org.eclipse.mylyn.internal.tasks.ui.views.TaskListTableSorter.SortByIndex;
 import org.eclipse.mylyn.internal.tasks.ui.wizards.NewLocalTaskWizard;
 import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask;
-import org.eclipse.mylyn.tasks.core.AbstractTaskContainer;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
+import org.eclipse.mylyn.tasks.core.AbstractTaskListElement;
 import org.eclipse.mylyn.tasks.core.DateRangeContainer;
-import org.eclipse.mylyn.tasks.core.ITask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
 import org.eclipse.mylyn.tasks.core.ITaskActivityListener;
 import org.eclipse.mylyn.tasks.core.ITaskListChangeListener;
-import org.eclipse.mylyn.tasks.core.ITaskListElement;
+import org.eclipse.mylyn.tasks.core.AbstractTaskListElement;
 import org.eclipse.mylyn.tasks.core.TaskArchive;
 import org.eclipse.mylyn.tasks.core.TaskCategory;
 import org.eclipse.mylyn.tasks.core.UncategorizedCategory;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask.PriorityLevel;
+import org.eclipse.mylyn.tasks.core.AbstractTask.PriorityLevel;
 import org.eclipse.mylyn.tasks.ui.TaskTransfer;
 import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
 import org.eclipse.mylyn.tasks.ui.TasksUiUtil;
@@ -208,7 +208,7 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener {
 
 	private DrillDownAdapter drillDownAdapter;
 
-	private AbstractTaskContainer drilledIntoCategory = null;
+	private AbstractTaskListElement drilledIntoCategory = null;
 
 	private GoIntoAction goIntoAction;
 
@@ -341,7 +341,7 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener {
 
 	private final Listener CATEGORY_GRADIENT_DRAWER = new Listener() {
 		public void handleEvent(Event event) {
-			if (event.item.getData() instanceof AbstractTaskContainer && !(event.item.getData() instanceof ITask)) {
+			if (event.item.getData() instanceof AbstractTaskListElement && !(event.item.getData() instanceof AbstractTask)) {
 				Scrollable scrollable = (Scrollable) event.widget;
 				GC gc = event.gc;
 
@@ -402,7 +402,7 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener {
 	private boolean gradientListenerAdded = false;
 
 	private final ITaskActivityListener TASK_ACTIVITY_LISTENER = new ITaskActivityListener() {
-		public void taskActivated(final ITask task) {
+		public void taskActivated(final AbstractTask task) {
 			if (task != null) {
 				PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
 					public void run() {
@@ -414,13 +414,13 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener {
 			}
 		}
 
-		public void tasksActivated(List<ITask> tasks) {
+		public void tasksActivated(List<AbstractTask> tasks) {
 			if (tasks.size() == 1) {
 				taskActivated(tasks.get(0));
 			}
 		}
 
-		public void taskDeactivated(final ITask task) {
+		public void taskDeactivated(final AbstractTask task) {
 			PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
 				public void run() {
 					refresh(task);
@@ -453,7 +453,7 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener {
 
 	private final ITaskListChangeListener TASK_REFERESH_LISTENER = new ITaskListChangeListener() {
 
-		public void localInfoChanged(final ITask task) {
+		public void localInfoChanged(final AbstractTask task) {
 			PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
 				public void run() {
 					if (getCurrentPresentation().getPresentationName().equals(
@@ -476,17 +476,17 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener {
 			}
 		}
 
-		public void repositoryInfoChanged(ITask task) {
+		public void repositoryInfoChanged(AbstractTask task) {
 			localInfoChanged(task);
 		}
 
-		public void taskMoved(final ITask task, final AbstractTaskContainer fromContainer,
-				final AbstractTaskContainer toContainer) {
+		public void taskMoved(final AbstractTask task, final AbstractTaskListElement fromContainer,
+				final AbstractTaskListElement toContainer) {
 			PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
 				public void run() {
 					// category might appear or disappear
 					refresh(null);
-					AbstractTaskContainer rootCategory = TasksUiPlugin.getTaskListManager().getTaskList()
+					AbstractTaskListElement rootCategory = TasksUiPlugin.getTaskListManager().getTaskList()
 							.getUncategorizedCategory();
 					if (rootCategory.equals(fromContainer) || rootCategory.equals(toContainer)) {
 						refresh(null);
@@ -499,7 +499,7 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener {
 			});
 		}
 
-		public void taskDeleted(ITask task) {
+		public void taskDeleted(AbstractTask task) {
 			PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
 				public void run() {
 					refresh(null);
@@ -507,7 +507,7 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener {
 			});
 		}
 
-		public void containerAdded(AbstractTaskContainer container) {
+		public void containerAdded(AbstractTaskListElement container) {
 			PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
 				public void run() {
 					refresh(null);
@@ -515,7 +515,7 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener {
 			});
 		}
 
-		public void containerDeleted(AbstractTaskContainer container) {
+		public void containerDeleted(AbstractTaskListElement container) {
 			PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
 				public void run() {
 					refresh(null);
@@ -523,7 +523,7 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener {
 			});
 		}
 
-		public void taskAdded(ITask task) {
+		public void taskAdded(AbstractTask task) {
 			PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
 				public void run() {
 					refresh(null);
@@ -531,7 +531,7 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener {
 			});
 		}
 
-		public void containerInfoChanged(final AbstractTaskContainer container) {
+		public void containerInfoChanged(final AbstractTaskListElement container) {
 			PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
 				public void run() {
 					if (container == null) {
@@ -652,7 +652,7 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener {
 	/**
 	 * TODO: should be updated when view mode switches to fast and vice-versa
 	 */
-	private void updateDescription(ITask task) {
+	private void updateDescription(AbstractTask task) {
 		if (getSite() == null || getSite().getPage() == null)
 			return;
 
@@ -679,7 +679,7 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener {
 		}
 	}
 
-	public void addTaskToHistory(ITask task) {
+	public void addTaskToHistory(AbstractTask task) {
 		if (!TasksUiPlugin.getDefault().isMultipleActiveTasksMode()) {
 			TasksUiPlugin.getTaskListManager().getTaskActivationHistory().addTask(task);
 			// nextTaskAction.setEnabled(taskHistory.hasNext());
@@ -821,9 +821,9 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener {
 				Object selectedNode = ((Tree) e.widget).getItem(new Point(e.x + 70, e.y));
 				if (selectedNode instanceof TreeItem) {
 					Object selectedObject = ((TreeItem) selectedNode).getData();
-					if (selectedObject instanceof ITask) {
+					if (selectedObject instanceof AbstractTask) {
 						if (e.x > activationImageOffset && e.x < activationImageOffset + 13) {
-							taskListCellModifier.toggleTaskActivation((ITaskListElement) selectedObject);
+							taskListCellModifier.toggleTaskActivation((AbstractTaskListElement) selectedObject);
 						}
 					}
 				}
@@ -894,8 +894,8 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener {
 		getViewer().addSelectionChangedListener(new ISelectionChangedListener() {
 			public void selectionChanged(SelectionChangedEvent event) {
 				Object selectedObject = ((IStructuredSelection) getViewer().getSelection()).getFirstElement();
-				if (selectedObject instanceof ITaskListElement) {
-					updateActionEnablement(renameAction, (ITaskListElement) selectedObject);
+				if (selectedObject instanceof AbstractTaskListElement) {
+					updateActionEnablement(renameAction, (AbstractTaskListElement) selectedObject);
 				}
 			}
 		});
@@ -919,7 +919,7 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener {
 		expandToActiveTasks();
 		restoreState();
 
-		List<ITask> activeTasks = TasksUiPlugin.getTaskListManager().getTaskList().getActiveTasks();
+		List<AbstractTask> activeTasks = TasksUiPlugin.getTaskListManager().getTaskList().getActiveTasks();
 		if (activeTasks.size() > 0) {
 			updateDescription(activeTasks.get(0));
 		}
@@ -1037,8 +1037,8 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener {
 		final IWorkbench workbench = PlatformUI.getWorkbench();
 		workbench.getDisplay().asyncExec(new Runnable() {
 			public void run() {
-				List<ITask> activeTasks = TasksUiPlugin.getTaskListManager().getTaskList().getActiveTasks();
-				for (ITask t : activeTasks) {
+				List<AbstractTask> activeTasks = TasksUiPlugin.getTaskListManager().getTaskList().getActiveTasks();
+				for (AbstractTask t : activeTasks) {
 					getViewer().expandToLevel(t, 0);
 				}
 			}
@@ -1107,22 +1107,22 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener {
 	 */
 	private void fillContextMenu(IMenuManager manager) {
 		updateDrillDownActions();
-		ITaskListElement element = null;
+		AbstractTaskListElement element = null;
 
 		final Object firstSelectedObject = ((IStructuredSelection) getViewer().getSelection()).getFirstElement();
-		if (firstSelectedObject instanceof ITaskListElement) {
-			element = (ITaskListElement) firstSelectedObject;
+		if (firstSelectedObject instanceof AbstractTaskListElement) {
+			element = (AbstractTaskListElement) firstSelectedObject;
 		}
-		List<ITaskListElement> selectedElements = new ArrayList<ITaskListElement>();
+		List<AbstractTaskListElement> selectedElements = new ArrayList<AbstractTaskListElement>();
 		for (Iterator<?> i = ((IStructuredSelection) getViewer().getSelection()).iterator(); i.hasNext();) {
 			Object object = i.next();
-			if (object instanceof ITaskListElement) {
-				selectedElements.add((ITaskListElement) object);
+			if (object instanceof AbstractTaskListElement) {
+				selectedElements.add((AbstractTaskListElement) object);
 			}
 		}
-		ITask task = null;
-		if ((element instanceof ITask)) {
-			task = (ITask) element;
+		AbstractTask task = null;
+		if ((element instanceof AbstractTask)) {
+			task = (AbstractTask) element;
 		}
 
 		manager.add(new Separator(ID_SEPARATOR_NEW));
@@ -1130,7 +1130,7 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener {
 
 		Map<String, List<IDynamicSubMenuContributor>> dynamicMenuMap = TasksUiPlugin.getDefault().getDynamicMenuMap();
 
-		if (element instanceof ITask) {
+		if (element instanceof AbstractTask) {
 			addAction(openAction, manager, element);
 		}
 		addAction(openWithBrowser, manager, element);
@@ -1161,11 +1161,11 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener {
 			addAction(removeFromCategoryAction, manager, element);
 		}
 		addAction(deleteAction, manager, element);
-		if (!(element instanceof AbstractRepositoryTask) || element instanceof AbstractTaskContainer) {
+		if (!(element instanceof AbstractTask) || element instanceof AbstractTaskListElement) {
 			addAction(renameAction, manager, element);
 		}
 
-		if (element instanceof AbstractTaskContainer && !(element instanceof ITask)) {
+		if (element instanceof AbstractTaskListElement && !(element instanceof AbstractTask)) {
 			manager.add(goIntoAction);
 		}
 		if (drilledIntoCategory != null) {
@@ -1174,7 +1174,7 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener {
 		manager.add(new Separator(ID_SEPARATOR_REPOSITORY));
 		manager.add(new Separator(ID_SEPARATOR_CONTEXT));
 
-		if (element instanceof ITask) {
+		if (element instanceof AbstractTask) {
 			for (String menuPath : dynamicMenuMap.keySet()) {
 				if (ID_SEPARATOR_CONTEXT.equals(menuPath)) {
 					for (IDynamicSubMenuContributor contributor : dynamicMenuMap.get(menuPath)) {
@@ -1195,14 +1195,14 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener {
 		manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
 	}
 
-	private void addMenuManager(IMenuManager menuToAdd, IMenuManager manager, ITaskListElement element) {
-		if ((element instanceof ITask)
-				|| (element instanceof AbstractTaskContainer || element instanceof AbstractRepositoryQuery)) {
+	private void addMenuManager(IMenuManager menuToAdd, IMenuManager manager, AbstractTaskListElement element) {
+		if ((element instanceof AbstractTask)
+				|| (element instanceof AbstractTaskListElement || element instanceof AbstractRepositoryQuery)) {
 			manager.add(menuToAdd);
 		}
 	}
 
-	private void addAction(Action action, IMenuManager manager, ITaskListElement element) {
+	private void addAction(Action action, IMenuManager manager, AbstractTaskListElement element) {
 		manager.add(action);
 		if (element != null) {
 			// ITaskHandler handler =
@@ -1218,10 +1218,10 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener {
 	/**
 	 * Refactor out element
 	 */
-	private void updateActionEnablement(Action action, ITaskListElement element) {
-		if (element instanceof ITask) {
+	private void updateActionEnablement(Action action, AbstractTaskListElement element) {
+		if (element instanceof AbstractTask) {
 			if (action instanceof OpenWithBrowserAction) {
-				if (((ITask) element).hasValidUrl()) {
+				if (((AbstractTask) element).hasValidUrl()) {
 					action.setEnabled(true);
 				} else {
 					action.setEnabled(false);
@@ -1235,7 +1235,7 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener {
 			} else if (action instanceof RenameAction) {
 				action.setEnabled(true);
 			}
-		} else if (element instanceof AbstractTaskContainer) {
+		} else if (element instanceof AbstractTaskListElement) {
 			if (action instanceof MarkTaskCompleteAction) {
 				action.setEnabled(false);
 			} else if (action instanceof MarkTaskIncompleteAction) {
@@ -1257,8 +1257,8 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener {
 			} else if (action instanceof CopyTaskDetailsAction) {
 				action.setEnabled(true);
 			} else if (action instanceof RenameAction) {
-				if (element instanceof AbstractTaskContainer) {
-					AbstractTaskContainer container = (AbstractTaskContainer) element;
+				if (element instanceof AbstractTaskListElement) {
+					AbstractTaskListElement container = (AbstractTaskListElement) element;
 					action.setEnabled(container.canRename());
 				}
 				// if (element instanceof TaskArchive)
@@ -1375,7 +1375,7 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener {
 				Object object = selection.getFirstElement();
 				if (TasksUiPlugin.getDefault().getPreferenceStore().getBoolean(
 						TasksUiPreferenceConstants.ACTIVATE_WHEN_OPENED)) {
-					ITask selectedTask = TaskListView.getFromActivePerspective().getSelectedTask();
+					AbstractTask selectedTask = TaskListView.getFromActivePerspective().getSelectedTask();
 					if (selectedTask != null) {
 						// TODO: move history stuff
 						activateAction.run(selectedTask);
@@ -1384,7 +1384,7 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener {
 					}
 				}
 				if (object instanceof TaskCategory || object instanceof AbstractRepositoryQuery) {
-					TasksUiUtil.refreshAndOpenTaskListElement((ITaskListElement) object);
+					TasksUiUtil.refreshAndOpenTaskListElement((AbstractTaskListElement) object);
 					// if(getViewer().getExpandedState(object)){
 					// getViewer().collapseToLevel(object,
 					// TreeViewer.ALL_LEVELS);
@@ -1472,8 +1472,8 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener {
 		if (selection instanceof StructuredSelection) {
 			StructuredSelection structuredSelection = (StructuredSelection) selection;
 			Object element = structuredSelection.getFirstElement();
-			if (element instanceof AbstractTaskContainer) {
-				drilledIntoCategory = (AbstractTaskContainer) element;
+			if (element instanceof AbstractTaskListElement) {
+				drilledIntoCategory = (AbstractTaskListElement) element;
 				drillDownAdapter.goInto();
 				IActionBars bars = getViewSite().getActionBars();
 				bars.getToolBarManager().add(goUpAction);
@@ -1492,29 +1492,29 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener {
 		updateDrillDownActions();
 	}
 
-	public ITask getSelectedTask() {
+	public AbstractTask getSelectedTask() {
 		ISelection selection = getViewer().getSelection();
 		if (selection.isEmpty())
 			return null;
 		if (selection instanceof StructuredSelection) {
 			StructuredSelection structuredSelection = (StructuredSelection) selection;
 			Object element = structuredSelection.getFirstElement();
-			if (element instanceof ITask) {
-				return (ITask) structuredSelection.getFirstElement();
+			if (element instanceof AbstractTask) {
+				return (AbstractTask) structuredSelection.getFirstElement();
 			}
 		}
 		return null;
 	}
 
-	public static ITask getSelectedTask(ISelection selection) {
+	public static AbstractTask getSelectedTask(ISelection selection) {
 		if (selection instanceof StructuredSelection) {
 			StructuredSelection structuredSelection = (StructuredSelection) selection;
 			if (structuredSelection.size() != 1) {
 				return null;
 			}
 			Object element = structuredSelection.getFirstElement();
-			if (element instanceof ITask) {
-				return (ITask) structuredSelection.getFirstElement();
+			if (element instanceof AbstractTask) {
+				return (AbstractTask) structuredSelection.getFirstElement();
 			}
 		}
 		return null;
@@ -1533,7 +1533,7 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener {
 		}
 	}
 
-	public AbstractTaskContainer getDrilledIntoCategory() {
+	public AbstractTaskListElement getDrilledIntoCategory() {
 		return drilledIntoCategory;
 	}
 
@@ -1541,7 +1541,7 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener {
 		return filteredTree;
 	}
 
-	public void selectedAndFocusTask(ITask task) {
+	public void selectedAndFocusTask(AbstractTask task) {
 		if (task == null || getViewer().getControl().isDisposed()) {
 			return;
 		}
@@ -1571,10 +1571,10 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener {
 	private void saveSelection() {
 		IStructuredSelection selection = (IStructuredSelection) getViewer().getSelection();
 		if (!selection.isEmpty()) {
-			if (selection.getFirstElement() instanceof ITaskListElement) {
+			if (selection.getFirstElement() instanceof AbstractTaskListElement) {
 				// make sure the new selection is inserted at the end of the
 				// list
-				String handle = ((ITaskListElement) selection.getFirstElement()).getHandleIdentifier();
+				String handle = ((AbstractTaskListElement) selection.getFirstElement()).getHandleIdentifier();
 				lastSelectionByTaskHandle.remove(handle);
 				lastSelectionByTaskHandle.put(handle, selection);
 
@@ -1587,7 +1587,7 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener {
 		}
 	}
 
-	private IStructuredSelection restoreSelection(ITaskListElement task) {
+	private IStructuredSelection restoreSelection(AbstractTaskListElement task) {
 		IStructuredSelection selection = lastSelectionByTaskHandle.get(task.getHandleIdentifier());
 		if (selection != null) {
 			return selection;
@@ -1599,7 +1599,7 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener {
 	/**
 	 * Encapsulates refresh policy.
 	 */
-	private void refresh(final ITaskListElement element) {
+	private void refresh(final AbstractTaskListElement element) {
 		if (getViewer().getControl() != null && !getViewer().getControl().isDisposed()) {
 			if (element == null) {
 				try {
@@ -1610,14 +1610,14 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener {
 				}
 			} else {
 				try {
-					if (element instanceof ITask) {
-						ITask task = (ITask) element;
-						AbstractTaskContainer rootCategory = TasksUiPlugin.getTaskListManager().getTaskList()
+					if (element instanceof AbstractTask) {
+						AbstractTask task = (AbstractTask) element;
+						AbstractTaskListElement rootCategory = TasksUiPlugin.getTaskListManager().getTaskList()
 								.getUncategorizedCategory();
 						Set<AbstractRepositoryQuery> queries = TasksUiPlugin.getTaskListManager().getTaskList()
 								.getQueriesForHandle(task.getHandleIdentifier());
 						if (task.getContainer() == null || task.getContainer().equals(rootCategory)
-								|| (task instanceof AbstractRepositoryTask && queries.isEmpty())) {
+								|| (task instanceof AbstractTask && queries.isEmpty())) {
 							// || task.getContainer() instanceof TaskArchive) {
 							refresh(null);
 						} else {
@@ -1638,7 +1638,7 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener {
 						for (AbstractRepositoryQuery query : queries) {
 							refresh(query);
 						}
-					} else if (element instanceof AbstractTaskContainer) {
+					} else if (element instanceof AbstractTaskListElement) {
 						getViewer().refresh(element, true);
 					} else {
 						getViewer().refresh(element, true);
@@ -1747,8 +1747,8 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener {
 	private void jumpToEditorTask(IEditorPart editor) {
 		IEditorInput input = editor.getEditorInput();
 		if (input instanceof TaskEditorInput) {
-			ITask task = ((TaskEditorInput) input).getTask();
-			ITask selected = getSelectedTask();
+			AbstractTask task = ((TaskEditorInput) input).getTask();
+			AbstractTask selected = getSelectedTask();
 			if (selected == null || !selected.equals(task)) {
 				selectedAndFocusTask(task);
 			}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskScheduleContentProvider.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskScheduleContentProvider.java
index e361c140e..717f6e632 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskScheduleContentProvider.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskScheduleContentProvider.java
@@ -14,10 +14,10 @@ package org.eclipse.mylyn.internal.tasks.ui.views;
 import java.util.HashSet;
 import java.util.Set;
 
-import org.eclipse.mylyn.tasks.core.AbstractTaskContainer;
+import org.eclipse.mylyn.tasks.core.AbstractTaskListElement;
 import org.eclipse.mylyn.tasks.core.DateRangeContainer;
-import org.eclipse.mylyn.tasks.core.ITask;
-import org.eclipse.mylyn.tasks.core.ITaskListElement;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
+import org.eclipse.mylyn.tasks.core.AbstractTaskListElement;
 import org.eclipse.mylyn.tasks.ui.TaskListManager;
 import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
 
@@ -37,16 +37,16 @@ public class TaskScheduleContentProvider extends TaskListContentProvider {
 
 	public Object[] getElements(Object parent) {
 		if (parent.equals(this.view.getViewSite())) {
-			Set<ITaskListElement> ranges = new HashSet<ITaskListElement>();
+			Set<AbstractTaskListElement> ranges = new HashSet<AbstractTaskListElement>();
 			ranges.addAll(taskListManager.getDateRanges());
 
 			ranges.add(TasksUiPlugin.getTaskListManager().getTaskList().getArchiveContainer());
-			ITask activeTask = TasksUiPlugin.getTaskListManager().getTaskList().getActiveTask();
+			AbstractTask activeTask = TasksUiPlugin.getTaskListManager().getTaskList().getActiveTask();
 			boolean containsActiveTask = false;
 			if (activeTask != null) {
-				for (ITaskListElement taskListElement : ranges) {
-					if (taskListElement instanceof AbstractTaskContainer) {
-						if (((AbstractTaskContainer) taskListElement).getChildren().contains(activeTask)) {
+				for (AbstractTaskListElement taskListElement : ranges) {
+					if (taskListElement instanceof AbstractTaskListElement) {
+						if (((AbstractTaskListElement) taskListElement).getChildren().contains(activeTask)) {
 							containsActiveTask = true;
 						}
 					}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskTableLabelProvider.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskTableLabelProvider.java
index def1f1210..0d235409b 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskTableLabelProvider.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskTableLabelProvider.java
@@ -21,10 +21,10 @@ import org.eclipse.jface.viewers.ITableFontProvider;
 import org.eclipse.jface.viewers.ITableLabelProvider;
 import org.eclipse.mylyn.internal.tasks.ui.TaskListColorsAndFonts;
 import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery;
-import org.eclipse.mylyn.tasks.core.AbstractTaskContainer;
+import org.eclipse.mylyn.tasks.core.AbstractTaskListElement;
 import org.eclipse.mylyn.tasks.core.DateRangeContainer;
-import org.eclipse.mylyn.tasks.core.ITask;
-import org.eclipse.mylyn.tasks.core.ITaskListElement;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
+import org.eclipse.mylyn.tasks.core.AbstractTaskListElement;
 import org.eclipse.mylyn.tasks.core.TaskArchive;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.Font;
@@ -48,7 +48,7 @@ public class TaskTableLabelProvider extends DecoratingLabelProvider implements I
 	}
 
 	public String getColumnText(Object obj, int columnIndex) {
-		if (obj instanceof ITaskListElement) {
+		if (obj instanceof AbstractTaskListElement) {
 			switch (columnIndex) {
 			case 0:
 				if (obj instanceof DateRangeContainer) {
@@ -65,7 +65,7 @@ public class TaskTableLabelProvider extends DecoratingLabelProvider implements I
 	}
 
 	public Image getColumnImage(Object element, int columnIndex) {
-		if (!(element instanceof ITaskListElement)) {
+		if (!(element instanceof AbstractTaskListElement)) {
 			return null;
 		}
 		if (columnIndex == 0) {
@@ -83,8 +83,8 @@ public class TaskTableLabelProvider extends DecoratingLabelProvider implements I
 	}
 
 	public Color getBackground(Object element, int columnIndex) {
-		if (element instanceof AbstractTaskContainer && !(element instanceof ITask)) {
-			AbstractTaskContainer category = (AbstractTaskContainer) element;
+		if (element instanceof AbstractTaskListElement && !(element instanceof AbstractTask)) {
+			AbstractTaskListElement category = (AbstractTaskListElement) element;
 			if (category instanceof TaskArchive) {
 				return TaskListColorsAndFonts.BACKGROUND_ARCHIVE;
 			} else {
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/ContextAttachWizard.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/ContextAttachWizard.java
index 08276c2f2..9fa669be2 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/ContextAttachWizard.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/ContextAttachWizard.java
@@ -13,7 +13,7 @@ package org.eclipse.mylyn.internal.tasks.ui.wizards;
 
 import org.eclipse.jface.wizard.Wizard;
 import org.eclipse.mylyn.internal.tasks.ui.TasksUiImages;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
 import org.eclipse.mylyn.tasks.core.TaskRepository;
 import org.eclipse.mylyn.tasks.ui.ContextUiUtil;
 import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
@@ -28,11 +28,11 @@ public class ContextAttachWizard extends Wizard {
 
 	private final TaskRepository repository;
 
-	private final AbstractRepositoryTask task;
+	private final AbstractTask task;
 
 	private ContextAttachWizardPage wizardPage;
 
-	public ContextAttachWizard(AbstractRepositoryTask task) {
+	public ContextAttachWizard(AbstractTask task) {
 		repository = TasksUiPlugin.getRepositoryManager().getRepository(task.getRepositoryKind(),
 				task.getRepositoryUrl());
 		this.task = task;
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/ContextAttachWizardPage.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/ContextAttachWizardPage.java
index 5f229583a..647a88bfd 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/ContextAttachWizardPage.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/ContextAttachWizardPage.java
@@ -12,9 +12,9 @@
 package org.eclipse.mylyn.internal.tasks.ui.wizards;
 
 import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
 import org.eclipse.mylyn.tasks.core.TaskRepository;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask.RepositoryTaskSyncState;
+import org.eclipse.mylyn.tasks.core.AbstractTask.RepositoryTaskSyncState;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.KeyEvent;
 import org.eclipse.swt.events.KeyListener;
@@ -33,13 +33,13 @@ public class ContextAttachWizardPage extends WizardPage {
 		
 	private TaskRepository repository;
 
-	private AbstractRepositoryTask task;
+	private AbstractTask task;
 
 	private Text commentText;
 
 	private boolean complete = true;
 	
-	protected ContextAttachWizardPage(TaskRepository repository, AbstractRepositoryTask task) {
+	protected ContextAttachWizardPage(TaskRepository repository, AbstractTask task) {
 		super(ContextAttachWizard.WIZARD_TITLE);
 		this.repository = repository;
 		this.task = task; 
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/ContextRetrieveWizard.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/ContextRetrieveWizard.java
index 6738b748b..b3c3977ee 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/ContextRetrieveWizard.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/ContextRetrieveWizard.java
@@ -13,7 +13,7 @@ package org.eclipse.mylyn.internal.tasks.ui.wizards;
 
 import org.eclipse.jface.wizard.Wizard;
 import org.eclipse.mylyn.internal.tasks.ui.TasksUiImages;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
 import org.eclipse.mylyn.tasks.core.RepositoryAttachment;
 import org.eclipse.mylyn.tasks.core.TaskRepository;
 import org.eclipse.mylyn.tasks.ui.ContextUiUtil;
@@ -32,11 +32,11 @@ public class ContextRetrieveWizard extends Wizard {
 
 	private final TaskRepository repository;
 
-	private final AbstractRepositoryTask task;
+	private final AbstractTask task;
 
 	private ContextRetrieveWizardPage wizardPage;
 
-	public ContextRetrieveWizard(AbstractRepositoryTask task) {
+	public ContextRetrieveWizard(AbstractTask task) {
 		repository = TasksUiPlugin.getRepositoryManager().getRepository(task.getRepositoryKind(),
 				task.getRepositoryUrl());
 		this.task = task;
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/ContextRetrieveWizardPage.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/ContextRetrieveWizardPage.java
index 3ed48cf9d..a1d5af682 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/ContextRetrieveWizardPage.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/ContextRetrieveWizardPage.java
@@ -21,7 +21,7 @@ import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.mylyn.internal.tasks.ui.views.TaskElementLabelProvider;
 import org.eclipse.mylyn.tasks.core.AbstractAttributeFactory;
 import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
 import org.eclipse.mylyn.tasks.core.RepositoryAttachment;
 import org.eclipse.mylyn.tasks.core.RepositoryTaskAttribute;
 import org.eclipse.mylyn.tasks.core.RepositoryTaskData;
@@ -56,13 +56,13 @@ public class ContextRetrieveWizardPage extends WizardPage {
 
 	private TaskRepository repository;
 
-	private AbstractRepositoryTask task;
+	private AbstractTask task;
 
 	private TaskElementLabelProvider labelProvider = new TaskElementLabelProvider();
 
 	private RepositoryAttachment selectedContextAttachment = null;
 
-	protected ContextRetrieveWizardPage(TaskRepository repository, AbstractRepositoryTask task) {
+	protected ContextRetrieveWizardPage(TaskRepository repository, AbstractTask task) {
 		super(ContextAttachWizard.WIZARD_TITLE);
 		this.repository = repository;
 		this.task = task;
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/NewAttachmentWizard.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/NewAttachmentWizard.java
index 7fe55f3ed..418279973 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/NewAttachmentWizard.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/NewAttachmentWizard.java
@@ -33,13 +33,13 @@ import org.eclipse.mylyn.internal.tasks.core.RepositoryTaskHandleUtil;
 import org.eclipse.mylyn.internal.tasks.ui.ITasksUiConstants;
 import org.eclipse.mylyn.internal.tasks.ui.TasksUiImages;
 import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
 import org.eclipse.mylyn.tasks.core.IAttachmentHandler;
-import org.eclipse.mylyn.tasks.core.ITask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
 import org.eclipse.mylyn.tasks.core.LocalAttachment;
 import org.eclipse.mylyn.tasks.core.RepositoryStatus;
 import org.eclipse.mylyn.tasks.core.TaskRepository;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask.RepositoryTaskSyncState;
+import org.eclipse.mylyn.tasks.core.AbstractTask.RepositoryTaskSyncState;
 import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
 import org.eclipse.mylyn.tasks.ui.TasksUiUtil;
 import org.eclipse.mylyn.tasks.ui.editors.AbstractTaskEditorInput;
@@ -71,9 +71,9 @@ public class NewAttachmentWizard extends Wizard {
 
 	private TaskRepository repository;
 
-	private AbstractRepositoryTask task;
+	private AbstractTask task;
 
-	public NewAttachmentWizard(TaskRepository repository, AbstractRepositoryTask task) {
+	public NewAttachmentWizard(TaskRepository repository, AbstractTask task) {
 		super();
 		this.task = task;
 		this.repository = repository;
@@ -94,12 +94,12 @@ public class NewAttachmentWizard extends Wizard {
 		}
 	}
 
-	public NewAttachmentWizard(TaskRepository repository, AbstractRepositoryTask task, File attachFile) {
+	public NewAttachmentWizard(TaskRepository repository, AbstractTask task, File attachFile) {
 		this(repository, task);
 		attachment.setFilePath(attachFile.getAbsolutePath());
 	}
 
-	public NewAttachmentWizard(TaskRepository repository, AbstractRepositoryTask task, String attachContents) {
+	public NewAttachmentWizard(TaskRepository repository, AbstractTask task, String attachContents) {
 		this(repository, task);
 		inputPage.setUseClipboard(true);
 		inputPage.setClipboardContents(attachContents);
@@ -214,8 +214,8 @@ public class NewAttachmentWizard extends Wizard {
 	/**
 	 * If task is open, force inplace refresh Must be called from UI thread.
 	 */
-	public static boolean forceRefreshInplace(ITask task) {
-		if (task instanceof AbstractRepositoryTask) {
+	public static boolean forceRefreshInplace(AbstractTask task) {
+		if (task instanceof AbstractTask) {
 			String handleTarget = task.getHandleIdentifier();
 			for (TaskEditor editor : TasksUiUtil.getActiveRepositoryTaskEditors()) {
 				if (editor.getEditorInput() instanceof AbstractTaskEditorInput) {
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/NewLocalTaskWizard.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/NewLocalTaskWizard.java
index 079bb35a2..577c79c7f 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/NewLocalTaskWizard.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/NewLocalTaskWizard.java
@@ -11,7 +11,7 @@ package org.eclipse.mylyn.internal.tasks.ui.wizards;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.wizard.Wizard;
 import org.eclipse.mylyn.internal.tasks.ui.TasksUiImages;
-import org.eclipse.mylyn.tasks.core.ITask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
 import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
 import org.eclipse.mylyn.tasks.ui.TasksUiUtil;
 import org.eclipse.ui.INewWizard;
@@ -75,7 +75,7 @@ public class NewLocalTaskWizard extends Wizard implements INewWizard {
 //			TasksUiPlugin.getTaskListManager().getTaskList().addTask(newTask,
 //					TasksUiPlugin.getTaskListManager().getTaskList().getUncategorizedCategory());
 //		}
-		ITask task = TasksUiPlugin.getTaskListManager().createNewLocalTask(null);
+		AbstractTask task = TasksUiPlugin.getTaskListManager().createNewLocalTask(null);
 		if (task != null) {
 			TasksUiUtil.openEditor(task, true);
 			return true;
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/TaskDataExportWizard.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/TaskDataExportWizard.java
index 641c963cc..a1a3f2360 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/TaskDataExportWizard.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/TaskDataExportWizard.java
@@ -26,7 +26,7 @@ import org.eclipse.mylyn.core.MylarStatusHandler;
 import org.eclipse.mylyn.internal.context.core.InteractionContextManager;
 import org.eclipse.mylyn.internal.tasks.ui.ITasksUiConstants;
 import org.eclipse.mylyn.internal.tasks.ui.util.TaskDataExportJob;
-import org.eclipse.mylyn.tasks.core.ITask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
 import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
 import org.eclipse.ui.IExportWizard;
 import org.eclipse.ui.IWorkbench;
@@ -109,7 +109,7 @@ public class TaskDataExportWizard extends Wizard implements IExportWizard {
 		boolean overwrite = exportPage.overwrite();
 		boolean zip = exportPage.zip();
 		
-		Collection<ITask> taskContextsToExport = TasksUiPlugin.getTaskListManager().getTaskList().getAllTasks();
+		Collection<AbstractTask> taskContextsToExport = TasksUiPlugin.getTaskListManager().getTaskList().getAllTasks();
 
 		// Get file paths to check for existence
 		String destDir = exportPage.getDestinationDirectory();
@@ -154,7 +154,7 @@ public class TaskDataExportWizard extends Wizard implements IExportWizard {
 				}
 
 				if (exportPage.exportTaskContexts()) {
-					for (ITask task : taskContextsToExport) {
+					for (AbstractTask task : taskContextsToExport) {
 						File contextFile = ContextCorePlugin.getContextManager()
 								.getFileForContext(task.getHandleIdentifier());
 						File destTaskFile = new File(destDir + File.separator + contextFile.getName());
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/TaskDataImportWizard.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/TaskDataImportWizard.java
index df0951a30..99c5ea65a 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/TaskDataImportWizard.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/TaskDataImportWizard.java
@@ -30,9 +30,9 @@ import org.eclipse.mylyn.core.MylarStatusHandler;
 import org.eclipse.mylyn.internal.context.core.InteractionContextManager;
 import org.eclipse.mylyn.internal.monitor.core.util.ZipFileUtil;
 import org.eclipse.mylyn.internal.tasks.ui.ITasksUiConstants;
-import org.eclipse.mylyn.tasks.core.AbstractTaskContainer;
-import org.eclipse.mylyn.tasks.core.ITask;
-import org.eclipse.mylyn.tasks.core.TaskList;
+import org.eclipse.mylyn.tasks.core.AbstractTaskListElement;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
+import org.eclipse.mylyn.tasks.core.getAllCategories;
 import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
 import org.eclipse.ui.IImportWizard;
 import org.eclipse.ui.IWorkbench;
@@ -220,13 +220,13 @@ public class TaskDataImportWizard extends Wizard implements IImportWizard {
 	}
 
 	/** Returns all tasks in the task list root or a category in the task list */
-	protected List<ITask> getAllTasks() {
-		List<ITask> allTasks = new ArrayList<ITask>();
-		TaskList taskList = TasksUiPlugin.getTaskListManager().getTaskList();
+	protected List<AbstractTask> getAllTasks() {
+		List<AbstractTask> allTasks = new ArrayList<AbstractTask>();
+		getAllCategories taskList = TasksUiPlugin.getTaskListManager().getTaskList();
 
 		allTasks.addAll(taskList.getRootTasks());
 
-		for (AbstractTaskContainer category : taskList.getCategories()) {
+		for (AbstractTaskListElement category : taskList.getCategories()) {
 			allTasks.addAll(category.getChildren());
 		}
 
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingset/TaskAdapterFactory.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingset/TaskAdapterFactory.java
index 174aba078..946a51a1a 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingset/TaskAdapterFactory.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingset/TaskAdapterFactory.java
@@ -9,7 +9,7 @@
 package org.eclipse.mylyn.internal.tasks.ui.workingset;
 
 import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.mylyn.tasks.core.AbstractTaskContainer;
+import org.eclipse.mylyn.tasks.core.AbstractTaskListElement;
 import org.eclipse.ui.IMemento;
 import org.eclipse.ui.IPersistableElement;
 
@@ -31,11 +31,11 @@ public class TaskAdapterFactory implements IAdapterFactory {
 	}
 
 	public Object getAdapter(final Object adaptableObject, @SuppressWarnings("unchecked") Class adapterType) {
-	    if (adapterType == IPersistableElement.class && adaptableObject instanceof AbstractTaskContainer) {
+	    if (adapterType == IPersistableElement.class && adaptableObject instanceof AbstractTaskListElement) {
 	    	// 
 	    	return new IPersistableElement() {
 				public void saveState(IMemento memento) {
-					AbstractTaskContainer container = (AbstractTaskContainer) adaptableObject;
+					AbstractTaskListElement container = (AbstractTaskListElement) adaptableObject;
 					memento.putString(TaskElementFactory.HANDLE_ID, container.getHandleIdentifier());
 				}
 
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingset/TaskElementFactory.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingset/TaskElementFactory.java
index 2bd454448..d4e9d4a30 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingset/TaskElementFactory.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingset/TaskElementFactory.java
@@ -9,9 +9,9 @@
 package org.eclipse.mylyn.internal.tasks.ui.workingset;
 
 import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.mylyn.tasks.core.AbstractTaskContainer;
-import org.eclipse.mylyn.tasks.core.ITaskListElement;
-import org.eclipse.mylyn.tasks.core.TaskList;
+import org.eclipse.mylyn.tasks.core.AbstractTaskListElement;
+import org.eclipse.mylyn.tasks.core.AbstractTaskListElement;
+import org.eclipse.mylyn.tasks.core.getAllCategories;
 import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
 import org.eclipse.ui.IElementFactory;
 import org.eclipse.ui.IMemento;
@@ -26,11 +26,11 @@ public class TaskElementFactory implements IElementFactory {
 	public static final String HANDLE_ID = "handle";
 
 	public IAdaptable createElement(IMemento memento) {
-		TaskList taskList = TasksUiPlugin.getTaskListManager().getTaskList();
+		getAllCategories taskList = TasksUiPlugin.getTaskListManager().getTaskList();
 
 		String handle = memento.getString(HANDLE_ID);
-		for (ITaskListElement element : taskList.getRootElements()) {
-			if (element instanceof AbstractTaskContainer && element.getHandleIdentifier().equals(handle)) {
+		for (AbstractTaskListElement element : taskList.getRootElements()) {
+			if (element instanceof AbstractTaskListElement && element.getHandleIdentifier().equals(handle)) {
 				return (IAdaptable) element;
 			}
 		}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingset/TaskWorkingSetElementAdapter.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingset/TaskWorkingSetElementAdapter.java
index 5040873be..41b6b2fea 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingset/TaskWorkingSetElementAdapter.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingset/TaskWorkingSetElementAdapter.java
@@ -12,7 +12,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.mylyn.tasks.core.AbstractTaskContainer;
+import org.eclipse.mylyn.tasks.core.AbstractTaskListElement;
 import org.eclipse.ui.IWorkingSet;
 import org.eclipse.ui.IWorkingSetElementAdapter;
 
@@ -24,7 +24,7 @@ public class TaskWorkingSetElementAdapter implements IWorkingSetElementAdapter {
 	public IAdaptable[] adaptElements(IWorkingSet ws, IAdaptable[] elements) {
 		for (int i = 0; i < elements.length; i++) {
 			IAdaptable adaptable = elements[i];
-			if (!(adaptable instanceof AbstractTaskContainer)) {
+			if (!(adaptable instanceof AbstractTaskListElement)) {
 				return selectContainers(elements);
 			}
 		}
@@ -34,7 +34,7 @@ public class TaskWorkingSetElementAdapter implements IWorkingSetElementAdapter {
 	private IAdaptable[] selectContainers(IAdaptable[] elements) {
 		List<IAdaptable> containers = new ArrayList<IAdaptable>(elements.length);
 		for (IAdaptable adaptable : elements) {
-			if (adaptable instanceof AbstractTaskContainer) {
+			if (adaptable instanceof AbstractTaskListElement) {
 				containers.add(adaptable);
 			}
 		}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingset/TaskWorkingSetPage.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingset/TaskWorkingSetPage.java
index a36707894..cabc30a4c 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingset/TaskWorkingSetPage.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingset/TaskWorkingSetPage.java
@@ -23,8 +23,8 @@ import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerSorter;
 import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.mylyn.internal.tasks.ui.views.TaskElementLabelProvider;
-import org.eclipse.mylyn.tasks.core.AbstractTaskContainer;
-import org.eclipse.mylyn.tasks.core.ITaskListElement;
+import org.eclipse.mylyn.tasks.core.AbstractTaskListElement;
+import org.eclipse.mylyn.tasks.core.AbstractTaskListElement;
 import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.BusyIndicator;
@@ -180,8 +180,8 @@ public class TaskWorkingSetPage extends WizardPage implements IWorkingSetPage {
         tree.setSorter(new ViewerSorter());
         
 		ArrayList<Object> containers = new ArrayList<Object>();
-		for (ITaskListElement element : (Set<ITaskListElement>) TasksUiPlugin.getTaskListManager().getTaskList().getRootElements()) {
-			if (element instanceof AbstractTaskContainer) {
+		for (AbstractTaskListElement element : (Set<AbstractTaskListElement>) TasksUiPlugin.getTaskListManager().getTaskList().getRootElements()) {
+			if (element instanceof AbstractTaskListElement) {
 				containers.add(element);
 			}
 		}
@@ -281,7 +281,7 @@ public class TaskWorkingSetPage extends WizardPage implements IWorkingSetPage {
 	protected void handleCheckStateChange(final CheckStateChangedEvent event) {
         BusyIndicator.showWhile(getShell().getDisplay(), new Runnable() {
             public void run() {
-            	AbstractTaskContainer element = (AbstractTaskContainer) event.getElement();
+            	AbstractTaskListElement element = (AbstractTaskListElement) event.getElement();
             	tree.setGrayed(element, false);
 
                 // boolean state = event.getChecked();
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingset/TaskWorkingSetUpdater.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingset/TaskWorkingSetUpdater.java
index 3164c944e..d9c6d0d29 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingset/TaskWorkingSetUpdater.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingset/TaskWorkingSetUpdater.java
@@ -13,10 +13,10 @@ import java.util.Arrays;
 import java.util.List;
 
 import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.mylyn.tasks.core.AbstractTaskContainer;
-import org.eclipse.mylyn.tasks.core.ITask;
+import org.eclipse.mylyn.tasks.core.AbstractTaskListElement;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
 import org.eclipse.mylyn.tasks.core.ITaskListChangeListener;
-import org.eclipse.mylyn.tasks.core.ITaskListElement;
+import org.eclipse.mylyn.tasks.core.AbstractTaskListElement;
 import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
 import org.eclipse.ui.IWorkingSet;
 import org.eclipse.ui.IWorkingSetUpdater;
@@ -44,10 +44,10 @@ public class TaskWorkingSetUpdater implements IWorkingSetUpdater, ITaskListChang
 	private void checkElementExistence(IWorkingSet workingSet) {
 		ArrayList<IAdaptable> list = new ArrayList<IAdaptable>();
 		for (IAdaptable adaptable : workingSet.getElements()) {
-			if (adaptable instanceof AbstractTaskContainer) {
-				String handle = ((AbstractTaskContainer) adaptable).getHandleIdentifier();
-				for (ITaskListElement element : TasksUiPlugin.getTaskListManager().getTaskList().getRootElements()) {
-					if (element instanceof AbstractTaskContainer && element.getHandleIdentifier().equals(handle)) {
+			if (adaptable instanceof AbstractTaskListElement) {
+				String handle = ((AbstractTaskListElement) adaptable).getHandleIdentifier();
+				for (AbstractTaskListElement element : TasksUiPlugin.getTaskListManager().getTaskList().getRootElements()) {
+					if (element instanceof AbstractTaskListElement && element.getHandleIdentifier().equals(handle)) {
 						list.add(adaptable);
 					}
 				}
@@ -75,17 +75,17 @@ public class TaskWorkingSetUpdater implements IWorkingSetUpdater, ITaskListChang
 	
 	// ITaskListChangeListener
 	
-	public void containerAdded(AbstractTaskContainer container) {
+	public void containerAdded(AbstractTaskListElement container) {
 	}
 
-	public void containerDeleted(AbstractTaskContainer container) {
+	public void containerDeleted(AbstractTaskListElement container) {
 		synchronized (workingSets) {
 			for (IWorkingSet workingSet : workingSets) {
 				// TODO could filter by working set id
 				ArrayList<IAdaptable> remove = new ArrayList<IAdaptable>(); 
 				for (IAdaptable adaptable : workingSet.getElements()) {
-					if (adaptable instanceof AbstractTaskContainer
-							&& ((AbstractTaskContainer) adaptable).getHandleIdentifier().equals(
+					if (adaptable instanceof AbstractTaskListElement
+							&& ((AbstractTaskListElement) adaptable).getHandleIdentifier().equals(
 									container.getHandleIdentifier())) {
 						remove.add(adaptable);
 					}
@@ -99,22 +99,22 @@ public class TaskWorkingSetUpdater implements IWorkingSetUpdater, ITaskListChang
 		}
 	}
 
-	public void containerInfoChanged(AbstractTaskContainer container) {
+	public void containerInfoChanged(AbstractTaskListElement container) {
 	}
 
-	public void localInfoChanged(ITask task) {
+	public void localInfoChanged(AbstractTask task) {
 	}
 
-	public void repositoryInfoChanged(ITask task) {
+	public void repositoryInfoChanged(AbstractTask task) {
 	}
 
-	public void taskAdded(ITask task) {
+	public void taskAdded(AbstractTask task) {
 	}
 
-	public void taskDeleted(ITask task) {
+	public void taskDeleted(AbstractTask task) {
 	}
 
-	public void taskMoved(ITask task, AbstractTaskContainer fromContainer, AbstractTaskContainer toContainer) {
+	public void taskMoved(AbstractTask task, AbstractTaskListElement fromContainer, AbstractTaskListElement toContainer) {
 	}
 	
 }