diff --git a/CHANGELOG.md b/CHANGELOG.md
index 085150038..73f56bc13 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,6 +29,7 @@ HFP/GOEP Client/AVDTP/A2DP: return `SDP_SERVICE_NOT_FOUND` if no suitable SDP re
 GATT Client: Skip MTU exchange after MTU exchange on ATT Server
 AVDTP Source: `avdtp_source_stream_send_media_payload` includes SBC Header and was deprecated
 Ports: STM32-F103RB Nucleo + CC256x port removed
+A2DP: fix events and use `a2dp_cid`, `local_seid,` `remote_seid` in A2DP subevents
 
 ## Release v1.2.1
 
diff --git a/example/a2dp_source_demo.c b/example/a2dp_source_demo.c
index debfd8d23..bcb42c0d9 100644
--- a/example/a2dp_source_demo.c
+++ b/example/a2dp_source_demo.c
@@ -585,7 +585,7 @@ static void a2dp_source_packet_handler(uint8_t packet_type, uint16_t channel, ui
             cid  = avdtp_subevent_signaling_media_codec_sbc_configuration_get_avdtp_cid(packet);
             if (cid != media_tracker.a2dp_cid) return;
 
-            media_tracker.remote_seid = a2dp_subevent_signaling_media_codec_sbc_configuration_get_acp_seid(packet);
+            media_tracker.remote_seid = a2dp_subevent_signaling_media_codec_sbc_configuration_get_remote_seid(packet);
             
             sbc_configuration.reconfigure = a2dp_subevent_signaling_media_codec_sbc_configuration_get_reconfigure(packet);
             sbc_configuration.num_channels = a2dp_subevent_signaling_media_codec_sbc_configuration_get_num_channels(packet);
@@ -600,8 +600,8 @@ static void a2dp_source_packet_handler(uint8_t packet_type, uint16_t channel, ui
             
             printf("A2DP Source: Received SBC codec configuration, sampling frequency %u, a2dp_cid 0x%02x, local seid 0x%02x, remote seid 0x%02x.\n", 
                 sbc_configuration.sampling_frequency, cid,
-                a2dp_subevent_signaling_media_codec_sbc_configuration_get_int_seid(packet),
-                a2dp_subevent_signaling_media_codec_sbc_configuration_get_acp_seid(packet));
+                   a2dp_subevent_signaling_media_codec_sbc_configuration_get_local_seid(packet),
+                   a2dp_subevent_signaling_media_codec_sbc_configuration_get_remote_seid(packet));
             
             // Adapt Bluetooth spec definition to SBC Encoder expected input
             sbc_configuration.allocation_method = (btstack_sbc_allocation_method_t)(allocation_method - 1);
diff --git a/src/btstack_defines.h b/src/btstack_defines.h
index 9fca863ad..c759dbb76 100644
--- a/src/btstack_defines.h
+++ b/src/btstack_defines.h
@@ -2076,8 +2076,8 @@ typedef uint8_t sm_key_t[16];
  * @format 12111121111111
  * @param subevent_code
  * @param a2dp_cid
- * @param int_seid
- * @param acp_seid
+ * @param local_seid
+ * @param remote_seid
  * @param reconfigure
  * @param media_type
  * @param sampling_frequency
@@ -2092,9 +2092,10 @@ typedef uint8_t sm_key_t[16];
 #define A2DP_SUBEVENT_SIGNALING_MEDIA_CODEC_SBC_CONFIGURATION      0x02
 
 /**
- * @format 1211111111211
+ * @format 12111111111211
  * @param subevent_code
- * @param avdtp_cid
+ * @param a2dp_cid
+ * @param local_seid
  * @param remote_seid
  * @param reconfigure
  * @param media_type
@@ -2110,9 +2111,10 @@ typedef uint8_t sm_key_t[16];
 #define A2DP_SUBEVENT_SIGNALING_MEDIA_CODEC_MPEG_AUDIO_CONFIGURATION   0x03
 
 /**
- * @format 1211113111
+ * @format 12111113111
  * @param subevent_code
- * @param avdtp_cid
+ * @param a2dp_cid
+ * @param local_seid
  * @param remote_seid
  * @param reconfigure
  * @param media_type
@@ -2125,9 +2127,10 @@ typedef uint8_t sm_key_t[16];
 #define A2DP_SUBEVENT_SIGNALING_MEDIA_CODEC_MPEG_AAC_CONFIGURATION     0x04
 
 /**
- * @format 121111112112
+ * @format 1211111112112
  * @param subevent_code
- * @param avdtp_cid
+ * @param a2dp_cid
+ * @param local_seid
  * @param remote_seid
  * @param reconfigure
  * @param media_type
@@ -2145,8 +2148,8 @@ typedef uint8_t sm_key_t[16];
  * @format 1211112LV
  * @param subevent_code
  * @param a2dp_cid
- * @param int_seid
- * @param acp_seid
+ * @param local_seid
+ * @param remote_seid
  * @param reconfigure
  * @param media_type
  * @param media_codec_type
@@ -2156,7 +2159,7 @@ typedef uint8_t sm_key_t[16];
 #define A2DP_SUBEVENT_SIGNALING_MEDIA_CODEC_OTHER_CONFIGURATION    0x06
 
 /**
- * @format 12B111          Stream is opened byt not started.
+ * @format 12B111          Stream is opened but not started.
  * @param subevent_code 
  * @param a2dp_cid
  * @param bd_addr
@@ -2183,7 +2186,7 @@ typedef uint8_t sm_key_t[16];
 #define A2DP_SUBEVENT_STREAM_SUSPENDED                              0x09
 
 /**
- * @format 121           Stream is stoped or aborted.
+ * @format 121           Stream is stopped or aborted.
  * @param subevent_code
  * @param a2dp_cid
  * @param local_seid
@@ -2245,7 +2248,7 @@ typedef uint8_t sm_key_t[16];
 /**
  * @format 12111111111
  * @param subevent_code
- * @param avdtp_cid
+ * @param a2dp_cid
  * @param remote_seid
  * @param media_type
  * @param sampling_frequency_bitmap
@@ -2261,7 +2264,7 @@ typedef uint8_t sm_key_t[16];
 /**
  * @format 12111111112
  * @param subevent_code
- * @param avdtp_cid
+ * @param a2dp_cid
  * @param remote_seid
  * @param media_type
  * @param layer_bitmap
@@ -2275,9 +2278,9 @@ typedef uint8_t sm_key_t[16];
 #define A2DP_SUBEVENT_SIGNALING_MEDIA_CODEC_MPEG_AUDIO_CAPABILITY   0x12
 
 /**
- * @format 121112111
+ * @format 121112131
  * @param subevent_code
- * @param avdtp_cid
+ * @param a2dp_cid
  * @param remote_seid
  * @param media_type
  * @param object_type_bitmap
@@ -2291,7 +2294,7 @@ typedef uint8_t sm_key_t[16];
 /**
  * @format 1211111132
  * @param subevent_code
- * @param avdtp_cid
+ * @param a2dp_cid
  * @param remote_seid
  * @param media_type
  * @param version
@@ -2306,7 +2309,7 @@ typedef uint8_t sm_key_t[16];
 /**
  * @format 12112LV
  * @param subevent_code
- * @param avdtp_cid
+ * @param a2dp_cid
  * @param remote_seid
  * @param media_type
  * @param media_codec_type
@@ -2316,10 +2319,9 @@ typedef uint8_t sm_key_t[16];
 #define A2DP_SUBEVENT_SIGNALING_MEDIA_CODEC_OTHER_CAPABILITY        0x15
 
 /**
- * @format 1211
+ * @format 121
  * @param subevent_code
- * @param avdtp_cid
- * @param local_seid
+ * @param a2dp_cid
  * @param remote_seid
  */
 #define A2DP_SUBEVENT_SIGNALING_DELAY_REPORTING_CAPABILITY           0x16
@@ -2328,7 +2330,7 @@ typedef uint8_t sm_key_t[16];
 /**
  * @format 1212
  * @param subevent_code
- * @param avdtp_cid
+ * @param a2dp_cid
  * @param local_seid
  * @param delay_100us
  */
@@ -2337,7 +2339,7 @@ typedef uint8_t sm_key_t[16];
 /**
  * @format 121
  * @param subevent_code
- * @param avdtp_cid
+ * @param a2dp_cid
  * @param remote_seid
  */
 #define A2DP_SUBEVENT_SIGNALING_CAPABILITIES_DONE                    0x18
@@ -2345,7 +2347,7 @@ typedef uint8_t sm_key_t[16];
 /**
  * @format 12
  * @param subevent_code
- * @param avdtp_cid
+ * @param a2dp_cid
  */
 #define A2DP_SUBEVENT_SIGNALING_CAPABILITIES_COMPLETE                0x19
 
diff --git a/src/btstack_event.h b/src/btstack_event.h
index 331c4d768..c108d91e1 100644
--- a/src/btstack_event.h
+++ b/src/btstack_event.h
@@ -5865,21 +5865,21 @@ static inline uint16_t a2dp_subevent_signaling_media_codec_sbc_configuration_get
     return little_endian_read_16(event, 3);
 }
 /**
- * @brief Get field int_seid from event A2DP_SUBEVENT_SIGNALING_MEDIA_CODEC_SBC_CONFIGURATION
+ * @brief Get field local_seid from event A2DP_SUBEVENT_SIGNALING_MEDIA_CODEC_SBC_CONFIGURATION
  * @param event packet
- * @return int_seid
+ * @return local_seid
  * @note: btstack_type 1
  */
