Index: trunk/quest-core-usageprofiles/src/main/java/de/ugoe/cs/quest/usageprofiles/FirstOrderMarkovModel.java
===================================================================
--- trunk/quest-core-usageprofiles/src/main/java/de/ugoe/cs/quest/usageprofiles/FirstOrderMarkovModel.java	(revision 547)
+++ trunk/quest-core-usageprofiles/src/main/java/de/ugoe/cs/quest/usageprofiles/FirstOrderMarkovModel.java	(revision 553)
@@ -103,9 +103,9 @@
 		List<Integer> endIndexList = new LinkedList<Integer>();
 		for( int i=0 ; i<knownSymbols.size() ; i++ ) {
-			String id = knownSymbols.get(i).getStandardId();
-			if( id.equals(Event.STARTEVENT.getStandardId()) || id.contains(Event.STARTEVENT.getStandardId()+"-=-") ) {
+			String id = knownSymbols.get(i).getId();
+			if( id.equals(Event.STARTEVENT.getId()) || id.contains(Event.STARTEVENT.getId()+"-=-") ) {
 				startIndexList.add(i);
 			}
-			if( id.equals(Event.ENDEVENT.getStandardId()) || id.contains("-=-"+Event.ENDEVENT.getStandardId()) ) {
+			if( id.equals(Event.ENDEVENT.getId()) || id.contains("-=-"+Event.ENDEVENT.getId()) ) {
 				endIndexList.add(i);
 			}
@@ -176,5 +176,5 @@
 				trie.getKnownSymbols());
 		for (Event symbol : knownSymbols) {
-			final String thisSaneId = symbol.getShortId().replace("\"", "\\\"")
+			final String thisSaneId = symbol.getId().replace("\"", "\\\"")
 					.replaceAll("[\r\n]", "");
 			stringBuilder.append(" " + knownSymbols.indexOf(symbol) + " [label=\""
@@ -210,5 +210,5 @@
 
 		for (Event symbol : knownSymbols) {
-			String from = symbol.getShortId();
+			String from = symbol.getId();
 			List<Event> context = new ArrayList<Event>();
 			context.add(symbol);
@@ -217,5 +217,5 @@
 
 			for (Event follower : followers) {
-				String to = follower.getShortId();
+				String to = follower.getId();
 				MarkovEdge prob = new MarkovEdge(getProbability(context,
 						follower));
Index: trunk/quest-core-usageprofiles/src/main/java/de/ugoe/cs/quest/usageprofiles/ModelFlattener.java
===================================================================
--- trunk/quest-core-usageprofiles/src/main/java/de/ugoe/cs/quest/usageprofiles/ModelFlattener.java	(revision 547)
+++ trunk/quest-core-usageprofiles/src/main/java/de/ugoe/cs/quest/usageprofiles/ModelFlattener.java	(revision 553)
@@ -6,5 +6,5 @@
 
 import de.ugoe.cs.quest.eventcore.Event;
-import de.ugoe.cs.quest.eventcore.ReplayableEvent;
+import de.ugoe.cs.quest.eventcore.StringEventType;
 
 /**
@@ -101,5 +101,5 @@
 			List<String> parentIDs, int depth) {
 		for (TrieNode<Event> child : currentNode.getChildren()) {
-			String currentId = child.getSymbol().getStandardId();
+			String currentId = child.getSymbol().getId();
 			if (depth > 1) {
 				List<String> childParentIDs = new LinkedList<String>(parentIDs);
@@ -114,6 +114,6 @@
 				firstOrderID.append(currentId);
 				TrieNode<Event> firstOrderNode = firstOrderTrie
-						.getChildCreate(new Event<Object>(firstOrderID
-								.toString()));
+						.getChildCreate(new Event(new StringEventType(firstOrderID
+								.toString())));
 				firstOrderNode.setCount(child.getCount());
 				for (TrieNode<Event> transitionChild : child.getChildren()) {
@@ -125,8 +125,8 @@
 					transitionID.append(currentId + EVENT_SEPARATOR);
 					transitionID.append(transitionChild.getSymbol()
-							.getStandardId());
+							.getId());
 					TrieNode<Event> firstOrderTransitionChild = firstOrderNode
-							.getChildCreate(new Event<Object>(transitionID
-									.toString()));
+							.getChildCreate(new Event(new StringEventType(transitionID
+									.toString())));
 					firstOrderTransitionChild.setCount(transitionChild
 							.getCount());