Index: /trunk/autoquest-generic-event-monitor-test/src/test/java/de/ugoe/cs/autoquest/genericeventmonitor/GenericEventMonitorServerTest.java
===================================================================
--- /trunk/autoquest-generic-event-monitor-test/src/test/java/de/ugoe/cs/autoquest/genericeventmonitor/GenericEventMonitorServerTest.java	(revision 2163)
+++ /trunk/autoquest-generic-event-monitor-test/src/test/java/de/ugoe/cs/autoquest/genericeventmonitor/GenericEventMonitorServerTest.java	(revision 2164)
@@ -136,6 +136,6 @@
             "    [ {" +
             "        \"time\":\"12345\"," +
-            "        \"eventTargetId\":\"target2\"," +
-            "        \"eventType\":\"gaze\"," +
+            "        \"targetId\":\"target2\"," +
+            "        \"type\":\"gaze\"," +
             "        \"xcoordinate\": \"194\"," +
             "        \"ycoordinate\": \"12\"" +
@@ -250,56 +250,56 @@
             "    [ {" +
             "        \"time\":\"1\"," +
-            "        \"eventTargetId\":\"input1\"," +
-            "        \"eventType\":\"onclick\"," +
+            "        \"targetId\":\"input1\"," +
+            "        \"type\":\"onclick\"," +
             "        \"coordinates\": \"194\"" +
             "      }," +
             "      {" +
             "        \"time\":\"2\"," +
-            "        \"eventTargetId\":\"input2\"," +
-            "        \"eventType\":\"ondblclick\"," +
+            "        \"targetId\":\"input2\"," +
+            "        \"type\":\"ondblclick\"," +
             "        \"coordinates\": \"194\"" +
             "      }," +
             "      {" +
             "        \"time\":\"3\"," +
-            "        \"eventTargetId\":\"input3\"," +
-            "        \"eventType\":\"onfocus\"" +
+            "        \"targetId\":\"input3\"," +
+            "        \"type\":\"onfocus\"" +
             "      }," +
             "      {" +
             "        \"time\":\"4\"," +
-            "        \"eventTargetId\":\"input4\"," +
-            "        \"eventType\":\"onclick\"," +
+            "        \"targetId\":\"input4\"," +
+            "        \"type\":\"onclick\"," +
             "        \"coordinates\": \"255\"" +
             "      }," +
             "      {" +
             "        \"time\":\"5\"," +
-            "        \"eventTargetId\":\"input5\"," +
-            "        \"eventType\":\"onfocus\"" +
+            "        \"targetId\":\"input5\"," +
+            "        \"type\":\"onfocus\"" +
             "      }," +
             "      {" +
             "        \"time\":\"6\"," +
-            "        \"eventTargetId\":\"input6\"," +
-            "        \"eventType\":\"onfocus\"" +
+            "        \"targetId\":\"input6\"," +
+            "        \"type\":\"onfocus\"" +
             "      }," +
             "      {" +
             "        \"time\":\"7\"," +
-            "        \"eventTargetId\":\"input7\"," +
-            "        \"eventType\":\"onfocus\"" +
+            "        \"targetId\":\"input7\"," +
+            "        \"type\":\"onfocus\"" +
             "      }," +
             "      {" +
             "        \"time\":\"8\"," +
-            "        \"eventTargetId\":\"input8\"," +
-            "        \"eventType\":\"onclick\"," +
+            "        \"targetId\":\"input8\"," +
+            "        \"type\":\"onclick\"," +
             "        \"coordinates\": \"255\"" +
             "      }," +
             "      {" +
             "        \"time\":\"9\"," +
-            "        \"eventTargetId\":\"input9\"," +
-            "        \"eventType\":\"onscroll\"," +
+            "        \"targetId\":\"input9\"," +
+            "        \"type\":\"onscroll\"," +
             "        \"scrollPosition\": \"194\"" +
             "      }," +
             "      {" +
             "        \"time\":\"10\"," +
-            "        \"eventTargetId\":\"input10\"," +
-            "        \"eventType\":\"onclick\"," +
+            "        \"targetId\":\"input10\"," +
+            "        \"type\":\"onclick\"," +
             "        \"coordinates\": \"194\"" +
             "      }" +
@@ -432,5 +432,5 @@
             "        \"time\":\"9\"," +
             "        \"path\":\"/html[0]/body(htmlId=gsr)\"," +
-            "        \"eventType\":\"onscroll\"," +
+            "        \"type\":\"onscroll\"," +
             "      }" +
             "    ]" +
@@ -473,5 +473,5 @@
             "        \"time\":\"12345\"," +
             "        \"path\":\"/html[0]/body(htmlId=gsr)\"," +
-            "        \"eventType\":\"onunload\"" +
+            "        \"type\":\"onunload\"" +
             "      }" +
             "    ]" +
