Index: trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/endswith/EndsWithPatternTest.java
===================================================================
--- trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/endswith/EndsWithPatternTest.java	(revision 1171)
+++ trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/endswith/EndsWithPatternTest.java	(revision 1205)
@@ -25,6 +25,6 @@
 
 import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel;
-import de.ugoe.cs.autoquest.usability.rules.patterns.UsagePattern;
-import de.ugoe.cs.autoquest.usability.rules.patterns.UsagePatternBuilder;
+import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPattern;
+import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPatternBuilder;
 import de.ugoe.cs.autoquest.usability.testutil.GenerateTaskModelUtil;
 
@@ -39,5 +39,5 @@
 
     @Test
-    public void starts_with_pattern_positive() {
+    public void ends_with_pattern_positive() {
         // Given
         String spec = "UserSession {" +
@@ -48,5 +48,5 @@
                       "      Sequence seq2 {" +
                       "        TextInput target4 {}" +
-                      "        MouseClick target2 {}" +
+                      "        MouseClick target5 {}" +
                       "      }" +
                       "    }" +
@@ -54,5 +54,5 @@
                       "      Sequence seq3 {" +
                       "        TextInput target4 {}" +
-                      "        EventTask target2 {}" +
+                      "        EventTask target3 {}" +
                       "      }" +
                       "    }" +
@@ -60,7 +60,7 @@
                       "}";
         ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec);
-        UsagePatternBuilder patternBuilder = new UsagePatternBuilder();
-        UsagePattern endsWithPattern = patternBuilder.concernedNode(SELECTION).startsWith(TEXT_INPUT).endsWith(MOUSE_CLICK).build();
-        UsagePattern pattern = patternBuilder.concernedNode(SEQUENCE).endsWith(endsWithPattern).build();
+        InteractionPatternBuilder patternBuilder = new InteractionPatternBuilder();
+        InteractionPattern endsWithPattern = patternBuilder.concernedNode(SELECTION).startsWith(TEXT_INPUT).endsWith(MOUSE_CLICK).build();
+        InteractionPattern pattern = patternBuilder.concernedNode(SEQUENCE).endsWith(endsWithPattern).build();
         // When
         boolean patternContained = pattern.containedIn(taskTree);
@@ -70,33 +70,35 @@
     
     @Test
-    public void starts_with_pattern_negative() {
+    public void ends_with_pattern_negative() {
         // Given
         String spec = "UserSession {" +
-        		      "  Selection sel1 {" +
-                      "    Sequence seq1 {" +
-                      "      EventTask target1 {}" +
-                      "      EventTask target2 {}" +
-                      "    }" +
-                      "  }" +
-                      "  Selection sel1 {" +
-                      "    Iteration it1 {" +
-                      "      Sequence seq2 {" +
-                      "        MouseClick target5 {}" +
-                      "        EventTask target4 {}" +
+        		      "  Sequence seg0 {" +
+        		      "    Selection sel1 {" +
+                      "      Sequence seq1 {" +
+                      "        EventTask target1 {}" +
                       "        EventTask target2 {}" +
                       "      }" +
                       "    }" +
-                      "  }" +
-                      "  Selection sel1 {" +
-                      "    Sequence seq3 {" +
-                      "      EventTask target5 {}" +
-                      "      EventTask target6 {}" +
+                      "    Selection sel1 {" +
+                      "      Iteration it1 {" +
+                      "        Sequence seq2 {" +
+                      "          MouseClick target5 {}" +
+                      "          EventTask target4 {}" +
+                      "          EventTask target2 {}" +
+                      "        }" +
+                      "      }" +
+                      "    }" +
+                      "    Selection sel1 {" +
+                      "      Sequence seq3 {" +
+                      "        EventTask target5 {}" +
+                      "        EventTask target6 {}" +
+                      "      }" +
                       "    }" +
                       "  }" +
                       "}";
         ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec);
-        UsagePatternBuilder patternBuilder = new UsagePatternBuilder();
-        UsagePattern endsWithPattern = patternBuilder.concernedNode(ITERATION).startsWith(MOUSE_CLICK).contains(TEXT_INPUT).build();
-        UsagePattern pattern = patternBuilder.concernedNode(SEQUENCE).endsWith(endsWithPattern).build();
+        InteractionPatternBuilder patternBuilder = new InteractionPatternBuilder();
+        InteractionPattern endsWithPattern = patternBuilder.concernedNode(ITERATION).startsWith(MOUSE_CLICK).contains(TEXT_INPUT).build();
+        InteractionPattern pattern = patternBuilder.concernedNode(SEQUENCE).endsWith(endsWithPattern).build();
         // When
         boolean patternContained = pattern.containedIn(taskTree);
