Index: events/src/test/java/geniusweb/inform/ActionDoneTest.java
===================================================================
--- events/src/test/java/geniusweb/inform/ActionDoneTest.java	(revision 32)
+++ events/src/test/java/geniusweb/inform/ActionDoneTest.java	(revision 33)
@@ -24,5 +24,5 @@
 	private static final PartyId id2 = new PartyId("party2");
 
-	private final String actiondonestr = "{\"ActionDone\":{\"action\":{\"endnegotiation\":{\"actor\":\"party1\"}}}}";
+	private final String actiondonestr = "{\"ActionDone\":{\"action\":{\"EndNegotiation\":{\"actor\":\"party1\"}}}}";
 
 	private final static Action act1 = new EndNegotiation(id);
Index: events/src/test/java/geniusweb/inform/OptInTest.java
===================================================================
--- events/src/test/java/geniusweb/inform/OptInTest.java	(revision 32)
+++ events/src/test/java/geniusweb/inform/OptInTest.java	(revision 33)
@@ -42,5 +42,5 @@
 	private final OptIn optIn2 = new OptIn(Arrays.asList(votesA));
 
-	private String asJson = "{\"OptIn\":{\"votes\":[{\"Votes\":{\"actor\":\"partyA\",\"votes\":[{\"vote\":{\"actor\":\"partyA\",\"bid\":{\"issuevalues\":{\"iss\":\"val1\"}},\"minPower\":2,\"maxPower\":9}}]}},{\"Votes\":{\"actor\":\"partyB\",\"votes\":[{\"vote\":{\"actor\":\"partyB\",\"bid\":{\"issuevalues\":{\"iss\":\"val2\"}},\"minPower\":2,\"maxPower\":9}},{\"vote\":{\"actor\":\"partyB\",\"bid\":{\"issuevalues\":{\"iss\":\"val1\"}},\"minPower\":2,\"maxPower\":9}}]}}]}}";
+	private String asJson = "{\"OptIn\":{\"votes\":[{\"Votes\":{\"actor\":\"partyA\",\"votes\":[{\"Vote\":{\"actor\":\"partyA\",\"bid\":{\"issuevalues\":{\"iss\":\"val1\"}},\"minPower\":2,\"maxPower\":9}}]}},{\"Votes\":{\"actor\":\"partyB\",\"votes\":[{\"Vote\":{\"actor\":\"partyB\",\"bid\":{\"issuevalues\":{\"iss\":\"val2\"}},\"minPower\":2,\"maxPower\":9}},{\"Vote\":{\"actor\":\"partyB\",\"bid\":{\"issuevalues\":{\"iss\":\"val1\"}},\"minPower\":2,\"maxPower\":9}}]}}]}}";
 
 	@Override
Index: events/src/test/java/geniusweb/inform/OptInWithValueTest.java
===================================================================
--- events/src/test/java/geniusweb/inform/OptInWithValueTest.java	(revision 32)
+++ events/src/test/java/geniusweb/inform/OptInWithValueTest.java	(revision 33)
@@ -49,5 +49,5 @@
 			Arrays.asList(votesA));
 
-	private String asJson = "{\"OptInWithValue\":{\"votes\":[{\"VotesWithValue\":{\"actor\":\"partyA\",\"votes\":[{\"votewithvalue\":{\"actor\":\"partyA\",\"bid\":{\"issuevalues\":{\"iss\":\"val1\"}},\"minPower\":2,\"maxPower\":9,\"value\":100}}]}},{\"VotesWithValue\":{\"actor\":\"partyB\",\"votes\":[{\"votewithvalue\":{\"actor\":\"partyB\",\"bid\":{\"issuevalues\":{\"iss\":\"val1\"}},\"minPower\":2,\"maxPower\":9,\"value\":60}},{\"votewithvalue\":{\"actor\":\"partyB\",\"bid\":{\"issuevalues\":{\"iss\":\"val2\"}},\"minPower\":2,\"maxPower\":9,\"value\":40}}]}}]}}";
+	private String asJson = "{\"OptInWithValue\":{\"votes\":[{\"VotesWithValue\":{\"actor\":\"partyA\",\"votes\":[{\"VoteWithValue\":{\"actor\":\"partyA\",\"bid\":{\"issuevalues\":{\"iss\":\"val1\"}},\"minPower\":2,\"maxPower\":9,\"value\":100}}]}},{\"VotesWithValue\":{\"actor\":\"partyB\",\"votes\":[{\"VoteWithValue\":{\"actor\":\"partyB\",\"bid\":{\"issuevalues\":{\"iss\":\"val1\"}},\"minPower\":2,\"maxPower\":9,\"value\":60}},{\"VoteWithValue\":{\"actor\":\"partyB\",\"bid\":{\"issuevalues\":{\"iss\":\"val2\"}},\"minPower\":2,\"maxPower\":9,\"value\":40}}]}}]}}";
 
 	@Override
Index: events/src/test/java/geniusweb/inform/SettingsTest.java
===================================================================
--- events/src/test/java/geniusweb/inform/SettingsTest.java	(revision 32)
+++ events/src/test/java/geniusweb/inform/SettingsTest.java	(revision 33)
@@ -36,5 +36,5 @@
 			+ "{\"id\":\"party1\",\"profile\":\"ws:profile1\","
 			+ "\"protocol\":\"ws:localhost/protocol1\","
-			+ "\"progress\":{\"rounds\":{\"duration\":10,\"currentRound\":0,\"endtime\":999}},"
+			+ "\"progress\":{\"ProgressRounds\":{\"duration\":10,\"currentRound\":0,\"endtime\":999}},"
 			+ "\"parameters\":{}}}";
 
Index: events/src/test/java/geniusweb/inform/VotingTest.java
===================================================================
--- events/src/test/java/geniusweb/inform/VotingTest.java	(revision 32)
+++ events/src/test/java/geniusweb/inform/VotingTest.java	(revision 33)
@@ -40,5 +40,5 @@
 			Arrays.asList(new Offer(party1, bid1)), powers2);
 
-	private String asJson = "{\"Voting\":{\"offers\":[{\"offer\":{\"actor\":\"party1\",\"bid\":{\"issuevalues\":{\"iss\":\"val1\"}}}}],\"powers\":{\"party1\":2}}}";
+	private String asJson = "{\"Voting\":{\"offers\":[{\"Offer\":{\"actor\":\"party1\",\"bid\":{\"issuevalues\":{\"iss\":\"val1\"}}}}],\"powers\":{\"party1\":2}}}";
 
 	@Override
