#define GNUNET_MESSAGE_TYPE_PSYC_CHANNEL_SLAVE_RM 690
-#define GNUNET_MESSAGE_TYPE_PSYC_TRANSMIT_METHOD 691
+#define GNUNET_MESSAGE_TYPE_PSYC_MESSAGE_METHOD 691
-#define GNUNET_MESSAGE_TYPE_PSYC_TRANSMIT_MODIFIER 692
+#define GNUNET_MESSAGE_TYPE_PSYC_MESSAGE_MODIFIER 692
-#define GNUNET_MESSAGE_TYPE_PSYC_TRANSMIT_MOD_CONT 693
+#define GNUNET_MESSAGE_TYPE_PSYC_MESSAGE_MOD_CONT 693
-#define GNUNET_MESSAGE_TYPE_PSYC_TRANSMIT_DATA 694
+#define GNUNET_MESSAGE_TYPE_PSYC_MESSAGE_DATA 694
#define GNUNET_MESSAGE_TYPE_PSYC_TRANSMIT_ACK 695
-#define GNUNET_MESSAGE_TYPE_PSYC_MESSAGE_METHOD 696
-
-#define GNUNET_MESSAGE_TYPE_PSYC_MESSAGE_MODIFIER 697
-
-#define GNUNET_MESSAGE_TYPE_PSYC_MESSAGE_MOD_CONT 698
-
-#define GNUNET_MESSAGE_TYPE_PSYC_MESSAGE_DATA 699
-
-#define GNUNET_MESSAGE_TYPE_PSYC_MESSAGE_ACK 700
-
-
#define GNUNET_MESSAGE_TYPE_PSYC_STORY_REQUEST 701
-#define GNUNET_MESSAGE_TYPE_PSYC_STORY_METHOD 702
-
-#define GNUNET_MESSAGE_TYPE_PSYC_STORY_MODIFIER 703
-
-#define GNUNET_MESSAGE_TYPE_PSYC_STORY_MOD_CONT 704
-
-#define GNUNET_MESSAGE_TYPE_PSYC_STORY_DATA 705
+#define GNUNET_MESSAGE_TYPE_PSYC_STORY_RESPONSE 702
-#define GNUNET_MESSAGE_TYPE_PSYC_STORY_ACK 706
+#define GNUNET_MESSAGE_TYPE_PSYC_STATE_GET 703
-#define GNUNET_MESSAGE_TYPE_PSYC_STATE_GET 707
+#define GNUNET_MESSAGE_TYPE_PSYC_STATE_GET_PREFIX 704
-#define GNUNET_MESSAGE_TYPE_PSYC_STATE_GET_PREFIX 708
+#define GNUNET_MESSAGE_TYPE_PSYC_STATE_RESPONSE 705
-#define GNUNET_MESSAGE_TYPE_PSYC_STATE_MODIFIER 709
+#define GNUNET_MESSAGE_TYPE_PSYC_STATE_MODIFIER 706
-#define GNUNET_MESSAGE_TYPE_PSYC_STATE_MOD_CONT 710
+#define GNUNET_MESSAGE_TYPE_PSYC_STATE_MOD_CONT 707
/*******************************************************************************