Index: trunk/autoquest-core-usability/src/main/java/de/ugoe/cs/autoquest/usability/DefaultValueRule.java
===================================================================
--- trunk/autoquest-core-usability/src/main/java/de/ugoe/cs/autoquest/usability/DefaultValueRule.java	(revision 2138)
+++ trunk/autoquest-core-usability/src/main/java/de/ugoe/cs/autoquest/usability/DefaultValueRule.java	(revision 2146)
@@ -29,4 +29,7 @@
 
 import de.ugoe.cs.autoquest.eventcore.Event;
+import de.ugoe.cs.autoquest.eventcore.IEventTargetSpec;
+import de.ugoe.cs.autoquest.eventcore.IHierarchicalEventTarget;
+import de.ugoe.cs.autoquest.eventcore.IHierarchicalEventTargetModel;
 import de.ugoe.cs.autoquest.eventcore.gui.MouseClick;
 import de.ugoe.cs.autoquest.eventcore.gui.TextInput;
@@ -609,4 +612,11 @@
 
         /**
+         * 
+         */
+        public IHierarchicalEventTargetModel<?> getEventTargetModel() {
+            return target.getEventTargetModel();
+        }
+
+        /**
          *
          */
@@ -653,5 +663,5 @@
          *
          */
-        public void updateSpecification(IGUIElementSpec furtherSpec) {
+        public void updateSpecification(IEventTargetSpec furtherSpec) {
             target.updateSpecification(furtherSpec);
         }
@@ -660,6 +670,6 @@
          * 
          */
-        public void addEqualGUIElement(IGUIElement equalElement) {
-            target.addEqualGUIElement(equalElement);
+        public void addEqualEventTarget(IHierarchicalEventTarget equalElement) {
+            target.addEqualEventTarget(equalElement);
         }
 
Index: trunk/autoquest-core-usability/src/main/java/de/ugoe/cs/autoquest/usability/RuleUtils.java
===================================================================
--- trunk/autoquest-core-usability/src/main/java/de/ugoe/cs/autoquest/usability/RuleUtils.java	(revision 2138)
+++ trunk/autoquest-core-usability/src/main/java/de/ugoe/cs/autoquest/usability/RuleUtils.java	(revision 2146)
@@ -23,5 +23,5 @@
 import java.util.Map;
 
-import de.ugoe.cs.autoquest.eventcore.guimodel.GUIElementGroup;
+import de.ugoe.cs.autoquest.eventcore.HierarchicalEventTargetGroup;
 import de.ugoe.cs.autoquest.eventcore.guimodel.IGUIElement;
 
@@ -123,5 +123,5 @@
         
         while (parent != null) {
-            if (!(parent instanceof GUIElementGroup)) {
+            if (!(parent instanceof HierarchicalEventTargetGroup)) {
                 result = parent.toString() + "/" + result;
             }
@@ -149,5 +149,5 @@
             IGUIElement parent = guiElement;
             while (parent != null) {
-                if (!(parent instanceof GUIElementGroup)) {
+                if (!(parent instanceof HierarchicalEventTargetGroup)) {
                     path.addFirst(parent);
                 }
Index: trunk/autoquest-core-usability/src/main/java/de/ugoe/cs/autoquest/usability/UnusedGUIElementsRule.java
===================================================================
--- trunk/autoquest-core-usability/src/main/java/de/ugoe/cs/autoquest/usability/UnusedGUIElementsRule.java	(revision 2138)
+++ trunk/autoquest-core-usability/src/main/java/de/ugoe/cs/autoquest/usability/UnusedGUIElementsRule.java	(revision 2146)
@@ -24,4 +24,5 @@
 
 import de.ugoe.cs.autoquest.eventcore.Event;
+import de.ugoe.cs.autoquest.eventcore.IHierarchicalEventTargetModel;
 import de.ugoe.cs.autoquest.eventcore.guimodel.GUIModel;
 import de.ugoe.cs.autoquest.eventcore.guimodel.IButton;
@@ -175,5 +176,5 @@
         GUIModel model = result.values().iterator().next().iterator().next().getGUIModel();
         
-        GUIModel.Traverser traverser = model.getTraverser();
+        IHierarchicalEventTargetModel.Traverser<IGUIElement> traverser = model.getTraverser();
 
         IGUIElement currentGUIElement = null;