-static inline uint8_t a2dp_subevent_signaling_media_codec_sbc_configuration_get_int_seid(const uint8_t * event){
+static inline uint8_t a2dp_subevent_signaling_media_codec_sbc_configuration_get_local_seid(const uint8_t * event){
     return event[5];
 }
 /**
- * @brief Get field acp_seid from event A2DP_SUBEVENT_SIGNALING_MEDIA_CODEC_SBC_CONFIGURATION
+ * @brief Get field remote_seid from event A2DP_SUBEVENT_SIGNALING_MEDIA_CODEC_SBC_CONFIGURATION
  * @param event packet
- * @return acp_seid
+ * @return remote_seid
  * @note: btstack_type 1
  */
-static inline uint8_t a2dp_subevent_signaling_media_codec_sbc_configuration_get_acp_seid(const uint8_t * event){
+static inline uint8_t a2dp_subevent_signaling_media_codec_sbc_configuration_get_remote_seid(const uint8_t * event){
     return event[6];
 }
 /**
@@ -5974,14 +5974,23 @@ static inline uint8_t a2dp_subevent_signaling_media_codec_sbc_configuration_get_
 }
 
 /**
- * @brief Get field avdtp_cid from event A2DP_SUBEVENT_SIGNALING_MEDIA_CODEC_MPEG_AUDIO_CONFIGURATION
+ * @brief Get field a2dp_cid from event A2DP_SUBEVENT_SIGNALING_MEDIA_CODEC_MPEG_AUDIO_CONFIGURATION
  * @param event packet
- * @return avdtp_cid
+ * @return a2dp_cid
  * @note: btstack_type 2
  */
-static inline uint16_t a2dp_subevent_signaling_media_codec_mpeg_audio_configuration_get_avdtp_cid(const uint8_t * event){
+static inline uint16_t a2dp_subevent_signaling_media_codec_mpeg_audio_configuration_get_a2dp_cid(const uint8_t * event){
     return little_endian_read_16(event, 3);
 }
+/**
+ * @brief Get field local_seid from event A2DP_SUBEVENT_SIGNALING_MEDIA_CODEC_MPEG_AUDIO_CONFIGURATION
+ * @param event packet
+ * @return local_seid
+ * @note: btstack_type 1
+ */
+static inline uint8_t a2dp_subevent_signaling_media_codec_mpeg_audio_configuration_get_local_seid(const uint8_t * event){
+    return event[5];
+}
 /**
  * @brief Get field remote_seid from event A2DP_SUBEVENT_SIGNALING_MEDIA_CODEC_MPEG_AUDIO_CONFIGURATION
  * @param event packet
@@ -5989,7 +5998,7 @@ static inline uint16_t a2dp_subevent_signaling_media_codec_mpeg_audio_configurat
  * @note: btstack_type 1
  */
 static inline uint8_t a2dp_subevent_signaling_media_codec_mpeg_audio_configuration_get_remote_seid(const uint8_t * event){
-    return event[5];
+    return event[6];
 }
 /**
  * @brief Get field reconfigure from event A2DP_SUBEVENT_SIGNALING_MEDIA_CODEC_MPEG_AUDIO_CONFIGURATION
@@ -5998,7 +6007,7 @@ static inline uint8_t a2dp_subevent_signaling_media_codec_mpeg_audio_configurati
  * @note: btstack_type 1
  */
 static inline uint8_t a2dp_subevent_signaling_media_codec_mpeg_audio_configuration_get_reconfigure(const uint8_t * event){
-    return event[6];
+    return event[7];
 }
 /**
  * @brief Get field media_type from event A2DP_SUBEVENT_SIGNALING_MEDIA_CODEC_MPEG_AUDIO_CONFIGURATION
@@ -6007,7 +6016,7 @@ static inline uint8_t a2dp_subevent_signaling_media_codec_mpeg_audio_configurati
  * @note: btstack_type 1
  */
 static inline uint8_t a2dp_subevent_signaling_media_codec_mpeg_audio_configuration_get_media_type(const uint8_t * event){
-    return event[7];
+    return event[8];
 }
 /**
  * @brief Get field layer from event A2DP_SUBEVENT_SIGNALING_MEDIA_CODEC_MPEG_AUDIO_CONFIGURATION
@@ -6016,7 +6025,7 @@ static inline uint8_t a2dp_subevent_signaling_media_codec_mpeg_audio_configurati
  * @note: btstack_type 1
  */
 static inline uint8_t a2dp_subevent_signaling_media_codec_mpeg_audio_configuration_get_layer(const uint8_t * event){
-    return event[8];
+    return event[9];
 }
 /**
  * @brief Get field crc from event A2DP_SUBEVENT_SIGNALING_MEDIA_CODEC_MPEG_AUDIO_CONFIGURATION
@@ -6025,7 +6034,7 @@ static inline uint8_t a2dp_subevent_signaling_media_codec_mpeg_audio_configurati
  * @note: btstack_type 1
  */
 static inline uint8_t a2dp_subevent_signaling_media_codec_mpeg_audio_configuration_get_crc(const uint8_t * event){
-    return event[9];
+    return event[10];
 }
 /**
  * @brief Get field channel_mode from event A2DP_SUBEVENT_SIGNALING_MEDIA_CODEC_MPEG_AUDIO_CONFIGURATION
@@ -6034,7 +6043,7 @@ static inline uint8_t a2dp_subevent_signaling_media_codec_mpeg_audio_configurati
  * @note: btstack_type 1
  */
 static inline uint8_t a2dp_subevent_signaling_media_codec_mpeg_audio_configuration_get_channel_mode(const uint8_t * event){
-    return event[10];
+    return event[11];
 }
 /**
  * @brief Get field num_channels from event A2DP_SUBEVENT_SIGNALING_MEDIA_CODEC_MPEG_AUDIO_CONFIGURATION
@@ -6043,7 +6052,7 @@ static inline uint8_t a2dp_subevent_signaling_media_codec_mpeg_audio_configurati
  * @note: btstack_type 1
  */
 static inline uint8_t a2dp_subevent_signaling_media_codec_mpeg_audio_configuration_get_num_channels(const uint8_t * event){
-    return event[11];
+    return event[12];
 }
 /**
  * @brief Get field media_payload_format from event A2DP_SUBEVENT_SIGNALING_MEDIA_CODEC_MPEG_AUDIO_CONFIGURATION
@@ -6052,7 +6061,7 @@ static inline uint8_t a2dp_subevent_signaling_media_codec_mpeg_audio_configurati
  * @note: btstack_type 1
  */
 static inline uint8_t a2dp_subevent_signaling_media_codec_mpeg_audio_configuration_get_media_payload_format(const uint8_t * event){
-    return event[12];
+    return event[13];
 }
 /**
  * @brief Get field sampling_frequency from event A2DP_SUBEVENT_SIGNALING_MEDIA_CODEC_MPEG_AUDIO_CONFIGURATION
@@ -6061,7 +6070,7 @@ static inline uint8_t a2dp_subevent_signaling_media_codec_mpeg_audio_configurati
  * @note: btstack_type 2
  */
 static inline uint16_t a2dp_subevent_signaling_media_codec_mpeg_audio_configuration_get_sampling_frequency(const uint8_t * event){
-    return little_endian_read_16(event, 13);
+    return little_endian_read_16(event, 14);
 }
 /**
  * @brief Get field vbr from event A2DP_SUBEVENT_SIGNALING_MEDIA_CODEC_MPEG_AUDIO_CONFIGURATION
@@ -6070,7 +6079,7 @@ static inline uint16_t a2dp_subevent_signaling_media_codec_mpeg_audio_configurat
  * @note: btstack_type 1
  */
 static inline uint8_t a2dp_subevent_signaling_media_codec_mpeg_audio_configuration_get_vbr(const uint8_t * event){
-    return event[15];
+    return event[16];
 }
 /**
  * @brief Get field bit_rate_index from event A2DP_SUBEVENT_SIGNALING_MEDIA_CODEC_MPEG_AUDIO_CONFIGURATION
@@ -6079,18 +6088,27 @@ static inline uint8_t a2dp_subevent_signaling_media_codec_mpeg_audio_configurati
  * @note: btstack_type 1
  */
 static inline uint8_t a2dp_subevent_signaling_media_codec_mpeg_audio_configuration_get_bit_rate_index(const uint8_t * event){
-    return event[16];
+    return event[17];
 }
 
 /**
- * @brief Get field avdtp_cid from event A2DP_SUBEVENT_SIGNALING_MEDIA_CODEC_MPEG_AAC_CONFIGURATION
+ * @brief Get field a2dp_cid from event A2DP_SUBEVENT_SIGNALING_MEDIA_CODEC_MPEG_AAC_CONFIGURATION
  * @param event packet
- * @return avdtp_cid
+ * @return a2dp_cid
  * @note: btstack_type 2
  */
-static inline uint16_t a2dp_subevent_signaling_media_codec_mpeg_aac_configuration_get_avdtp_cid(const uint8_t * event){
+static inline uint16_t a2dp_subevent_signaling_media_codec_mpeg_aac_configuration_get_a2dp_cid(const uint8_t * event){
     return little_endian_read_16(event, 3);
 }
+/**
+ * @brief Get field local_seid from event A2DP_SUBEVENT_SIGNALING_MEDIA_CODEC_MPEG_AAC_CONFIGURATION
+ * @param event packet
+ * @return local_seid
+ * @note: btstack_type 1
+ */
+static inline uint8_t a2dp_subevent_signaling_media_codec_mpeg_aac_configuration_get_local_seid(const uint8_t * event){
+    return event[5];
+}
 /**
  * @brief Get field remote_seid from event A2DP_SUBEVENT_SIGNALING_MEDIA_CODEC_MPEG_AAC_CONFIGURATION
  * @param event packet
@@ -6098,7 +6116,7 @@ static inline uint16_t a2dp_subevent_signaling_media_codec_mpeg_aac_configuratio
  * @note: btstack_type 1
  */
 static inline uint8_t a2dp_subevent_signaling_media_codec_mpeg_aac_configuration_get_remote_seid(const uint8_t * event){
-    return event[5];
+    return event[6];
 }
 /**
  * @brief Get field reconfigure from event A2DP_SUBEVENT_SIGNALING_MEDIA_CODEC_MPEG_AAC_CONFIGURATION
@@ -6107,7 +6125,7 @@ static inline uint8_t a2dp_subevent_signaling_media_codec_mpeg_aac_configuration
  * @note: btstack_type 1
  */
 static inline uint8_t a2dp_subevent_signaling_media_codec_mpeg_aac_configuration_get_reconfigure(const uint8_t * event){
-    return event[6];
+    return event[7];
 }
 /**
  * @brief Get field media_type from event A2DP_SUBEVENT_SIGNALING_MEDIA_CODEC_MPEG_AAC_CONFIGURATION
@@ -6116,7 +6134,7 @@ static inline uint8_t a2dp_subevent_signaling_media_codec_mpeg_aac_configuration
  * @note: btstack_type 1
  */
 static inline uint8_t a2dp_subevent_signaling_media_codec_mpeg_aac_configuration_get_media_type(const uint8_t * event){
-    return event[7];
+    return event[8];
 }
 /**
  * @brief Get field object_type from event A2DP_SUBEVENT_SIGNALING_MEDIA_CODEC_MPEG_AAC_CONFIGURATION
@@ -6125,7 +6143,7 @@ static inline uint8_t a2dp_subevent_signaling_media_codec_mpeg_aac_configuration
  * @note: btstack_type 1
  */
 static inline uint8_t a2dp_subevent_signaling_media_codec_mpeg_aac_configuration_get_object_type(const uint8_t * event){
-    return event[8];
+    return event[9];
 }
 /**
  * @brief Get field sampling_frequency from event A2DP_SUBEVENT_SIGNALING_MEDIA_CODEC_MPEG_AAC_CONFIGURATION
@@ -6134,7 +6152,7 @@ static inline uint8_t a2dp_subevent_signaling_media_codec_mpeg_aac_configuration
  * @note: btstack_type 3
  */
 static inline uint32_t a2dp_subevent_signaling_media_codec_mpeg_aac_configuration_get_sampling_frequency(const uint8_t * event){
-    return little_endian_read_24(event, 9);
+    return little_endian_read_24(event, 10);
 }
 /**
  * @brief Get field num_channels from event A2DP_SUBEVENT_SIGNALING_MEDIA_CODEC_MPEG_AAC_CONFIGURATION
@@ -6143,7 +6161,7 @@ static inline uint32_t a2dp_subevent_signaling_media_codec_mpeg_aac_configuratio
  * @note: btstack_type 1
  */
 static inline uint8_t a2dp_subevent_signaling_media_codec_mpeg_aac_configuration_get_num_channels(const uint8_t * event){
-    return event[12];
+    return event[13];
 }
 /**
  * @brief Get field bit_rate from event A2DP_SUBEVENT_SIGNALING_MEDIA_CODEC_MPEG_AAC_CONFIGURATION
@@ -6152,7 +6170,7 @@ static inline uint8_t a2dp_subevent_signaling_media_codec_mpeg_aac_configuration
  * @note: btstack_type 1
  */
 static inline uint8_t a2dp_subevent_signaling_media_codec_mpeg_aac_configuration_get_bit_rate(const uint8_t * event){
-    return event[13];
+    return event[14];
 }
 /**
  * @brief Get field vbr from event A2DP_SUBEVENT_SIGNALING_MEDIA_CODEC_MPEG_AAC_CONFIGURATION
@@ -6161,18 +6179,27 @@ static inline uint8_t a2dp_subevent_signaling_media_codec_mpeg_aac_configuration
  * @note: btstack_type 1
  */
 static inline uint8_t a2dp_subevent_signaling_media_codec_mpeg_aac_configuration_get_vbr(const uint8_t * event){
-    return event[14];
+    return event[15];
 }
 
 /**
- * @brief Get field avdtp_cid from event A2DP_SUBEVENT_SIGNALING_MEDIA_CODEC_ATRAC_CONFIGURATION
+ * @brief Get field a2dp_cid from event A2DP_SUBEVENT_SIGNALING_MEDIA_CODEC_ATRAC_CONFIGURATION
  * @param event packet
- * @return avdtp_cid
+ * @return a2dp_cid
  * @note: btstack_type 2
  */
-static inline uint16_t a2dp_subevent_signaling_media_codec_atrac_configuration_get_avdtp_cid(const uint8_t * event){
+static inline uint16_t a2dp_subevent_signaling_media_codec_atrac_configuration_get_a2dp_cid(const uint8_t * event){
     return little_endian_read_16(event, 3);
 }
+/**
+ * @brief Get field local_seid from event A2DP_SUBEVENT_SIGNALING_MEDIA_CODEC_ATRAC_CONFIGURATION
+ * @param event packet
+ * @return local_seid
+ * @note: btstack_type 1
+ */
+static inline uint8_t a2dp_subevent_signaling_media_codec_atrac_configuration_get_local_seid(const uint8_t * event){
+    return event[5];
+}
 /**
  * @brief Get field remote_seid from event A2DP_SUBEVENT_SIGNALING_MEDIA_CODEC_ATRAC_CONFIGURATION
  * @param event packet
@@ -6180,7 +6207,7 @@ static inline uint16_t a2dp_subevent_signaling_media_codec_atrac_configuration_g
  * @note: btstack_type 1
  */
 static inline uint8_t a2dp_subevent_signaling_media_codec_atrac_configuration_get_remote_seid(const uint8_t * event){
-    return event[5];
+    return event[6];
 }
 /**
  * @brief Get field reconfigure from event A2DP_SUBEVENT_SIGNALING_MEDIA_CODEC_ATRAC_CONFIGURATION
@@ -6189,7 +6216,7 @@ static inline uint8_t a2dp_subevent_signaling_media_codec_atrac_configuration_ge
  * @note: btstack_type 1
  */
 static inline uint8_t a2dp_subevent_signaling_media_codec_atrac_configuration_get_reconfigure(const uint8_t * event){
-    return event[6];
+    return event[7];
 }
 /**
  * @brief Get field media_type from event A2DP_SUBEVENT_SIGNALING_MEDIA_CODEC_ATRAC_CONFIGURATION
@@ -6198,7 +6225,7 @@ static inline uint8_t a2dp_subevent_signaling_media_codec_atrac_configuration_ge
  * @note: btstack_type 1
  */
 static inline uint8_t a2dp_subevent_signaling_media_codec_atrac_configuration_get_media_type(const uint8_t * event){
-    return event[7];
+    return event[8];
 }
 /**
  * @brief Get field version from event A2DP_SUBEVENT_SIGNALING_MEDIA_CODEC_ATRAC_CONFIGURATION
@@ -6207,7 +6234,7 @@ static inline uint8_t a2dp_subevent_signaling_media_codec_atrac_configuration_ge
  * @note: btstack_type 1
  */
 static inline uint8_t a2dp_subevent_signaling_media_codec_atrac_configuration_get_version(const uint8_t * event){
-    return event[8];
+    return event[9];
 }
 /**
  * @brief Get field channel_mode from event A2DP_SUBEVENT_SIGNALING_MEDIA_CODEC_ATRAC_CONFIGURATION
@@ -6216,7 +6243,7 @@ static inline uint8_t a2dp_subevent_signaling_media_codec_atrac_configuration_ge
  * @note: btstack_type 1
  */
 static inline uint8_t a2dp_subevent_signaling_media_codec_atrac_configuration_get_channel_mode(const uint8_t * event){
-    return event[9];
+    return event[10];
 }
 /**
  * @brief Get field num_channels from event A2DP_SUBEVENT_SIGNALING_MEDIA_CODEC_ATRAC_CONFIGURATION
@@ -6225,7 +6252,7 @@ static inline uint8_t a2dp_subevent_signaling_media_codec_atrac_configuration_ge
  * @note: btstack_type 1
  */
 static inline uint8_t a2dp_subevent_signaling_media_codec_atrac_configuration_get_num_channels(const uint8_t * event){
-    return event[10];
+    return event[11];
 }
 /**
  * @brief Get field sampling_frequency from event A2DP_SUBEVENT_SIGNALING_MEDIA_CODEC_ATRAC_CONFIGURATION
@@ -6234,7 +6261,7 @@ static inline uint8_t a2dp_subevent_signaling_media_codec_atrac_configuration_ge
  * @note: btstack_type 2
  */
 static inline uint16_t a2dp_subevent_signaling_media_codec_atrac_configuration_get_sampling_frequency(const uint8_t * event){
-    return little_endian_read_16(event, 11);
+    return little_endian_read_16(event, 12);
 }
 /**
  * @brief Get field vbr from event A2DP_SUBEVENT_SIGNALING_MEDIA_CODEC_ATRAC_CONFIGURATION
@@ -6243,7 +6270,7 @@ static inline uint16_t a2dp_subevent_signaling_media_codec_atrac_configuration_g
  * @note: btstack_type 1
  */
 static inline uint8_t a2dp_subevent_signaling_media_codec_atrac_configuration_get_vbr(const uint8_t * event){
-    return event[13];
+    return event[14];
 }
 /**
  * @brief Get field bit_rate_index from event A2DP_SUBEVENT_SIGNALING_MEDIA_CODEC_ATRAC_CONFIGURATION
@@ -6252,7 +6279,7 @@ static inline uint8_t a2dp_subevent_signaling_media_codec_atrac_configuration_ge
  * @note: btstack_type 1
  */
 static inline uint8_t a2dp_subevent_signaling_media_codec_atrac_configuration_get_bit_rate_index(const uint8_t * event){
-    return event[14];
+    return event[15];
 }
 /**
  * @brief Get field maximum_sul from event A2DP_SUBEVENT_SIGNALING_MEDIA_CODEC_ATRAC_CONFIGURATION
@@ -6261,7 +6288,7 @@ static inline uint8_t a2dp_subevent_signaling_media_codec_atrac_configuration_ge
  * @note: btstack_type 2
  */
 static inline uint16_t a2dp_subevent_signaling_media_codec_atrac_configuration_get_maximum_sul(const uint8_t * event){
-    return little_endian_read_16(event, 15);
+    return little_endian_read_16(event, 16);
 }
 
 /**
@@ -6274,21 +6301,21 @@ static inline uint16_t a2dp_subevent_signaling_media_codec_other_configuration_g
     return little_endian_read_16(event, 3);
 }
 /**
- * @brief Get field int_seid from event A2DP_SUBEVENT_SIGNALING_MEDIA_CODEC_OTHER_CONFIGURATION
+ * @brief Get field local_seid from event A2DP_SUBEVENT_SIGNALING_MEDIA_CODEC_OTHER_CONFIGURATION
  * @param event packet
- * @return int_seid
+ * @return local_seid
  * @note: btstack_type 1
  */
-static inline uint8_t a2dp_subevent_signaling_media_codec_other_configuration_get_int_seid(const uint8_t * event){
+static inline uint8_t a2dp_subevent_signaling_media_codec_other_configuration_get_local_seid(const uint8_t * event){
     return event[5];
 }
 /**
- * @brief Get field acp_seid from event A2DP_SUBEVENT_SIGNALING_MEDIA_CODEC_OTHER_CONFIGURATION
+ * @brief Get field remote_seid from event A2DP_SUBEVENT_SIGNALING_MEDIA_CODEC_OTHER_CONFIGURATION
  * @param event packet
- * @return acp_seid
+ * @return remote_seid
  * @note: btstack_type 1
  */
-static inline uint8_t a2dp_subevent_signaling_media_codec_other_configuration_get_acp_seid(const uint8_t * event){
+static inline uint8_t a2dp_subevent_signaling_media_codec_other_configuration_get_remote_seid(const uint8_t * event){
     return event[6];
 }
 /**
@@ -6591,12 +6618,12 @@ static inline uint8_t a2dp_subevent_stream_reconfigured_get_status(const uint8_t
 }
 
 /**
- * @brief Get field avdtp_cid from event A2DP_SUBEVENT_SIGNALING_MEDIA_CODEC_SBC_CAPABILITY
+ * @brief Get field a2dp_cid from event A2DP_SUBEVENT_SIGNALING_MEDIA_CODEC_SBC_CAPABILITY
  * @param event packet
- * @return avdtp_cid
+ * @return a2dp_cid
  * @note: btstack_type 2
  */
-static inline uint16_t a2dp_subevent_signaling_media_codec_sbc_capability_get_avdtp_cid(const uint8_t * event){
+static inline uint16_t a2dp_subevent_signaling_media_codec_sbc_capability_get_a2dp_cid(const uint8_t * event){
     return little_endian_read_16(event, 3);
 }
 /**
@@ -6682,12 +6709,12 @@ static inline uint8_t a2dp_subevent_signaling_media_codec_sbc_capability_get_max
 }
 
 /**
- * @brief Get field avdtp_cid from event A2DP_SUBEVENT_SIGNALING_MEDIA_CODEC_MPEG_AUDIO_CAPABILITY
+ * @brief Get field a2dp_cid from event A2DP_SUBEVENT_SIGNALING_MEDIA_CODEC_MPEG_AUDIO_CAPABILITY
  * @param event packet
- * @return avdtp_cid
+ * @return a2dp_cid
  * @note: btstack_type 2
  */
-static inline uint16_t a2dp_subevent_signaling_media_codec_mpeg_audio_capability_get_avdtp_cid(const uint8_t * event){
+static inline uint16_t a2dp_subevent_signaling_media_codec_mpeg_audio_capability_get_a2dp_cid(const uint8_t * event){
     return little_endian_read_16(event, 3);
 }
 /**
@@ -6773,12 +6800,12 @@ static inline uint16_t a2dp_subevent_signaling_media_codec_mpeg_audio_capability
 }
 
 /**
- * @brief Get field avdtp_cid from event A2DP_SUBEVENT_SIGNALING_MEDIA_CODEC_MPEG_AAC_CAPABILITY
+ * @brief Get field a2dp_cid from event A2DP_SUBEVENT_SIGNALING_MEDIA_CODEC_MPEG_AAC_CAPABILITY
  * @param event packet
- * @return avdtp_cid
+ * @return a2dp_cid
  * @note: btstack_type 2
  */
-static inline uint16_t a2dp_subevent_signaling_media_codec_mpeg_aac_capability_get_avdtp_cid(const uint8_t * event){
+static inline uint16_t a2dp_subevent_signaling_media_codec_mpeg_aac_capability_get_a2dp_cid(const uint8_t * event){
     return little_endian_read_16(event, 3);
 }
 /**
@@ -6830,10 +6857,10 @@ static inline uint8_t a2dp_subevent_signaling_media_codec_mpeg_aac_capability_ge
  * @brief Get field bit_rate from event A2DP_SUBEVENT_SIGNALING_MEDIA_CODEC_MPEG_AAC_CAPABILITY
  * @param event packet
  * @return bit_rate
- * @note: btstack_type 1
+ * @note: btstack_type 3
  */
-static inline uint8_t a2dp_subevent_signaling_media_codec_mpeg_aac_capability_get_bit_rate(const uint8_t * event){
-    return event[11];
+static inline uint32_t a2dp_subevent_signaling_media_codec_mpeg_aac_capability_get_bit_rate(const uint8_t * event){
+    return little_endian_read_24(event, 11);
 }
 /**
  * @brief Get field vbr from event A2DP_SUBEVENT_SIGNALING_MEDIA_CODEC_MPEG_AAC_CAPABILITY
@@ -6842,16 +6869,16 @@ static inline uint8_t a2dp_subevent_signaling_media_codec_mpeg_aac_capability_ge
  * @note: btstack_type 1
  */
 static inline uint8_t a2dp_subevent_signaling_media_codec_mpeg_aac_capability_get_vbr(const uint8_t * event){
-    return event[12];
+    return event[14];
 }
 
 /**
- * @brief Get field avdtp_cid from event A2DP_SUBEVENT_SIGNALING_MEDIA_CODEC_ATRAC_CAPABILITY
+ * @brief Get field a2dp_cid from event A2DP_SUBEVENT_SIGNALING_MEDIA_CODEC_ATRAC_CAPABILITY
  * @param event packet
- * @return avdtp_cid
+ * @return a2dp_cid
  * @note: btstack_type 2
  */
-static inline uint16_t a2dp_subevent_signaling_media_codec_atrac_capability_get_avdtp_cid(const uint8_t * event){
+static inline uint16_t a2dp_subevent_signaling_media_codec_atrac_capability_get_a2dp_cid(const uint8_t * event){
     return little_endian_read_16(event, 3);
 }
 /**
@@ -6928,12 +6955,12 @@ static inline uint16_t a2dp_subevent_signaling_media_codec_atrac_capability_get_
 }
 
 /**
- * @brief Get field avdtp_cid from event A2DP_SUBEVENT_SIGNALING_MEDIA_CODEC_OTHER_CAPABILITY
+ * @brief Get field a2dp_cid from event A2DP_SUBEVENT_SIGNALING_MEDIA_CODEC_OTHER_CAPABILITY
  * @param event packet
- * @return avdtp_cid
+ * @return a2dp_cid
  * @note: btstack_type 2
  */
-static inline uint16_t a2dp_subevent_signaling_media_codec_other_capability_get_avdtp_cid(const uint8_t * event){
+static inline uint16_t a2dp_subevent_signaling_media_codec_other_capability_get_a2dp_cid(const uint8_t * event){
     return little_endian_read_16(event, 3);
 }
 /**
@@ -6983,23 +7010,14 @@ static inline const uint8_t * a2dp_subevent_signaling_media_codec_other_capabili
 }
 
 /**
- * @brief Get field avdtp_cid from event A2DP_SUBEVENT_SIGNALING_DELAY_REPORTING_CAPABILITY
+ * @brief Get field a2dp_cid from event A2DP_SUBEVENT_SIGNALING_DELAY_REPORTING_CAPABILITY
  * @param event packet
- * @return avdtp_cid
+ * @return a2dp_cid
  * @note: btstack_type 2
  */
-static inline uint16_t a2dp_subevent_signaling_delay_reporting_capability_get_avdtp_cid(const uint8_t * event){
+static inline uint16_t a2dp_subevent_signaling_delay_reporting_capability_get_a2dp_cid(const uint8_t * event){
     return little_endian_read_16(event, 3);
 }
-/**
- * @brief Get field local_seid from event A2DP_SUBEVENT_SIGNALING_DELAY_REPORTING_CAPABILITY
- * @param event packet
- * @return local_seid
- * @note: btstack_type 1
- */
-static inline uint8_t a2dp_subevent_signaling_delay_reporting_capability_get_local_seid(const uint8_t * event){
-    return event[5];
-}
 /**
  * @brief Get field remote_seid from event A2DP_SUBEVENT_SIGNALING_DELAY_REPORTING_CAPABILITY
  * @param event packet
@@ -7007,16 +7025,16 @@ static inline uint8_t a2dp_subevent_signaling_delay_reporting_capability_get_loc
  * @note: btstack_type 1
  */
 static inline uint8_t a2dp_subevent_signaling_delay_reporting_capability_get_remote_seid(const uint8_t * event){
-    return event[6];
+    return event[5];
 }
 
 /**
- * @brief Get field avdtp_cid from event A2DP_SUBEVENT_SIGNALING_DELAY_REPORT
+ * @brief Get field a2dp_cid from event A2DP_SUBEVENT_SIGNALING_DELAY_REPORT
  * @param event packet
- * @return avdtp_cid
+ * @return a2dp_cid
  * @note: btstack_type 2
  */
-static inline uint16_t a2dp_subevent_signaling_delay_report_get_avdtp_cid(const uint8_t * event){
+static inline uint16_t a2dp_subevent_signaling_delay_report_get_a2dp_cid(const uint8_t * event){
     return little_endian_read_16(event, 3);
 }
 /**
@@ -7039,12 +7057,12 @@ static inline uint16_t a2dp_subevent_signaling_delay_report_get_delay_100us(cons
 }
 
 /**
- * @brief Get field avdtp_cid from event A2DP_SUBEVENT_SIGNALING_CAPABILITIES_DONE
+ * @brief Get field a2dp_cid from event A2DP_SUBEVENT_SIGNALING_CAPABILITIES_DONE
  * @param event packet
- * @return avdtp_cid
+ * @return a2dp_cid
  * @note: btstack_type 2
  */
-static inline uint16_t a2dp_subevent_signaling_capabilities_done_get_avdtp_cid(const uint8_t * event){
+static inline uint16_t a2dp_subevent_signaling_capabilities_done_get_a2dp_cid(const uint8_t * event){
     return little_endian_read_16(event, 3);
 }
 /**
@@ -7058,12 +7076,12 @@ static inline uint8_t a2dp_subevent_signaling_capabilities_done_get_remote_seid(
 }
 
 /**
- * @brief Get field avdtp_cid from event A2DP_SUBEVENT_SIGNALING_CAPABILITIES_COMPLETE
+ * @brief Get field a2dp_cid from event A2DP_SUBEVENT_SIGNALING_CAPABILITIES_COMPLETE
  * @param event packet
- * @return avdtp_cid
+ * @return a2dp_cid
  * @note: btstack_type 2
  */
-static inline uint16_t a2dp_subevent_signaling_capabilities_complete_get_avdtp_cid(const uint8_t * event){
+static inline uint16_t a2dp_subevent_signaling_capabilities_complete_get_a2dp_cid(const uint8_t * event){
     return little_endian_read_16(event, 3);
 }