diff --git a/example/a2dp_sink_demo.c b/example/a2dp_sink_demo.c
index b37983456..2f0ecad78 100644
--- a/example/a2dp_sink_demo.c
+++ b/example/a2dp_sink_demo.c
@@ -42,7 +42,7 @@
  */
 
 // *****************************************************************************
-/* EXAMPLE_START(a2dp_sink_demo): Receive audio stream and control its playback.
+/* EXAMPLE_START(a2dp_sink_demo): Audio stream reception and playback control
  *
  * @text This A2DP Sink example demonstrates how to use the A2DP Sink service to 
  * receive an audio data stream from a remote A2DP Source device. In addition,
diff --git a/example/a2dp_source_demo.c b/example/a2dp_source_demo.c
index aab0d4bb1..7ef39351d 100644
--- a/example/a2dp_source_demo.c
+++ b/example/a2dp_source_demo.c
@@ -42,7 +42,7 @@
  */
 
 // *****************************************************************************
-/* EXAMPLE_START(a2dp_source_demo): Serve audio stream and handle remote playback control and queries.
+/* EXAMPLE_START(a2dp_source_demo): Audio streaming and remote playback control
  *
  * @text This A2DP Source example demonstrates how to send an audio data stream 
  * to a remote A2DP Sink device and how to switch between two audio data sources.  
diff --git a/example/dut_mode_classic.c b/example/dut_mode_classic.c
index bdede71a3..cb89fa415 100644
--- a/example/dut_mode_classic.c
+++ b/example/dut_mode_classic.c
@@ -38,7 +38,7 @@
 #define BTSTACK_FILE__ "dut_mode_classic.c"
 
 // *****************************************************************************
-/* EXAMPLE_START(dut_mode_classic): Enable Device Under Test (DUT) Mode for BR/EDR
+/* EXAMPLE_START(dut_mode_classic): Testing - Enable Device Under Test (DUT) Mode for BR/EDR
  *
  * @text DUT mode can be used for production testing. This example just configures 
  * the Bluetooth Controller for DUT mode.
diff --git a/example/gatt_streamer_server.c b/example/gatt_streamer_server.c
index 7c7516048..68cf27d2e 100644
--- a/example/gatt_streamer_server.c
+++ b/example/gatt_streamer_server.c
@@ -38,7 +38,7 @@
 #define BTSTACK_FILE__ "gatt_streamer.c"
 
 // *****************************************************************************
-/* EXAMPLE_START(le_streamer): LE Streamer - Stream data over GATT.
+/* EXAMPLE_START(le_streamer): Performance - Stream data over GATT
  *
  * @text All newer operating systems provide GATT Client functionality.
  * This example shows how to get a maximal throughput via BLE:
diff --git a/example/le_streamer_client.c b/example/le_streamer_client.c
index 60a895cff..ddec58db9 100644
--- a/example/le_streamer_client.c
+++ b/example/le_streamer_client.c
@@ -42,7 +42,10 @@
  */
 
 // *****************************************************************************
-/* EXAMPLE_START(le_streamer_client): Connects to 'LE Streamer' and subscribes to test characteristic
+/* EXAMPLE_START(le_streamer_client): Performance - LE Streamer Client
+ * 
+ * @text Connects to 'LE Streamer' and subscribes to test characteristic
+ *
  */
 // *****************************************************************************
 
diff --git a/example/led_counter.c b/example/led_counter.c
index fa21a54ea..6300e5d3b 100644
--- a/example/led_counter.c
+++ b/example/led_counter.c
@@ -38,7 +38,7 @@
 #define BTSTACK_FILE__ "led_counter.c"
 
 // *****************************************************************************
-/* EXAMPLE_START(led_counter): Hello World: blinking LED without Bluetooth
+/* EXAMPLE_START(led_counter): Hello World - Blinking LED without Bluetooth
  *
  * @text The example demonstrates how to provide a periodic timer to toggle an
  * LED and send debug messages to the console as a minimal BTstack test.
diff --git a/example/panu_demo.c b/example/panu_demo.c
index 85fcf7ef8..1de250e28 100644
--- a/example/panu_demo.c
+++ b/example/panu_demo.c
@@ -42,7 +42,7 @@
  * Author: Ole Reinhardt <ole.reinhardt@kernelconcepts.de>
  */
 
