Changed state names and made the aggregation of the nonces more secure.