@@ -515,5 +515,5 @@
             "        \"time\":\"blub\"," +
             "        \"path\":\"/html[0]/body(htmlId=gsr)\"," +
-            "        \"eventType\":\"onunload\"" +
+            "        \"type\":\"onunload\"" +
             "      }" +
             "    ]" +
Index: /trunk/autoquest-generic-event-monitor-test/src/test/java/de/ugoe/cs/autoquest/genericeventmonitor/GenericEventMonitorTest.java
===================================================================
--- /trunk/autoquest-generic-event-monitor-test/src/test/java/de/ugoe/cs/autoquest/genericeventmonitor/GenericEventMonitorTest.java	(revision 2163)
+++ /trunk/autoquest-generic-event-monitor-test/src/test/java/de/ugoe/cs/autoquest/genericeventmonitor/GenericEventMonitorTest.java	(revision 2164)
@@ -119,6 +119,6 @@
             "    [ {" +
             "        \"time\":\"12345\"," +
-            "        \"eventTargetId\":\"target2\"," +
-            "        \"eventType\":\"gaze\"," +
+            "        \"targetId\":\"target2\"," +
+            "        \"type\":\"gaze\"," +
             "        \"xcoordinate\": \"194\"," +
             "        \"ycoordinate\": \"12\"" +
@@ -285,56 +285,56 @@
             "    [ {" +
             "        \"time\":\"1\"," +
-            "        \"eventTargetId\":\"input1\"," +
-            "        \"eventType\":\"onclick\"," +
+            "        \"targetId\":\"input1\"," +
+            "        \"type\":\"onclick\"," +
             "        \"coordinates\": \"194\"" +
             "      }," +
             "      {" +
             "        \"time\":\"2\"," +
-            "        \"eventTargetId\":\"input2\"," +
-            "        \"eventType\":\"ondblclick\"," +
+            "        \"targetId\":\"input2\"," +
+            "        \"type\":\"ondblclick\"," +
             "        \"coordinates\": \"194\"" +
             "      }," +
             "      {" +
             "        \"time\":\"3\"," +
-            "        \"eventTargetId\":\"input3\"," +
-            "        \"eventType\":\"onfocus\"" +
+            "        \"targetId\":\"input3\"," +
+            "        \"type\":\"onfocus\"" +
             "      }," +
             "      {" +
             "        \"time\":\"4\"," +
-            "        \"eventTargetId\":\"input4\"," +
-            "        \"eventType\":\"onclick\"," +
+            "        \"targetId\":\"input4\"," +
+            "        \"type\":\"onclick\"," +
             "        \"coordinates\": \"255\"" +
             "      }," +
             "      {" +
             "        \"time\":\"5\"," +
-            "        \"eventTargetId\":\"input5\"," +
-            "        \"eventType\":\"onfocus\"" +
+            "        \"targetId\":\"input5\"," +
+            "        \"type\":\"onfocus\"" +
             "      }," +
             "      {" +
             "        \"time\":\"6\"," +
-            "        \"eventTargetId\":\"input6\"," +
-            "        \"eventType\":\"onfocus\"" +
+            "        \"targetId\":\"input6\"," +
+            "        \"type\":\"onfocus\"" +
             "      }," +
             "      {" +
             "        \"time\":\"7\"," +
-            "        \"eventTargetId\":\"input7\"," +
-            "        \"eventType\":\"onfocus\"" +
+            "        \"targetId\":\"input7\"," +
+            "        \"type\":\"onfocus\"" +
             "      }," +
             "      {" +
             "        \"time\":\"8\"," +
-            "        \"eventTargetId\":\"input8\"," +
-            "        \"eventType\":\"onclick\"," +
+            "        \"targetId\":\"input8\"," +
+            "        \"type\":\"onclick\"," +
             "        \"coordinates\": \"255\"" +
             "      }," +
             "      {" +
             "        \"time\":\"9\"," +
-            "        \"eventTargetId\":\"input9\"," +
-            "        \"eventType\":\"onscroll\"," +
+            "        \"targetId\":\"input9\"," +
+            "        \"type\":\"onscroll\"," +
             "        \"scrollPosition\": \"194\"" +
             "      }," +
             "      {" +
             "        \"time\":\"10\"," +
-            "        \"eventTargetId\":\"input10\"," +
-            "        \"eventType\":\"onclick\"," +
+            "        \"targetId\":\"input10\"," +
+            "        \"type\":\"onclick\"," +
             "        \"coordinates\": \"194\"" +
             "      }" +
@@ -494,5 +494,5 @@
             "        \"time\":\"12345\"," +
             "        \"path\":\"/html[0]/body(htmlId=gsr)\"," +
-            "        \"eventType\":\"onclick\"" +
+            "        \"type\":\"onclick\"" +
             "        \"coordinates\": [\"194\", \"7\"]" +
             "      }" +