-/* EXAMPLE_START(panu_demo): PANU Demo
+/* EXAMPLE_START(panu_demo): BNEP/PANU Demo
  *
  * @text This example implements both a PANU client and a server. In server mode, it 
  * sets up a BNEP server and registers a PANU SDP record and waits for incoming connections.
diff --git a/example/sdp_bnep_query.c b/example/sdp_bnep_query.c
index 108e1bb03..9576fe07c 100644
--- a/example/sdp_bnep_query.c
+++ b/example/sdp_bnep_query.c
@@ -38,7 +38,7 @@
 #define BTSTACK_FILE__ "sdp_bnep_query.c"
  
 // *****************************************************************************
-/* EXAMPLE_START(sdp_bnep_query): Dump remote BNEP PAN protocol UUID and L2CAP PSM
+/* EXAMPLE_START(sdp_bnep_query): SDP Records - Dump BNEP PAN protocol
  *
  * @text The example shows how the SDP Client is used to get all BNEP service
  * records from a remote device. It extracts the remote BNEP PAN protocol 
diff --git a/example/sdp_general_query.c b/example/sdp_general_query.c
index 7aeb7e40d..68bfb4bc8 100644
--- a/example/sdp_general_query.c
+++ b/example/sdp_general_query.c
@@ -38,7 +38,7 @@
 #define BTSTACK_FILE__ "sdp_general_query.c"
  
 // *****************************************************************************
-/* EXAMPLE_START(sdp_general_query): Dump remote SDP Records
+/* EXAMPLE_START(sdp_general_query): SDP Records Dump
  *
  * @text The example shows how the SDP Client is used to get a list of 
  * service records on a remote device. 
diff --git a/example/sm_pairing_central.c b/example/sm_pairing_central.c
index 952f55ade..78e2453e6 100644
--- a/example/sm_pairing_central.c
+++ b/example/sm_pairing_central.c
@@ -39,7 +39,7 @@
  
 
 // *****************************************************************************
-/* EXAMPLE_START(sm_pairing_central): LE Peripheral - Test pairing combinations
+/* EXAMPLE_START(sm_pairing_central): LE Central - Test pairing combinations
  *
  * @text Depending on the Authentication requiremens and IO Capabilities,
  * the pairing process uses different short and long term key generation method.
diff --git a/example/spp_and_gatt_counter.c b/example/spp_and_gatt_counter.c
index 2090d0718..6fdee8b66 100644
--- a/example/spp_and_gatt_counter.c
+++ b/example/spp_and_gatt_counter.c
@@ -38,7 +38,7 @@
 #define BTSTACK_FILE__ "spp_and_gatt_counter.c"
 
 // *****************************************************************************
-/* EXAMPLE_START(spp_and_le_counter): Dual mode example
+/* EXAMPLE_START(spp_and_le_counter): Dual mode - SPP and LE Counter
  * 
  * @text The SPP and LE Counter example combines the Bluetooth Classic SPP Counter
  * and the Bluetooth LE Counter into a single application.
diff --git a/example/spp_streamer.c b/example/spp_streamer.c
index 3da9ec8cc..e817aefab 100644
--- a/example/spp_streamer.c
+++ b/example/spp_streamer.c
@@ -42,7 +42,7 @@
  */
 
 // *****************************************************************************
-/* EXAMPLE_START(spp_streamer): Send test data via SPP as fast as possible.
+/* EXAMPLE_START(spp_streamer): Performance - Stream data over SPP
  * 
  * @text After RFCOMM connections gets open, request a
  * RFCOMM_EVENT_CAN_SEND_NOW via rfcomm_request_can_send_now_event().
diff --git a/example/spp_streamer_client.c b/example/spp_streamer_client.c
index c0d87f055..e25b53386 100644
--- a/example/spp_streamer_client.c
+++ b/example/spp_streamer_client.c
@@ -42,7 +42,7 @@
  */
 
 // *****************************************************************************
-/* EXAMPLE_START(spp_streamer_client): Client for SPP Streamer
+/* EXAMPLE_START(spp_streamer_client): Performance - SPP Streamer Client
  * 
  * @text Note: The SPP Streamer Client scans for and connects to SPP Streamer,
  * and measures the throughput.