Index: /trunk/autoquest-generic-event-monitor/src/main/java/de/ugoe/cs/autoquest/genericeventmonitor/GenericEventMonitorServlet.java
===================================================================
--- /trunk/autoquest-generic-event-monitor/src/main/java/de/ugoe/cs/autoquest/genericeventmonitor/GenericEventMonitorServlet.java	(revision 2162)
+++ /trunk/autoquest-generic-event-monitor/src/main/java/de/ugoe/cs/autoquest/genericeventmonitor/GenericEventMonitorServlet.java	(revision 2163)
@@ -218,7 +218,7 @@
                     Long time = assertValue(((JSONObject) eventObj), "time", Long.class);
                     String eventType =
-                        assertValue(((JSONObject) eventObj), "eventType", String.class);
+                        assertValue(((JSONObject) eventObj), "type", String.class);
                     String eventTargetId =
-                        assertValue(((JSONObject) eventObj), "eventTargetId", String.class);
+                        assertValue(((JSONObject) eventObj), "targetId", String.class);
                     
                     if (eventType == null) {
@@ -234,5 +234,5 @@
                         GenericEventTarget target = eventTargets.get(eventTargetId);
                         Map<String, String> parameters = getParameters
-                            (((JSONObject) eventObj), "time", "eventType", "eventTargetId");
+                            (((JSONObject) eventObj), "time", "type", "targetId");
                         
                         if (target != null) {