diff --git a/example/embedded/spp_counter.c b/example/embedded/spp_counter.c
index caa0f6c5a..378f3c5ad 100644
--- a/example/embedded/spp_counter.c
+++ b/example/embedded/spp_counter.c
@@ -82,7 +82,7 @@ static void packet_handler (void * connection, uint8_t packet_type, uint16_t cha
 				case BTSTACK_EVENT_STATE:
 					// bt stack activated, get started - set local name
 					if (packet[2] == HCI_STATE_WORKING) {
-                        hci_send_cmd(&hci_write_local_name, "BTstack SPP Counter");
+                        printf("BTstack is up and running\n");
 					}
 					break;
 				
@@ -204,6 +204,7 @@ int btstack_main(int argc, const char * argv[]){
     run_loop_set_timer(&heartbeat, HEARTBEAT_PERIOD_MS);
     run_loop_add_timer(&heartbeat);
 
+    gap_set_local_name("BTstack SPP Counter");
     // turn on!
 	hci_power_control(HCI_POWER_ON);
 	
diff --git a/example/embedded/spp_flowcontrol.c b/example/embedded/spp_flowcontrol.c
index c81b24782..dacdafd2f 100644
--- a/example/embedded/spp_flowcontrol.c
+++ b/example/embedded/spp_flowcontrol.c
@@ -78,9 +78,8 @@ static void packet_handler (void * connection, uint8_t packet_type, uint16_t cha
             switch (packet[0]) {
                     
                 case BTSTACK_EVENT_STATE:
-                    // bt stack activated, get started - set local name
                     if (packet[2] == HCI_STATE_WORKING) {
-                        hci_send_cmd(&hci_write_local_name, "BTstack SPP Flow Control");
+                        printf("BTstack is up and running\n");
                     }
                     break;
                 
@@ -90,10 +89,6 @@ static void packet_handler (void * connection, uint8_t packet_type, uint16_t cha
                         printf("BD-ADDR: %s\n\r", bd_addr_to_str(event_addr));
                         break;
                     }
-                    if (COMMAND_COMPLETE_EVENT(packet, hci_write_local_name)){
-                        hci_discoverable_control(1);
-                        break;
-                    }
                     break;
 
                 case HCI_EVENT_LINK_KEY_REQUEST:
@@ -184,6 +179,8 @@ int btstack_main(int argc, const char * argv[]){
     run_loop_add_timer(&heartbeat);
     
     puts("SPP FlowControl Demo: simulates processing on received data...\n\r");
+    gap_set_local_name("BTstack SPP Flow Control");
+    hci_discoverable_control(1);
 
     // turn on!
     hci_power_control(HCI_POWER_ON);
diff --git a/platforms/ez430-rf2560/example/ant-test.c b/platforms/ez430-rf2560/example/ant-test.c
index f776107f8..50ea01113 100644
--- a/platforms/ez430-rf2560/example/ant-test.c
+++ b/platforms/ez430-rf2560/example/ant-test.c
@@ -55,9 +55,10 @@ static void packet_handler (void * connection, uint8_t packet_type, uint16_t cha
 			switch (packet[0]) {
 					
 				case BTSTACK_EVENT_STATE:
-					// bt stack activated, get started - set local name
 					if (packet[2] == HCI_STATE_WORKING) {
-                        hci_send_cmd(&hci_write_local_name, "BlueMSP-Demo");
+                        printf("BTstack is up and running\n");
+                        // start ANT init
+                        ant_send_cmd(&ant_reset); 
 					}
 					break;
 				
@@ -67,12 +68,7 @@ static void packet_handler (void * connection, uint8_t packet_type, uint16_t cha
                         printf("BD-ADDR: %s\n\r", bd_addr_to_str(event_addr));
                         break;
                     }
-					if (COMMAND_COMPLETE_EVENT(packet, hci_write_local_name)){
-						// start ANT init
-						ant_send_cmd(&ant_reset); 
-						break;
-                    }
-                    break;
+					break;
 
 				case HCI_EVENT_LINK_KEY_REQUEST:
 					// deny link key request
@@ -205,14 +201,14 @@ int btstack_main(int argc, const char * argv[]){
     run_loop_set_timer(&heartbeat, HEARTBEAT_PERIOD_MS);
     run_loop_add_timer(&heartbeat);
     
-	printf("Run...\n\r");
-
- 	// turn on!
-	hci_power_control(HCI_POWER_ON);
-
-    // default to discoverable
+    // set local name
+    gap_set_local_name("BlueMSP-Demo");
+    // make discoverable
     hci_discoverable_control(1);
 
+	printf("Run...\n\r");
+ 	// turn on!
+	hci_power_control(HCI_POWER_ON);
     return 0;
 }
 
diff --git a/platforms/ez430-rf2560/example/spp_accel.c b/platforms/ez430-rf2560/example/spp_accel.c
index 19ffb2694..10ab3176a 100644
--- a/platforms/ez430-rf2560/example/spp_accel.c
+++ b/platforms/ez430-rf2560/example/spp_accel.c
@@ -95,9 +95,8 @@ static void packet_handler (void * connection, uint8_t packet_type, uint16_t cha
             switch (packet[0]) {
                     
                 case BTSTACK_EVENT_STATE:
-                    // bt stack activated, get started - set local name
                     if (packet[2] == HCI_STATE_WORKING) {
-                        hci_send_cmd(&hci_write_local_name, "BTstack SPP Sensor");
+                        printf("BTstack is up and running\n");
                     }
                     break;
                 
@@ -107,10 +106,6 @@ static void packet_handler (void * connection, uint8_t packet_type, uint16_t cha
                         printf("BD-ADDR: %s\n\r", bd_addr_to_str(event_addr));
                         break;
                     }
-                    if (COMMAND_COMPLETE_EVENT(packet, hci_write_local_name)){
-                        hci_discoverable_control(1);
-                        break;
-                    }
                     break;
 
                 case HCI_EVENT_LINK_KEY_REQUEST:
@@ -193,11 +188,12 @@ int btstack_main(int argc, const char * argv[]){
     // ready - enable irq used in h4 task
     __enable_interrupt();   
     
-    // turn on!
-    hci_power_control(HCI_POWER_ON);
+    // set local name
+    gap_set_local_name("BTstack SPP Sensor");
     // make discoverable
     hci_discoverable_control(1);
-        
+    // turn on!
+    hci_power_control(HCI_POWER_ON);
     return 0;
 }
 
diff --git a/platforms/msp-exp430f5438-cc2564b/example/ant-test.c b/platforms/msp-exp430f5438-cc2564b/example/ant-test.c
index f776107f8..d5727b3bd 100644
--- a/platforms/msp-exp430f5438-cc2564b/example/ant-test.c
+++ b/platforms/msp-exp430f5438-cc2564b/example/ant-test.c
@@ -55,10 +55,11 @@ static void packet_handler (void * connection, uint8_t packet_type, uint16_t cha
 			switch (packet[0]) {
 					
 				case BTSTACK_EVENT_STATE:
-					// bt stack activated, get started - set local name
 					if (packet[2] == HCI_STATE_WORKING) {
-                        hci_send_cmd(&hci_write_local_name, "BlueMSP-Demo");
-					}
+                        printf("BTstack is up and running\n");
+                        // start ANT init
+                        ant_send_cmd(&ant_reset); 
+                    }
 					break;
 				
 				case HCI_EVENT_COMMAND_COMPLETE:
@@ -67,12 +68,7 @@ static void packet_handler (void * connection, uint8_t packet_type, uint16_t cha
                         printf("BD-ADDR: %s\n\r", bd_addr_to_str(event_addr));
                         break;
                     }
-					if (COMMAND_COMPLETE_EVENT(packet, hci_write_local_name)){
-						// start ANT init
-						ant_send_cmd(&ant_reset); 
-						break;
-                    }
-                    break;
+					break;
 
 				case HCI_EVENT_LINK_KEY_REQUEST:
 					// deny link key request
@@ -205,14 +201,14 @@ int btstack_main(int argc, const char * argv[]){
     run_loop_set_timer(&heartbeat, HEARTBEAT_PERIOD_MS);
     run_loop_add_timer(&heartbeat);
     
-	printf("Run...\n\r");
-
- 	// turn on!
-	hci_power_control(HCI_POWER_ON);
-
-    // default to discoverable
+    // set local name
+    gap_set_local_name("BlueMSP-Demo");
+    // make discoverable
     hci_discoverable_control(1);
-
+                    
+ 	printf("Run...\n\r");
+    // turn on!
+	hci_power_control(HCI_POWER_ON);
     return 0;
 }
 
diff --git a/platforms/msp-exp430f5438-cc2564b/example/spp_accel.c b/platforms/msp-exp430f5438-cc2564b/example/spp_accel.c
index 19ffb2694..8de19827c 100644
--- a/platforms/msp-exp430f5438-cc2564b/example/spp_accel.c
+++ b/platforms/msp-exp430f5438-cc2564b/example/spp_accel.c
@@ -95,9 +95,8 @@ static void packet_handler (void * connection, uint8_t packet_type, uint16_t cha
             switch (packet[0]) {
                     
                 case BTSTACK_EVENT_STATE:
-                    // bt stack activated, get started - set local name
                     if (packet[2] == HCI_STATE_WORKING) {
-                        hci_send_cmd(&hci_write_local_name, "BTstack SPP Sensor");
+                        printf("BTstack is up and running.\n");
                     }
                     break;
                 
@@ -107,10 +106,6 @@ static void packet_handler (void * connection, uint8_t packet_type, uint16_t cha
                         printf("BD-ADDR: %s\n\r", bd_addr_to_str(event_addr));
                         break;
                     }
-                    if (COMMAND_COMPLETE_EVENT(packet, hci_write_local_name)){
-                        hci_discoverable_control(1);
-                        break;
-                    }
                     break;
 
                 case HCI_EVENT_LINK_KEY_REQUEST:
@@ -193,11 +188,13 @@ int btstack_main(int argc, const char * argv[]){
     // ready - enable irq used in h4 task
     __enable_interrupt();   
     
-    // turn on!
-    hci_power_control(HCI_POWER_ON);
+    // set local name
+    gap_set_local_name("BTstack SPP Sensor");
     // make discoverable
     hci_discoverable_control(1);
-        
+                    
+    // turn on!
+    hci_power_control(HCI_POWER_ON);
     return 0;
 }