diff --git a/deltachat-jsonrpc/typescript/generated/events.ts b/deltachat-jsonrpc/typescript/generated/events.ts
index 2f0fa5084..a483c68cb 100644
--- a/deltachat-jsonrpc/typescript/generated/events.ts
+++ b/deltachat-jsonrpc/typescript/generated/events.ts
@@ -52,7 +52,7 @@ export type Event=(({
  * should not be disturbed by a dialog or so.  Instead, use a bubble or so.
  * 
  * However, for ongoing processes (eg. configure())
- * or for functions that are expected to fail (eg. dc_continue_key_transfer())
+ * or for functions that are expected to fail (eg. autocryptContinueKeyTransfer())
  * it might be better to delay showing these events until the function has really
  * failed (returned false). It should be sufficient to report only the *last* error
  * in a messasge box then.
@@ -61,9 +61,9 @@ export type Event=(({
 /**
  * An action cannot be performed because the user is not in the group.
  * Reported eg. after a call to
- * dc_set_chat_name(), dc_set_chat_profile_image(),
- * dc_add_contact_to_chat(), dc_remove_contact_from_chat(),
- * dc_send_text_msg() or another sending function.
+ * setChatName(), setChatProfileImage(),
+ * addContactToChat(), removeContactFromChat(),
+ * and messages sending functions.
  */
 "type":"ErrorSelfNotInGroup";}&{"msg":string;})|({
 /**
@@ -73,8 +73,8 @@ export type Event=(({
  * - Chats created, deleted or archived
  * - A draft has been set
  * 
- * `chat_id` is set if only a single chat is affected by the changes, otherwise 0.
- * `msg_id` is set if only a single message is affected by the changes, otherwise 0.
+ * `chatId` is set if only a single chat is affected by the changes, otherwise 0.
+ * `msgId` is set if only a single message is affected by the changes, otherwise 0.
  */
 "type":"MsgsChanged";}&{"chatId":U32;"msgId":U32;})|({
 /**
@@ -91,24 +91,24 @@ export type Event=(({
 "type":"MsgsNoticed";}&{"chatId":U32;})|({
 /**
  * A single message is sent successfully. State changed from  DC_STATE_OUT_PENDING to
- * DC_STATE_OUT_DELIVERED, see dc_msg_get_state().
+ * DC_STATE_OUT_DELIVERED, see `Message.state`.
  */
 "type":"MsgDelivered";}&{"chatId":U32;"msgId":U32;})|({
 /**
  * A single message could not be sent. State changed from DC_STATE_OUT_PENDING or DC_STATE_OUT_DELIVERED to
- * DC_STATE_OUT_FAILED, see dc_msg_get_state().
+ * DC_STATE_OUT_FAILED, see `Message.state`.
  */
 "type":"MsgFailed";}&{"chatId":U32;"msgId":U32;})|({
 /**
  * A single message is read by the receiver. State changed from DC_STATE_OUT_DELIVERED to
- * DC_STATE_OUT_MDN_RCVD, see dc_msg_get_state().
+ * DC_STATE_OUT_MDN_RCVD, see `Message.state`.
  */
 "type":"MsgRead";}&{"chatId":U32;"msgId":U32;})|({
 /**
  * Chat changed.  The name or the image of a chat group was changed or members were added or removed.
  * Or the verify state of a chat has changed.
- * See dc_set_chat_name(), dc_set_chat_profile_image(), dc_add_contact_to_chat()
- * and dc_remove_contact_from_chat().
+ * See setChatName(), setChatProfileImage(), addContactToChat()
+ * and removeContactFromChat().
  * 
  * This event does not include ephemeral timer modification, which
  * is a separate event.
@@ -129,7 +129,7 @@ export type Event=(({
  * 
  * @param data1 (u32) contact_id of the contact for which the location has changed.
  *     If the locations of several contacts have been changed,
- *     eg. after calling dc_delete_all_locations(), this parameter is set to `None`.
+ *     this parameter is set to `None`.
  */
 "type":"LocationChanged";}&{"contactId":(U32|null);})|({
 /**
@@ -168,7 +168,7 @@ export type Event=(({
  * (Alice, the person who shows the QR code).
  * 
  * These events are typically sent after a joiner has scanned the QR code
- * generated by dc_get_securejoin_qr().
+ * generated by getChatSecurejoinQrCodeSvg().
  * 
  * @param data1 (int) ID of the contact that wants to join.
  * @param data2 (int) Progress as:
@@ -181,7 +181,7 @@ export type Event=(({
 /**
  * Progress information of a secure-join handshake from the view of the joiner
  * (Bob, the person who scans the QR code).
- * The events are typically sent while dc_join_securejoin(), which
+ * The events are typically sent while secureJoin(), which
  * may take some time, is executed.
  * @param data1 (int) ID of the inviting contact.
  * @param data2 (int) Progress as:
@@ -192,8 +192,8 @@ export type Event=(({
 /**
  * The connectivity to the server changed.
  * This means that you should refresh the connectivity view
- * and possibly the connectivtiy HTML; see dc_get_connectivity() and
- * dc_get_connectivity_html() for details.
+ * and possibly the connectivtiy HTML; see getConnectivity() and
+ * getConnectivityHtml() for details.
  */
 "type":"ConnectivityChanged";}|{"type":"SelfavatarChanged";}|({"type":"WebxdcStatusUpdate";}&{"msgId":U32;"statusUpdateSerial":U32;})|({
 /**
diff --git a/deltachat-jsonrpc/typescript/src/client.ts b/deltachat-jsonrpc/typescript/src/client.ts
index 993ced6b4..8da65c055 100644
--- a/deltachat-jsonrpc/typescript/src/client.ts
+++ b/deltachat-jsonrpc/typescript/src/client.ts
@@ -28,6 +28,7 @@ type ContextEvents = { ALL: (event: Event) => void } & {
 };
 
 export type DcEvent = Event;
+export type DcEventType<T extends Event["type"]> = Extract<Event, { type: T }>
 
 export class BaseDeltaChat<
   Transport extends BaseTransport<any>