Index: trunk/autoquest-plugin-html-test/src/test/java/de/ugoe/cs/autoquest/plugin/html/commands/CMDcondenseHTMLGUIModelTest.java
===================================================================
--- trunk/autoquest-plugin-html-test/src/test/java/de/ugoe/cs/autoquest/plugin/html/commands/CMDcondenseHTMLGUIModelTest.java	(revision 1496)
+++ trunk/autoquest-plugin-html-test/src/test/java/de/ugoe/cs/autoquest/plugin/html/commands/CMDcondenseHTMLGUIModelTest.java	(revision 2146)
@@ -26,9 +26,9 @@
 import org.junit.Test;
 
+import de.ugoe.cs.autoquest.eventcore.HierarchicalEventTargetGroup;
+import de.ugoe.cs.autoquest.eventcore.EventTargetModelException;
+import de.ugoe.cs.autoquest.eventcore.IHierarchicalEventTargetModel;
 import de.ugoe.cs.autoquest.eventcore.guimodel.GUIElementFactory;
-import de.ugoe.cs.autoquest.eventcore.guimodel.GUIElementGroup;
 import de.ugoe.cs.autoquest.eventcore.guimodel.GUIModel;
-import de.ugoe.cs.autoquest.eventcore.guimodel.GUIModel.Traverser;
-import de.ugoe.cs.autoquest.eventcore.guimodel.GUIModelException;
 import de.ugoe.cs.autoquest.eventcore.guimodel.IGUIElement;
 import de.ugoe.cs.autoquest.eventcore.guimodel.IGUIElementSpec;
@@ -343,5 +343,5 @@
      */
     private GUIModel generateGUIModel(String[] guiSpec)
-        throws IllegalArgumentException, GUIModelException
+        throws IllegalArgumentException, EventTargetModelException
     {
         GUIModel model = new GUIModel(true);
@@ -430,5 +430,5 @@
         }
         
-        GUIModel.Traverser traverser = guiModel.getTraverser();
+        IHierarchicalEventTargetModel.Traverser<IGUIElement> traverser = guiModel.getTraverser();
         
         assertPaths(traverser, "", paths);
@@ -440,5 +440,5 @@
      *
      */
-    private void assertPaths(Traverser traverser, String path, List<String> paths) {
+    private void assertPaths(IHierarchicalEventTargetModel.Traverser<IGUIElement> traverser, String path, List<String> paths) {
         if (traverser.hasFirstChild()) {
             IGUIElement childElement = traverser.firstChild();
@@ -481,6 +481,6 @@
             }
         }
-        else if (childElement instanceof GUIElementGroup) {
-            String tmp = ((GUIElementGroup) childElement).getStringIdentifier();
+        else if (childElement instanceof HierarchicalEventTargetGroup) {
+            String tmp = ((HierarchicalEventTargetGroup) childElement).getStringIdentifier();
             tmp = tmp.replaceAll("/", "");
             tmp = tmp.replaceAll("\\[", "");