Index: trunk/autoquest-ui-core/src/main/java/de/ugoe/cs/autoquest/commands/usability/CMDevaluateUsability.java
===================================================================
--- trunk/autoquest-ui-core/src/main/java/de/ugoe/cs/autoquest/commands/usability/CMDevaluateUsability.java	(revision 1096)
+++ trunk/autoquest-ui-core/src/main/java/de/ugoe/cs/autoquest/commands/usability/CMDevaluateUsability.java	(revision 1146)
@@ -18,5 +18,5 @@
 
 import de.ugoe.cs.autoquest.CommandHelpers;
-import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskTree;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel;
 import de.ugoe.cs.autoquest.usability.UsabilityEvaluationManager;
 import de.ugoe.cs.autoquest.usability.UsabilityEvaluationResult;
@@ -73,10 +73,10 @@
             return;
         }
-        if (!(dataObject instanceof ITaskTree)) {
+        if (!(dataObject instanceof ITaskModel)) {
             CommandHelpers.objectNotType(tasktreeName, "ITaskTree");
             return;
         }
 
-        ITaskTree taskTree = (ITaskTree) dataObject;
+        ITaskModel taskTree = (ITaskModel) dataObject;
         
         UsabilityEvaluationResult result =
Index: trunk/autoquest-ui-core/src/main/java/de/ugoe/cs/autoquest/commands/usability/CMDgenerateTaskTree.java
===================================================================
--- trunk/autoquest-ui-core/src/main/java/de/ugoe/cs/autoquest/commands/usability/CMDgenerateTaskTree.java	(revision 1096)
+++ trunk/autoquest-ui-core/src/main/java/de/ugoe/cs/autoquest/commands/usability/CMDgenerateTaskTree.java	(revision 1146)
@@ -22,5 +22,5 @@
 import de.ugoe.cs.autoquest.eventcore.Event;
 import de.ugoe.cs.autoquest.tasktrees.manager.TaskTreeManager;
-import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskTree;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel;
 import de.ugoe.cs.util.console.Command;
 import de.ugoe.cs.util.console.GlobalDataContainer;
@@ -84,7 +84,7 @@
         sequences = (Collection<List<Event>>) dataObject;
         
-        ITaskTree taskTree = new TaskTreeManager().createTaskTree(sequences);
+        ITaskModel taskModel = new TaskTreeManager().createTaskModel(sequences);
         
-        if (GlobalDataContainer.getInstance().addData(tasktreeName, taskTree)) {
+        if (GlobalDataContainer.getInstance().addData(tasktreeName, taskModel)) {
             CommandHelpers.dataOverwritten(sequencesName);
         }